chore: refactor last deprecated config methods

lib/Chat/Changelog/Manager.php

@@ -8,24 +8,25 @@
 
 namespace OCA\Talk\Chat\Changelog;
 
+use OCA\Talk\AppInfo\Application;
 use OCA\Talk\Chat\ChatManager;
+use OCA\Talk\Config;
 use OCA\Talk\Manager as RoomManager;
-use OCP\IConfig;
+use OCP\Config\IUserConfig;
 use OCP\IL10N;
-use OCP\PreConditionNotMetException;
 
 class Manager {
 
 	public function __construct(
-		private readonly IConfig $config,
+		private readonly IUserConfig $userConfig,
 		private readonly RoomManager $roomManager,
 		private readonly ChatManager $chatManager,
 		private readonly IL10N $l,
 	) {
 	}
 
 	public function getChangelogForUser(string $userId): int {
-		return (int)$this->config->getUserValue($userId, 'spreed', 'changelog', '0');
+		return $this->userConfig->getValueInt($userId, Application::APP_ID, Config::CHANGELOG);
 	}
 
 	public function updateChangelog(string $userId): void {
@@ -37,12 +38,7 @@ public function updateChangelog(string $userId): void {
 			return;
 		}
 
-		try {
-			$this->config->setUserValue($userId, 'spreed', 'changelog', (string)$shouldHaveReceived, (string)$hasReceivedLog);
-		} catch (PreConditionNotMetException) {
-			// Parallel request won the race
-			return;
-		}
+		$this->userConfig->setValueInt($userId, Application::APP_ID, Config::CHANGELOG, $shouldHaveReceived);
 
 		$room = $this->roomManager->getChangelogRoom($userId);
 

lib/Config.php

@@ -172,10 +172,11 @@ public function getAllowedTalkGroupIds(): array {
 	 * @return Participant::PRIVACY_*
 	 */
 	public function getUserReadPrivacy(string $userId): int {
-		return match ((int)$this->config->getUserValue(
+		return match ($this->userConfig->getValueInt(
 			$userId,
-			'spreed', UserPreference::READ_STATUS_PRIVACY,
-			(string)Participant::PRIVACY_PUBLIC)) {
+			Application::APP_ID,
+			UserPreference::READ_STATUS_PRIVACY,
+			Participant::PRIVACY_PUBLIC)) {
 			Participant::PRIVACY_PUBLIC => Participant::PRIVACY_PUBLIC,
 			default => Participant::PRIVACY_PRIVATE,
 		};
@@ -185,10 +186,11 @@ public function getUserReadPrivacy(string $userId): int {
 	 * @return Participant::PRIVACY_*
 	 */
 	public function getUserTypingPrivacy(string $userId): int {
-		return match ((int)$this->config->getUserValue(
+		return match ($this->userConfig->getValueInt(
 			$userId,
-			'spreed', UserPreference::TYPING_PRIVACY,
-			(string)Participant::PRIVACY_PUBLIC)) {
+			Application::APP_ID,
+			UserPreference::TYPING_PRIVACY,
+			Participant::PRIVACY_PUBLIC)) {
 			Participant::PRIVACY_PUBLIC => Participant::PRIVACY_PUBLIC,
 			default => Participant::PRIVACY_PRIVATE,
 		};
@@ -312,18 +314,18 @@ public function getRecordingConsentConfig(): int {
 	}
 
 	public function getRecordingFolder(string $userId): string {
-		return $this->config->getUserValue(
+		return $this->userConfig->getValueString(
 			$userId,
-			'spreed',
+			Application::APP_ID,
 			UserPreference::RECORDING_FOLDER,
 			$this->getAttachmentFolder($userId) . '/Recording'
 		);
 	}
 
 	public function getLiveTranscriptionTargetLanguageId(?string $userId = null): string {
-		return $this->config->getUserValue(
+		return $this->userConfig->getvalueString(
 			$userId,
-			'spreed',
+			Application::APP_ID,
 			UserPreference::LIVE_TRANSCRIPTION_TARGET_LANGUAGE_ID,
 			''
 		);
@@ -395,7 +397,7 @@ public function getDefaultPermissions(): int {
 
 	public function getAttachmentFolder(string $userId): string {
 		$defaultAttachmentFolder = $this->appConfig->getAppValueString(self::DEFAULT_ATTACHMENT_FOLDER);
-		return $this->config->getUserValue($userId, 'spreed', UserPreference::ATTACHMENT_FOLDER, $defaultAttachmentFolder);
+		return $this->userConfig->getValueString($userId, Application::APP_ID, UserPreference::ATTACHMENT_FOLDER, $defaultAttachmentFolder);
 	}
 
 	/**
@@ -730,7 +732,7 @@ private function getSignalingTicketV1(?string $userId): string {
 		if (empty($userId)) {
 			$secret = $this->appConfig->getAppValueString(self::SIGNALING_TICKET_SECRET);
 		} else {
-			$secret = $this->config->getUserValue($userId, 'spreed', 'signaling_ticket_secret');
+			$secret = $this->userConfig->getValueString($userId, Application::APP_ID, self::SIGNALING_TICKET_SECRET);
 		}
 		if (empty($secret)) {
 			// Create secret lazily on first access.
@@ -739,7 +741,7 @@ private function getSignalingTicketV1(?string $userId): string {
 			if (empty($userId)) {
 				$this->appConfig->setAppValueString(self::SIGNALING_TICKET_SECRET, $secret);
 			} else {
-				$this->config->setUserValue($userId, 'spreed', 'signaling_ticket_secret', $secret);
+				$this->userConfig->setValueString($userId, Application::APP_ID, self::SIGNALING_TICKET_SECRET, $secret);
 			}
 		}
 
@@ -914,7 +916,7 @@ public function validateSignalingTicket(?string $userId, #[SensitiveParameter] s
 		if (empty($userId)) {
 			$secret = $this->appConfig->getAppValueString(self::SIGNALING_TICKET_SECRET);
 		} else {
-			$secret = $this->config->getUserValue($userId, 'spreed', 'signaling_ticket_secret');
+			$secret = $this->userConfig->getValueString($userId, Application::APP_ID, self::SIGNALING_TICKET_SECRET);
 		}
 		if (empty($secret)) {
 			return false;
@@ -948,10 +950,7 @@ public function getGridVideosLimitEnforced(): bool {
 	 */
 	public function getCallsStartWithoutMedia(?string $userId): bool {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue($userId, 'spreed', UserPreference::CALLS_START_WITHOUT_MEDIA);
-			if ($userSetting === 'yes' || $userSetting === 'no') {
-				return $userSetting === 'yes';
-			}
+			return $this->userConfig->getValueBool($userId, Application::APP_ID, UserPreference::CALLS_START_WITHOUT_MEDIA);
 		}
 
 		return $this->appConfig->getAppValueBool(self::CALLS_START_WITHOUT_MEDIA);
@@ -965,8 +964,7 @@ public function getCallsStartWithoutMedia(?string $userId): bool {
 	 */
 	public function getBlurVirtualBackground(?string $userId): bool {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue($userId, 'spreed', UserPreference::BLUR_VIRTUAL_BACKGROUND);
-			return $userSetting === 'yes';
+			return $this->userConfig->getValueBool($userId, Application::APP_ID, UserPreference::BLUR_VIRTUAL_BACKGROUND);
 		}
 		return false;
 	}
@@ -979,10 +977,10 @@ public function getBlurVirtualBackground(?string $userId): bool {
 	 */
 	public function getConversationsListStyle(?string $userId): string {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue(
+			$userSetting = $this->userConfig->getValueString(
 				$userId,
-				'spreed',
-				UserPreference::CONVERSATIONS_LIST_STYLE,
+				Application::APP_ID,
+				UserPreference::CONVERSATIONS_LIST_STYLE
 			);
 
 			if (in_array($userSetting, [UserPreference::CONVERSATION_LIST_STYLE_TWO_LINES, UserPreference::CONVERSATION_LIST_STYLE_COMPACT], true)) {
@@ -1006,10 +1004,10 @@ public function getConversationsListStyle(?string $userId): string {
 	 */
 	public function getChatStyle(?string $userId): string {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue(
+			$userSetting = $this->userConfig->getValueString(
 				$userId,
-				'spreed',
-				UserPreference::CHAT_STYLE,
+				Application::APP_ID,
+				UserPreference::CHAT_STYLE
 			);
 
 			if (in_array($userSetting, [UserPreference::CHAT_STYLE_SPLIT, UserPreference::CHAT_STYLE_UNIFIED], true)) {
@@ -1033,10 +1031,10 @@ public function getChatStyle(?string $userId): string {
 	 */
 	public function getConversationsSortOrder(?string $userId): string {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue(
+			$userSetting = $this->userConfig->getValueString(
 				$userId,
-				'spreed',
-				UserPreference::CONVERSATIONS_SORT_ORDER,
+				Application::APP_ID,
+				UserPreference::CONVERSATIONS_SORT_ORDER
 			);
 
 			if (in_array($userSetting, [UserPreference::CONVERSATIONS_SORT_ORDER_ACTIVITY, UserPreference::CONVERSATIONS_SORT_ORDER_ALPHABETICAL], true)) {
@@ -1055,10 +1053,10 @@ public function getConversationsSortOrder(?string $userId): string {
 	 */
 	public function getConversationsGroupMode(?string $userId): string {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue(
+			$userSetting = $this->userConfig->getValueString(
 				$userId,
-				'spreed',
-				UserPreference::CONVERSATIONS_GROUP_MODE,
+				Application::APP_ID,
+				UserPreference::CONVERSATIONS_GROUP_MODE
 			);
 
 			if (in_array($userSetting, [
@@ -1081,10 +1079,10 @@ public function getConversationsGroupMode(?string $userId): string {
 	 */
 	public function getConversationsUnarchive(?string $userId): string {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue(
+			$userSetting = $this->userConfig->getValueString(
 				$userId,
-				'spreed',
-				UserPreference::CONVERSATIONS_UNARCHIVE,
+				Application::APP_ID,
+				UserPreference::CONVERSATIONS_UNARCHIVE
 			);
 
 			if (in_array($userSetting, [
@@ -1107,10 +1105,10 @@ public function getConversationsUnarchive(?string $userId): string {
 	 */
 	public function getConversationsTagsShowUnread(?string $userId): string {
 		if ($userId !== null) {
-			$userSetting = $this->config->getUserValue(
+			$userSetting = $this->userConfig->getValueString(
 				$userId,
-				'spreed',
-				UserPreference::CONVERSATIONS_TAGS_SHOW_UNREAD,
+				Application::APP_ID,
+				UserPreference::CONVERSATIONS_TAGS_SHOW_UNREAD
 			);
 
 			if (in_array($userSetting, [

lib/Controller/CallController.php

@@ -8,12 +8,12 @@
 
 namespace OCA\Talk\Controller;
 
+use OCA\Talk\AppInfo\Application;
 use OCA\Talk\AuditLog\Operation;
 use OCA\Talk\Authenticator;
 use OCA\Talk\Config;
 use OCA\Talk\Exceptions\DialOutFailedException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
-use OCA\Talk\Manager;
 use OCA\Talk\Middleware\Attribute\FederationSupported;
 use OCA\Talk\Middleware\Attribute\RequireCallEnabled;
 use OCA\Talk\Middleware\Attribute\RequireFederatedParticipant;
@@ -45,8 +45,8 @@
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Config\IUserConfig;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\Log\Audit\CriticalActionPerformedEvent;
@@ -59,15 +59,14 @@ class CallController extends AEnvironmentAwareOCSController {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private readonly Manager $manager,
 		private readonly ConsentService $consentService,
 		private readonly ParticipantService $participantService,
 		private readonly PhoneNumberMapper $phoneNumberMapper,
 		private readonly RoomService $roomService,
 		private readonly IUserManager $userManager,
 		private readonly ITimeFactory $timeFactory,
-		private readonly IConfig $serverConfig,
 		private readonly IAppConfig $appConfig,
+		private readonly IUserConfig $userConfig,
 		private readonly Config $talkConfig,
 		private readonly Authenticator $federationAuthenticator,
 		private readonly SIPDialOutService $dialOutService,
@@ -205,7 +204,7 @@ public function downloadParticipantsForCall(string $format = 'csv'): DataDownloa
 
 		$timezone = 'UTC';
 		if ($this->participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
-			$timezone = $this->serverConfig->getUserValue($this->participant->getAttendee()->getActorId(), 'core', 'timezone', 'UTC');
+			$timezone = $this->userConfig->getValueString($this->participant->getAttendee()->getActorId(), Application::APP_ID, 'timezone', 'UTC');
 		}
 
 		try {

lib/Controller/SettingsController.php

@@ -8,6 +8,7 @@
 
 namespace OCA\Talk\Controller;
 
+use OCA\Talk\AppInfo\Application;
 use OCA\Talk\AuditLog\Operation;
 use OCA\Talk\Config;
 use OCA\Talk\Settings\BeforePreferenceSetEventListener;
@@ -18,6 +19,7 @@
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\AppFramework\Services\IAppConfig;
+use OCP\Config\IUserConfig;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\IGroup;
@@ -33,6 +35,7 @@ public function __construct(
 		IRequest $request,
 		private readonly IConfig $config,
 		private readonly IAppConfig $appConfig,
+		private readonly IUserConfig $userConfig,
 		private readonly IGroupManager $groupManager,
 		private readonly BeforePreferenceSetEventListener $preferenceListener,
 		private readonly ?string $userId,
@@ -60,7 +63,13 @@ public function setUserSetting(string $key, string|int|null $value): DataRespons
 			return new DataResponse(null, Http::STATUS_BAD_REQUEST);
 		}
 
-		$this->config->setUserValue($this->userId, 'spreed', $key, $value);
+		if (is_string($value)) {
+			$this->userConfig->setValueString($this->userId, Application::APP_ID, $key, $value);
+		}
+
+		if (is_int($value)) {
+			$this->userConfig->setValueInt($this->userId, Application::APP_ID, $key, $value);
+		}
 
 		return new DataResponse(null);
 	}

lib/Federation/Proxy/TalkV1/ProxyRequest.php

@@ -19,6 +19,7 @@
 use OCA\Talk\Participant;
 use OCA\Talk\Settings\UserPreference;
 use OCP\AppFramework\Http;
+use OCP\Config\IUserConfig;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\IResponse;
 use OCP\IConfig;
@@ -30,6 +31,7 @@
 class ProxyRequest {
 	public function __construct(
 		private readonly IConfig $config,
+		private readonly IUserConfig $userConfig,
 		private readonly IClientService $clientService,
 		private readonly LoggerInterface $logger,
 		private readonly IFactory $l10nFactory,
@@ -39,11 +41,11 @@ public function __construct(
 	}
 
 	public function overwrittenRemoteTalkHash(string $hash): string {
-		$typingIndicator = $this->config->getUserValue(
+		$typingIndicator = $this->userConfig->getValueInt(
 			$this->userSession->getUser()?->getUID(),
 			Application::APP_ID,
 			UserPreference::TYPING_PRIVACY,
-			Participant::PRIVACY_PRIVATE,
+			Participant::PRIVACY_PRIVATE
 		);
 		return sha1(json_encode([
 			'remoteHash' => $hash,

lib/Notification/Listener.php

@@ -22,6 +22,8 @@
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Config\IUserConfig;
+use OCP\Config\ValueType;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IConfig;
@@ -43,6 +45,7 @@ class Listener implements IEventListener {
 
 	public function __construct(
 		private readonly IConfig $serverConfig,
+		private readonly IUserConfig $userConfig,
 		private readonly IDBConnection $connection,
 		private readonly IManager $notificationManager,
 		private readonly Notifier $notificationProvider,
@@ -304,7 +307,7 @@ protected function sendCallNotifications(Room $room, array $silentFor = []): voi
 			} else {
 				$fallbackLang = $this->serverConfig->getSystemValueString('default_language', 'en');
 				/** @psalm-var array<string, string> $userLanguages */
-				$userLanguages = $this->serverConfig->getUserValueForUsers('core', 'lang', array_map(strval(...), array_keys($users)));
+				$userLanguages = $this->userConfig->getValuesByUsers('core', 'lang', ValueType::STRING, array_map(strval(...), array_keys($users)));
 			}
 		}