From 0107e8fd68eb4f24825534d591fcf92bad408883 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 30 Oct 2021 00:56:48 -0600 Subject: [PATCH 1/3] Update Localization util, filter out .DS_Store --- app/Util/Localization/Localization.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Util/Localization/Localization.php b/app/Util/Localization/Localization.php index 0c5bc4e98..37d760ce0 100644 --- a/app/Util/Localization/Localization.php +++ b/app/Util/Localization/Localization.php @@ -11,8 +11,8 @@ class Localization { { return Cache::remember('core:localization:languages', now()->addDays(1), function() { $dir = resource_path('lang'); - return Arr::flatten(array_diff(scandir($dir), array('..', '.', 'vendor'))); + return Arr::flatten(array_diff(scandir($dir), array('..', '.', 'vendor', '.DS_Store'))); }); } -} \ No newline at end of file +} From aa2dd26c1b9bf6bced3c905883c88c46276e3e61 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 3 Nov 2021 19:40:46 -0600 Subject: [PATCH 2/3] Update PublicApiController, fix private account statuses api. Closes #2995 --- app/Http/Controllers/PublicApiController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index db3cc17bb..d76a42171 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -382,6 +382,7 @@ class PublicApiController extends Controller ->filter(function($s) use($filtered) { return in_array($s['account']['id'], $filtered) == false; }) + ->values() ->toArray(); } @@ -734,7 +735,7 @@ class PublicApiController extends Controller $following = Follower::whereProfileId($pid)->pluck('following_id'); return $following->push($pid)->toArray(); }); - $visibility = true == in_array($profile->id, $following) ? ['public', 'unlisted', 'private'] : []; + $visibility = true == in_array($profile['id'], $following) ? ['public', 'unlisted', 'private'] : []; } else { if($user) { $pid = $user->profile_id; From 694ce6ff3daca47860920034d1d17edda4c73ae2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 3 Nov 2021 19:41:12 -0600 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96d5a1c09..98bd0f3d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ - Updated public timeline api, add experimental cache. ([192553ff](https://github.com/pixelfed/pixelfed/commit/192553ff)) - Updated dark mode styles, fix black box on stories. Closes #2982. ([3169f68e](https://github.com/pixelfed/pixelfed/commit/3169f68e)) - Updated verify_credentials api endpoint to improve performance. ([7df3540b](https://github.com/pixelfed/pixelfed/commit/7df3540b)) +- Updated Localization util, filter out .DS_Store. ([0107e8fd](https://github.com/pixelfed/pixelfed/commit/0107e8fd)) +- Updated PublicApiController, fix private account statuses api. Closes #2995. ([aa2dd26c](https://github.com/pixelfed/pixelfed/commit/aa2dd26c)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)