UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-03 18:30:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve mute/block v1 api endpoints, fixes #3540

Browse source
This commit is contained in:
Daniel Supernault 2022-08-15 21:45:30 -06:00
parent d1dbed8932
commit c3e8a0e439
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -873,12 +873,15 @@ class ApiV1Controller extends Controller
->whereFilterableType('App\Profile') ->whereFilterableType('App\Profile')
->whereFilterType('block') ->whereFilterType('block')
->simplePaginate($limit) ->simplePaginate($limit)
->pluck('filterable_id'); ->pluck('filterable_id')
->map(function($id) {
return AccountService::get($id, true);
})
->filter(function($account) {
return $account && isset($account['id']);
});
$profiles = Profile::findOrFail($blocked); return $this->json($blocked);
$resource = new Fractal\Resource\Collection($profiles, new AccountTransformer());
$res = $this->fractal->createData($resource)->toArray();
return $this->json($res);
} }
/** /**
@ -1725,19 +1728,21 @@ class ApiV1Controller extends Controller
]); ]);
$user = $request->user(); $user = $request->user();
$limit = $request->input('limit') ?? 40; $limit = $request->input('limit', 40);
$mutes = UserFilter::whereUserId($user->profile_id) $mutes = UserFilter::whereUserId($user->profile_id)
->whereFilterableType('App\Profile') ->whereFilterableType('App\Profile')
->whereFilterType('mute') ->whereFilterType('mute')
->simplePaginate($limit) ->simplePaginate($limit)
->pluck('filterable_id'); ->pluck('filterable_id')
->map(function($id) {
return AccountService::get($id, true);
})
->filter(function($account) {
return $account && isset($account['id']);
});
$accounts = Profile::find($mutes); return $this->json($mutes);
$resource = new Fractal\Resource\Collection($accounts, new AccountTransformer());
$res = $this->fractal->createData($resource)->toArray();
return $this->json($res);
} }
/** /**