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

Merge pull request #2997 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-11-03 19:41:37 -06:00 committed by GitHub
commit 64112e41df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -24,6 +24,8 @@
- Updated public timeline api, add experimental cache. ([192553ff](https://github.com/pixelfed/pixelfed/commit/192553ff)) - 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 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 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/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)

3
app/Http/Controllers/PublicApiController.php
View file

@ -382,6 +382,7 @@ class PublicApiController extends Controller
->filter(function($s) use($filtered) { ->filter(function($s) use($filtered) {
return in_array($s['account']['id'], $filtered) == false; return in_array($s['account']['id'], $filtered) == false;
}) })
->values()
->toArray(); ->toArray();
} }
@ -734,7 +735,7 @@ class PublicApiController extends Controller
$following = Follower::whereProfileId($pid)->pluck('following_id'); $following = Follower::whereProfileId($pid)->pluck('following_id');
return $following->push($pid)->toArray(); 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 { } else {
if($user) { if($user) {
$pid = $user->profile_id; $pid = $user->profile_id;

2
app/Util/Localization/Localization.php
View file

@ -11,7 +11,7 @@ class Localization {
{ {
return Cache::remember('core:localization:languages', now()->addDays(1), function() { return Cache::remember('core:localization:languages', now()->addDays(1), function() {
$dir = resource_path('lang'); $dir = resource_path('lang');
return Arr::flatten(array_diff(scandir($dir), array('..', '.', 'vendor'))); return Arr::flatten(array_diff(scandir($dir), array('..', '.', 'vendor', '.DS_Store')));
}); });
} }