1
0
Fork 0
forked from mirror/pixelfed

Add /api/v1/accounts/{id}/unblock endpoint

This commit is contained in:
Daniel Supernault 2019-09-25 01:10:01 -06:00
parent f4952e2ef7
commit 35226c99e2
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 37 additions and 0 deletions

View file

@ -15,6 +15,7 @@ use App\{
FollowRequest, FollowRequest,
Like, Like,
Media, Media,
Notification,
Profile, Profile,
Status, Status,
UserFilter, UserFilter,
@ -575,6 +576,41 @@ class ApiV1Controller extends Controller
return response()->json($res); return response()->json($res);
} }
/**
* POST /api/v1/accounts/{id}/unblock
*
* @param integer $id
*
* @return \App\Transformer\Api\RelationshipTransformer
*/
public function accountUnblockById(Request $request, $id)
{
abort_if(!$request->user(), 403);
$user = $request->user();
$pid = $user->profile_id ?? $user->profile->id;
if($id == $pid) {
abort(400, 'You cannot unblock yourself');
}
$profile = Profile::findOrFail($id);
UserFilter::whereUserId($pid)
->whereFilterableId($profile->id)
->whereFilterableType('App\Profile')
->whereFilterType('block')
->delete();
Cache::forget("user:filter:list:$pid");
Cache::forget("api:local:exp:rec:$pid");
$resource = new Fractal\Resource\Item($profile, new RelationshipTransformer());
$res = $this->fractal->createData($resource)->toArray();
return response()->json($res);
}
public function statusById(Request $request, $id) public function statusById(Request $request, $id)
{ {
$status = Status::whereVisibility('public')->findOrFail($id); $status = Status::whereVisibility('public')->findOrFail($id);

View file

@ -88,6 +88,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::post('accounts/{id}/unfollow', 'Api\ApiV1Controller@accountUnfollowById')->middleware('auth:api'); Route::post('accounts/{id}/unfollow', 'Api\ApiV1Controller@accountUnfollowById')->middleware('auth:api');
Route::get('blocks', 'Api\ApiV1Controller@accountBlocks')->middleware('auth:api'); Route::get('blocks', 'Api\ApiV1Controller@accountBlocks')->middleware('auth:api');
Route::post('accounts/{id}/block', 'Api\ApiV1Controller@accountBlockById')->middleware('auth:api'); Route::post('accounts/{id}/block', 'Api\ApiV1Controller@accountBlockById')->middleware('auth:api');
Route::post('accounts/{id}/unblock', 'Api\ApiV1Controller@accountUnblockById')->middleware('auth:api');
// Route::get('accounts/{id}', 'PublicApiController@account'); // Route::get('accounts/{id}', 'PublicApiController@account');
Route::get('accounts/{id}', 'Api\ApiV1Controller@accountById'); Route::get('accounts/{id}', 'Api\ApiV1Controller@accountById');
Route::post('avatar/update', 'ApiController@avatarUpdate')->middleware('auth:api'); Route::post('avatar/update', 'ApiController@avatarUpdate')->middleware('auth:api');