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

Update AP helpers, fix federation bug

Browse source
This commit is contained in:
Daniel Supernault 2021-01-06 20:34:55 -07:00
parent 352fe9f1e6
commit a52564f31d
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Util/ActivityPub/Helpers.php
View file

@ -25,6 +25,7 @@ use App\Util\ActivityPub\HttpSignature;
use Illuminate\Support\Str;
use App\Services\ActivityPubDeliveryService;
use App\Services\MediaPathService;
use App\Services\MediaStorageService;
class Helpers {
@ -240,9 +241,12 @@ class Helpers {
if($local) {
$id = (int) last(explode('/', $url));
return Status::findOrFail($id);
return Status::whereNotIn('scope', ['draft','archived'])->findOrFail($id);
} else {
$cached = Status::whereUri($url)->orWhere('object_url', $url)->first();
$cached = Status::whereNotIn('scope', ['draft','archived'])
->whereUri($url)
->orWhere('object_url', $url)
->first();
if($cached) {
return $cached;
}
@ -325,7 +329,7 @@ class Helpers {
$profile = self::profileFirstOrNew($activity['object']['attributedTo']);
if(isset($activity['object']['inReplyTo']) && !empty($activity['object']['inReplyTo']) && $replyTo == true) {
$reply_to = self::statusFirstOrFetch($activity['object']['inReplyTo'], false);
$reply_to = $reply_to->id;
$reply_to = optional($reply_to)->id;
} else {
$reply_to = null;
}