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

Merge pull request #3681 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-10-04 23:29:38 -06:00 committed by GitHub
commit d8f62ed94c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,6 +2,10 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.4...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.4...dev)
### Updates
- Update ApiV1Controller, include self likes in favourited_by endpoint ([58b331d2](https://github.com/pixelfed/pixelfed/commit/58b331d2))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)
### New Features ### New Features
@ -94,7 +98,6 @@
- Update CollectionController, limit max title and description length ([6e76cf4b](https://github.com/pixelfed/pixelfed/commit/6e76cf4b)) - Update CollectionController, limit max title and description length ([6e76cf4b](https://github.com/pixelfed/pixelfed/commit/6e76cf4b))
- Update collection components, fix title/description padding/overflow bug and add title/description limit and input counter ([6e4272a8](https://github.com/pixelfed/pixelfed/commit/6e4272a8)) - Update collection components, fix title/description padding/overflow bug and add title/description limit and input counter ([6e4272a8](https://github.com/pixelfed/pixelfed/commit/6e4272a8))
- Update Media model, fix thumbnail cdn paths ([9888af12](https://github.com/pixelfed/pixelfed/commit/9888af12)) - Update Media model, fix thumbnail cdn paths ([9888af12](https://github.com/pixelfed/pixelfed/commit/9888af12))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

4
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -2449,12 +2449,12 @@ class ApiV1Controller extends Controller
->limit($limit) ->limit($limit)
->get() ->get()
->map(function($like) { ->map(function($like) {
$account = AccountService::getMastodon($like->profile_id); $account = AccountService::getMastodon($like->profile_id, true);
$account['follows'] = isset($like->created_at); $account['follows'] = isset($like->created_at);
return $account; return $account;
}) })
->filter(function($account) use($user) { ->filter(function($account) use($user) {
return $account && isset($account['id']) && $account['id'] != $user->profile_id; return $account && isset($account['id']);
}) })
->values(); ->values();