Skip to content

🔗☑️ 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.

Sign up for GitHub

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
rullzer merged 13 commits into from
Nov 18, 2019
Merged

🔗☑️ Accept all incoming shares #16828

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 Aug 21, 2019
e96c9e0
Add the notifier and the API endpoint for user shares
nickvergessen Aug 22, 2019
c79a564
Notifications for group shares
nickvergessen Aug 26, 2019
520042b
Allow to accept group shares
nickvergessen Sep 4, 2019
8986910
Add notifications for users that are added to the group
nickvergessen Sep 6, 2019
60da256
Only restrict loading of group and user shares for now
nickvergessen Sep 6, 2019
43517cf
Accept existing shares on update
nickvergessen Sep 6, 2019
19e1892
Use constants for the magic strings
nickvergessen Sep 9, 2019
e79ab7d
The share manager knows which provider can accept shares
nickvergessen Sep 9, 2019
0fe4b71
Correctly use the displayname of the sharer in the notification
nickvergessen Sep 9, 2019
6d9afca
Fix "Invalid parameter number: mixed named and positional parameters"
nickvergessen Oct 31, 2019
d3b6289
Make sure the super share also has a valid type
nickvergessen Oct 31, 2019
e163213
Fixes
rullzer Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Notifications for group shares 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Nov 12, 2019
commit c79a56481bc4bd9fb94b0dfbf483537400c76569
15 changes: 14 additions & 1 deletion apps/files_sharing/lib/Notification/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
namespace OCA\Files_Sharing\Notification;

use OC\Share\Share;
use OCP\IGroupManager;
use OCP\Notification\IManager;
use OCP\Notification\INotification;
use OCP\Share\IShare;
Expand All @@ -34,11 +35,15 @@ class Listener {

/** @var IManager */
protected $notificationManager;
/** @var IGroupManager */
protected $groupManager;

public function __construct(
IManager $notificationManager
IManager $notificationManager,
IGroupManager $groupManager
) {
$this->notificationManager = $notificationManager;
$this->groupManager = $groupManager;
}

/**
Expand All @@ -53,6 +58,14 @@ public function shareNotification(GenericEvent $event): void {
$notification->setSubject('incoming_user_share')
->setUser($share->getSharedWith());
$this->notificationManager->notify($notification);
} else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
$notification->setSubject('incoming_group_share');
$group = $this->groupManager->get($share->getSharedWith());

foreach ($group->getUsers() as $user) {
$notification->setUser($user->getUID());
$this->notificationManager->notify($notification);
}
}
}

Expand Down