Adjust by/self filter aswell and fix tests

diff --git a/apps/files/lib/activity.php b/apps/files/lib/activity.php
index 007f9a1dda4797686a5c6a54098d36cc041f0b65..fff49ea4ea5c97358c7848c00934230c531c99c0 100644 (file)
--- a/apps/files/lib/activity.php
+++ b/apps/files/lib/activity.php
@@ -318,7 +318,7 @@ class Activity implements IExtension {
                }
 
                // Display actions from favorites only
-               if ($filter === self::FILTER_FAVORITES || $filter === 'all' && $this->userSettingFavoritesOnly($user)) {
+               if ($filter === self::FILTER_FAVORITES || in_array($filter, ['all', 'by', 'self']) && $this->userSettingFavoritesOnly($user)) {
                        try {
                                $favorites = $this->helper->getFavoriteFilePaths($user);
                        } catch (\RuntimeException $e) {

diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/activitytest.php
index 24240a0377189fdd864beca9126a487a656873bb..b8766f9522451ed31b430e656383f7c649ee4fee 100644 (file)
--- a/apps/files/tests/activitytest.php
+++ b/apps/files/tests/activitytest.php
@@ -234,7 +234,7 @@ class ActivityTest extends TestCase {
                                        'items' => [],
                                        'folders' => [],
                                ],
-                               ' CASE WHEN `app` = ? THEN (`type` <> ? OR `type` <> ?) ELSE `app` <> ? END ',
+                               ' CASE WHEN `app` = ? THEN ((`type` <> ? AND `type` <> ?)) ELSE `app` <> ? END ',
                                ['files', Activity::TYPE_SHARE_CREATED, Activity::TYPE_SHARE_CHANGED, 'files']
                        ],
                        [
@@ -242,7 +242,7 @@ class ActivityTest extends TestCase {
                                        'items' => ['file.txt', 'folder'],
                                        'folders' => ['folder'],
                                ],
-                               ' CASE WHEN `app` = ? THEN (`type` <> ? OR `type` <> ? OR `file` = ? OR `file` = ? OR `file` LIKE ?) ELSE `app` <> ? END ',
+                               ' CASE WHEN `app` = ? THEN ((`type` <> ? AND `type` <> ?) OR `file` = ? OR `file` = ? OR `file` LIKE ?) ELSE `app` <> ? END ',
                                ['files', Activity::TYPE_SHARE_CREATED, Activity::TYPE_SHARE_CHANGED, 'file.txt', 'folder', 'folder/%', 'files']
                        ],
                ];