mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-22 21:13:16 +00:00
Merge pull request #850 from leuc/status-transform-cache
Status transform cache
This commit is contained in:
commit
3e59f6b3cf
4 changed files with 36 additions and 26 deletions
|
@ -4,6 +4,7 @@ namespace App\Http\Controllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Auth;
|
use Auth;
|
||||||
|
use Cache;
|
||||||
|
|
||||||
use App\Comment;
|
use App\Comment;
|
||||||
use App\Jobs\CommentPipeline\CommentPipeline;
|
use App\Jobs\CommentPipeline\CommentPipeline;
|
||||||
|
@ -50,6 +51,8 @@ class CommentController extends Controller
|
||||||
$profile = $user->profile;
|
$profile = $user->profile;
|
||||||
$status = Status::findOrFail($statusId);
|
$status = Status::findOrFail($statusId);
|
||||||
|
|
||||||
|
Cache::forget('transform:status:'.$status->url());
|
||||||
|
|
||||||
$reply = new Status();
|
$reply = new Status();
|
||||||
$reply->profile_id = $profile->id;
|
$reply->profile_id = $profile->id;
|
||||||
$reply->caption = e($comment);
|
$reply->caption = e($comment);
|
||||||
|
|
|
@ -26,6 +26,8 @@ class LikeController extends Controller
|
||||||
$profile = Auth::user()->profile;
|
$profile = Auth::user()->profile;
|
||||||
$status = Status::withCount('likes')->findOrFail($request->input('item'));
|
$status = Status::withCount('likes')->findOrFail($request->input('item'));
|
||||||
|
|
||||||
|
Cache::forget('transform:status:'.$status->url());
|
||||||
|
|
||||||
$count = $status->likes_count;
|
$count = $status->likes_count;
|
||||||
|
|
||||||
if ($status->likes()->whereProfileId($profile->id)->count() !== 0) {
|
if ($status->likes()->whereProfileId($profile->id)->count() !== 0) {
|
||||||
|
|
|
@ -218,6 +218,8 @@ class StatusController extends Controller
|
||||||
$profile = Auth::user()->profile;
|
$profile = Auth::user()->profile;
|
||||||
$status = Status::withCount('shares')->findOrFail($request->input('item'));
|
$status = Status::withCount('shares')->findOrFail($request->input('item'));
|
||||||
|
|
||||||
|
Cache::forget('transform:status:'.$status->url());
|
||||||
|
|
||||||
$count = $status->shares_count;
|
$count = $status->shares_count;
|
||||||
|
|
||||||
$exists = Status::whereProfileId(Auth::user()->profile->id)
|
$exists = Status::whereProfileId(Auth::user()->profile->id)
|
||||||
|
|
|
@ -4,6 +4,7 @@ namespace App\Transformer\Api;
|
||||||
|
|
||||||
use App\Status;
|
use App\Status;
|
||||||
use League\Fractal;
|
use League\Fractal;
|
||||||
|
use Cache;
|
||||||
|
|
||||||
class StatusTransformer extends Fractal\TransformerAbstract
|
class StatusTransformer extends Fractal\TransformerAbstract
|
||||||
{
|
{
|
||||||
|
@ -16,33 +17,35 @@ class StatusTransformer extends Fractal\TransformerAbstract
|
||||||
|
|
||||||
public function transform(Status $status)
|
public function transform(Status $status)
|
||||||
{
|
{
|
||||||
return [
|
return Cache::remember('transform:status:'. $status->url(), 60, function() use($status) {
|
||||||
'id' => (string) $status->id,
|
return [
|
||||||
'uri' => $status->url(),
|
'id' => (string) $status->id,
|
||||||
'url' => $status->url(),
|
'uri' => $status->url(),
|
||||||
'in_reply_to_id' => $status->in_reply_to_id,
|
'url' => $status->url(),
|
||||||
'in_reply_to_account_id' => $status->in_reply_to_profile_id,
|
'in_reply_to_id' => $status->in_reply_to_id,
|
||||||
'reblog' => $status->reblog_of_id || $status->in_reply_to_id ? $this->transform($status->parent()) : null,
|
'in_reply_to_account_id' => $status->in_reply_to_profile_id,
|
||||||
'content' => $status->rendered ?? $status->caption,
|
'reblog' => $status->reblog_of_id || $status->in_reply_to_id ? $this->transform($status->parent()) : null,
|
||||||
'created_at' => $status->created_at->format('c'),
|
'content' => $status->rendered ?? $status->caption,
|
||||||
'emojis' => [],
|
'created_at' => $status->created_at->format('c'),
|
||||||
'reblogs_count' => $status->shares()->count(),
|
'emojis' => [],
|
||||||
'favourites_count' => $status->likes()->count(),
|
'reblogs_count' => $status->shares()->count(),
|
||||||
'reblogged' => $status->shared(),
|
'favourites_count' => $status->likes()->count(),
|
||||||
'favourited' => $status->liked(),
|
'reblogged' => $status->shared(),
|
||||||
'muted' => null,
|
'favourited' => $status->liked(),
|
||||||
'sensitive' => (bool) $status->is_nsfw,
|
'muted' => null,
|
||||||
'spoiler_text' => $status->cw_summary,
|
'sensitive' => (bool) $status->is_nsfw,
|
||||||
'visibility' => $status->visibility,
|
'spoiler_text' => $status->cw_summary,
|
||||||
'application' => [
|
'visibility' => $status->visibility,
|
||||||
'name' => 'web',
|
'application' => [
|
||||||
'website' => null
|
'name' => 'web',
|
||||||
],
|
'website' => null
|
||||||
'language' => null,
|
],
|
||||||
'pinned' => null,
|
'language' => null,
|
||||||
|
'pinned' => null,
|
||||||
|
|
||||||
'pf_type' => $status->type ?? $status->setType(),
|
'pf_type' => $status->type ?? $status->setType(),
|
||||||
];
|
];
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function includeAccount(Status $status)
|
public function includeAccount(Status $status)
|
||||||
|
|
Loading…
Reference in a new issue