[fix] news notification doesn't disappear bug

Leantime · May 2, 2024 · ef6a6c6 · ef6a6c6
1 parent 3458523
commit ef6a6c6
Show file tree

Hide file tree

Showing 7 changed files with 154 additions and 5 deletions.
diff --git a/.idea/codeception.xml b/.idea/codeception.xml
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
diff --git a/app/Domain/Menu/Repositories/Menu.php b/app/Domain/Menu/Repositories/Menu.php
@@ -124,7 +124,6 @@ class Menu
                         5 => ['type' => 'item', 'module' => 'plugins', 'title' => 'menu.leantime_apps', 'icon' => 'fa fa-fw fa-puzzle-piece', 'tooltip' => 'menu.leantime_apps_tooltip', 'href' => '/plugins/marketplace', 'active' => ['marketplace', 'myapps']],
                         10 => ['type' => 'item', 'module' => 'connector', 'title' => 'menu.integrations', 'icon' => 'fa fa-fw fa-circle-nodes', 'tooltip' => 'menu.connector_tooltip', 'href' => '/connector/show', 'active' => ['show']],
                         15 => ['type' => 'item', 'module' => 'setting', 'title' => 'menu.company_settings', 'icon' => 'fa fa-fw fa-cogs', 'tooltip' => 'menu.company_settings_tooltip', 'href' => '/setting/editCompanySettings', 'active' => ['editCompanySettings']],
-
                         20 => ['type' => 'item', 'module' => 'notes', 'title' => 'menu.customfields_premium', 'icon' => 'fa fa-solid fa-list', 'tooltip' => 'Custom Fields', 'href' => '/plugins/marketplace#/plugins/details/leantime_customfields', 'role' => 'editor'],
 
                     ],

diff --git a/app/Domain/Notifications/Services/News.php b/app/Domain/Notifications/Services/News.php
@@ -51,8 +51,8 @@ public function getLatest(int $userId): false|\SimpleXMLElement
 
             $rss = $this->getFeed();
 
-            $latestGuid = $rss?->channel?->item[0]?->guid;
-            $this->settingService->saveSetting("usersettings.".$userId.".lastNewsGuid", $latestGuid);
+            $latestGuid = strval($rss?->channel?->item[0]?->guid);
+            $this->settingService->saveSetting("usersettings.".$userId.".lastNewsGuid", strval($latestGuid));
 
             //Todo: check last article the user read
             //Only load rss feed once a day
@@ -65,7 +65,7 @@ public function hasNews(int $userId): bool
 
             $rss = $this->getFeed();
 
-            $latestGuid = $rss?->channel?->item[0]?->guid;
+            $latestGuid = strval($rss?->channel?->item[0]?->guid);
 
             $lastNewsGuid = $this->settingService->getSetting("usersettings.".$userId.".lastNewsGuid");
 

diff --git a/app/Plugins b/app/Plugins