UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4804 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-12-08 03:27:52 -07:00 committed by GitHub
commit f01f4bf23e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1225 additions and 1206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php
View file

@ -79,7 +79,6 @@ class FeedInsertPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
HomeTimelineService::add($this->pid, $this->sid);
$ids = FollowerService::localFollowerIds($this->pid);
if(!$ids || !count($ids)) {

22
app/Util/ActivityPub/Inbox.php
View file

@ -713,9 +713,11 @@ class Inbox
if(!$status) {
return;
}
if($status->scope && $status->scope != 'direct') {
if($status->scope && in_array($status->scope, ['public', 'unlisted', 'private'])) {
if($status->type && !in_array($status->type, ['story:reaction', 'story:reply', 'reply'])) {
FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
}
}
RemoteStatusDelete::dispatch($status)->onQueue('high');
return;
break;
@ -985,9 +987,18 @@ class Inbox
return;
}
$url = $id;
if(str_ends_with($url, '/activity')) {
$url = substr($url, 0, -9);
}
$status = new Status;
$status->profile_id = $actorProfile->id;
$status->type = 'story:reaction';
$status->url = $url;
$status->uri = $url;
$status->object_url = $url;
$status->caption = $text;
$status->rendered = $text;
$status->scope = 'direct';
@ -1094,11 +1105,20 @@ class Inbox
return;
}
$url = $id;
if(str_ends_with($url, '/activity')) {
$url = substr($url, 0, -9);
}
$status = new Status;
$status->profile_id = $actorProfile->id;
$status->type = 'story:reply';
$status->caption = $text;
$status->rendered = $text;
$status->url = $url;
$status->uri = $url;
$status->object_url = $url;
$status->scope = 'direct';
$status->visibility = 'direct';
$status->in_reply_to_profile_id = $story->profile_id;