Merge pull request #1668 from pixelfed/staging

Update AP Inbox, fix url bug
6 years ago · 7af9dcd2ec
parent b99d23f0e0 6e4a56236e
commit 7af9dcd2ec
1 changed files with 2 additions and 2 deletions
--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@ -130,7 +130,7 @@ class Inbox
        }

        $inReplyTo = $activity['inReplyTo'];
-        $url = $activity['id'];
+        $url = isset($activity['url']) ? $activity['url'] : $activity['id'];
        
        Helpers::statusFirstOrFetch($url, true);
        return;
@ -148,7 +148,7 @@ class Inbox
            return;
        }

-        $url = $activity['id'];
+        $url = isset($activity['url']) ? $activity['url'] : $activity['id'];
        if(Status::whereUrl($url)->exists()) {
            return;
        }