Merge pull request #69 from v17development/beta-13-bug-fix

Fix filter update & discussion language fix
v17development · Feb 16, 2021 · 533d73f · 533d73f
2 parents 4d2e83f + 0301300
commit 533d73f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Filter/FilterDiscussionsForBlogPosts.php b/src/Filter/FilterDiscussionsForBlogPosts.php
@@ -5,6 +5,7 @@
 use Flarum\Discussion\Event\Searching;
 use Flarum\Settings\SettingsRepositoryInterface;
 use V17Development\FlarumBlog\Gambit\BlogGambit;
+use Flarum\Discussion\Search\Gambit\FulltextGambit;
 
 class FilterDiscussionsForBlogPosts
 {
@@ -38,6 +39,9 @@ public function handle(Searching $event)
 			if(get_class($gambit) === BlogGambit::class) {
 				$hideBlogPosts = false;
 			}
+			if(get_class($gambit) === FulltextGambit::class) {
+				$hideBlogPosts = false;
+			}
 		}
 
 		// Filter discussions from discussion list

diff --git a/src/Listeners/CreateBlogMetaOnDiscussionCreate.php b/src/Listeners/CreateBlogMetaOnDiscussionCreate.php
@@ -36,6 +36,12 @@ public function handle(Saving $event)
 
         // After the tags are synced, check if it's a blog article
         $discussion->afterSave(function ($discussion) use ($event) {
+
+            // Here it may happen that `$discussion->tags` gives an empty array because of a strange bug.
+            // This can be reproduced when using the fof/discussion-language extension (v1.2.1)
+            // For this reason we need to explictly reloag the tags relationship before using it here.
+            $discussion->load('tags');
+
             // Make sure it's a blog base discussion!
             if ($discussion->tags && $discussion->tags->whereIn('id', $this->blogTags)->count() > 0) {
                 if(!$event->actor->can('blog.writeArticles')) {