chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3996 from pixelfed/staging 

Update AP helpers
This commit is contained in:
daniel 2022-12-24 00:26:59 -07:00 committed by GitHub
parent def5ac8a28 43c93e74e7
commit dddbfe0176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Util/ActivityPub/Helpers.php
View File

@ -453,7 +453,7 @@ class Helpers {
public static function storeStatus($url, $profile, $activity) public static function storeStatus($url, $profile, $activity)
{ {
$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($activity['url']); $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($activity['url']);
$url = isset($activity['url']) && is_string($activity['url']) ? $activity['url'] : $id; $url = isset($activity['url']) && is_string($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);
$idDomain = parse_url($id, PHP_URL_HOST); $idDomain = parse_url($id, PHP_URL_HOST);
$urlDomain = parse_url($url, PHP_URL_HOST); $urlDomain = parse_url($url, PHP_URL_HOST);
if(!self::validateUrl($id) || !self::validateUrl($url)) { if(!self::validateUrl($id) || !self::validateUrl($url)) {
@ -556,7 +556,7 @@ class Helpers {
{ {
$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url); $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url);
$url = isset($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id); $url = isset($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);
$urlDomain = parse_url($url, PHP_URL_HOST); $urlDomain = parse_url(self::pluckval($url), PHP_URL_HOST);
$scope = 'private'; $scope = 'private';
if(isset($activity['to']) == true) { if(isset($activity['to']) == true) {