mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #4740 from pixelfed/staging 

Update ApiV1Controller, fix mutes in home feed
This commit is contained in:
daniel 2023-11-07 02:28:35 -07:00 committed by GitHub
parent c0575ae3bf ff272292ef
commit 1bdd0b3609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -44,6 +44,7 @@
- Update LikePipeline, dispatch to feed queue. Fixes ([#4723](https://github.com/pixelfed/pixelfed/issues/4723)) ([da510089](https://github.com/pixelfed/pixelfed/commit/da510089))
- Update AccountImport ([5a2d7e3e](https://github.com/pixelfed/pixelfed/commit/5a2d7e3e))
- Update ImportPostController, fix IG bug with missing spaces between hashtags ([9c24157a](https://github.com/pixelfed/pixelfed/commit/9c24157a))
- Update ApiV1Controller, fix mutes in home feed ([ddc21714](https://github.com/pixelfed/pixelfed/commit/ddc21714))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)

6
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -2155,6 +2155,12 @@ class ApiV1Controller extends Controller
return $following->push($pid)->toArray();
});
$muted = UserFilterService::mutes($pid);
if($muted && count($muted)) {
$following = array_diff($following, $muted);
}
if($min || $max) {
$dir = $min ? '>' : '<';
$id = $min ?? $max;