nextcloud / server

apps/comments/lib/Activity/Listener.php

Indentation +89 added lines, -89 removed lines

@@ -34,101 +34,101 @@
 use OCP\Share\IShareHelper;
 
 class Listener {
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
-	/** @var IShareHelper */
-	protected $shareHelper;
+    /** @var IManager */
+    protected $activityManager;
+    /** @var IUserSession */
+    protected $session;
+    /** @var \OCP\App\IAppManager */
+    protected $appManager;
+    /** @var \OCP\Files\Config\IMountProviderCollection */
+    protected $mountCollection;
+    /** @var \OCP\Files\IRootFolder */
+    protected $rootFolder;
+    /** @var IShareHelper */
+    protected $shareHelper;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 * @param IShareHelper $shareHelper
-	 */
-	public function __construct(IManager $activityManager,
-								IUserSession $session,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder,
-								IShareHelper $shareHelper) {
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-		$this->shareHelper = $shareHelper;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IManager $activityManager
+     * @param IUserSession $session
+     * @param IAppManager $appManager
+     * @param IMountProviderCollection $mountCollection
+     * @param IRootFolder $rootFolder
+     * @param IShareHelper $shareHelper
+     */
+    public function __construct(IManager $activityManager,
+                                IUserSession $session,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder,
+                                IShareHelper $shareHelper) {
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+        $this->shareHelper = $shareHelper;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function commentEvent(CommentsEvent $event) {
-		if ($event->getComment()->getObjectType() !== 'files'
-			|| $event->getEvent() !== CommentsEvent::EVENT_ADD
-			|| !$this->appManager->isInstalled('activity')) {
-			// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function commentEvent(CommentsEvent $event) {
+        if ($event->getComment()->getObjectType() !== 'files'
+            || $event->getEvent() !== CommentsEvent::EVENT_ADD
+            || !$this->appManager->isInstalled('activity')) {
+            // Comment not for file, not adding a comment or no activity-app enabled (save the energy)
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$al = $this->shareHelper->getPathsForAccessList($node);
-				$users += $al['users'];
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $al = $this->shareHelper->getPathsForAccessList($node);
+                $users += $al['users'];
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('comments')
-			->setType('comments')
-			->setAuthor($actor)
-			->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
-			->setMessage('add_comment_message', [
-				'commentId' => $event->getComment()->getId(),
-			]);
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('comments')
+            ->setType('comments')
+            ->setAuthor($actor)
+            ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
+            ->setMessage('add_comment_message', [
+                'commentId' => $event->getComment()->getId(),
+            ]);
 
-		foreach ($users as $user => $path) {
-			// numerical user ids end up as integers from array keys, but string
-			// is required
-			$activity->setAffectedUser((string)$user);
+        foreach ($users as $user => $path) {
+            // numerical user ids end up as integers from array keys, but string
+            // is required
+            $activity->setAffectedUser((string)$user);
 
-			$activity->setSubject('add_comment_subject', [
-				'actor' => $actor,
-				'fileId' => (int) $event->getComment()->getObjectId(),
-				'filePath' => trim($path, '/'),
-			]);
-			$this->activityManager->publish($activity);
-		}
-	}
+            $activity->setSubject('add_comment_subject', [
+                'actor' => $actor,
+                'fileId' => (int) $event->getComment()->getObjectId(),
+                'filePath' => trim($path, '/'),
+            ]);
+            $this->activityManager->publish($activity);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 
 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int) $event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -93,7 +93,7 @@ 
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int) $event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);
@@ -121,7 +121,7 @@ 
 		foreach ($users as $user => $path) {
 			// numerical user ids end up as integers from array keys, but string
 			// is required
-			$activity->setAffectedUser((string)$user);
+			$activity->setAffectedUser((string) $user);
 
 			$activity->setSubject('add_comment_subject', [
 				'actor' => $actor,

apps/systemtags/lib/Activity/Listener.php

Indentation +199 added lines, -199 removed lines

@@ -43,224 +43,224 @@
 use OCP\SystemTag\TagNotFoundException;
 
 class Listener {
-	/** @var IGroupManager */
-	protected $groupManager;
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var IConfig */
-	protected $config;
-	/** @var \OCP\SystemTag\ISystemTagManager */
-	protected $tagManager;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
-	/** @var IShareHelper */
-	protected $shareHelper;
+    /** @var IGroupManager */
+    protected $groupManager;
+    /** @var IManager */
+    protected $activityManager;
+    /** @var IUserSession */
+    protected $session;
+    /** @var IConfig */
+    protected $config;
+    /** @var \OCP\SystemTag\ISystemTagManager */
+    protected $tagManager;
+    /** @var \OCP\App\IAppManager */
+    protected $appManager;
+    /** @var \OCP\Files\Config\IMountProviderCollection */
+    protected $mountCollection;
+    /** @var \OCP\Files\IRootFolder */
+    protected $rootFolder;
+    /** @var IShareHelper */
+    protected $shareHelper;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IGroupManager $groupManager
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IConfig $config
-	 * @param ISystemTagManager $tagManager
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 * @param IShareHelper $shareHelper
-	 */
-	public function __construct(IGroupManager $groupManager,
-								IManager $activityManager,
-								IUserSession $session,
-								IConfig $config,
-								ISystemTagManager $tagManager,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder,
-								IShareHelper $shareHelper) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->config = $config;
-		$this->tagManager = $tagManager;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-		$this->shareHelper = $shareHelper;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IGroupManager $groupManager
+     * @param IManager $activityManager
+     * @param IUserSession $session
+     * @param IConfig $config
+     * @param ISystemTagManager $tagManager
+     * @param IAppManager $appManager
+     * @param IMountProviderCollection $mountCollection
+     * @param IRootFolder $rootFolder
+     * @param IShareHelper $shareHelper
+     */
+    public function __construct(IGroupManager $groupManager,
+                                IManager $activityManager,
+                                IUserSession $session,
+                                IConfig $config,
+                                ISystemTagManager $tagManager,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder,
+                                IShareHelper $shareHelper) {
+        $this->groupManager = $groupManager;
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->config = $config;
+        $this->tagManager = $tagManager;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+        $this->shareHelper = $shareHelper;
+    }
 
-	/**
-	 * @param ManagerEvent $event
-	 */
-	public function event(ManagerEvent $event) {
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
-		$tag = $event->getTag();
+    /**
+     * @param ManagerEvent $event
+     */
+    public function event(ManagerEvent $event) {
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
+        $tag = $event->getTag();
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('systemtags')
-			->setType('systemtags')
-			->setAuthor($actor)
-			->setObject('systemtag', $tag->getId(), $tag->getName());
-		if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
-			$activity->setSubject(Provider::CREATE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-			]);
-		} else if ($event->getEvent() === ManagerEvent::EVENT_UPDATE) {
-			$activity->setSubject(Provider::UPDATE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-				$this->prepareTagAsParameter($event->getTagBefore()),
-			]);
-		} else if ($event->getEvent() === ManagerEvent::EVENT_DELETE) {
-			$activity->setSubject(Provider::DELETE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-			]);
-		} else {
-			return;
-		}
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('systemtags')
+            ->setType('systemtags')
+            ->setAuthor($actor)
+            ->setObject('systemtag', $tag->getId(), $tag->getName());
+        if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
+            $activity->setSubject(Provider::CREATE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+            ]);
+        } else if ($event->getEvent() === ManagerEvent::EVENT_UPDATE) {
+            $activity->setSubject(Provider::UPDATE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+                $this->prepareTagAsParameter($event->getTagBefore()),
+            ]);
+        } else if ($event->getEvent() === ManagerEvent::EVENT_DELETE) {
+            $activity->setSubject(Provider::DELETE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+            ]);
+        } else {
+            return;
+        }
 
-		$group = $this->groupManager->get('admin');
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				$activity->setAffectedUser($user->getUID());
-				$this->activityManager->publish($activity);
-			}
-		}
+        $group = $this->groupManager->get('admin');
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                $activity->setAffectedUser($user->getUID());
+                $this->activityManager->publish($activity);
+            }
+        }
 
 
-		if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
-			$this->updateLastUsedTags($actor, $event->getTag());
-		}
-	}
+        if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
+            $this->updateLastUsedTags($actor, $event->getTag());
+        }
+    }
 
-	/**
-	 * @param MapperEvent $event
-	 */
-	public function mapperEvent(MapperEvent $event) {
-		$tagIds = $event->getTags();
-		if ($event->getObjectType() !== 'files' ||empty($tagIds)
-			|| !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
-			|| !$this->appManager->isInstalled('activity')) {
-			// System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param MapperEvent $event
+     */
+    public function mapperEvent(MapperEvent $event) {
+        $tagIds = $event->getTags();
+        if ($event->getObjectType() !== 'files' ||empty($tagIds)
+            || !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
+            || !$this->appManager->isInstalled('activity')) {
+            // System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
+            return;
+        }
 
-		try {
-			$tags = $this->tagManager->getTagsByIds($tagIds);
-		} catch (TagNotFoundException $e) {
-			// User assigned/unassigned a non-existing tag, ignore...
-			return;
-		}
+        try {
+            $tags = $this->tagManager->getTagsByIds($tagIds);
+        } catch (TagNotFoundException $e) {
+            // User assigned/unassigned a non-existing tag, ignore...
+            return;
+        }
 
-		if (empty($tags)) {
-			return;
-		}
+        if (empty($tags)) {
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId($event->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId($event->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById($event->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$al = $this->shareHelper->getPathsForAccessList($node);
-				$users += $al['users'];
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById($event->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $al = $this->shareHelper->getPathsForAccessList($node);
+                $users += $al['users'];
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('systemtags')
-			->setType('systemtags')
-			->setAuthor($actor)
-			->setObject($event->getObjectType(), (int) $event->getObjectId());
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('systemtags')
+            ->setType('systemtags')
+            ->setAuthor($actor)
+            ->setObject($event->getObjectType(), (int) $event->getObjectId());
 
-		foreach ($users as $user => $path) {
-			$user = (string)$user; // numerical ids could be ints which are not accepted everywhere
-			$activity->setAffectedUser($user);
+        foreach ($users as $user => $path) {
+            $user = (string)$user; // numerical ids could be ints which are not accepted everywhere
+            $activity->setAffectedUser($user);
 
-			foreach ($tags as $tag) {
-				// don't publish activity for non-admins if tag is invisible
-				if (!$tag->isUserVisible() && !$this->groupManager->isAdmin($user)) {
-					continue;
-				}
-				if ($event->getEvent() === MapperEvent::EVENT_ASSIGN) {
-					$activity->setSubject(Provider::ASSIGN_TAG, [
-						$actor,
-						$path,
-						$this->prepareTagAsParameter($tag),
-					]);
-				} else if ($event->getEvent() === MapperEvent::EVENT_UNASSIGN) {
-					$activity->setSubject(Provider::UNASSIGN_TAG, [
-						$actor,
-						$path,
-						$this->prepareTagAsParameter($tag),
-					]);
-				}
+            foreach ($tags as $tag) {
+                // don't publish activity for non-admins if tag is invisible
+                if (!$tag->isUserVisible() && !$this->groupManager->isAdmin($user)) {
+                    continue;
+                }
+                if ($event->getEvent() === MapperEvent::EVENT_ASSIGN) {
+                    $activity->setSubject(Provider::ASSIGN_TAG, [
+                        $actor,
+                        $path,
+                        $this->prepareTagAsParameter($tag),
+                    ]);
+                } else if ($event->getEvent() === MapperEvent::EVENT_UNASSIGN) {
+                    $activity->setSubject(Provider::UNASSIGN_TAG, [
+                        $actor,
+                        $path,
+                        $this->prepareTagAsParameter($tag),
+                    ]);
+                }
 
-				$this->activityManager->publish($activity);
-			}
-		}
+                $this->activityManager->publish($activity);
+            }
+        }
 
-		if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
-			foreach ($tags as $tag) {
-				$this->updateLastUsedTags($actor, $tag);
-			}
-		}
-	}
+        if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
+            foreach ($tags as $tag) {
+                $this->updateLastUsedTags($actor, $tag);
+            }
+        }
+    }
 
-	/**
-	 * @param string $actor
-	 * @param ISystemTag $tag
-	 */
-	protected function updateLastUsedTags($actor, ISystemTag $tag) {
-		$lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
-		$lastUsedTags = json_decode($lastUsedTags, true);
+    /**
+     * @param string $actor
+     * @param ISystemTag $tag
+     */
+    protected function updateLastUsedTags($actor, ISystemTag $tag) {
+        $lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
+        $lastUsedTags = json_decode($lastUsedTags, true);
 
-		array_unshift($lastUsedTags, $tag->getId());
-		array_unique($lastUsedTags);
-		$lastUsedTags = array_slice($lastUsedTags, 0, 10);
+        array_unshift($lastUsedTags, $tag->getId());
+        array_unique($lastUsedTags);
+        $lastUsedTags = array_slice($lastUsedTags, 0, 10);
 
-		$this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
-	}
+        $this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
+    }
 
-	/**
-	 * @param ISystemTag $tag
-	 * @return string
-	 */
-	protected function prepareTagAsParameter(ISystemTag $tag) {
-		return json_encode([
-			'id' => $tag->getId(),
-			'name' => $tag->getName(),
-			'assignable' => $tag->isUserAssignable(),
-			'visible' => $tag->isUserVisible(),
-		]);
-	}
+    /**
+     * @param ISystemTag $tag
+     * @return string
+     */
+    protected function prepareTagAsParameter(ISystemTag $tag) {
+        return json_encode([
+            'id' => $tag->getId(),
+            'name' => $tag->getName(),
+            'assignable' => $tag->isUserAssignable(),
+            'visible' => $tag->isUserVisible(),
+        ]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
 	 */
 	public function mapperEvent(MapperEvent $event) {
 		$tagIds = $event->getTags();
-		if ($event->getObjectType() !== 'files' ||empty($tagIds)
+		if ($event->getObjectType() !== 'files' || empty($tagIds)
 			|| !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
 			|| !$this->appManager->isInstalled('activity')) {
 			// System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
@@ -203,7 +203,7 @@ 
 			->setObject($event->getObjectType(), (int) $event->getObjectId());
 
 		foreach ($users as $user => $path) {
-			$user = (string)$user; // numerical ids could be ints which are not accepted everywhere
+			$user = (string) $user; // numerical ids could be ints which are not accepted everywhere
 			$activity->setAffectedUser($user);
 
 			foreach ($tags as $tag) {