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

Merge pull request #4399 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-05-21 01:54:24 -06:00 committed by GitHub
commit 7b5949f55d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -45,6 +45,7 @@
- Update ProfileController, require login to view spam accounts, and disable profile embeds and atom feeds for spam accounts ([dd2f5bb9](https://github.com/pixelfed/pixelfed/commit/dd2f5bb9)) - Update ProfileController, require login to view spam accounts, and disable profile embeds and atom feeds for spam accounts ([dd2f5bb9](https://github.com/pixelfed/pixelfed/commit/dd2f5bb9))
- Update Settings, allow users to disable atom feeds ([3662d3de](https://github.com/pixelfed/pixelfed/commit/3662d3de)) - Update Settings, allow users to disable atom feeds ([3662d3de](https://github.com/pixelfed/pixelfed/commit/3662d3de))
- Update ApiV1Controller, filter muted/blocked accounts from tag timeline ([f42c1140](https://github.com/pixelfed/pixelfed/commit/f42c1140)) - Update ApiV1Controller, filter muted/blocked accounts from tag timeline ([f42c1140](https://github.com/pixelfed/pixelfed/commit/f42c1140))
- Update admin moderation logic, only re-add top level posts ([c6ffda96](https://github.com/pixelfed/pixelfed/commit/c6ffda96))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](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/Http/Controllers/Admin/AdminReportController.php
View file

@ -1138,7 +1138,9 @@ trait AdminReportController
StatusService::del($status->id); StatusService::del($status->id);
StatusService::get($status->id); StatusService::get($status->id);
PublicTimelineService::add($status->id); if($status->in_reply_to_id == null && $status->reblog_of_id == null) {
PublicTimelineService::add($status->id);
}
} }
if($action == 'mark-all-read') { if($action == 'mark-all-read') {

8
app/Http/Controllers/Api/ApiV1Dot1Controller.php
View file

@ -800,9 +800,13 @@ class ApiV1Dot1Controller extends Controller
StatusService::del($status->id, true); StatusService::del($status->id, true);
if($state !== 'public') { if($state !== 'public') {
if($status->uri) { if($status->uri) {
NetworkTimelineService::add($status->id); if($status->in_reply_to_id == null && $status->reblog_of_id == null) {
NetworkTimelineService::add($status->id);
}
} else { } else {
PublicTimelineService::add($status->id); if($status->in_reply_to_id == null && $status->reblog_of_id == null) {
PublicTimelineService::add($status->id);
}
} }
} }
} else if ($action == 'mark-unlisted') { } else if ($action == 'mark-unlisted') {