Exclude top ordered records(Pin, Draft, Scheduled, Unread News) from bookmarked list

.github/workflows/php-test-v1.14.yml

@@ -0,0 +1,10 @@
+name: PHP Codeception Tests - v1.14
+
+on:
+  push:
+
+jobs:
+  tests:
+    uses: humhub/actions/.github/workflows/module-tests-v1.14.yml@main
+    with:
+      module-id: content-bookmarks

docs/CHANGELOG.md

@@ -1,13 +1,14 @@
 Changelog
 =========
 
-1.0.2 (Unreleased)
+1.1.0 (Unreleased)
 ---------------------
 - Fix: Translation category for 'You didn\'t save any content yet!'
 - Enh: Improvement and addition of French translations
 - Enh #23: Tests for `next` version
 - Fix #24: Fix visibility of the method `Controller::getAccessRules()`
 - Enh #27: Use PHP CS Fixer
+- Fix #28: Exclude top ordered records(Pin, Draft, Scheduled, Unread News) from bookmarked list
 
 
 1.0.1 (June 13, 2021)

module.json

@@ -5,9 +5,9 @@
   "keywords": [
     "content bookmarks"
   ],
-  "version": "1.0.2",
+  "version": "1.1.0",
   "humhub": {
-    "minVersion": "1.8"
+    "minVersion": "1.14"
   },
   "homepage": "https://github.com/humhub/content-bookmarks"
 }

stream/BookmarkStreamQuery.php

@@ -7,6 +7,7 @@
 
 namespace humhub\modules\contentBookmarks\stream;
 
+use humhub\modules\contentBookmarks\models\ContentBookmark;
 use humhub\modules\stream\models\ContentContainerStreamQuery;
 use humhub\modules\stream\models\filters\ContentContainerStreamFilter;
 use humhub\modules\contentBookmarks\stream\filters\BookmarkStreamFilter;
@@ -27,4 +28,29 @@ public function beforeApplyFilters()
         $this->addFilterHandler(new BookmarkStreamFilter(['user' => Yii::$app->user]));
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function postProcessAll(array $result)
+    {
+        $result = parent::postProcessAll($result);
+
+        if (count($result) > 0 && !Yii::$app->user->isGuest) {
+            // Keep the top ordered records(Pin, Draft, Scheduled, Unread News) only if they are bookmarked by current user
+            $bookmarkedContentIds = ContentBookmark::find()
+                ->select('content_id')
+                ->where(['user_id' => Yii::$app->user->id])
+                ->column();
+
+            if (count($bookmarkedContentIds) > 0) {
+                return array_filter($result, function ($content) use ($bookmarkedContentIds) {
+                    return in_array($content->id, $bookmarkedContentIds);
+                });
+            }
+
+            return [];
+        }
+
+        return $result;
+    }
 }