Commit 46d70541 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix(notifications): remove cache inconsistencies when marking notification as read

parent 2e7b462d

app/Models/ActorModel.php

+1 −10
Original line number Diff line number Diff line
@@ -22,15 +22,6 @@ class ActorModel extends FediverseActorModel 


    public function getActorById(int $id): ?Actor

    {

        $cacheName = config('Fediverse')

            ->cachePrefix . "actor#{$id}";

        if (! ($found = cache($cacheName))) {

            $found = $this->find($id);



            cache()

                ->save($cacheName, $found, DECADE);

        }



        return $found;

        return $this->find($id);

    }

}

modules/Admin/Controllers/NotificationController.php

+1 −4
Original line number Diff line number Diff line
@@ -85,10 +85,7 @@ class NotificationController extends BaseController 


        $post = (new PostModel())->getPostById($this->notification->post_id);



        return redirect()->route(

            'post',

            [esc((new PodcastModel())->getPodcastByActorId($this->notification->actor_id)->handle), $post->id]

        );

        return redirect()->route('post', [$this->podcast->handle, $post->id]);

    }



    public function markAllAsRead(): RedirectResponse

modules/Fediverse/Models/ActorModel.php

+1 −10
Original line number Diff line number Diff line
@@ -61,16 +61,7 @@ class ActorModel extends BaseModel 


    public function getActorById(int $id): ?Actor

    {

        $cacheName = config('Fediverse')

            ->cachePrefix . "actor#{$id}";

        if (! ($found = cache($cacheName))) {

            $found = $this->find($id);



            cache()

                ->save($cacheName, $found, DECADE);

        }



        return $found;

        return $this->find($id);

    }



    /**

modules/Fediverse/Models/PostModel.php

+1 −10
Original line number Diff line number Diff line
@@ -89,16 +89,7 @@ class PostModel extends BaseUuidModel 


    public function getPostById(string $postId): ?Post

    {

        $cacheName = config('Fediverse')

            ->cachePrefix . "post#{$postId}";

        if (! ($found = cache($cacheName))) {

            $found = $this->find($postId);



            cache()

                ->save($cacheName, $found, DECADE);

        }



        return $found;

        return $this->find($postId);

    }



    public function getPostByUri(string $postUri): ?Post