From ed4c1e584f685d18f77b5eca95e3a82826e8be5d Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Fri, 22 Apr 2022 10:01:35 +0200
Subject: [PATCH] Update cache when display name change

This improve the correctness of the data

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
---
 apps/files_sharing/lib/AppInfo/Application.php |  3 +++
 apps/files_sharing/lib/Cache.php               |  2 +-
 lib/private/User/DisplayNameCache.php          | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index befd1532d02..2539247b561 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -30,6 +30,7 @@
 namespace OCA\Files_Sharing\AppInfo;
 
 use OC\Share\Share;
+use OC\User\DisplayNameCache;
 use OCA\Files_Sharing\Capabilities;
 use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
 use OCA\Files_Sharing\External\Manager;
@@ -65,6 +66,7 @@ use OCP\IUserSession;
 use OCP\L10N\IFactory;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\IManager;
+use OCP\User\Events\UserChangedEvent;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -98,6 +100,7 @@ class Application extends App implements IBootstrap {
 		$context->registerCapability(Capabilities::class);
 
 		$context->registerNotifierService(Notifier::class);
+		$context->registerEventListener(UserChangedEvent::class, DisplayNameCache::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
index 7290c33da94..9f11431008f 100644
--- a/apps/files_sharing/lib/Cache.php
+++ b/apps/files_sharing/lib/Cache.php
@@ -53,7 +53,7 @@ class Cache extends CacheJail {
 	private ICacheEntry $sourceRootInfo;
 	private bool $rootUnchanged = true;
 	private ?string $ownerDisplayName = null;
-	private int $numericId;
+	private $numericId;
 	private DisplayNameCache $displayNameCache;
 
 	/**
diff --git a/lib/private/User/DisplayNameCache.php b/lib/private/User/DisplayNameCache.php
index f44cdac6e85..ed0c723ef37 100644
--- a/lib/private/User/DisplayNameCache.php
+++ b/lib/private/User/DisplayNameCache.php
@@ -23,9 +23,12 @@ declare(strict_types=1);
 
 namespace OC\User;
 
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
 use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IUserManager;
+use OCP\User\Events\UserChangedEvent;
 
 /**
  * Class that cache the relation UserId -> Display name
@@ -34,7 +37,7 @@ use OCP\IUserManager;
  * their preferences. It's generally not an issue if this data is slightly
  * outdated.
  */
-class DisplayNameCache {
+class DisplayNameCache implements IEventListener {
 	private ICache $internalCache;
 	private IUserManager $userManager;
 
@@ -63,4 +66,12 @@ class DisplayNameCache {
 	public function clear(): void {
 		$this->internalCache->clear();
 	}
+
+	public function handle(Event $event): void {
+		if ($event instanceof UserChangedEvent && $event->getFeature() === 'displayName') {
+			$userId = $event->getUser()->getUID();
+			$newDisplayName = $event->getValue();
+			$this->internalCache->set($userId, $newDisplayName, 60 * 10); // 10 minutes
+		}
+	}
 }
-- 
2.39.5