From 38f8f7cbf4dbfecdb55be8bfcafa4d8b5c7355d4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 9 Apr 2019 11:23:06 +0200 Subject: [PATCH 1/3] Don't get the avatar when we don't operate anyway Signed-off-by: Joas Schilling --- lib/private/Avatar/UserAvatar.php | 5 ----- lib/private/Server.php | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index db5e041d66c..2db65634e8c 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -312,11 +312,6 @@ class UserAvatar extends Avatar { * @throws \OCP\PreConditionNotMetException */ public function userChanged($feature, $oldValue, $newValue) { - // We only change the avatar on display name changes - if ($feature !== 'displayName') { - return; - } - // If the avatar is not generated (so an uploaded image) we skip this if (!$this->folder->fileExists('generated')) { return; diff --git a/lib/private/Server.php b/lib/private/Server.php index 6507f58f896..936ce21fa62 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1257,6 +1257,11 @@ class Server extends ServerContainer implements IServerContainer { $oldValue = $e->getArgument('oldValue'); $value = $e->getArgument('value'); + // We only change the avatar on display name changes + if ($feature !== 'displayName') { + return; + } + try { $avatar = $manager->getAvatar($user->getUID()); $avatar->userChanged($feature, $oldValue, $value); From ca0b70eb2f975c9c53d6261c8c595ca440935215 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 9 Apr 2019 11:28:33 +0200 Subject: [PATCH 2/3] Remove unnecessary event dispatcher The event is already triggered in OC\User\User::triggerChange Signed-off-by: Joas Schilling --- lib/private/Server.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/private/Server.php b/lib/private/Server.php index 936ce21fa62..aaceac004c0 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -426,10 +426,9 @@ class Server extends ServerContainer implements IServerContainer { $userSession->listen('\OC\User', 'logout', function () { \OC_Hook::emit('OC_User', 'logout', array()); }); - $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) use ($dispatcher) { + $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) { /** @var $user \OC\User\User */ \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue)); - $dispatcher->dispatch('OCP\IUser::changeUser', new GenericEvent($user, ['feature' => $feature, 'oldValue' => $oldValue, 'value' => $value])); }); return $userSession; }); From 0948ab721bed3d6efb45635878e910d2fbe6bb26 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 9 Apr 2019 12:28:06 +0200 Subject: [PATCH 3/3] Only update the lookup server if it is enabled AND a server is set Signed-off-by: Joas Schilling --- apps/lookup_server_connector/lib/UpdateLookupServer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php index f96b3d787f2..75da45dce2f 100644 --- a/apps/lookup_server_connector/lib/UpdateLookupServer.php +++ b/apps/lookup_server_connector/lib/UpdateLookupServer.php @@ -165,7 +165,7 @@ class UpdateLookupServer { * @return bool */ private function shouldUpdateLookupServer() { - return $this->lookupServerEnabled || !empty($this->lookupServer); + return $this->lookupServerEnabled && !empty($this->lookupServer); } }