UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1668 from pixelfed/staging

Browse source 
Update AP Inbox, fix url bug
This commit is contained in:
daniel 2019-09-06 22:00:58 -06:00 committed by GitHub
commit 7af9dcd2ec
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/Inbox.php
View file

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