Merge pull request #1196 from nextcloud/bugfix/1183/allow-to-reshare-files-into-chat

Allow to reshare files again

Author: nickvergessen

js/views/chatview.js

@@ -765,6 +765,9 @@
 
 					var result = xhr.responseJSON;
 					if (result && result.ocs && result.ocs.meta) {
+						if (result.ocs.meta.statuscode === 403) {
+							return;
+						}
 						message = result.ocs.meta.message;
 					}
 

lib/Chat/SystemMessage/Listener.php

@@ -26,6 +26,7 @@
 use OCA\Spreed\Manager;
 use OCA\Spreed\Participant;
 use OCA\Spreed\Room;
+use OCA\Spreed\Share\RoomShareProvider;
 use OCA\Spreed\TalkSession;
 use OCP\IUser;
 use OCP\IUserSession;
@@ -135,7 +136,7 @@ public function register() {
 				$this->sendSystemMessage($room, 'moderator_demoted', ['user' => $event->getArgument('user')]);
 			}
 		});
-		$this->dispatcher->addListener('OCP\Share::postShare', function(GenericEvent $event) {
+		$listener = function(GenericEvent $event) {
 			/** @var IShare $share */
 			$share = $event->getSubject();
 
@@ -145,7 +146,9 @@ public function register() {
 
 			$room = $this->roomManager->getRoomByToken($share->getSharedWith());
 			$this->sendSystemMessage($room, 'file_shared', ['share' => $share->getId()]);
-		});
+		};
+		$this->dispatcher->addListener('OCP\Share::postShare', $listener);
+		$this->dispatcher->addListener(RoomShareProvider::class . '::' . 'share_file_again', $listener);
 	}
 
 	protected function sendSystemMessage(Room $room, string $message, array $parameters = []) {

lib/Share/RoomShareProvider.php

@@ -45,6 +45,8 @@
 use OCP\Share\IManager as IShareManager;
 use OCP\Share\IShare;
 use OCP\Share\IShareProvider;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Share provider for room shares.
@@ -76,6 +78,9 @@ class RoomShareProvider implements IShareProvider {
 	/** @var IRootFolder */
 	private $rootFolder;
 
+	/** @var EventDispatcherInterface */
+	private $dispatcher;
+
 	/** @var IL10N */
 	private $l;
 
@@ -90,6 +95,7 @@ class RoomShareProvider implements IShareProvider {
 	 * @param IUserManager $userManager
 	 * @param IShareManager $shareManager
 	 * @param IRootFolder $rootFolder
+	 * @param EventDispatcherInterface $dispatcher
 	 * @param IL10N $l10n
 	 * @param Manager $manager
 	 */
@@ -99,6 +105,7 @@ public function __construct(
 			IUserManager $userManager,
 			IShareManager $shareManager,
 			IRootFolder $rootFolder,
+			EventDispatcherInterface $dispatcher,
 			IL10N $l,
 			Manager $manager
 	) {
@@ -107,6 +114,7 @@ public function __construct(
 		$this->userManager = $userManager;
 		$this->shareManager = $shareManager;
 		$this->rootFolder = $rootFolder;
+		$this->dispatcher = $dispatcher;
 		$this->l = $l;
 		$this->manager = $manager;
 	}
@@ -145,6 +153,7 @@ public function create(IShare $share) {
 		$existingShares = $this->getSharesByPath($share->getNode());
 		foreach ($existingShares as $existingShare) {
 			if ($existingShare->getSharedWith() === $share->getSharedWith()) {
+				$this->dispatcher->dispatch(self::class . '::' . 'share_file_again', new GenericEvent($existingShare));
 				throw new GenericShareException("Already shared", $this->l->t('Path is already shared with this room'), 403);
 			}
 		}