sharing by mail

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Apr 21, 2020 · 1b6ea8b · 1b6ea8b
1 parent 013c0fe
commit 1b6ea8b
Show file tree

Hide file tree

Showing 16 changed files with 807 additions and 145 deletions.
diff --git a/lib/Circles/FileSharingBroadcaster.php b/lib/Circles/FileSharingBroadcaster.php
@@ -33,6 +33,7 @@
 use OCA\Circles\AppInfo\Application;
 use OCA\Circles\Db\SharesRequest;
 use OCA\Circles\Db\TokensRequest;
+use OCA\Circles\Exceptions\TokenDoesNotExistException;
 use OCA\Circles\IBroadcaster;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;

diff --git a/lib/Db/MembersRequest.php b/lib/Db/MembersRequest.php
@@ -111,16 +111,23 @@ public function forceGetMemberById(string $memberId): Member {
 	 *
 	 * @param string $circleUniqueId
 	 * @param int $level
+	 * @param int $type
 	 * @param bool $incGroup
 	 *
 	 * @return Member[]
 	 */
-	public function forceGetMembers($circleUniqueId, $level = Member::LEVEL_MEMBER, $incGroup = false) {
+	public function forceGetMembers(
+		$circleUniqueId, $level = Member::LEVEL_MEMBER, int $type = 0, $incGroup = false
+	) {
 
 		$qb = $this->getMembersSelectSql();
 		$this->limitToMembersAndAlmost($qb);
 		$this->limitToLevel($qb, $level);
 
+		if ($type > 0) {
+			$this->limitToUserType($qb, $type);
+		}
+
 		$this->limitToCircleId($qb, $circleUniqueId);
 
 		$members = [];

diff --git a/lib/GlobalScale/AGlobalScaleEvent.php b/lib/GlobalScale/AGlobalScaleEvent.php
@@ -47,8 +47,11 @@
 use OCA\Circles\Service\EventsService;
 use OCA\Circles\Service\MembersService;
 use OCA\Circles\Service\MiscService;
+use OCP\Defaults;
 use OCP\Files\IRootFolder;
+use OCP\IURLGenerator;
 use OCP\IUserManager;
+use OCP\Mail\IMailer;
 
 
 /**
@@ -62,6 +65,15 @@ abstract class AGlobalScaleEvent {
 	/** @var IRootFolder */
 	protected $rootFolder;
 
+	/** @var IURLGenerator */
+	protected $urlGenerator;
+
+	/** @var IMailer */
+	protected $mailer;
+
+	/** @var Defaults */
+	protected $defaults;
+
 	/** @var IUserManager */
 	protected $userManager;
 
@@ -100,6 +112,9 @@ abstract class AGlobalScaleEvent {
 	 * AGlobalScaleEvent constructor.
 	 *
 	 * @param IRootFolder $rootFolder
+	 * @param IURLGenerator $urlGenerator
+	 * @param IMailer $mailer
+	 * @param Defaults $defaults
 	 * @param IUserManager $userManager
 	 * @param SharesRequest $sharesRequest
 	 * @param TokensRequest $tokensRequest
@@ -114,6 +129,9 @@ abstract class AGlobalScaleEvent {
 	 */
 	public function __construct(
 		IRootFolder $rootFolder,
+		IURLGenerator $urlGenerator,
+		IMailer $mailer,
+		Defaults $defaults,
 		IUserManager $userManager,
 		SharesRequest $sharesRequest,
 		TokensRequest $tokensRequest,
@@ -127,6 +145,9 @@ public function __construct(
 		MiscService $miscService
 	) {
 		$this->rootFolder = $rootFolder;
+		$this->urlGenerator = $urlGenerator;
+		$this->mailer = $mailer;
+		$this->defaults = $defaults;
 		$this->userManager = $userManager;
 		$this->sharesRequest = $sharesRequest;
 		$this->tokensRequest = $tokensRequest;