From 4b7d7fd5332e55152d68a5625f505a0479f541c5 Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 23 May 2024 18:36:39 +0900 Subject: [PATCH 1/3] Fix existence check for topic cover --- app/Transformers/Forum/TopicCoverTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Transformers/Forum/TopicCoverTransformer.php b/app/Transformers/Forum/TopicCoverTransformer.php index b15615267a6..56fde883fe9 100644 --- a/app/Transformers/Forum/TopicCoverTransformer.php +++ b/app/Transformers/Forum/TopicCoverTransformer.php @@ -12,7 +12,7 @@ class TopicCoverTransformer extends TransformerAbstract { public function transform(TopicCover $cover) { - if ($cover->file_json === null) { + if ($cover->filename === null) { $data = [ 'method' => 'post', 'url' => route('forum.topic-covers.store', [ From 483472423d0007461870a64e8859311f89d3c86f Mon Sep 17 00:00:00 2001 From: nanaya Date: Thu, 23 May 2024 19:06:57 +0900 Subject: [PATCH 2/3] Fix new topic cover model not initialised correctly --- app/Http/Controllers/Forum/TopicsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php index 03669272259..af83f256e46 100644 --- a/app/Http/Controllers/Forum/TopicsController.php +++ b/app/Http/Controllers/Forum/TopicsController.php @@ -431,7 +431,8 @@ public function show($id) $topic->incrementViewCount($currentUser, \Request::ip()); $posts->last()->markRead($currentUser); - $coverModel = $topic->cover ?? new TopicCover(); + // initiate new cover model separately to prevent it from getting used by opengraph + $coverModel = $topic->cover ?? new TopicCover(['topic_id' => $topic->getKey()]); $coverModel->setRelation('topic', $topic); $cover = json_item($coverModel, new TopicCoverTransformer()); From 271fefdd934e6e41b9d6ebdf8b230aab007e3e5f Mon Sep 17 00:00:00 2001 From: Edho Arief Date: Thu, 23 May 2024 20:19:19 +0900 Subject: [PATCH 3/3] Adjust comment Co-authored-by: clayton --- app/Http/Controllers/Forum/TopicsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php index af83f256e46..76dca0b2b6f 100644 --- a/app/Http/Controllers/Forum/TopicsController.php +++ b/app/Http/Controllers/Forum/TopicsController.php @@ -431,7 +431,7 @@ public function show($id) $topic->incrementViewCount($currentUser, \Request::ip()); $posts->last()->markRead($currentUser); - // initiate new cover model separately to prevent it from getting used by opengraph + // Instantiate new cover model separately to prevent it from getting used by opengraph $coverModel = $topic->cover ?? new TopicCover(['topic_id' => $topic->getKey()]); $coverModel->setRelation('topic', $topic); $cover = json_item($coverModel, new TopicCoverTransformer());