mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-25 01:05:36 +00:00
Added following_since
attribute to /api/v1/accounts/relationships
endpoint when _pe=1
(pixelfed entity) parameter is present
This commit is contained in:
parent
d4f92da0e5
commit
992d910b9c
2 changed files with 26 additions and 2 deletions
|
@ -905,13 +905,16 @@ class ApiV1Controller extends Controller
|
|||
'id' => 'required|array|min:1|max:20',
|
||||
'id.*' => 'required|integer|min:1|max:' . PHP_INT_MAX
|
||||
]);
|
||||
$napi = $request->has(self::PF_API_ENTITY_KEY);
|
||||
$pid = $request->user()->profile_id ?? $request->user()->profile->id;
|
||||
$res = collect($request->input('id'))
|
||||
->filter(function($id) use($pid) {
|
||||
return intval($id) !== intval($pid);
|
||||
})
|
||||
->map(function($id) use($pid) {
|
||||
return RelationshipService::get($pid, $id);
|
||||
->map(function($id) use($pid, $napi) {
|
||||
return $napi ?
|
||||
RelationshipService::getWithDate($pid, $id) :
|
||||
RelationshipService::get($pid, $id);
|
||||
});
|
||||
return $this->json($res);
|
||||
}
|
||||
|
|
|
@ -52,6 +52,7 @@ class RelationshipService
|
|||
|
||||
public static function delete($aid, $tid)
|
||||
{
|
||||
Cache::forget(self::key("wd:a_{$aid}:t_{$tid}"));
|
||||
return Cache::forget(self::key("a_{$aid}:t_{$tid}"));
|
||||
}
|
||||
|
||||
|
@ -85,4 +86,24 @@ class RelationshipService
|
|||
{
|
||||
return self::CACHE_KEY . $suffix;
|
||||
}
|
||||
|
||||
public static function getWithDate($aid, $tid)
|
||||
{
|
||||
$res = self::get($aid, $tid);
|
||||
|
||||
if(!$res || !$res['following']) {
|
||||
$res['following_since'] = null;
|
||||
return $res;
|
||||
}
|
||||
|
||||
return Cache::remember(self::key("wd:a_{$aid}:t_{$tid}"), 1209600, function() use($aid, $tid, $res) {
|
||||
$tmp = Follower::whereProfileId($aid)->whereFollowingId($tid)->first();
|
||||
if(!$tmp) {
|
||||
$res['following_since'] = null;
|
||||
return $res;
|
||||
}
|
||||
$res['following_since'] = str_replace('+00:00', 'Z', $tmp->created_at->format(DATE_RFC3339_EXTENDED));
|
||||
return $res;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue