UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-09 21:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4420 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-05-25 05:00:17 -06:00 committed by GitHub
commit 5cfe8cd56a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -10,6 +10,7 @@
- Update Config, bump version for post edit support without having to clear cache ([c0190d84](https://github.com/pixelfed/pixelfed/commit/c0190d84)) - Update Config, bump version for post edit support without having to clear cache ([c0190d84](https://github.com/pixelfed/pixelfed/commit/c0190d84))
- Update EditHistoryModal, fix caption rendering ([0f803446](https://github.com/pixelfed/pixelfed/commit/0f803446)) - Update EditHistoryModal, fix caption rendering ([0f803446](https://github.com/pixelfed/pixelfed/commit/0f803446))
- Update StatusRemoteUpdatePipeline, fix typo ([109d0419](https://github.com/pixelfed/pixelfed/commit/109d0419)) - Update StatusRemoteUpdatePipeline, fix typo ([109d0419](https://github.com/pixelfed/pixelfed/commit/109d0419))
- Update StatusActivityPubDeliver, fix delivery addressing ([1f2183ee](https://github.com/pixelfed/pixelfed/commit/1f2183ee))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.7 (2023-05-24)](https://github.com/pixelfed/pixelfed/compare/v0.11.6...v0.11.7) ## [v0.11.7 (2023-05-24)](https://github.com/pixelfed/pixelfed/compare/v0.11.6...v0.11.7)

25
app/Jobs/StatusPipeline/StatusActivityPubDeliver.php
View file

@ -3,6 +3,7 @@
namespace App\Jobs\StatusPipeline; namespace App\Jobs\StatusPipeline;
use Cache, Log; use Cache, Log;
use App\Profile;
use App\Status; use App\Status;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
@ -52,12 +53,36 @@ class StatusActivityPubDeliver implements ShouldQueue
$status = $this->status; $status = $this->status;
$profile = $status->profile; $profile = $status->profile;
// ignore group posts
// if($status->group_id != null) {
// return;
// }
if($status->local == false || $status->url || $status->uri) { if($status->local == false || $status->url || $status->uri) {
return; return;
} }
$audience = $status->profile->getAudienceInbox(); $audience = $status->profile->getAudienceInbox();
$parentInbox = [];
$mentions = $status->mentions
->filter(function($f) { return $f->domain !== null;})
->values()
->map(function($m) { return $m->sharedInbox ?? $m->inbox_url; })
->toArray();
if($status->in_reply_to_profile_id) {
$parent = Profile::find($status->in_reply_to_profile_id);
if($parent && $parent->domain !== null) {
$parentInbox = [
$parent->sharedInbox ?? $parent->inbox_url
];
}
}
$audience = array_values(array_unique(array_merge($audience, $mentions, $parentInbox)));
if(empty($audience) || !in_array($status->scope, ['public', 'unlisted', 'private'])) { if(empty($audience) || !in_array($status->scope, ['public', 'unlisted', 'private'])) {
// Return on profiles with no remote followers // Return on profiles with no remote followers
return; return;