Merge pull request #22205 from nextcloud/activity-settings-cleanup
merge file activity settings into a single 'favorite changed' item
This commit is contained in:
commit
3c56922444
|
@ -40,10 +40,7 @@
|
||||||
<settings>
|
<settings>
|
||||||
<setting>OCA\Files\Activity\Settings\FavoriteAction</setting>
|
<setting>OCA\Files\Activity\Settings\FavoriteAction</setting>
|
||||||
<setting>OCA\Files\Activity\Settings\FileChanged</setting>
|
<setting>OCA\Files\Activity\Settings\FileChanged</setting>
|
||||||
<setting>OCA\Files\Activity\Settings\FileCreated</setting>
|
<setting>OCA\Files\Activity\Settings\FileFavoriteChanged</setting>
|
||||||
<setting>OCA\Files\Activity\Settings\FileDeleted</setting>
|
|
||||||
<setting>OCA\Files\Activity\Settings\FileFavorite</setting>
|
|
||||||
<setting>OCA\Files\Activity\Settings\FileRestored</setting>
|
|
||||||
</settings>
|
</settings>
|
||||||
|
|
||||||
<filters>
|
<filters>
|
||||||
|
|
|
@ -14,10 +14,7 @@ return array(
|
||||||
'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
|
'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
|
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
|
'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
|
'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
|
|
||||||
'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
|
|
||||||
'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
|
|
||||||
'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
|
'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
|
||||||
'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
|
'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
|
||||||
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
|
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
|
||||||
|
|
|
@ -29,10 +29,7 @@ class ComposerStaticInitFiles
|
||||||
'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
|
'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
|
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
|
'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
|
'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
|
||||||
'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
|
|
||||||
'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
|
|
||||||
'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
|
|
||||||
'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
|
'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
|
||||||
'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
|
'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
|
||||||
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
|
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
|
||||||
|
|
|
@ -37,7 +37,7 @@ class FileChanged extends FileActivitySettings {
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getName() {
|
public function getName() {
|
||||||
return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>');
|
return $this->l->t('A file or folder has been <strong>changed</strong>');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -50,35 +50,19 @@ class FileChanged extends FileActivitySettings {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the mail
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeMail() {
|
public function canChangeMail() {
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledMail() {
|
public function isDefaultEnabledMail() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function canChangeNotification() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isDefaultEnabledNotification() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,84 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
|
|
||||||
*
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OCA\Files\Activity\Settings;
|
|
||||||
|
|
||||||
class FileDeleted extends FileActivitySettings {
|
|
||||||
/**
|
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getIdentifier() {
|
|
||||||
return 'file_deleted';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string A translated string
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getName() {
|
|
||||||
return $this->l->t('A file or folder has been <strong>deleted</strong>');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return int whether the filter should be rather on the top or bottom of
|
|
||||||
* the admin section. The filters are arranged in ascending order of the
|
|
||||||
* priority values. It is required to return a value between 0 and 100.
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getPriority() {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the mail
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeMail() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledMail() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,84 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
|
|
||||||
*
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OCA\Files\Activity\Settings;
|
|
||||||
|
|
||||||
class FileFavorite extends FileActivitySettings {
|
|
||||||
/**
|
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getIdentifier() {
|
|
||||||
return 'file_favorite';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string A translated string
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getName() {
|
|
||||||
return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return int whether the filter should be rather on the top or bottom of
|
|
||||||
* the admin section. The filters are arranged in ascending order of the
|
|
||||||
* priority values. It is required to return a value between 0 and 100.
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getPriority() {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledStream() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the mail
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeMail() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledMail() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -23,13 +23,13 @@
|
||||||
|
|
||||||
namespace OCA\Files\Activity\Settings;
|
namespace OCA\Files\Activity\Settings;
|
||||||
|
|
||||||
class FileCreated extends FileActivitySettings {
|
class FileFavoriteChanged extends FileActivitySettings {
|
||||||
/**
|
/**
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
* @return string Lowercase a-z and underscore only identifier
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getIdentifier() {
|
public function getIdentifier() {
|
||||||
return 'file_created';
|
return 'file_favorite_changed';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -37,7 +37,7 @@ class FileCreated extends FileActivitySettings {
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getName() {
|
public function getName() {
|
||||||
return $this->l->t('A new file or folder has been <strong>created</strong>');
|
return $this->l->t('A favorite file or folder has been <strong>changed</strong>');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -47,7 +47,7 @@ class FileCreated extends FileActivitySettings {
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
*/
|
*/
|
||||||
public function getPriority() {
|
public function getPriority() {
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -81,4 +81,8 @@ class FileCreated extends FileActivitySettings {
|
||||||
public function isDefaultEnabledMail() {
|
public function isDefaultEnabledMail() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isDefaultEnabledNotification() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -1,84 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
|
|
||||||
*
|
|
||||||
* @author Joas Schilling <coding@schilljs.com>
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OCA\Files\Activity\Settings;
|
|
||||||
|
|
||||||
class FileRestored extends FileActivitySettings {
|
|
||||||
/**
|
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getIdentifier() {
|
|
||||||
return 'file_restored';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string A translated string
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getName() {
|
|
||||||
return $this->l->t('A file or folder has been <strong>restored</strong>');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return int whether the filter should be rather on the top or bottom of
|
|
||||||
* the admin section. The filters are arranged in ascending order of the
|
|
||||||
* priority values. It is required to return a value between 0 and 100.
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function getPriority() {
|
|
||||||
return 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledStream() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the mail
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function canChangeMail() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return bool True when the option can be changed for the stream
|
|
||||||
* @since 11.0.0
|
|
||||||
*/
|
|
||||||
public function isDefaultEnabledMail() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -26,10 +26,6 @@ namespace OCA\Files\Tests\Activity\Setting;
|
||||||
|
|
||||||
use OCA\Files\Activity\Settings\FavoriteAction;
|
use OCA\Files\Activity\Settings\FavoriteAction;
|
||||||
use OCA\Files\Activity\Settings\FileChanged;
|
use OCA\Files\Activity\Settings\FileChanged;
|
||||||
use OCA\Files\Activity\Settings\FileCreated;
|
|
||||||
use OCA\Files\Activity\Settings\FileDeleted;
|
|
||||||
use OCA\Files\Activity\Settings\FileFavorite;
|
|
||||||
use OCA\Files\Activity\Settings\FileRestored;
|
|
||||||
use OCP\Activity\ISetting;
|
use OCP\Activity\ISetting;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
|
|
||||||
|
@ -38,10 +34,7 @@ class GenericTest extends TestCase {
|
||||||
return [
|
return [
|
||||||
[FavoriteAction::class],
|
[FavoriteAction::class],
|
||||||
[FileChanged::class],
|
[FileChanged::class],
|
||||||
[FileCreated::class],
|
[FileChanged::class],
|
||||||
[FileDeleted::class],
|
|
||||||
[FileFavorite::class],
|
|
||||||
[FileRestored::class],
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ return array(
|
||||||
'OCA\\Files_Sharing\\Activity\\Providers\\Users' => $baseDir . '/../lib/Activity/Providers/Users.php',
|
'OCA\\Files_Sharing\\Activity\\Providers\\Users' => $baseDir . '/../lib/Activity/Providers/Users.php',
|
||||||
'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => $baseDir . '/../lib/Activity/Settings/PublicLinks.php',
|
'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => $baseDir . '/../lib/Activity/Settings/PublicLinks.php',
|
||||||
'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => $baseDir . '/../lib/Activity/Settings/RemoteShare.php',
|
'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => $baseDir . '/../lib/Activity/Settings/RemoteShare.php',
|
||||||
|
'OCA\\Files_Sharing\\Activity\\Settings\\ShareActivitySettings' => $baseDir . '/../lib/Activity/Settings/ShareActivitySettings.php',
|
||||||
'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => $baseDir . '/../lib/Activity/Settings/Shared.php',
|
'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => $baseDir . '/../lib/Activity/Settings/Shared.php',
|
||||||
'OCA\\Files_Sharing\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
|
'OCA\\Files_Sharing\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
|
||||||
'OCA\\Files_Sharing\\BackgroundJob\\FederatedSharesDiscoverJob' => $baseDir . '/../lib/BackgroundJob/FederatedSharesDiscoverJob.php',
|
'OCA\\Files_Sharing\\BackgroundJob\\FederatedSharesDiscoverJob' => $baseDir . '/../lib/BackgroundJob/FederatedSharesDiscoverJob.php',
|
||||||
|
|
|
@ -30,6 +30,7 @@ class ComposerStaticInitFiles_Sharing
|
||||||
'OCA\\Files_Sharing\\Activity\\Providers\\Users' => __DIR__ . '/..' . '/../lib/Activity/Providers/Users.php',
|
'OCA\\Files_Sharing\\Activity\\Providers\\Users' => __DIR__ . '/..' . '/../lib/Activity/Providers/Users.php',
|
||||||
'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => __DIR__ . '/..' . '/../lib/Activity/Settings/PublicLinks.php',
|
'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => __DIR__ . '/..' . '/../lib/Activity/Settings/PublicLinks.php',
|
||||||
'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => __DIR__ . '/..' . '/../lib/Activity/Settings/RemoteShare.php',
|
'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => __DIR__ . '/..' . '/../lib/Activity/Settings/RemoteShare.php',
|
||||||
|
'OCA\\Files_Sharing\\Activity\\Settings\\ShareActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/ShareActivitySettings.php',
|
||||||
'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => __DIR__ . '/..' . '/../lib/Activity/Settings/Shared.php',
|
'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => __DIR__ . '/..' . '/../lib/Activity/Settings/Shared.php',
|
||||||
'OCA\\Files_Sharing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
|
'OCA\\Files_Sharing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
|
||||||
'OCA\\Files_Sharing\\BackgroundJob\\FederatedSharesDiscoverJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/FederatedSharesDiscoverJob.php',
|
'OCA\\Files_Sharing\\BackgroundJob\\FederatedSharesDiscoverJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/FederatedSharesDiscoverJob.php',
|
||||||
|
|
|
@ -23,21 +23,7 @@
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Activity\Settings;
|
namespace OCA\Files_Sharing\Activity\Settings;
|
||||||
|
|
||||||
use OCP\Activity\ISetting;
|
class PublicLinks extends ShareActivitySettings {
|
||||||
use OCP\IL10N;
|
|
||||||
|
|
||||||
class PublicLinks implements ISetting {
|
|
||||||
|
|
||||||
/** @var IL10N */
|
|
||||||
protected $l;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param IL10N $l
|
|
||||||
*/
|
|
||||||
public function __construct(IL10N $l) {
|
|
||||||
$this->l = $l;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
* @return string Lowercase a-z and underscore only identifier
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
|
|
|
@ -24,21 +24,7 @@
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Activity\Settings;
|
namespace OCA\Files_Sharing\Activity\Settings;
|
||||||
|
|
||||||
use OCP\Activity\ISetting;
|
class RemoteShare extends ShareActivitySettings {
|
||||||
use OCP\IL10N;
|
|
||||||
|
|
||||||
class RemoteShare implements ISetting {
|
|
||||||
|
|
||||||
/** @var IL10N */
|
|
||||||
protected $l;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param IL10N $l
|
|
||||||
*/
|
|
||||||
public function __construct(IL10N $l) {
|
|
||||||
$this->l = $l;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
* @return string Lowercase a-z and underscore only identifier
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\Files_Sharing\Activity\Settings;
|
||||||
|
|
||||||
|
use OCP\Activity\ActivitySettings;
|
||||||
|
use OCP\IL10N;
|
||||||
|
|
||||||
|
abstract class ShareActivitySettings extends ActivitySettings {
|
||||||
|
/** @var IL10N */
|
||||||
|
protected $l;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param IL10N $l
|
||||||
|
*/
|
||||||
|
public function __construct(IL10N $l) {
|
||||||
|
$this->l = $l;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getGroupIdentifier() {
|
||||||
|
return 'files';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getGroupName() {
|
||||||
|
return $this->l->t('Files');
|
||||||
|
}
|
||||||
|
}
|
|
@ -24,21 +24,7 @@
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Activity\Settings;
|
namespace OCA\Files_Sharing\Activity\Settings;
|
||||||
|
|
||||||
use OCP\Activity\ISetting;
|
class Shared extends ShareActivitySettings {
|
||||||
use OCP\IL10N;
|
|
||||||
|
|
||||||
class Shared implements ISetting {
|
|
||||||
|
|
||||||
/** @var IL10N */
|
|
||||||
protected $l;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param IL10N $l
|
|
||||||
*/
|
|
||||||
public function __construct(IL10N $l) {
|
|
||||||
$this->l = $l;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string Lowercase a-z and underscore only identifier
|
* @return string Lowercase a-z and underscore only identifier
|
||||||
* @since 11.0.0
|
* @since 11.0.0
|
||||||
|
|
|
@ -641,6 +641,23 @@ class Tags implements ITags {
|
||||||
return $this->unTag($objid, ITags::TAG_FAVORITE);
|
return $this->unTag($objid, ITags::TAG_FAVORITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get all users who favorited an object
|
||||||
|
*/
|
||||||
|
public function getUsersFavoritingObject($objId) {
|
||||||
|
$entries = [];
|
||||||
|
|
||||||
|
$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
|
||||||
|
$query->select('uid')
|
||||||
|
->from('vcategory_to_object', 'o')
|
||||||
|
->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
|
||||||
|
->where($query->expr()->eq('objid', $query->createNamedParameter($objId, IQueryBuilder::PARAM_INT)))
|
||||||
|
->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($this->type)))
|
||||||
|
->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));
|
||||||
|
|
||||||
|
return $query->execute()->fetchAll(\PDO::FETCH_COLUMN);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a tag/object relation.
|
* Creates a tag/object relation.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue