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/Command/User/Remove.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Command\User;
+
+use OC\Core\Command\Base;
+use OCA\Talk\Manager;
+use OCP\IUserManager;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Remove extends Base {
+
+	public function __construct(
+		private IUserManager $userManager,
+		private Manager $manager,
+	) {
+		parent::__construct();
+	}
+
+	#[\Override]
+	protected function configure(): void {
+		$this
+			->setName('talk:user:remove')
+			->setDescription('Remove a user from all their rooms')
+			->addOption(
+				'user',
+				null,
+				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+				'Remove the given users from all rooms'
+			)
+			->addOption(
+				'private-only',
+				null,
+				InputOption::VALUE_NONE,
+				'Only remove the user from private rooms, retaining membership in public and open conversations as well as one-to-ones'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$userIds = $input->getOption('user');
+		$privateOnly = $input->getOption('private-only');
+
+		$users = [];
+		foreach ($userIds as $userId) {
+			$user = $this->userManager->get($userId);
+			if (!$user) {
+				$output->writeln('<error>' . sprintf("User '%s' not found.", $userId) . '</error>');
+				return 1;
+			}
+			$users[] = $user;
+		}
+
+		foreach ($users as $user) {
+			$this->manager->removeUserFromAllRooms($user, $privateOnly);
+		}
+
+		$output->writeln('<info>Users successfully removed from all rooms.</info>');
+		return 0;
+	}
+}

lib/Command/User/TransferOwnership.php

@@ -0,0 +1,170 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Talk\Command\User;
+
+use OC\Core\Command\Base;
+use OCA\Talk\Events\AAttendeeRemovedEvent;
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
+use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Participant;
+use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
+use OCA\Talk\Service\RoomService;
+use OCP\IUserManager;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class TransferOwnership extends Base {
+	private RoomService $roomService;
+
+	public function __construct(
+		private ParticipantService $participantService,
+		private Manager $manager,
+		private IUserManager $userManager,
+	) {
+		parent::__construct();
+	}
+
+	#[\Override]
+	protected function configure(): void {
+		$this
+			->setName('talk:user:transfer-ownership')
+			->setDescription('Adds the destination-user with the same participant type to all (not one-to-one) conversations of source-user')
+			->addArgument(
+				'source-user',
+				InputArgument::REQUIRED,
+				'Owner of conversations which shall be moved'
+			)
+			->addArgument(
+				'destination-user',
+				InputArgument::REQUIRED,
+				'User who will be the new owner of the conversations'
+			)
+			->addOption(
+				'include-non-moderator',
+				null,
+				InputOption::VALUE_NONE,
+				'Also include conversations where the source-user is a normal user'
+			)
+			->addOption(
+				'remove-source-user',
+				null,
+				InputOption::VALUE_NONE,
+				'Remove the source-user from the conversations'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$sourceUID = $input->getArgument('source-user');
+		$destinationUID = $input->getArgument('destination-user');
+
+		$destinationUser = $this->userManager->get($destinationUID);
+		if ($destinationUser === null) {
+			$output->writeln('<error>Destination user could not be found.</error>');
+			return 1;
+		}
+
+		$includeNonModeratorRooms = $input->getOption('include-non-moderator');
+		$removeSourceUser = $input->getOption('remove-source-user');
+
+		$modified = $federatedRooms = 0;
+		$rooms = $this->manager->getRoomsForActor(Attendee::ACTOR_USERS, $sourceUID);
+		foreach ($rooms as $room) {
+			if ($room->getType() !== Room::TYPE_GROUP && $room->getType() !== Room::TYPE_PUBLIC) {
+				// Skip one-to-one, changelog and any other room types
+				continue;
+			}
+
+			if ($room->getObjectType() === Room::OBJECT_TYPE_SAMPLE) {
+				// Skip sample rooms
+				continue;
+			}
+
+			if ($room->isFederatedConversation()) {
+				$federatedRooms++;
+				continue;
+			}
+
+			$sourceParticipant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_USERS, $sourceUID);
+
+			if ($sourceParticipant->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED) {
+				continue;
+			}
+
+			if (!$includeNonModeratorRooms && !$sourceParticipant->hasModeratorPermissions()) {
+				continue;
+			}
+
+			try {
+				$destinationParticipant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_USERS, $destinationUser->getUID());
+
+				$targetType = $this->shouldUpdateParticipantType($sourceParticipant->getAttendee()->getParticipantType(), $destinationParticipant->getAttendee()->getParticipantType());
+
+				if ($targetType !== null) {
+					$this->participantService->updateParticipantType(
+						$room,
+						$destinationParticipant,
+						$sourceParticipant->getAttendee()->getParticipantType()
+					);
+					$modified++;
+				}
+			} catch (ParticipantNotFoundException $e) {
+				$this->participantService->addUsers($room, [
+					[
+						'actorType' => Attendee::ACTOR_USERS,
+						'actorId' => $destinationUser->getUID(),
+						'displayName' => $destinationUser->getDisplayName(),
+						'participantType' => $sourceParticipant->getAttendee()->getParticipantType(),
+					]
+				]);
+				$modified++;
+			}
+
+			if ($removeSourceUser) {
+				$this->participantService->removeAttendee($room, $sourceParticipant, AAttendeeRemovedEvent::REASON_REMOVED);
+			}
+		}
+
+		if ($federatedRooms > 0) {
+			$output->writeln('<comment>Could not transfer membership in ' . $federatedRooms . ' federated rooms.</comment>');
+		}
+
+		$output->writeln('<info>Added or promoted user ' . $destinationUser->getUID() . ' in ' . $modified . ' rooms.</info>');
+		return 0;
+	}
+
+	protected function shouldUpdateParticipantType(int $sourceParticipantType, int $destinationParticipantType): ?int {
+		if ($sourceParticipantType === Participant::OWNER) {
+			if ($destinationParticipantType === Participant::OWNER) {
+				return null;
+			}
+			return $sourceParticipantType;
+		}
+
+		if ($sourceParticipantType === Participant::MODERATOR) {
+			if ($destinationParticipantType === Participant::OWNER || $destinationParticipantType === Participant::MODERATOR) {
+				return null;
+			}
+			return $sourceParticipantType;
+		}
+
+		if ($sourceParticipantType === Participant::USER) {
+			if ($destinationParticipantType !== Participant::USER_SELF_JOINED) {
+				return null;
+			}
+			return $sourceParticipantType;
+		}
+
+		return null;
+	}
+}