UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 08:44:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4407 from pixelfed/staging

Browse source 
Update AP Inbox, fix delete handling
This commit is contained in:
daniel 2023-05-23 02:55:33 -06:00 committed by GitHub
commit 9a8a840b4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -50,8 +50,9 @@
- Update admin dashboard, add mass account deletes ([b8426cce](https://github.com/pixelfed/pixelfed/commit/b8426cce)) - Update admin dashboard, add mass account deletes ([b8426cce](https://github.com/pixelfed/pixelfed/commit/b8426cce))
- Update scheduler, fix S3 media garbage collection not being executed when cloud storage is enabled via dashboard without .env/config being enabled ([adb070f1](https://github.com/pixelfed/pixelfed/commit/adb070f1)) - Update scheduler, fix S3 media garbage collection not being executed when cloud storage is enabled via dashboard without .env/config being enabled ([adb070f1](https://github.com/pixelfed/pixelfed/commit/adb070f1))
- Update MediaController, add fallback for local files that are later stored on S3 but still are referenced in cached objects remotely ([4973cb46](https://github.com/pixelfed/pixelfed/commit/4973cb46)) - Update MediaController, add fallback for local files that are later stored on S3 but still are referenced in cached objects remotely ([4973cb46](https://github.com/pixelfed/pixelfed/commit/4973cb46))
- ([](https://github.com/pixelfed/pixelfed/commit/))
- Update PublicTimelineService, improve warmCache query ([9f901d65](https://github.com/pixelfed/pixelfed/commit/9f901d65)) - Update PublicTimelineService, improve warmCache query ([9f901d65](https://github.com/pixelfed/pixelfed/commit/9f901d65))
- Update AP Inbox, fix delete handling ([2800c888](https://github.com/pixelfed/pixelfed/commit/2800c888))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6) ## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)

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

@ -479,8 +479,8 @@ class Helpers {
'profile_id' => $pid, 'profile_id' => $pid,
'url' => $url, 'url' => $url,
'object_url' => $id, 'object_url' => $id,
'caption' => strip_tags($activity['content']), 'caption' => isset($activity['content']) ? Purify::clean(strip_tags($activity['content'])) : null,
'rendered' => Purify::clean($activity['content']), 'rendered' => isset($activity['content']) ? Purify::clean($activity['content']) : null,
'created_at' => Carbon::parse($ts)->tz('UTC'), 'created_at' => Carbon::parse($ts)->tz('UTC'),
'in_reply_to_id' => $reply_to, 'in_reply_to_id' => $reply_to,
'local' => false, 'local' => false,

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

@ -698,7 +698,7 @@ class Inbox
return; return;
} }
$status = Status::whereProfileId($profile->id) $status = Status::whereProfileId($profile->id)
->whereUri($id) ->whereObjectUrl($id)
->first(); ->first();
if(!$status) { if(!$status) {
return; return;