-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
🔗☑️ Accept all incoming shares #16828
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
dcdbea5
Respect the accepted flag for group and user shares
nickvergessen e96c9e0
Add the notifier and the API endpoint for user shares
nickvergessen c79a564
Notifications for group shares
nickvergessen 520042b
Allow to accept group shares
nickvergessen 8986910
Add notifications for users that are added to the group
nickvergessen 60da256
Only restrict loading of group and user shares for now
nickvergessen 43517cf
Accept existing shares on update
nickvergessen 19e1892
Use constants for the magic strings
nickvergessen e79ab7d
The share manager knows which provider can accept shares
nickvergessen 0fe4b71
Correctly use the displayname of the sharer in the notification
nickvergessen 6d9afca
Fix "Invalid parameter number: mixed named and positional parameters"
nickvergessen d3b6289
Make sure the super share also has a valid type
nickvergessen e163213
Fixes
rullzer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Accept existing shares on update
Signed-off-by: Joas Schilling <[email protected]>
- Loading branch information
commit 43517cfac6b32a2470a0bdf2b85007b2e5b3233c
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| <?php | ||
| declare(strict_types=1); | ||
| /** | ||
| * @copyright Copyright (c) 2019, Joas Schilling <[email protected]> | ||
| * | ||
| * @author Joas Schilling <[email protected]> | ||
| * | ||
| * @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\Migration; | ||
|
|
||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IConfig; | ||
| use OCP\IDBConnection; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\IRepairStep; | ||
| use OCP\Share\IShare; | ||
|
|
||
| class SetAcceptedStatus implements IRepairStep { | ||
|
|
||
| /** @var IDBConnection */ | ||
| private $connection; | ||
|
|
||
| /** @var IConfig */ | ||
| private $config; | ||
|
|
||
|
|
||
| public function __construct(IDBConnection $connection, IConfig $config) { | ||
| $this->connection = $connection; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the step's name | ||
| * | ||
| * @return string | ||
| * @since 9.1.0 | ||
| */ | ||
| public function getName(): string { | ||
| return 'Set existing shares as accepted'; | ||
| } | ||
|
|
||
| /** | ||
| * @param IOutput $output | ||
| */ | ||
| public function run(IOutput $output): void { | ||
| if (!$this->shouldRun()) { | ||
| return; | ||
| } | ||
|
|
||
| $query = $this->connection->getQueryBuilder(); | ||
| $query | ||
| ->update('share') | ||
| ->set('accepted', $query->createParameter(IShare::STATUS_ACCEPTED)) | ||
| ->where($query->expr()->in('share_type', $query->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP], IQueryBuilder::PARAM_INT_ARRAY))); | ||
| $query->execute(); | ||
| } | ||
|
|
||
| protected function shouldRun() { | ||
| $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0'); | ||
| return version_compare($appVersion, '1.10.1', '<'); | ||
| } | ||
|
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.