chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3179 from pixelfed/staging 

Update compiled assets
This commit is contained in:
daniel 2022-01-23 00:06:18 -07:00 committed by GitHub
parent d61c91d1a5 803bbac0ea
commit ddd9b7ef4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -685,7 +685,6 @@ class ApiV1Controller extends Controller
->whereNull('status')
->findOrFail($id);
RelationshipService::refresh($user->profile_id, $target->id);
$private = (bool) $target->is_private;
$remote = (bool) $target->domain;
@ -718,6 +717,7 @@ class ApiV1Controller extends Controller
(new FollowerController())->sendUndoFollow($user->profile, $target);
}
RelationshipService::refresh($user->profile_id, $target->id);
Cache::forget('profile:following:'.$target->id);
Cache::forget('profile:followers:'.$target->id);
Cache::forget('profile:following:'.$user->profile_id);
@ -726,8 +726,7 @@ class ApiV1Controller extends Controller
Cache::forget('user:account:id:'.$target->user_id);
Cache::forget('user:account:id:'.$user->id);
$resource = new Fractal\Resource\Item($target, new RelationshipTransformer());
$res = $this->fractal->createData($resource)->toArray();
$res = RelationshipService::get($user->profile_id, $target->id);
return response()->json($res);
}

2
public/js/spa.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=44a61814a65c98749e8c",
"/js/rempro.js": "/js/rempro.js?id=38df28bb47f4d8e99313",
"/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
"/js/spa.js": "/js/spa.js?id=47983083f9e47356e388",
"/js/spa.js": "/js/spa.js?id=0f9002fafba52faa18d1",
"/js/status.js": "/js/status.js?id=12003fb7fcda55bba597",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",