UPSTREAM BASELINE: nextcloud/spreed v22.0.12 (без изменений)

Источник: https://github.com/nextcloud/spreed/archive/refs/tags/v22.0.12.tar.gz
С этого коммита ветка официального Nextcloud Talk отрезана (решение владельца 2026-07-06).
Все дальнейшие изменения — только наши; версии релизов: 22.0.12-f7.N.

lib/Search/ConversationSearch.php

@@ -0,0 +1,184 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Search;
+
+use OCA\Talk\AppInfo\Application;
+use OCA\Talk\Config;
+use OCA\Talk\Manager;
+use OCA\Talk\Room;
+use OCA\Talk\Service\AvatarService;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+class ConversationSearch implements IProvider {
+
+	public function __construct(
+		protected AvatarService $avatarService,
+		protected Manager $manager,
+		protected IURLGenerator $url,
+		protected IL10N $l,
+		protected Config $talkConfig,
+		protected IUserSession $userSession,
+	) {
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getId(): string {
+		return 'talk-conversations';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getName(): string {
+		return $this->l->t('Conversations');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getOrder(string $route, array $routeParameters): ?int {
+		$currentUser = $this->userSession->getUser();
+		if ($currentUser && $this->talkConfig->isDisabledForUser($currentUser)) {
+			return null;
+		}
+
+		if (str_starts_with($route, Application::APP_ID . '.')) {
+			// Active app, prefer Talk results
+			return -1;
+		}
+
+		return 25;
+	}
+
+	/**
+	 * Search for user's conversations
+	 *
+	 * Cursor is the conversation token
+	 * Results are sorted by display name and then conversation token
+	 *
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function search(IUser $user, ISearchQuery $query): SearchResult {
+		$rooms = $this->manager->getRoomsForUser($user->getUID());
+
+		$cursorKey = null;
+		$result = [];
+		foreach ($rooms as $room) {
+			if ($room->getType() === Room::TYPE_CHANGELOG) {
+				continue;
+			}
+
+			$parameters = $query->getRouteParameters();
+			if (isset($parameters['token'])
+				&& $parameters['token'] === $room->getToken()
+				&& str_starts_with($query->getRoute(), Application::APP_ID . '.')) {
+				// Don't search the current conversation.
+				// User most likely looks for other things with the same name
+				continue;
+			}
+
+			$displayName = $room->getDisplayName($user->getUID());
+			if ($room->getType() === Room::TYPE_ONE_TO_ONE || $room->getType() === Room::TYPE_ONE_TO_ONE_FORMER) {
+				$otherUserId = str_replace(
+					json_encode($user->getUID()),
+					'',
+					$room->getName()
+				);
+				if (mb_stripos($otherUserId, $query->getTerm()) === false
+					&& mb_stripos($displayName, $query->getTerm()) === false) {
+					// Neither name nor displayname (one-to-one) match, skip
+					continue;
+				}
+			} elseif (mb_stripos($room->getName(), $query->getTerm()) === false) {
+				continue;
+			}
+
+			$entry = new SearchResultEntry(
+				$this->avatarService->getAvatarUrl($room),
+				$displayName,
+				'',
+				$this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()]),
+				'',
+				true
+			);
+
+			$entry->addAttribute('conversation', $room->getToken());
+
+			$result[mb_strtolower($displayName . '#' . $room->getToken())] = $entry;
+
+			if ($query->getCursor() === $room->getToken()) {
+				$cursorKey = mb_strtolower($displayName . '#' . $room->getToken());
+			}
+		}
+
+		ksort($result);
+		if (count($result) <= $query->getLimit()) {
+			return SearchResult::complete(
+				$this->l->t('Conversations'),
+				array_values($result),
+			);
+		}
+
+		$newCursorWithName = '#';
+		if ($cursorKey) {
+			$foundCursor = false;
+			$filteredResults = [];
+			$lastPossibleCursor = '#';
+			foreach ($result as $key => $entry) {
+				if ($cursorKey === $key) {
+					$foundCursor = true;
+					continue;
+				}
+				if (!$foundCursor) {
+					continue;
+				}
+
+				if (count($filteredResults) === $query->getLimit()) {
+					// We already have enough results, but there are more,
+					// so we add the cursor for the next request.
+					$newCursorWithName = $lastPossibleCursor;
+					break;
+				}
+
+				$filteredResults[] = $entry;
+				$lastPossibleCursor = $key;
+			}
+		} else {
+			$filteredResults = array_slice($result, 0, $query->getLimit());
+			// Next page starts at the last result
+			$newCursorWithName = array_key_last($filteredResults);
+		}
+
+		// Cursor is the token only (to survive renamed),
+		// but the array key is `display name#token`, so we split by the #
+		// and get the last part which is the token.
+		// If it's empty, there is no cursor for a next page
+		$parts = explode('#', $newCursorWithName);
+		$newCursor = end($parts);
+
+		return SearchResult::paginated(
+			$this->l->t('Conversations'),
+			array_values($filteredResults),
+			$newCursor
+		);
+	}
+}

lib/Search/CurrentMessageSearch.php

@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Search;
+
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
+use OCA\Talk\Exceptions\RoomNotFoundException;
+use OCP\IUser;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+
+class CurrentMessageSearch extends MessageSearch {
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getId(): string {
+		return 'talk-message-current';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getName(): string {
+		return $this->l->t('Messages in current conversation');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getOrder(string $route, array $routeParameters): ?int {
+		$currentUser = $this->userSession->getUser();
+		if ($currentUser && $this->talkConfig->isDisabledForUser($currentUser)) {
+			return null;
+		}
+
+		if ($route === 'spreed.Page.showCall') {
+			// In conversation, prefer this search results
+			return -3;
+		}
+
+		// We are not returning something anyway.
+		return null;
+	}
+
+	#[\Override]
+	protected function getSublineTemplate(): string {
+		return $this->l->t('{user}');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function search(IUser $user, ISearchQuery $query): SearchResult {
+		$title = $this->l->t('Messages');
+		$currentToken = $this->getCurrentConversationToken($query);
+		if ($currentToken === '') {
+			return SearchResult::complete($title, []);
+		}
+
+		$filter = $query->getFilter(self::CONVERSATION_FILTER);
+		if ($filter && $filter->get() !== $currentToken) {
+			return SearchResult::complete($title, []);
+		}
+
+		try {
+			$room = $this->roomManager->getRoomForUserByToken(
+				$currentToken,
+				$user->getUID()
+			);
+		} catch (RoomNotFoundException) {
+			return SearchResult::complete($title, []);
+		}
+
+		try {
+			$this->participantService->getParticipant($room, $user->getUID(), false);
+		} catch (ParticipantNotFoundException) {
+			return SearchResult::complete($title, []);
+		}
+
+		if ($room->isFederatedConversation()) {
+			return SearchResult::complete($title, []);
+		}
+
+		return $this->performSearch($user, $query, $this->l->t('Messages'), [$room], true);
+	}
+}

lib/Search/MessageSearch.php

@@ -0,0 +1,347 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Search;
+
+use OCA\Talk\AppInfo\Application;
+use OCA\Talk\Chat\ChatManager;
+use OCA\Talk\Chat\MessageParser;
+use OCA\Talk\Config;
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
+use OCA\Talk\Exceptions\RoomNotFoundException;
+use OCA\Talk\Exceptions\UnauthorizedException;
+use OCA\Talk\Manager as RoomManager;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
+use OCA\Talk\Service\ThreadService;
+use OCA\Talk\Webinary;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Comments\IComment;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Search\FilterDefinition;
+use OCP\Search\IFilter;
+use OCP\Search\IFilteringProvider;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+class MessageSearch implements IProvider, IFilteringProvider {
+
+	public const CONVERSATION_FILTER = 'conversation';
+
+	protected bool $isConversationFiltered = false;
+
+	public function __construct(
+		protected RoomManager $roomManager,
+		protected ParticipantService $participantService,
+		protected ChatManager $chatManager,
+		protected MessageParser $messageParser,
+		protected ITimeFactory $timeFactory,
+		protected IURLGenerator $url,
+		protected IL10N $l,
+		protected Config $talkConfig,
+		protected IUserSession $userSession,
+		protected ThreadService $threadService,
+	) {
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getId(): string {
+		return 'talk-message';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getName(): string {
+		return $this->l->t('Messages');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function getOrder(string $route, array $routeParameters): ?int {
+		$currentUser = $this->userSession->getUser();
+		if ($currentUser && $this->talkConfig->isDisabledForUser($currentUser)) {
+			return null;
+		}
+
+		if (str_starts_with($route, Application::APP_ID . '.')) {
+			// Active app, prefer Talk results
+			return -2;
+		}
+
+		return 15;
+	}
+
+	protected function getCurrentConversationToken(ISearchQuery $query): string {
+		if ($query->getRoute() === 'spreed.Page.showCall') {
+			return $query->getRouteParameters()['token'];
+		}
+		return '';
+	}
+
+	protected function getSublineTemplate(): string {
+		if ($this->isConversationFiltered) {
+			return $this->l->t('{user}');
+		}
+		return $this->l->t('{user} in {conversation}');
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	#[\Override]
+	public function search(IUser $user, ISearchQuery $query): SearchResult {
+		$title = $this->l->t('Messages');
+		$currentToken = $this->getCurrentConversationToken($query);
+		if ($currentToken !== '') {
+			$title = $this->l->t('Messages in other conversations');
+		}
+
+		$filter = $query->getFilter(self::CONVERSATION_FILTER);
+		if ($filter && $filter->get() !== $currentToken) {
+			$this->isConversationFiltered = true;
+			$title = $this->l->t('Messages');
+
+			try {
+				$rooms = [$this->roomManager->getRoomForUserByToken(
+					$filter->get(),
+					$user->getUID()
+				)];
+			} catch (RoomNotFoundException) {
+				return SearchResult::complete($title, []);
+			}
+		} elseif ($filter) {
+			// The filter is the "Current conversation" so the CurrentMessageSearch will handle it
+			return SearchResult::complete($title, []);
+		} else {
+			$rooms = $this->roomManager->getRoomsForUser($user->getUID());
+		}
+
+		return $this->performSearch($user, $query, $title, $rooms, $this->isConversationFiltered);
+	}
+
+	/**
+	 * @param Room[] $rooms
+	 */
+	public function performSearch(IUser $user, ISearchQuery $query, string $title, array $rooms, bool $isCurrentMessageSearch = false): SearchResult {
+		$roomMap = [];
+		foreach ($rooms as $room) {
+			if (!$isCurrentMessageSearch
+				&& $room->getType() === Room::TYPE_CHANGELOG) {
+				continue;
+			}
+
+			if (!$isCurrentMessageSearch
+				&& $this->getCurrentConversationToken($query) === $room->getToken()) {
+				// No search result from current conversation
+				continue;
+			}
+
+			if ($room->getLobbyState() !== Webinary::LOBBY_NONE) {
+				$participant = $this->participantService->getParticipant($room, $user->getUID(), false);
+				if (!($participant->getPermissions() & Attendee::PERMISSIONS_LOBBY_IGNORE)) {
+					continue;
+				}
+			}
+
+			if ($room->isFederatedConversation()) {
+				continue;
+			}
+
+			$roomMap[(string)$room->getId()] = $room;
+		}
+
+		if (empty($roomMap)) {
+			return SearchResult::complete($title, []);
+		}
+
+		// Apply filters when available
+		$lowerTimeBoundary = $upperTimeBoundary = $actorType = $actorId = null;
+		if ($since = $query->getFilter(IFilter::BUILTIN_SINCE)?->get()) {
+			if ($since instanceof \DateTimeImmutable) {
+				$lowerTimeBoundary = $since;
+			}
+		}
+
+		if ($until = $query->getFilter(IFilter::BUILTIN_UNTIL)?->get()) {
+			if ($until instanceof \DateTimeImmutable) {
+				$upperTimeBoundary = $until;
+			}
+		}
+
+		if ($person = $query->getFilter(IFilter::BUILTIN_PERSON)?->get()) {
+			if ($person instanceof IUser) {
+				$actorType = Attendee::ACTOR_USERS;
+				$actorId = $person->getUID();
+			}
+		}
+
+		$offset = (int)$query->getCursor();
+		$comments = $this->chatManager->searchForObjectsWithFilters(
+			$query->getTerm(),
+			array_keys($roomMap),
+			[ChatManager::VERB_MESSAGE, ChatManager::VERB_OBJECT_SHARED],
+			$lowerTimeBoundary,
+			$upperTimeBoundary,
+			$actorType,
+			$actorId,
+			$offset,
+			$query->getLimit()
+		);
+
+		$result = [];
+		foreach ($comments as $comment) {
+			$room = $roomMap[$comment->getObjectId()];
+			try {
+				$result[] = $this->commentToSearchResultEntry($room, $user, $comment, $query);
+			} catch (UnauthorizedException|ParticipantNotFoundException) {
+			}
+		}
+
+		return SearchResult::paginated(
+			$title,
+			$result,
+			$offset + $query->getLimit()
+		);
+	}
+
+	/**
+	 * @throws ParticipantNotFoundException
+	 * @throws UnauthorizedException
+	 */
+	protected function commentToSearchResultEntry(Room $room, IUser $user, IComment $comment, ISearchQuery $query): SearchResultEntry {
+		$participant = $this->participantService->getParticipant($room, $user->getUID(), false);
+
+		$id = (int)$comment->getId();
+		$message = $this->messageParser->createMessage($room, $participant, $comment, $this->l);
+		$this->messageParser->parseMessage($message);
+
+		$messageStr = $message->getMessage();
+		$search = $replace = [];
+		foreach ($message->getMessageParameters() as $key => $parameter) {
+			$search[] = '{' . $key . '}';
+			if ($parameter['type'] === 'user') {
+				$replace[] = '@' . $parameter['name'];
+			} else {
+				$replace[] = $parameter['name'];
+			}
+		}
+		$messageStr = str_replace($search, $replace, $messageStr);
+
+		$matchPosition = mb_stripos($messageStr, $query->getTerm());
+		if ($matchPosition > 30 && mb_strlen($messageStr) > 40) {
+			// Mostlikely the result is not visible from the beginning,
+			// so we cut of the message a bit.
+			$messageStr = '…' . mb_substr($messageStr, $matchPosition - 10);
+		}
+
+		$now = $this->timeFactory->getDateTime();
+		$expireDate = $message->getComment()->getExpireDate();
+		if ($expireDate instanceof \DateTime && $expireDate < $now) {
+			throw new UnauthorizedException('Expired');
+		}
+
+		if (!$message->getVisibility()) {
+			throw new UnauthorizedException('Not visible');
+		}
+
+		$iconUrl = '';
+		if ($message->getActorType() === Attendee::ACTOR_USERS) {
+			$iconUrl = $this->url->linkToRouteAbsolute('core.avatar.getAvatar', [
+				'userId' => $message->getActorId(),
+				'size' => 512,
+			]);
+		}
+
+		$subline = $this->getSublineTemplate();
+		if ($room->getType() === Room::TYPE_ONE_TO_ONE || $room->getType() === Room::TYPE_ONE_TO_ONE_FORMER) {
+			$subline = '{user}';
+		}
+
+		$displayName = $message->getActorDisplayName();
+		if (in_array($message->getActorType(), [Attendee::ACTOR_GUESTS, Attendee::ACTOR_EMAILS], true)) {
+			if ($displayName === '') {
+				$displayName = $this->l->t('Guest');
+			} else {
+				$displayName = $this->l->t('%s (guest)', $displayName);
+			}
+		}
+
+		$urlParams = [
+			'token' => $room->getToken(),
+			'_fragment' => 'message_' . $id,
+		];
+		$threadId = (int)$comment->getTopmostParentId() ?: (int)$comment->getId();
+		try {
+			$thread = $this->threadService->findByThreadId($room->getId(), $threadId);
+			$urlParams['threadId'] = $thread->getId();
+		} catch (DoesNotExistException) {
+			$thread = null;
+		}
+
+		$entry = new SearchResultEntry(
+			$iconUrl,
+			str_replace(
+				['{user}', '{conversation}'],
+				[$displayName, $room->getDisplayName($user->getUID())],
+				$subline
+			),
+			$messageStr,
+			$this->url->linkToRouteAbsolute('spreed.Page.showCall', $urlParams),
+			'icon-talk', // $iconClass,
+			true
+		);
+
+		$entry->addAttribute('conversation', $room->getToken());
+		$entry->addAttribute('messageId', $comment->getId());
+		if ($thread !== null) {
+			$entry->addAttribute('threadId', (string)$thread->getId());
+		}
+		$entry->addAttribute('actorType', $comment->getActorType());
+		$entry->addAttribute('actorId', $comment->getActorId());
+		$entry->addAttribute('timestamp', '' . $comment->getCreationDateTime()->getTimestamp());
+
+		return $entry;
+	}
+
+	#[\Override]
+	public function getSupportedFilters(): array {
+		return [
+			IFilter::BUILTIN_TERM,
+			IFilter::BUILTIN_SINCE,
+			IFilter::BUILTIN_UNTIL,
+			IFilter::BUILTIN_PERSON,
+			self::CONVERSATION_FILTER,
+		];
+	}
+
+	#[\Override]
+	public function getAlternateIds(): array {
+		return ['talk-message'];
+	}
+
+	#[\Override]
+	public function getCustomFilters(): array {
+		return [
+			new FilterDefinition(self::CONVERSATION_FILTER)
+		];
+	}
+}

lib/Search/UnifiedSearchCSSLoader.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Search;
+
+use OCA\Talk\AppInfo\Application;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Util;
+
+/**
+ * @template-implements IEventListener<Event>
+ */
+class UnifiedSearchCSSLoader implements IEventListener {
+	#[\Override]
+	public function handle(Event $event): void {
+		if (!$event instanceof BeforeTemplateRenderedEvent) {
+			return;
+		}
+
+		if ($event->isLoggedIn()) {
+			Util::addStyle(Application::APP_ID, 'talk-search');
+		}
+	}
+}

lib/Search/UnifiedSearchFilterPlugin.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Search;
+
+use OCA\Talk\Config;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IUserSession;
+use OCP\Util;
+
+/**
+ * @template-implements IEventListener<Event>
+ */
+class UnifiedSearchFilterPlugin implements IEventListener {
+
+	public function __construct(
+		protected Config $talkConfig,
+		protected IUserSession $userSession,
+	) {
+	}
+
+	#[\Override]
+	public function handle(Event $event): void {
+		if (!($event instanceof BeforeTemplateRenderedEvent)) {
+			return;
+		}
+
+		$currentUser = $this->userSession->getUser();
+		if ($currentUser === null || $this->talkConfig->isDisabledForUser($currentUser)) {
+			return;
+		}
+
+		Util::addScript('spreed', 'talk-search');
+	}
+}