More IShare::TYPE_* fixes

Signed-off-by: Joas Schilling <coding@schilljs.com>

6 files changed, 21 insertions, 26 deletions

diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index 3933b6d3a..ed3826cc5 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -24,20 +24,15 @@ namespace OCA\Talk\Chat\SystemMessage;
 
 
 use OCA\Talk\Chat\ChatManager;
-use OCA\Talk\Chat\MessageParser;
-use OCA\Talk\Chat\Parser\SystemMessage;
 use OCA\Talk\Manager;
-use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Share\RoomShareProvider;
 use OCA\Talk\TalkSession;
 use OCA\Talk\Webinary;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Comments\IComment;
 use OCP\IUser;
 use OCP\IUserSession;
-use OCP\Share;
 use OCP\Share\IShare;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
@@ -250,7 +245,7 @@ class Listener {
 			/** @var IShare $share */
 			$share = $event->getSubject();
 
-			if ($share->getShareType() !== Share::SHARE_TYPE_ROOM) {
+			if ($share->getShareType() !== IShare::TYPE_ROOM) {
 				return;
 			}
 
diff --git a/lib/Collaboration/Collaborators/RoomPlugin.php b/lib/Collaboration/Collaborators/RoomPlugin.php
index 716477fe8..3a55f7dfd 100644
--- a/lib/Collaboration/Collaborators/RoomPlugin.php
+++ b/lib/Collaboration/Collaborators/RoomPlugin.php
@@ -29,7 +29,7 @@ use OCP\Collaboration\Collaborators\ISearchPlugin;
 use OCP\Collaboration\Collaborators\ISearchResult;
 use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\IUserSession;
-use OCP\Share;
+use OCP\Share\IShare;
 
 class RoomPlugin implements ISearchPlugin {
 
@@ -86,7 +86,7 @@ class RoomPlugin implements ISearchPlugin {
 		[
 			'label' => $room->getDisplayName($userId),
 			'value' => [
-				'shareType' => Share::SHARE_TYPE_ROOM,
+				'shareType' => IShare::TYPE_ROOM,
 				'shareWith' => $room->getToken()
 			]
 		];
diff --git a/lib/Controller/PublicShareAuthController.php b/lib/Controller/PublicShareAuthController.php
index 62edaf010..9221c860a 100644
--- a/lib/Controller/PublicShareAuthController.php
+++ b/lib/Controller/PublicShareAuthController.php
@@ -32,9 +32,9 @@ use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\Share;
 use OCP\Share\IManager as IShareManager;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\IShare;
 
 class PublicShareAuthController extends OCSController {
 
@@ -98,7 +98,7 @@ class PublicShareAuthController extends OCSController {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+		if ($share->getShareType() === IShare::TYPE_EMAIL) {
 			$roomName = $share->getSharedWith();
 		} else {
 			$roomName = trim($share->getTarget(), '/');
diff --git a/lib/Files/Listener.php b/lib/Files/Listener.php
index 0cac3a6fa..a71e080cc 100644
--- a/lib/Files/Listener.php
+++ b/lib/Files/Listener.php
@@ -138,7 +138,7 @@ class Listener {
 	 * @param Room $room
 	 * @param string $userId
 	 */
-	public function addUserAsPersistentParticipant(Room $room, string $userId) {
+	public function addUserAsPersistentParticipant(Room $room, string $userId): void {
 		if ($room->getObjectType() !== 'file') {
 			return;
 		}
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index 1083e05e4..f34037610 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -47,6 +47,7 @@ use OCP\RichObjectStrings\Definitions;
 use OCP\Share;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager as IShareManager;
+use OCP\Share\IShare;
 
 class Notifier implements INotifier {
 
@@ -544,7 +545,7 @@ class Notifier implements INotifier {
 			$notification = $this->addActionButton($notification, $l->t('Call back'));
 		}
 
-		if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+		if ($share->getShareType() === IShare::TYPE_EMAIL) {
 			$sharedWith = $share->getSharedWith();
 			if ($callIsActive) {
 				$subject = $l->t('{email} is requesting the password to access {file}');
diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php
index 70506059b..86aa89d7d 100644
--- a/lib/Share/RoomShareProvider.php
+++ b/lib/Share/RoomShareProvider.php
@@ -42,7 +42,6 @@ use OCP\Share\Exceptions\GenericShareException;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager as IShareManager;
 use OCP\Share\IShare;
-use OCP\Share\IShareHelper;
 use OCP\Share\IShareProvider;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
@@ -223,7 +222,7 @@ class RoomShareProvider implements IShareProvider {
 	): int {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM))
+			->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM))
 			->setValue('share_with', $qb->createNamedParameter($shareWith))
 			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
 			->setValue('uid_owner', $qb->createNamedParameter($shareOwner))
@@ -530,7 +529,7 @@ class RoomShareProvider implements IShareProvider {
 				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
 			))
 			->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM))
+				$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM))
 			);
 
 		/**
@@ -578,7 +577,7 @@ class RoomShareProvider implements IShareProvider {
 		$qb->select('*')
 			->from('share');
 
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)));
+		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)));
 
 		/**
 		 * Reshares for this user are shares where they are the owner.
@@ -635,7 +634,7 @@ class RoomShareProvider implements IShareProvider {
 			->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
 			->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
 			->where($qb->expr()->eq('s.id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('s.share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)));
+			->andWhere($qb->expr()->eq('s.share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)));
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -731,7 +730,7 @@ class RoomShareProvider implements IShareProvider {
 		$cursor = $qb->select('*')
 			->from('share')
 			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 			->execute();
 
 		$shares = [];
@@ -791,7 +790,7 @@ class RoomShareProvider implements IShareProvider {
 
 			$rooms = array_map(function(Room $room) { return $room->getToken(); }, $rooms);
 
-			$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+			$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 				->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
 					$rooms,
 					IQueryBuilder::PARAM_STR_ARRAY
@@ -852,7 +851,7 @@ class RoomShareProvider implements IShareProvider {
 
 		$cursor = $qb->select('*')
 			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
 			->execute();
 
@@ -926,7 +925,7 @@ class RoomShareProvider implements IShareProvider {
 
 		$qb = $this->dbConnection->getQueryBuilder();
 
-		$types = [\OCP\Share::SHARE_TYPE_ROOM];
+		$types = [IShare::TYPE_ROOM];
 		if ($currentAccess) {
 			$types[] = self::SHARE_TYPE_USERROOM;
 		}
@@ -944,7 +943,7 @@ class RoomShareProvider implements IShareProvider {
 		$users = [];
 		while($row = $cursor->fetch()) {
 			$type = (int)$row['share_type'];
-			if ($type === \OCP\Share::SHARE_TYPE_ROOM) {
+			if ($type === IShare::TYPE_ROOM) {
 				$roomToken = $row['share_with'];
 				try {
 					$room = $this->manager->getRoomByToken($roomToken);
@@ -1026,7 +1025,7 @@ class RoomShareProvider implements IShareProvider {
 		$qb->select('*')
 			->from('share')
 			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 			->orderBy('id');
 
 		$cursor = $qb->execute();
@@ -1055,7 +1054,7 @@ class RoomShareProvider implements IShareProvider {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->select('id')
 			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($roomToken)));
 
 		if ($user !== null) {
@@ -1082,7 +1081,7 @@ class RoomShareProvider implements IShareProvider {
 		// Now delete all the original room shares
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($roomToken)));
 
 		if ($user !== null) {
@@ -1096,7 +1095,7 @@ class RoomShareProvider implements IShareProvider {
 			$qb = $this->dbConnection->getQueryBuilder();
 			$qb->select('id')
 				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_ROOM)))
+				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_ROOM)))
 				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($roomToken)));
 
 			$cursor = $qb->execute();