From 0e5b79f1dd2b7d78a9d3150c6731b85412ec18ae Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 20 Nov 2024 11:51:46 -0500
Subject: [PATCH] Differentiate both UserGServer types used in
 Content/Conversation

- Address https://forum.friendi.ca/display/0b6b25a8-5967-3d08-355b-14b668843210
---
 src/Content/Conversation.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 110f18933f..f765e39e31 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -34,7 +34,8 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Object\Post as PostObject;
 use Friendica\Object\Thread;
 use Friendica\Protocol\Activity;
-use Friendica\User\Settings\Repository\UserGServer;
+use Friendica\User\Settings\Entity\UserGServer as UserGServerEntity;
+use Friendica\User\Settings\Repository\UserGServer as UserGServerRepository;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
@@ -81,10 +82,10 @@ class Conversation
 	private $mode;
 	/** @var IHandleUserSessions */
 	private $session;
-	/** @var UserGServer */
+	/** @var UserGServerRepository */
 	private $userGServer;
 
-	public function __construct(UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, AppHelper $appHelper, IHandleUserSessions $session)
+	public function __construct(UserGServerRepository $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, AppHelper $appHelper, IHandleUserSessions $session)
 	{
 		$this->activity    = $activity;
 		$this->item        = $item;
@@ -455,7 +456,7 @@ class Conversation
 
 		$userGservers = $this->userGServer->listIgnoredByUser($this->session->getLocalUserId());
 
-		$ignoredGsids = array_map(function (UserGServer $userGServer) {
+		$ignoredGsids = array_map(function (UserGServerEntity $userGServer) {
 			return $userGServer->gsid;
 		}, $userGservers->getArrayCopy());