From e46c2b5ae2ad0fba9895942bd5fe8baa2272a545 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 8 Oct 2020 12:32:17 +0200
Subject: [PATCH 001/129] Only use numeric tokens for conversations when sip is
 configured

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Manager.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index 5a4b81eb7cc..95a18b0484b 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -804,10 +804,18 @@ protected function getRoomNameByParticipants(Room $room): string {
 	 * @return string
 	 */
 	protected function getNewToken(): string {
-		$chars = str_replace(['l', '0', '1'], '', ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		$sipConfig = $this->config->getAppValue('spreed', 'sip_config', ''); // FIXME adjust config name
 		$entropy = (int) $this->config->getAppValue('spreed', 'token_entropy', 8);
 		$entropy = max(8, $entropy); // For update cases
 
+		if ($sipConfig === '') {
+			$chars = str_replace(['l', '0', '1'], '', ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		} else {
+			$chars = ISecureRandom::CHAR_DIGITS;
+			// Increase default token length as we only use numbers
+			$entropy = max(10, $entropy);
+		}
+
 		$query = $this->db->getQueryBuilder();
 		$query->select('id')
 			->from('talk_rooms')

From 07adec8e9938be7f181ad3bb472deb3f52aa9bd6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 8 Oct 2020 14:28:01 +0200
Subject: [PATCH 002/129] Add a setting which groups can enable SIP in
 conversations

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Config.php                             |   9 ++
 lib/Settings/Admin/AdminSettings.php       |   5 +
 src/components/AdminSettings/SIPBridge.vue | 147 +++++++++++++++++++++
 src/views/AdminSettings.vue                |  19 +--
 4 files changed, 172 insertions(+), 8 deletions(-)
 create mode 100644 src/components/AdminSettings/SIPBridge.vue

diff --git a/lib/Config.php b/lib/Config.php
index 6f8abca7ccd..2fe9da2b207 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -62,6 +62,15 @@ public function getAllowedTalkGroupIds(): array {
 		return \is_array($groups) ? $groups : [];
 	}
 
+	/**
+	 * @return string[]
+	 */
+	public function getSIPGroups(): array {
+		$groups = $this->config->getAppValue('spreed', 'sip_bridge_groups', '[]');
+		$groups = json_decode($groups, true);
+		return \is_array($groups) ? $groups : [];
+	}
+
 	public function isDisabledForUser(IUser $user): bool {
 		$allowedGroups = $this->getAllowedTalkGroupIds();
 		if (empty($allowedGroups)) {
diff --git a/lib/Settings/Admin/AdminSettings.php b/lib/Settings/Admin/AdminSettings.php
index 94b69e24649..725b2540f08 100644
--- a/lib/Settings/Admin/AdminSettings.php
+++ b/lib/Settings/Admin/AdminSettings.php
@@ -93,6 +93,7 @@ public function getForm(): TemplateResponse {
 		$this->initTurnServers();
 		$this->initSignalingServers();
 		$this->initRequestSignalingServerTrial();
+		$this->initSIPBridge();
 
 		return new TemplateResponse('spreed', 'settings/admin-settings', [], '');
 	}
@@ -467,6 +468,10 @@ protected function initRequestSignalingServerTrial(): void {
 		]);
 	}
 
+	protected function initSIPBridge(): void {
+		$this->initialStateService->provideInitialState('talk', 'sip_bridge_groups', $this->talkConfig->getSIPGroups());
+	}
+
 	/**
 	 * @return string the section ID, e.g. 'sharing'
 	 */
diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
new file mode 100644
index 00000000000..db90804c46e
--- /dev/null
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -0,0 +1,147 @@
+<!--
+ - @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
+ -
+ - @author Joas Schilling <coding@schilljs.com>
+ -
+ - @license GNU AGPL version 3 or any later version
+ -
+ - This program is free software: you can redistribute it and/or modify
+ - it under the terms of the GNU Affero General Public License as
+ - published by the Free Software Foundation, either version 3 of the
+ - License, or (at your option) any later version.
+ -
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ - GNU Affero General Public License for more details.
+ -
+ - You should have received a copy of the GNU Affero General Public License
+ - along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -
+ -->
+
+<template>
+	<div id="sip_bridge" class="videocalls section">
+		<h2>{{ t('spreed', 'SIP configuration') }}</h2>
+
+		<p class="settings-hint">
+			{{ t('spreed', 'Only users of the following groups can enable SIP in conversations they moderate') }}
+		</p>
+
+		<p class="sip_bridge__groups-settings-content">
+			<Multiselect v-model="sipGroups"
+				class="allowed-groups-select"
+				:options="groups"
+				:placeholder="t('spreed', 'Enable SIP configuration')"
+				:disabled="loading"
+				:multiple="true"
+				:searchable="true"
+				:tag-width="60"
+				:loading="loadingGroups"
+				:show-no-options="false"
+				:close-on-select="false"
+				@search-change="searchGroup" />
+
+			<button class="button primary"
+				:disabled="loading"
+				@click="saveSIPGroups">
+				{{ saveLabelSIPGroups }}
+			</button>
+		</p>
+	</div>
+</template>
+
+<script>
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import axios from '@nextcloud/axios'
+import debounce from 'debounce'
+import { generateOcsUrl } from '@nextcloud/router'
+import { loadState } from '@nextcloud/initial-state'
+
+export default {
+	name: 'SIPBridge',
+
+	components: {
+		Multiselect,
+	},
+
+	data() {
+		return {
+			loading: false,
+			loadingGroups: false,
+			groups: [],
+			sipGroups: [],
+			saveLabelSIPGroups: t('spreed', 'Save changes'),
+		}
+	},
+
+	mounted() {
+		this.loading = true
+		this.sipGroups = loadState('talk', 'sip_bridge_groups')
+		this.groups = [...new Set(this.sipGroups.concat(this.canStartConversations))].sort(function(a, b) {
+			return a.localeCompare(b)
+		})
+		this.loading = false
+	},
+
+	methods: {
+		searchGroup: debounce(async function(query) {
+			this.loadingGroups = true
+			try {
+				const res = await axios.get(generateOcsUrl('cloud', 2) + 'groups', {
+					search: query,
+					limit: 20,
+					offset: 0,
+				})
+				// remove duplicates and sort
+				this.groups = [...new Set(res.data.ocs.data.groups)].sort(function(a, b) {
+					return a.localeCompare(b)
+				})
+			} catch (err) {
+				console.error('Could not fetch groups', err)
+			} finally {
+				this.loadingGroups = false
+			}
+		}, 500),
+
+		saveSIPGroups() {
+			this.loading = true
+			this.loadingGroups = true
+			this.saveLabelSIPGroups = t('spreed', 'Saving …')
+
+			OCP.AppConfig.setValue('spreed', 'sip_bridge_groups', JSON.stringify(this.sipGroups), {
+				success: function() {
+					this.loading = false
+					this.loadingGroups = false
+					this.saveLabelSIPGroups = t('spreed', 'Saved!')
+					setTimeout(function() {
+						this.saveLabelSIPGroups = t('spreed', 'Save changes')
+					}.bind(this), 5000)
+				}.bind(this),
+			})
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.sip_bridge {
+	&__groups-settings-content {
+		display: flex;
+		align-items: center;
+
+		.allowed-groups-select {
+			width: 300px;
+		}
+		button {
+			margin-left: 10px;
+		}
+	}
+
+	.multiselect {
+		flex-grow: 1;
+		max-width: 300px;
+	}
+}
+
+</style>
diff --git a/src/views/AdminSettings.vue b/src/views/AdminSettings.vue
index a3cc105e46a..095c7903b92 100644
--- a/src/views/AdminSettings.vue
+++ b/src/views/AdminSettings.vue
@@ -30,31 +30,34 @@
 		<TurnServers />
 		<SignalingServers />
 		<HostedSignalingServer />
+		<SIPBridge />
 	</div>
 </template>
 
 <script>
-import GeneralSettings from '../components/AdminSettings/GeneralSettings'
 import AllowedGroups from '../components/AdminSettings/AllowedGroups'
 import Commands from '../components/AdminSettings/Commands'
-import StunServers from '../components/AdminSettings/StunServers'
-import TurnServers from '../components/AdminSettings/TurnServers'
-import SignalingServers from '../components/AdminSettings/SignalingServers'
+import GeneralSettings from '../components/AdminSettings/GeneralSettings'
 import HostedSignalingServer from '../components/AdminSettings/HostedSignalingServer'
 import MatterbridgeIntegration from '../components/AdminSettings/MatterbridgeIntegration'
+import SignalingServers from '../components/AdminSettings/SignalingServers'
+import SIPBridge from '../components/AdminSettings/SIPBridge'
+import StunServers from '../components/AdminSettings/StunServers'
+import TurnServers from '../components/AdminSettings/TurnServers'
 
 export default {
 	name: 'AdminSettings',
 
 	components: {
-		GeneralSettings,
 		AllowedGroups,
 		Commands,
-		StunServers,
-		TurnServers,
-		SignalingServers,
+		GeneralSettings,
 		HostedSignalingServer,
 		MatterbridgeIntegration,
+		SignalingServers,
+		SIPBridge,
+		StunServers,
+		TurnServers,
 	},
 }
 </script>

From 208d4f965b6e5794d1bef8925537be7b1a930148 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 8 Oct 2020 16:33:13 +0200
Subject: [PATCH 003/129] Add dial-in info and fix group display names

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Config.php                             |   4 +
 lib/Settings/Admin/AdminSettings.php       |  21 +++-
 src/components/AdminSettings/SIPBridge.vue | 119 ++++++++++++---------
 3 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/lib/Config.php b/lib/Config.php
index 2fe9da2b207..ffbcc1fa8e5 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -71,6 +71,10 @@ public function getSIPGroups(): array {
 		return \is_array($groups) ? $groups : [];
 	}
 
+	public function getDialInInfo(): string {
+		return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info', '');
+	}
+
 	public function isDisabledForUser(IUser $user): bool {
 		$allowedGroups = $this->getAllowedTalkGroupIds();
 		if (empty($allowedGroups)) {
diff --git a/lib/Settings/Admin/AdminSettings.php b/lib/Settings/Admin/AdminSettings.php
index 725b2540f08..da2df2f6639 100644
--- a/lib/Settings/Admin/AdminSettings.php
+++ b/lib/Settings/Admin/AdminSettings.php
@@ -33,6 +33,8 @@
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\ICacheFactory;
 use OCP\IConfig;
+use OCP\IGroup;
+use OCP\IGroupManager;
 use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IUser;
@@ -52,6 +54,8 @@ class AdminSettings implements ISettings {
 	private $initialStateService;
 	/** @var ICacheFactory */
 	private $memcacheFactory;
+	/** @var IGroupManager */
+	private $groupManager;
 	/** @var MatterbridgeManager */
 	private $bridgeManager;
 	/** @var IUser */
@@ -66,6 +70,7 @@ public function __construct(Config $talkConfig,
 								CommandService $commandService,
 								IInitialStateService $initialStateService,
 								ICacheFactory $memcacheFactory,
+								IGroupManager $groupManager,
 								MatterbridgeManager $bridgeManager,
 								IUserSession $userSession,
 								IL10N $l10n,
@@ -75,6 +80,7 @@ public function __construct(Config $talkConfig,
 		$this->commandService = $commandService;
 		$this->initialStateService = $initialStateService;
 		$this->memcacheFactory = $memcacheFactory;
+		$this->groupManager = $groupManager;
 		$this->bridgeManager = $bridgeManager;
 		$this->currentUser = $userSession->getUser();
 		$this->l10n = $l10n;
@@ -469,7 +475,20 @@ protected function initRequestSignalingServerTrial(): void {
 	}
 
 	protected function initSIPBridge(): void {
-		$this->initialStateService->provideInitialState('talk', 'sip_bridge_groups', $this->talkConfig->getSIPGroups());
+		$gids = $this->talkConfig->getSIPGroups();
+		$groups = [];
+		foreach ($gids as $gid) {
+			$group = $this->groupManager->get($gid);
+			if ($group instanceof IGroup) {
+				$groups[] = [
+					'id' => $group->getGID(),
+					'displayname' => $group->getDisplayName(),
+				];
+			}
+		}
+
+		$this->initialStateService->provideInitialState('talk', 'sip_bridge_groups', $groups);
+		$this->initialStateService->provideInitialState('talk', 'sip_bridge_dial-in_info', $this->talkConfig->getDialInInfo());
 	}
 
 	/**
diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
index db90804c46e..56f2064b19c 100644
--- a/src/components/AdminSettings/SIPBridge.vue
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -21,31 +21,48 @@
  -->
 
 <template>
-	<div id="sip_bridge" class="videocalls section">
+	<div id="sip-bridge" class="videocalls section">
 		<h2>{{ t('spreed', 'SIP configuration') }}</h2>
 
 		<p class="settings-hint">
 			{{ t('spreed', 'Only users of the following groups can enable SIP in conversations they moderate') }}
 		</p>
 
-		<p class="sip_bridge__groups-settings-content">
-			<Multiselect v-model="sipGroups"
-				class="allowed-groups-select"
-				:options="groups"
-				:placeholder="t('spreed', 'Enable SIP configuration')"
-				:disabled="loading"
-				:multiple="true"
-				:searchable="true"
-				:tag-width="60"
-				:loading="loadingGroups"
-				:show-no-options="false"
-				:close-on-select="false"
-				@search-change="searchGroup" />
+		<Multiselect
+			v-model="sipGroups"
+			class="sip-bridge__sip-groups-select"
+			:options="groups"
+			:placeholder="t('spreed', 'Enable SIP configuration')"
+			:disabled="loading"
+			:multiple="true"
+			:searchable="true"
+			:tag-width="60"
+			:loading="loadingGroups"
+			:show-no-options="false"
+			:close-on-select="false"
+			track-by="id"
+			label="displayname"
+			@search-change="searchGroup" />
+
+		<h3>{{ t('spreed', 'Dial-in information') }}</h3>
+
+		<p class="settings-hint">
+			{{ t('spreed', 'This information is sent in invitation emails as well as displayed in the sidebar to all participants.') }}
+		</p>
 
+		<textarea
+			v-model="dialInInfo"
+			name="message"
+			class="sip-bridge__dialin-info"
+			rows="4"
+			:disabled="loading"
+			:placeholder="t('spreed', 'Phone number (Country)')" />
+
+		<p>
 			<button class="button primary"
 				:disabled="loading"
-				@click="saveSIPGroups">
-				{{ saveLabelSIPGroups }}
+				@click="saveSIPSettings">
+				{{ saveLabel }}
 			</button>
 		</p>
 	</div>
@@ -71,16 +88,19 @@ export default {
 			loadingGroups: false,
 			groups: [],
 			sipGroups: [],
-			saveLabelSIPGroups: t('spreed', 'Save changes'),
+			saveLabel: t('spreed', 'Save changes'),
+			dialInInfo: '',
 		}
 	},
 
 	mounted() {
 		this.loading = true
-		this.sipGroups = loadState('talk', 'sip_bridge_groups')
-		this.groups = [...new Set(this.sipGroups.concat(this.canStartConversations))].sort(function(a, b) {
-			return a.localeCompare(b)
+		this.groups = loadState('talk', 'sip_bridge_groups').sort(function(a, b) {
+			return a.displayname.localeCompare(b.displayname)
 		})
+		this.sipGroups = this.groups
+		this.dialInInfo = loadState('talk', 'sip_bridge_dial-in_info')
+		this.searchGroup('')
 		this.loading = false
 	},
 
@@ -88,14 +108,13 @@ export default {
 		searchGroup: debounce(async function(query) {
 			this.loadingGroups = true
 			try {
-				const res = await axios.get(generateOcsUrl('cloud', 2) + 'groups', {
+				const response = await axios.get(generateOcsUrl('cloud', 2) + 'groups/details', {
 					search: query,
 					limit: 20,
 					offset: 0,
 				})
-				// remove duplicates and sort
-				this.groups = [...new Set(res.data.ocs.data.groups)].sort(function(a, b) {
-					return a.localeCompare(b)
+				this.groups = response.data.ocs.data.groups.sort(function(a, b) {
+					return a.displayname.localeCompare(b.displayname)
 				})
 			} catch (err) {
 				console.error('Could not fetch groups', err)
@@ -104,20 +123,26 @@ export default {
 			}
 		}, 500),
 
-		saveSIPGroups() {
+		saveSIPSettings() {
 			this.loading = true
-			this.loadingGroups = true
-			this.saveLabelSIPGroups = t('spreed', 'Saving …')
-
-			OCP.AppConfig.setValue('spreed', 'sip_bridge_groups', JSON.stringify(this.sipGroups), {
-				success: function() {
-					this.loading = false
-					this.loadingGroups = false
-					this.saveLabelSIPGroups = t('spreed', 'Saved!')
-					setTimeout(function() {
-						this.saveLabelSIPGroups = t('spreed', 'Save changes')
-					}.bind(this), 5000)
-				}.bind(this),
+			this.saveLabel = t('spreed', 'Saving …')
+
+			const groups = this.sipGroups.map(group => {
+				return group.id
+			})
+
+			OCP.AppConfig.setValue('spreed', 'sip_bridge_groups', JSON.stringify(groups), {
+				success: () => {
+					OCP.AppConfig.setValue('spreed', 'sip_bridge_dial-in_info', this.dialInInfo, {
+						success: () => {
+							this.loading = false
+							this.saveLabel = t('spreed', 'Saved!')
+							setTimeout(() => {
+								this.saveLabel = t('spreed', 'Save changes')
+							}, 5000)
+						},
+					})
+				},
 			})
 		},
 	},
@@ -125,22 +150,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.sip_bridge {
-	&__groups-settings-content {
-		display: flex;
-		align-items: center;
-
-		.allowed-groups-select {
-			width: 300px;
-		}
-		button {
-			margin-left: 10px;
-		}
-	}
-
-	.multiselect {
-		flex-grow: 1;
-		max-width: 300px;
+.sip-bridge {
+	&__sip-groups-select,
+	&__dialin-info {
+		width: 480px;
 	}
 }
 

From 232487982812f413195b00534a5b7e7303db8ac2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 12 Oct 2020 16:51:04 +0200
Subject: [PATCH 004/129] Add SIP status column to rooms table

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml                              |  2 +-
 lib/Manager.php                               |  1 +
 .../Version10000Date20201012144235.php        | 56 +++++++++++++++++++
 lib/Room.php                                  |  8 +++
 lib/Webinary.php                              |  3 +
 5 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 lib/Migration/Version10000Date20201012144235.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 235fa98e04d..d8532ca8e14 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>10.0.3</version>
+	<version>10.0.3.1</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/lib/Manager.php b/lib/Manager.php
index 95a18b0484b..987334a6ba8 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -148,6 +148,7 @@ public function createRoomObject(array $row): Room {
 			(int) $row['type'],
 			(int) $row['read_only'],
 			(int) $row['lobby_state'],
+			(int) $row['sip_status'],
 			$assignedSignalingServer,
 			(string) $row['token'],
 			(string) $row['name'],
diff --git a/lib/Migration/Version10000Date20201012144235.php b/lib/Migration/Version10000Date20201012144235.php
new file mode 100644
index 00000000000..f361bf4388e
--- /dev/null
+++ b/lib/Migration/Version10000Date20201012144235.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Type;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version10000Date20201012144235 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		$table = $schema->getTable('talk_rooms');
+		$table->addColumn('sip_status', Type::SMALLINT, [
+			'notnull' => true,
+			'default' => 0,
+			'unsigned' => true,
+		]);
+
+		return $schema;
+	}
+
+}
diff --git a/lib/Room.php b/lib/Room.php
index 09d52f69b7f..8582b19e841 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -125,6 +125,8 @@ class Room {
 	private $readOnly;
 	/** @var int */
 	private $lobbyState;
+	/** @var int */
+	private $sipStatus;
 	/** @var int|null */
 	private $assignedSignalingServer;
 	/** @var \DateTime|null */
@@ -165,6 +167,7 @@ public function __construct(Manager $manager,
 								int $type,
 								int $readOnly,
 								int $lobbyState,
+								int $sipStatus,
 								?int $assignedSignalingServer,
 								string $token,
 								string $name,
@@ -187,6 +190,7 @@ public function __construct(Manager $manager,
 		$this->type = $type;
 		$this->readOnly = $readOnly;
 		$this->lobbyState = $lobbyState;
+		$this->sipStatus = $sipStatus;
 		$this->assignedSignalingServer = $assignedSignalingServer;
 		$this->token = $token;
 		$this->name = $name;
@@ -218,6 +222,10 @@ public function getLobbyState(): int {
 		return $this->lobbyState;
 	}
 
+	public function getSIPStatus(): int {
+		return $this->sipStatus;
+	}
+
 	public function getLobbyTimer(): ?\DateTime {
 		$this->validateTimer();
 		return $this->lobbyTimer;
diff --git a/lib/Webinary.php b/lib/Webinary.php
index d29866b6ac0..fecbe44fa34 100644
--- a/lib/Webinary.php
+++ b/lib/Webinary.php
@@ -26,4 +26,7 @@
 class Webinary {
 	public const LOBBY_NONE = 0;
 	public const LOBBY_NON_MODERATORS = 1;
+
+	public const SIP_DISABLED = 0;
+	public const SIP_ENABLED = 1;
 }

From bf7ed08b58a670c082123865119fb295348e6f7f Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 12 Oct 2020 16:53:51 +0200
Subject: [PATCH 005/129] Fix unit tests?

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/php/Settings/Admin/AdminSettingsTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/php/Settings/Admin/AdminSettingsTest.php b/tests/php/Settings/Admin/AdminSettingsTest.php
index 95807ee2dd8..2fcdcff65e0 100644
--- a/tests/php/Settings/Admin/AdminSettingsTest.php
+++ b/tests/php/Settings/Admin/AdminSettingsTest.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Settings\Admin\AdminSettings;
 use OCP\ICacheFactory;
 use OCP\IConfig;
+use OCP\IGroupManager;
 use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IUserSession;
@@ -47,6 +48,8 @@ class AdminSettingsTest extends \Test\TestCase {
 	protected $initialState;
 	/** @var ICacheFactory|MockObject */
 	protected $cacheFactory;
+	/** @var IGroupManager|MockObject  */
+	protected $groupManager;
 	/** @var MatterbridgeManager|MockObject  */
 	protected $matterbridgeManager;
 	/** @var IUserSession|MockObject  */
@@ -66,6 +69,7 @@ public function setUp(): void {
 		$this->commandService = $this->createMock(CommandService::class);
 		$this->initialState = $this->createMock(IInitialStateService::class);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
+		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->matterbridgeManager = $this->createMock(MatterbridgeManager::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->l10n = $this->createMock(IL10N::class);
@@ -86,6 +90,7 @@ protected function getAdminSettings(array $methods = []): AdminSettings {
 				$this->commandService,
 				$this->initialState,
 				$this->cacheFactory,
+				$this->groupManager,
 				$this->matterbridgeManager,
 				$this->userSession,
 				$this->l10n,
@@ -100,6 +105,7 @@ protected function getAdminSettings(array $methods = []): AdminSettings {
 				$this->commandService,
 				$this->initialState,
 				$this->cacheFactory,
+				$this->groupManager,
 				$this->matterbridgeManager,
 				$this->userSession,
 				$this->l10n,

From e65d1711ea5aecb84854eea5fb83538b15d27599 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 12:01:52 +0200
Subject: [PATCH 006/129] More strict token generation

Do not allow to start with a '0' as that is a special mode on the phone server
Also there are issues with some providers when you enter the same number twice
consecutive too fast, so we avoid this as well.

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Manager.php | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index 987334a6ba8..e24ecde71d3 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -808,11 +808,8 @@ protected function getNewToken(): string {
 		$sipConfig = $this->config->getAppValue('spreed', 'sip_config', ''); // FIXME adjust config name
 		$entropy = (int) $this->config->getAppValue('spreed', 'token_entropy', 8);
 		$entropy = max(8, $entropy); // For update cases
-
-		if ($sipConfig === '') {
-			$chars = str_replace(['l', '0', '1'], '', ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
-		} else {
-			$chars = ISecureRandom::CHAR_DIGITS;
+		$digitsOnly = $sipConfig !== '';
+		if ($digitsOnly) {
 			// Increase default token length as we only use numbers
 			$entropy = max(10, $entropy);
 		}
@@ -825,7 +822,7 @@ protected function getNewToken(): string {
 		$i = 0;
 		while ($i < 1000) {
 			try {
-				$token = $this->generateNewToken($query, $entropy, $chars);
+				$token = $this->generateNewToken($query, $entropy, $digitsOnly);
 				if (\in_array($token, ['settings', 'backend'], true)) {
 					throw new \OutOfBoundsException('Reserved word');
 				}
@@ -841,27 +838,33 @@ protected function getNewToken(): string {
 
 		$entropy++;
 		$this->config->setAppValue('spreed', 'token_entropy', $entropy);
-		return $this->generateNewToken($query, $entropy, $chars);
+		return $this->generateNewToken($query, $entropy, $digitsOnly);
 	}
 
 	/**
 	 * @param IQueryBuilder $query
 	 * @param int $entropy
-	 * @param string $chars
+	 * @param bool $digitsOnly
 	 * @return string
 	 * @throws \OutOfBoundsException
 	 */
-	protected function generateNewToken(IQueryBuilder $query, int $entropy, string $chars): string {
-		$event = new CreateRoomTokenEvent($entropy, $chars);
-		$this->dispatcher->dispatch(self::EVENT_TOKEN_GENERATE, $event);
-		try {
-			$token = $event->getToken();
-			if ($token === '') {
-				// Will generate default token below.
-				throw new \InvalidArgumentException('token may not be empty');
-			}
-		} catch (\InvalidArgumentException $e) {
+	protected function generateNewToken(IQueryBuilder $query, int $entropy, bool $digitsOnly): string {
+		if (!$digitsOnly) {
+			$chars = str_replace(['l', '0', '1'], '', ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
 			$token = $this->secureRandom->generate($entropy, $chars);
+		} else {
+			$chars = ISecureRandom::CHAR_DIGITS;
+			$token = '';
+			// Do not allow to start with a '0' as that is a special mode on the phone server
+			// Also there are issues with some providers when you enter the same number twice
+			// consecutive too fast, so we avoid this as well.
+			$lastDigit = '0';
+			for ($i = 0; $i < $entropy; $i++) {
+				$lastDigit = $this->secureRandom->generate(1,
+					str_replace($lastDigit, '', $chars)
+				);
+				$token .= $lastDigit;
+			}
 		}
 
 		$query->setParameter('token', $token);

From 6576896e53c3913f8fb3273eeb8889742f87cdd8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 14:17:12 +0200
Subject: [PATCH 007/129] Add a shared secret

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                         | 10 +++++-
 lib/Config.php                             |  6 +++-
 lib/Controller/SettingsController.php      | 32 +++++++++++++++++
 lib/Settings/Admin/AdminSettings.php       |  1 +
 src/components/AdminSettings/SIPBridge.vue | 40 ++++++++++++++--------
 src/services/settingsService.js            | 17 +++++++++
 6 files changed, 89 insertions(+), 17 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 49651fe46a7..32bd845708c 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -495,8 +495,16 @@
 		],
 
 		/**
-		 * UserSettings
+		 * Settings
 		 */
+		[
+			'name' => 'Settings#setSIPSettings',
+			'url' => '/api/{apiVersion}/settings/sip',
+			'verb' => 'POST',
+			'requirements' => [
+				'apiVersion' => 'v1',
+			],
+		],
 		[
 			'name' => 'Settings#setUserSetting',
 			'url' => '/api/{apiVersion}/settings/user',
diff --git a/lib/Config.php b/lib/Config.php
index ffbcc1fa8e5..0b77abdbcef 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -72,7 +72,11 @@ public function getSIPGroups(): array {
 	}
 
 	public function getDialInInfo(): string {
-		return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info', '');
+		return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info');
+	}
+
+	public function getSIPSharedSecret(): string {
+		return $this->config->getAppValue('spreed', 'sip_bridge_shared_secret');
 	}
 
 	public function isDisabledForUser(IUser $user): bool {
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 1124456e5ff..2de96ae5d2b 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -34,6 +34,8 @@
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
+use OCP\IGroup;
+use OCP\IGroupManager;
 use OCP\IRequest;
 use Psr\Log\LoggerInterface;
 
@@ -43,6 +45,8 @@ class SettingsController extends OCSController {
 	protected $rootFolder;
 	/** @var IConfig */
 	protected $config;
+	/** @var IGroupManager */
+	protected $groupManager;
 	/** @var LoggerInterface */
 	protected $logger;
 	/** @var string|null */
@@ -52,11 +56,13 @@ public function __construct(string $appName,
 								IRequest $request,
 								IRootFolder $rootFolder,
 								IConfig $config,
+								IGroupManager $groupManager,
 								LoggerInterface $logger,
 								?string $userId) {
 		parent::__construct($appName, $request);
 		$this->rootFolder = $rootFolder;
 		$this->config = $config;
+		$this->groupManager = $groupManager;
 		$this->logger = $logger;
 		$this->userId = $userId;
 	}
@@ -99,4 +105,30 @@ protected function validateUserSetting(string $setting, ?string $value): bool {
 
 		return false;
 	}
+
+	/**
+	 * @param string[] $sipGroups
+	 * @param string $dialInInfo
+	 * @param string $sharedSecret
+	 * @return DataResponse
+	 */
+	public function setSIPSettings(
+		array $sipGroups = [],
+		string $dialInInfo = '',
+		string $sharedSecret = ''): DataResponse {
+
+		$groups = [];
+		foreach ($sipGroups as $gid) {
+			$group = $this->groupManager->get($gid);
+			if ($group instanceof IGroup) {
+				$groups[] = $group->getGID();
+			}
+		}
+
+		$this->config->setAppValue('spreed', 'sip_bridge_groups', json_encode($groups));
+		$this->config->setAppValue('spreed', 'sip_bridge_dial-in_info', $dialInInfo);
+		$this->config->setAppValue('spreed', 'sip_bridge_shared_secret', $sharedSecret);
+
+		return new DataResponse();
+	}
 }
diff --git a/lib/Settings/Admin/AdminSettings.php b/lib/Settings/Admin/AdminSettings.php
index da2df2f6639..1bf2fa62dc6 100644
--- a/lib/Settings/Admin/AdminSettings.php
+++ b/lib/Settings/Admin/AdminSettings.php
@@ -488,6 +488,7 @@ protected function initSIPBridge(): void {
 		}
 
 		$this->initialStateService->provideInitialState('talk', 'sip_bridge_groups', $groups);
+		$this->initialStateService->provideInitialState('talk', 'sip_bridge_shared_secret', $this->talkConfig->getSIPSharedSecret());
 		$this->initialStateService->provideInitialState('talk', 'sip_bridge_dial-in_info', $this->talkConfig->getDialInInfo());
 	}
 
diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
index 56f2064b19c..307b35e878c 100644
--- a/src/components/AdminSettings/SIPBridge.vue
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -21,9 +21,11 @@
  -->
 
 <template>
-	<div id="sip-bridge" class="videocalls section">
+	<div id="sip-bridge" class="section">
 		<h2>{{ t('spreed', 'SIP configuration') }}</h2>
 
+		<h3>{{ t('spreed', 'Restrict SIP configuration') }}</h3>
+
 		<p class="settings-hint">
 			{{ t('spreed', 'Only users of the following groups can enable SIP in conversations they moderate') }}
 		</p>
@@ -44,6 +46,16 @@
 			label="displayname"
 			@search-change="searchGroup" />
 
+		<h3>{{ t('spreed', 'Shared secret') }}</h3>
+
+		<input v-model="sharedSecret"
+			type="text"
+			name="shared-secret"
+			class="sip-bridge__shared-secret"
+			:disabled="loading"
+			:placeholder="t('spreed', 'Shared secret')"
+			:aria-label="t('spreed', 'Shared secret')">
+
 		<h3>{{ t('spreed', 'Dial-in information') }}</h3>
 
 		<p class="settings-hint">
@@ -74,6 +86,7 @@ import axios from '@nextcloud/axios'
 import debounce from 'debounce'
 import { generateOcsUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
+import { setSIPSettings } from '../../services/settingsService'
 
 export default {
 	name: 'SIPBridge',
@@ -90,6 +103,7 @@ export default {
 			sipGroups: [],
 			saveLabel: t('spreed', 'Save changes'),
 			dialInInfo: '',
+			sharedSecret: '',
 		}
 	},
 
@@ -100,6 +114,7 @@ export default {
 		})
 		this.sipGroups = this.groups
 		this.dialInInfo = loadState('talk', 'sip_bridge_dial-in_info')
+		this.sharedSecret = loadState('talk', 'sip_bridge_shared_secret')
 		this.searchGroup('')
 		this.loading = false
 	},
@@ -123,7 +138,7 @@ export default {
 			}
 		}, 500),
 
-		saveSIPSettings() {
+		async saveSIPSettings() {
 			this.loading = true
 			this.saveLabel = t('spreed', 'Saving …')
 
@@ -131,19 +146,13 @@ export default {
 				return group.id
 			})
 
-			OCP.AppConfig.setValue('spreed', 'sip_bridge_groups', JSON.stringify(groups), {
-				success: () => {
-					OCP.AppConfig.setValue('spreed', 'sip_bridge_dial-in_info', this.dialInInfo, {
-						success: () => {
-							this.loading = false
-							this.saveLabel = t('spreed', 'Saved!')
-							setTimeout(() => {
-								this.saveLabel = t('spreed', 'Save changes')
-							}, 5000)
-						},
-					})
-				},
-			})
+			await setSIPSettings(groups, this.sharedSecret, this.dialInInfo)
+
+			this.loading = false
+			this.saveLabel = t('spreed', 'Saved!')
+			setTimeout(() => {
+				this.saveLabel = t('spreed', 'Save changes')
+			}, 5000)
 		},
 	},
 }
@@ -152,6 +161,7 @@ export default {
 <style lang="scss" scoped>
 .sip-bridge {
 	&__sip-groups-select,
+	&__shared-secret,
 	&__dialin-info {
 		width: 480px;
 	}
diff --git a/src/services/settingsService.js b/src/services/settingsService.js
index 65e262658bf..900a580592a 100644
--- a/src/services/settingsService.js
+++ b/src/services/settingsService.js
@@ -36,6 +36,23 @@ const setAttachmentFolder = async function(path) {
 	})
 }
 
+/**
+ * Save the SIP settings
+ *
+ * @param {Array<string>} sipGroups The groups allowed to enable SIP on a conversation
+ * @param {string} sharedSecret The shared secret which is used by the SIP server to authenticate
+ * @param {string} dialInInfo The dial-in Information displayed in the email and sidebar
+ * @returns {Object} The axios response
+ */
+const setSIPSettings = async function(sipGroups, sharedSecret, dialInInfo) {
+	return axios.post(generateOcsUrl('apps/spreed/api/v1/settings', 2) + 'sip', {
+		sipGroups,
+		sharedSecret,
+		dialInInfo,
+	})
+}
+
 export {
 	setAttachmentFolder,
+	setSIPSettings,
 }

From e6c7b0dbf0695585cba5e7e6cfc3c3698057e60a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 14:47:33 +0200
Subject: [PATCH 008/129] Allow the SIP bridge to get the room data

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 80 ++++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 13 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 2547e4903de..5788613e5d2 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -201,8 +201,14 @@ public function getRooms(int $noStatusUpdate = 0): DataResponse {
 	 * @return DataResponse
 	 */
 	public function getSingleRoom(string $token): DataResponse {
+		$isSIPBridgeRequest = $this->validateSIPBridgeRequest($token);
+		if ($isSIPBridgeRequest && $this->getAPIVersion() === 1) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+		$includeLastMessage = !$isSIPBridgeRequest;
+
 		try {
-			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId, true);
+			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId, $includeLastMessage);
 
 			$participant = null;
 			try {
@@ -214,22 +220,55 @@ public function getSingleRoom(string $token): DataResponse {
 				}
 			}
 
-			return new DataResponse($this->formatRoom($room, $participant), Http::STATUS_OK, $this->getTalkHashHeader());
+			return new DataResponse($this->formatRoom($room, $participant, $isSIPBridgeRequest), Http::STATUS_OK, $this->getTalkHashHeader());
 		} catch (RoomNotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 	}
 
 	/**
-	 * @param string $apiVersion
+	 * Check if the current request is coming from an allowed backend.
+	 *
+	 * The SIP bridge is sending the custom header "Talk-SIPBridge-Random"
+	 * containing at least 32 bytes random data, and the header
+	 * "Talk-SIPBridge-Checksum", which is the SHA256-HMAC of the random data
+	 * and the body of the request, calculated with the shared secret from the
+	 * configuration.
+	 *
+	 * @param string $data
+	 * @return bool
+	 */
+	private function validateSIPBridgeRequest(string $data): bool {
+		if (!isset($_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'],
+			$_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'])) {
+			return false;
+		}
+		$random = $_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'];
+		if (empty($random) || strlen($random) < 32) {
+			return false;
+		}
+		$checksum = $_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'];
+		if (empty($checksum)) {
+			return false;
+		}
+		$secret = $this->talkConfig->getSIPSharedSecret();
+		if (empty($secret)) {
+			return false;
+		}
+		$hash = hash_hmac('sha256', $random . $data, $secret);
+		return hash_equals($hash, strtolower($checksum));
+	}
+
+	/**
 	 * @param Room $room
-	 * @param Participant $currentParticipant
+	 * @param Participant|null $currentParticipant
+	 * @param bool $isSIPBridgeRequest
 	 * @return array
 	 * @throws RoomNotFoundException
 	 */
-	protected function formatRoom(Room $room, ?Participant $currentParticipant): array {
+	protected function formatRoom(Room $room, ?Participant $currentParticipant, bool $isSIPBridgeRequest = false): array {
 		if ($this->getAPIVersion() === 2) {
-			return $this->formatRoomV2($room, $currentParticipant);
+			return $this->formatRoomV2($room, $currentParticipant, $isSIPBridgeRequest);
 		}
 
 		return $this->formatRoomV1($room, $currentParticipant);
@@ -237,7 +276,7 @@ protected function formatRoom(Room $room, ?Participant $currentParticipant): arr
 
 	/**
 	 * @param Room $room
-	 * @param Participant $currentParticipant
+	 * @param Participant|null $currentParticipant
 	 * @return array
 	 * @throws RoomNotFoundException
 	 */
@@ -416,11 +455,12 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 
 	/**
 	 * @param Room $room
-	 * @param Participant $currentParticipant
+	 * @param Participant|null $currentParticipant
+	 * @param bool $isSIPBridgeRequest
 	 * @return array
 	 * @throws RoomNotFoundException
 	 */
-	protected function formatRoomV2(Room $room, ?Participant $currentParticipant): array {
+	protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bool $isSIPBridgeRequest = false): array {
 		$roomData = [
 			'id' => $room->getId(),
 			'token' => $room->getToken(),
@@ -451,10 +491,6 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant): a
 			'lastMessage' => [],
 		];
 
-		if (!$currentParticipant instanceof Participant) {
-			return $roomData;
-		}
-
 		$lastActivity = $room->getLastActivity();
 		if ($lastActivity instanceof \DateTimeInterface) {
 			$lastActivity = $lastActivity->getTimestamp();
@@ -469,6 +505,24 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant): a
 			$lobbyTimer = 0;
 		}
 
+		if ($isSIPBridgeRequest) {
+			return array_merge($roomData, [
+				'name' => $room->getName(),
+				'displayName' => $room->getDisplayName(''),
+				'objectType' => $room->getObjectType(),
+				'objectId' => $room->getObjectId(),
+				'readOnly' => $room->getReadOnly(),
+				'hasCall' => $room->getActiveSince() instanceof \DateTimeInterface,
+				'lastActivity' => $lastActivity,
+				'lobbyState' => $room->getLobbyState(),
+				'lobbyTimer' => $lobbyTimer,
+			]);
+		}
+
+		if (!$currentParticipant instanceof Participant) {
+			return $roomData;
+		}
+
 		$roomData = array_merge($roomData, [
 			'name' => $room->getName(),
 			'displayName' => $room->getDisplayName($currentParticipant->getUser()),

From 09f58272ec9842de820ebd38bfdd8350a6b149d8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 15:53:51 +0200
Subject: [PATCH 009/129] Add an endpoint to enable the SIP per conversation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                            | 10 ++++
 lib/Controller/RoomController.php             |  3 ++
 lib/Controller/WebinarController.php          | 17 +++++++
 lib/Manager.php                               |  2 +-
 .../Version10000Date20201012144235.php        |  2 +-
 lib/Room.php                                  | 48 +++++++++++++++++--
 6 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 32bd845708c..b3a793732b4 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -493,6 +493,16 @@
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
+		[
+			'name' => 'Webinar#setSIPEnabled',
+			'url' => '/api/{apiVersion}/room/{token}/{webinar}/sip',
+			'verb' => 'PUT',
+			'requirements' => [
+				'apiVersion' => 'v(1|2)',
+				'webinar' => 'webinary?',
+				'token' => '^[a-z0-9]{4,30}$',
+			],
+		],
 
 		/**
 		 * Settings
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 5788613e5d2..e38ec4adde8 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -485,6 +485,7 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 			'notificationLevel' => Participant::NOTIFY_NEVER,
 			'lobbyState' => Webinary::LOBBY_NONE,
 			'lobbyTimer' => 0,
+			'sipEnabled' => Webinary::SIP_DISABLED,
 			'lastPing' => 0,
 			'sessionId' => '0',
 			'guestList' => '',
@@ -516,6 +517,7 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 				'lastActivity' => $lastActivity,
 				'lobbyState' => $room->getLobbyState(),
 				'lobbyTimer' => $lobbyTimer,
+				'sipEnabled' => $room->getSIPEnabled(),
 			]);
 		}
 
@@ -537,6 +539,7 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 			'notificationLevel' => $currentParticipant->getNotificationLevel(),
 			'lobbyState' => $room->getLobbyState(),
 			'lobbyTimer' => $lobbyTimer,
+			'sipEnabled' => $room->getSIPEnabled(),
 			'lastPing' => $currentParticipant->getLastPing(),
 			'sessionId' => $currentParticipant->getSessionId(),
 		]);
diff --git a/lib/Controller/WebinarController.php b/lib/Controller/WebinarController.php
index c3ac6e5d540..406495158ab 100644
--- a/lib/Controller/WebinarController.php
+++ b/lib/Controller/WebinarController.php
@@ -67,4 +67,21 @@ public function setLobby(int $state, ?int $timer = null): DataResponse {
 
 		return new DataResponse();
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @RequireModeratorParticipant
+	 *
+	 * @param int $state
+	 * @return DataResponse
+	 */
+	public function setSIPEnabled(int $state): DataResponse {
+		// TODO Check if user is in "SIP groups"
+
+		if (!$this->room->setSIPEnabled($state)) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		return new DataResponse();
+	}
 }
diff --git a/lib/Manager.php b/lib/Manager.php
index e24ecde71d3..749b3462558 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -148,7 +148,7 @@ public function createRoomObject(array $row): Room {
 			(int) $row['type'],
 			(int) $row['read_only'],
 			(int) $row['lobby_state'],
-			(int) $row['sip_status'],
+			(int) $row['sip_enabled'],
 			$assignedSignalingServer,
 			(string) $row['token'],
 			(string) $row['name'],
diff --git a/lib/Migration/Version10000Date20201012144235.php b/lib/Migration/Version10000Date20201012144235.php
index f361bf4388e..d761429302f 100644
--- a/lib/Migration/Version10000Date20201012144235.php
+++ b/lib/Migration/Version10000Date20201012144235.php
@@ -44,7 +44,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$schema = $schemaClosure();
 
 		$table = $schema->getTable('talk_rooms');
-		$table->addColumn('sip_status', Type::SMALLINT, [
+		$table->addColumn('sip_enabled', Type::SMALLINT, [
 			'notnull' => true,
 			'default' => 0,
 			'unsigned' => true,
diff --git a/lib/Room.php b/lib/Room.php
index 8582b19e841..fa8102b7e70 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -81,6 +81,8 @@ class Room {
 	public const EVENT_AFTER_READONLY_SET = self::class . '::postSetReadOnly';
 	public const EVENT_BEFORE_LOBBY_STATE_SET = self::class . '::preSetLobbyState';
 	public const EVENT_AFTER_LOBBY_STATE_SET = self::class . '::postSetLobbyState';
+	public const EVENT_BEFORE_SIP_ENABLED_SET = self::class . '::preSetSIPEnabled';
+	public const EVENT_AFTER_SIP_ENABLED_SET = self::class . '::postSetSIPEnabled';
 	public const EVENT_BEFORE_USERS_ADD = self::class . '::preAddUsers';
 	public const EVENT_AFTER_USERS_ADD = self::class . '::postAddUsers';
 	public const EVENT_BEFORE_PARTICIPANT_TYPE_SET = self::class . '::preSetParticipantType';
@@ -126,7 +128,7 @@ class Room {
 	/** @var int */
 	private $lobbyState;
 	/** @var int */
-	private $sipStatus;
+	private $sipEnabled;
 	/** @var int|null */
 	private $assignedSignalingServer;
 	/** @var \DateTime|null */
@@ -167,7 +169,7 @@ public function __construct(Manager $manager,
 								int $type,
 								int $readOnly,
 								int $lobbyState,
-								int $sipStatus,
+								int $sipEnabled,
 								?int $assignedSignalingServer,
 								string $token,
 								string $name,
@@ -190,7 +192,7 @@ public function __construct(Manager $manager,
 		$this->type = $type;
 		$this->readOnly = $readOnly;
 		$this->lobbyState = $lobbyState;
-		$this->sipStatus = $sipStatus;
+		$this->sipEnabled = $sipEnabled;
 		$this->assignedSignalingServer = $assignedSignalingServer;
 		$this->token = $token;
 		$this->name = $name;
@@ -222,8 +224,8 @@ public function getLobbyState(): int {
 		return $this->lobbyState;
 	}
 
-	public function getSIPStatus(): int {
-		return $this->sipStatus;
+	public function getSIPEnabled(): int {
+		return $this->sipEnabled;
 	}
 
 	public function getLobbyTimer(): ?\DateTime {
@@ -680,6 +682,42 @@ public function setLobby(int $newState, ?\DateTime $dateTime, bool $timerReached
 		return true;
 	}
 
+	public function setSIPEnabled(int $newSipEnabled): bool {
+		$oldSipEnabled = $this->sipEnabled;
+
+		if ($newSipEnabled === $oldSipEnabled) {
+			return false;
+		}
+
+		if (!in_array($this->getType(), [self::GROUP_CALL, self::PUBLIC_CALL], true)) {
+			return false;
+		}
+
+		if (!in_array($newSipEnabled, [Webinary::SIP_ENABLED, Webinary::SIP_DISABLED], true)) {
+			return false;
+		}
+
+		if (!preg_match('/^\d+$/', $this->token)) {
+			return false;
+		}
+
+		$event = new ModifyRoomEvent($this, 'sipStatus', $newSipEnabled, $oldSipEnabled);
+		$this->dispatcher->dispatch(self::EVENT_BEFORE_SIP_ENABLED_SET, $event);
+
+		$query = $this->db->getQueryBuilder();
+		$query->update('talk_rooms')
+			->set('sip_enabled', $query->createNamedParameter($newSipEnabled, IQueryBuilder::PARAM_INT))
+			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+		$query->execute();
+
+		$this->sipEnabled = $newSipEnabled;
+
+		$this->dispatcher->dispatch(self::EVENT_AFTER_SIP_ENABLED_SET, $event);
+
+
+		return true;
+	}
+
 	public function ensureOneToOneRoomIsFilled(): void {
 		if ($this->getType() !== self::ONE_TO_ONE_CALL) {
 			return;

From 9cd6c19fcc94407753bf0c51f39d2efa4df77eed Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 16:17:53 +0200
Subject: [PATCH 010/129] Check if the SIP is configured

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Config.php                       |  5 +++++
 lib/Controller/WebinarController.php | 12 ++++++++++--
 lib/Manager.php                      |  7 +++++--
 lib/Room.php                         |  4 +++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/Config.php b/lib/Config.php
index 0b77abdbcef..4dacecd9987 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -71,6 +71,11 @@ public function getSIPGroups(): array {
 		return \is_array($groups) ? $groups : [];
 	}
 
+	public function isSIPConfigured(): bool {
+		return $this->getSIPSharedSecret() !== ''
+			&& $this->getDialInInfo() !== '';
+	}
+
 	public function getDialInInfo(): string {
 		return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info');
 	}
diff --git a/lib/Controller/WebinarController.php b/lib/Controller/WebinarController.php
index 406495158ab..91942870f4a 100644
--- a/lib/Controller/WebinarController.php
+++ b/lib/Controller/WebinarController.php
@@ -25,6 +25,7 @@
 
 namespace OCA\Talk\Controller;
 
+use OCA\Talk\Config;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -34,12 +35,16 @@ class WebinarController extends AEnvironmentAwareController {
 
 	/** @var ITimeFactory */
 	protected $timeFactory;
+	/** @var Config */
+	protected $talkConfig;
 
 	public function __construct(string $appName,
 								IRequest $request,
-								ITimeFactory $timeFactory) {
+								ITimeFactory $timeFactory,
+								Config $talkConfig) {
 		parent::__construct($appName, $request);
 		$this->timeFactory = $timeFactory;
+		$this->talkConfig = $talkConfig;
 	}
 
 	/**
@@ -76,8 +81,11 @@ public function setLobby(int $state, ?int $timer = null): DataResponse {
 	 * @return DataResponse
 	 */
 	public function setSIPEnabled(int $state): DataResponse {
-		// TODO Check if user is in "SIP groups"
+		if (!$this->talkConfig->isSIPConfigured()) {
+			return new DataResponse([], Http::STATUS_PRECONDITION_FAILED);
+		}
 
+		// TODO Check if user is in "SIP groups"
 		if (!$this->room->setSIPEnabled($state)) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
diff --git a/lib/Manager.php b/lib/Manager.php
index 749b3462558..615cc70964e 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -50,6 +50,8 @@ class Manager {
 	private $db;
 	/** @var IConfig */
 	private $config;
+	/** @var Config */
+	private $talkConfig;
 	/** @var ISecureRandom */
 	private $secureRandom;
 	/** @var IUserManager */
@@ -69,6 +71,7 @@ class Manager {
 
 	public function __construct(IDBConnection $db,
 								IConfig $config,
+								Config $talkConfig,
 								ISecureRandom $secureRandom,
 								IUserManager $userManager,
 								CommentsManager $commentsManager,
@@ -79,6 +82,7 @@ public function __construct(IDBConnection $db,
 								IL10N $l) {
 		$this->db = $db;
 		$this->config = $config;
+		$this->talkConfig = $talkConfig;
 		$this->secureRandom = $secureRandom;
 		$this->userManager = $userManager;
 		$this->commentsManager = $commentsManager;
@@ -805,10 +809,9 @@ protected function getRoomNameByParticipants(Room $room): string {
 	 * @return string
 	 */
 	protected function getNewToken(): string {
-		$sipConfig = $this->config->getAppValue('spreed', 'sip_config', ''); // FIXME adjust config name
 		$entropy = (int) $this->config->getAppValue('spreed', 'token_entropy', 8);
 		$entropy = max(8, $entropy); // For update cases
-		$digitsOnly = $sipConfig !== '';
+		$digitsOnly = $this->talkConfig->isSIPConfigured();
 		if ($digitsOnly) {
 			// Increase default token length as we only use numbers
 			$entropy = max(10, $entropy);
diff --git a/lib/Room.php b/lib/Room.php
index fa8102b7e70..76edef8fb58 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -701,7 +701,9 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 			return false;
 		}
 
-		$event = new ModifyRoomEvent($this, 'sipStatus', $newSipEnabled, $oldSipEnabled);
+		// FIXME check if SIP is enabled/configured
+
+		$event = new ModifyRoomEvent($this, 'sipEnabled', $newSipEnabled, $oldSipEnabled);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_SIP_ENABLED_SET, $event);
 
 		$query = $this->db->getQueryBuilder();

From 920d95abe0a09393f3b3a7c14a576e11c1772fb0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 16:18:40 +0200
Subject: [PATCH 011/129] Add UI option to enable SIP

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/TopBar/TopBar.vue     | 21 +++++++++++++++++++++
 src/constants.js                     |  4 ++++
 src/services/conversationsService.js | 12 ++++++++++++
 src/store/conversationsStore.js      | 14 ++++++++++++++
 4 files changed, 51 insertions(+)

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 7efdae757c6..450370af25c 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -133,6 +133,11 @@
 					@change="setLobbyTimer">
 					{{ t('spreed', 'Start time (optional)') }}
 				</ActionInput>
+				<ActionCheckbox
+					:checked="hasSIPEnabled"
+					@change="toggleSIPEnabled">
+					{{ t('spreed', 'Enable SIP dial-in') }}
+				</ActionCheckbox>
 			</template>
 			<template
 				v-if="showModerationOptions && canFullModerate && isInCall">
@@ -349,6 +354,9 @@ export default {
 				confirm: true,
 			}
 		},
+		hasSIPEnabled() {
+			return this.conversation.sipEnabled === WEBINAR.SIP.ENABLED
+		},
 		isGrid() {
 			return this.$store.getters.isGrid
 		},
@@ -440,6 +448,19 @@ export default {
 			})
 		},
 
+		async toggleSIPEnabled(checked) {
+			try {
+				await this.$store.dispatch('setSIPEnabled', {
+					token: this.token,
+					state: checked ? WEBINAR.SIP.ENABLED : WEBINAR.SIP.DISABLED,
+				})
+			} catch (e) {
+				// TODO check "precondition failed"
+				// TODO showError()
+				console.error(e)
+			}
+		},
+
 		async setLobbyTimer(date) {
 			this.lobbyTimerLoading = true
 
diff --git a/src/constants.js b/src/constants.js
index 4caa62ba778..e5a5cfb09c5 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -69,6 +69,10 @@ export const WEBINAR = {
 		NONE: 0,
 		NON_MODERATORS: 1,
 	},
+	SIP: {
+		DISABLED: 0,
+		ENABLED: 1,
+	},
 }
 export const SHARE = {
 	TYPE: {
diff --git a/src/services/conversationsService.js b/src/services/conversationsService.js
index af11a70a643..670bc4db340 100644
--- a/src/services/conversationsService.js
+++ b/src/services/conversationsService.js
@@ -279,6 +279,17 @@ const makePrivate = async function(token) {
 	}
 }
 
+/**
+ * Change the SIP enabled
+ * @param {string} token The token of the conversation to be modified
+ * @param {int} newState The new SIP state to set
+ */
+const setSIPEnabled = async function(token, newState) {
+	return axios.put(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/webinar/sip`, {
+		state: newState,
+	})
+}
+
 /**
  * Change the lobby state
  * @param {string} token The token of the conversation to be modified
@@ -311,6 +322,7 @@ export {
 	setNotificationLevel,
 	makePublic,
 	makePrivate,
+	setSIPEnabled,
 	changeLobbyState,
 	setConversationPassword,
 	setConversationName,
diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index 09f2c9f8df9..17d3f093f87 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -23,6 +23,7 @@ import Vue from 'vue'
 import {
 	makePublic,
 	makePrivate,
+	setSIPEnabled,
 	changeLobbyState,
 	addToFavorites,
 	removeFromFavorites,
@@ -206,6 +207,19 @@ const actions = {
 		commit('addConversation', conversation)
 	},
 
+	async setSIPEnabled({ commit, getters }, { token, state }) {
+		const conversation = Object.assign({}, getters.conversations[token])
+		if (!conversation) {
+			return
+		}
+
+		// The backend requires the state and timestamp to be set together.
+		await setSIPEnabled(token, state)
+		conversation.sipEnabled = state
+
+		commit('addConversation', conversation)
+	},
+
 	async markConversationRead({ commit, getters }, token) {
 		const conversation = Object.assign({}, getters.conversations[token])
 		if (!conversation) {

From 0ff5f19b3fdb0a39b0c24e7fa1659ba90dab0ad6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 16:29:20 +0200
Subject: [PATCH 012/129] Notify the HPB about SIP changes

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Room.php               | 1 +
 lib/Signaling/Listener.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/Room.php b/lib/Room.php
index 76edef8fb58..62262022426 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -329,6 +329,7 @@ public function getPropertiesForSignaling(string $userId): array {
 			'lobby-timer' => $this->getLobbyTimer(),
 			'read-only' => $this->getReadOnly(),
 			'active-since' => $this->getActiveSince(),
+			'sip-enabled' => $this->getSIPEnabled(),
 		];
 
 		$event = new SignalingRoomPropertiesEvent($this, $userId, $properties);
diff --git a/lib/Signaling/Listener.php b/lib/Signaling/Listener.php
index 3081a4c8dbd..c24d88debe9 100644
--- a/lib/Signaling/Listener.php
+++ b/lib/Signaling/Listener.php
@@ -135,6 +135,7 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
 		$dispatcher->addListener(Room::EVENT_AFTER_TYPE_SET, $listener);
 		$dispatcher->addListener(Room::EVENT_AFTER_READONLY_SET, $listener);
 		$dispatcher->addListener(Room::EVENT_AFTER_LOBBY_STATE_SET, $listener);
+		$dispatcher->addListener(Room::EVENT_AFTER_SIP_ENABLED_SET, $listener);
 		// TODO remove handler with "roomModified" in favour of handler with
 		// "participantsModified" once the clients no longer expect a
 		// "roomModified" message for participant type changes.

From df6f06c24910281e98f523a3b8e3f6e826881ff3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 14 Oct 2020 17:54:55 +0200
Subject: [PATCH 013/129] Fix PHP CS

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SettingsController.php            | 1 -
 lib/Manager.php                                  | 1 -
 lib/Migration/Version10000Date20201012144235.php | 2 --
 3 files changed, 4 deletions(-)

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 2de96ae5d2b..15f4e9603d7 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -116,7 +116,6 @@ public function setSIPSettings(
 		array $sipGroups = [],
 		string $dialInInfo = '',
 		string $sharedSecret = ''): DataResponse {
-
 		$groups = [];
 		foreach ($sipGroups as $gid) {
 			$group = $this->groupManager->get($gid);
diff --git a/lib/Manager.php b/lib/Manager.php
index 615cc70964e..98cba202344 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -25,7 +25,6 @@
 
 use OCA\Talk\Chat\Changelog;
 use OCA\Talk\Chat\CommentsManager;
-use OCA\Talk\Events\CreateRoomTokenEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
diff --git a/lib/Migration/Version10000Date20201012144235.php b/lib/Migration/Version10000Date20201012144235.php
index d761429302f..9ee1d7f8954 100644
--- a/lib/Migration/Version10000Date20201012144235.php
+++ b/lib/Migration/Version10000Date20201012144235.php
@@ -32,7 +32,6 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version10000Date20201012144235 extends SimpleMigrationStep {
-
 	/**
 	 * @param IOutput $output
 	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
@@ -52,5 +51,4 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		return $schema;
 	}
-
 }

From 16ff501757d79eb3ad69c350aa1be626053aeaff Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 15 Oct 2020 15:29:58 +0200
Subject: [PATCH 014/129] No mix of _ and -

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Config.php                             | 2 +-
 lib/Controller/SettingsController.php      | 2 +-
 lib/Settings/Admin/AdminSettings.php       | 2 +-
 src/components/AdminSettings/SIPBridge.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Config.php b/lib/Config.php
index 4dacecd9987..6347700bb3f 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -77,7 +77,7 @@ public function isSIPConfigured(): bool {
 	}
 
 	public function getDialInInfo(): string {
-		return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info');
+		return $this->config->getAppValue('spreed', 'sip_bridge_dialin_info');
 	}
 
 	public function getSIPSharedSecret(): string {
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 15f4e9603d7..d8eb3b4e3ba 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -125,7 +125,7 @@ public function setSIPSettings(
 		}
 
 		$this->config->setAppValue('spreed', 'sip_bridge_groups', json_encode($groups));
-		$this->config->setAppValue('spreed', 'sip_bridge_dial-in_info', $dialInInfo);
+		$this->config->setAppValue('spreed', 'sip_bridge_dialin_info', $dialInInfo);
 		$this->config->setAppValue('spreed', 'sip_bridge_shared_secret', $sharedSecret);
 
 		return new DataResponse();
diff --git a/lib/Settings/Admin/AdminSettings.php b/lib/Settings/Admin/AdminSettings.php
index 1bf2fa62dc6..66f6525ff3c 100644
--- a/lib/Settings/Admin/AdminSettings.php
+++ b/lib/Settings/Admin/AdminSettings.php
@@ -489,7 +489,7 @@ protected function initSIPBridge(): void {
 
 		$this->initialStateService->provideInitialState('talk', 'sip_bridge_groups', $groups);
 		$this->initialStateService->provideInitialState('talk', 'sip_bridge_shared_secret', $this->talkConfig->getSIPSharedSecret());
-		$this->initialStateService->provideInitialState('talk', 'sip_bridge_dial-in_info', $this->talkConfig->getDialInInfo());
+		$this->initialStateService->provideInitialState('talk', 'sip_bridge_dialin_info', $this->talkConfig->getDialInInfo());
 	}
 
 	/**
diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
index 307b35e878c..e626261512f 100644
--- a/src/components/AdminSettings/SIPBridge.vue
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -113,7 +113,7 @@ export default {
 			return a.displayname.localeCompare(b.displayname)
 		})
 		this.sipGroups = this.groups
-		this.dialInInfo = loadState('talk', 'sip_bridge_dial-in_info')
+		this.dialInInfo = loadState('talk', 'sip_bridge_dialin_info')
 		this.sharedSecret = loadState('talk', 'sip_bridge_shared_secret')
 		this.searchGroup('')
 		this.loading = false

From a700646a2810c107340f5f4d1da92fccc4496b76 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 15 Oct 2020 15:37:56 +0200
Subject: [PATCH 015/129] 401 Unauthorized when the SIP headers are provided
 but invalid

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 34 ++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index e38ec4adde8..16dd8a53bb9 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -201,7 +201,12 @@ public function getRooms(int $noStatusUpdate = 0): DataResponse {
 	 * @return DataResponse
 	 */
 	public function getSingleRoom(string $token): DataResponse {
-		$isSIPBridgeRequest = $this->validateSIPBridgeRequest($token);
+		try {
+			$isSIPBridgeRequest = $this->validateSIPBridgeRequest($token);
+		} catch (UnauthorizedException $e) {
+			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+		}
+
 		if ($isSIPBridgeRequest && $this->getAPIVersion() === 1) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
@@ -237,26 +242,35 @@ public function getSingleRoom(string $token): DataResponse {
 	 *
 	 * @param string $data
 	 * @return bool
+	 * @throws UnauthorizedException when the request tried to sign as SIP bridge but failed
 	 */
 	private function validateSIPBridgeRequest(string $data): bool {
-		if (!isset($_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'],
-			$_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'])) {
+		if (!isset($_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'])
+			&& !isset($_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'])) {
 			return false;
 		}
-		$random = $_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'];
-		if (empty($random) || strlen($random) < 32) {
-			return false;
+
+		$random = $_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'] ?? '';
+		if (strlen($random) < 32) {
+			throw new UnauthorizedException('Invalid random provided');
 		}
-		$checksum = $_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'];
+
+		$checksum = $_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'] ?? '';
 		if (empty($checksum)) {
-			return false;
+			throw new UnauthorizedException('Invalid checksum provided');
 		}
+
 		$secret = $this->talkConfig->getSIPSharedSecret();
 		if (empty($secret)) {
-			return false;
+			throw new UnauthorizedException('No shared SIP secret provided');
 		}
 		$hash = hash_hmac('sha256', $random . $data, $secret);
-		return hash_equals($hash, strtolower($checksum));
+
+		if (hash_equals($hash, strtolower($checksum))) {
+			return true;
+		}
+
+		throw new UnauthorizedException('Invalid HMAC provided');
 	}
 
 	/**

From 945599104dbb1b8df1b63ea632fb573c54207fce Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 15 Oct 2020 16:40:14 +0200
Subject: [PATCH 016/129] Split table of participants into attendees and
 sessions

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml                              |   2 +-
 .../Version10000Date20201015134000.php        | 218 ++++++++++++++++++
 .../Version10000Date20201015143852.php        |  52 +++++
 3 files changed, 271 insertions(+), 1 deletion(-)
 create mode 100644 lib/Migration/Version10000Date20201015134000.php
 create mode 100644 lib/Migration/Version10000Date20201015143852.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index d8532ca8e14..474c9fba491 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>10.0.3.1</version>
+	<version>10.0.3.2</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/lib/Migration/Version10000Date20201015134000.php b/lib/Migration/Version10000Date20201015134000.php
new file mode 100644
index 00000000000..b4b19ff364b
--- /dev/null
+++ b/lib/Migration/Version10000Date20201015134000.php
@@ -0,0 +1,218 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Type;
+use OCA\Talk\Participant;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * In order to be able to keep "attendees" which are not users, but groups,
+ * email addresses, etc the sessions had to be decoupled from the participants
+ */
+class Version10000Date20201015134000 extends SimpleMigrationStep {
+	/** @var IDBConnection */
+	protected $connection;
+	/** @var ITimeFactory */
+	protected $timeFactory;
+
+	public function __construct(IDBConnection $connection,
+								ITimeFactory $timeFactory) {
+		$this->connection = $connection;
+		$this->timeFactory = $timeFactory;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('talk_attendees')) {
+			$table = $schema->createTable('talk_attendees');
+
+			// Auto increment id
+			$table->addColumn('id', Type::BIGINT, [
+				'autoincrement' => true,
+				'notnull' => true,
+			]);
+
+			// Unique key
+			$table->addColumn('room_id', Type::BIGINT, [
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('actor_type', Type::STRING, [
+				'notnull' => true,
+				'length' => 32,
+			]);
+			$table->addColumn('actor_id', Type::STRING, [
+				'notnull' => true,
+				'length' => 255,
+			]);
+
+			$table->addColumn('pin', Type::STRING, [
+				'notnull' => false,
+				'length' => 32,
+			]);
+			$table->addColumn('participant_type', Type::SMALLINT, [
+				'notnull' => true,
+				'length' => 6,
+				'default' => 0,
+				'unsigned' => true,
+			]);
+			$table->addColumn('favorite', Type::BOOLEAN, [
+				'default' => 0,
+			]);
+			$table->addColumn('notification_level', Type::INTEGER, [
+				'default' => Participant::NOTIFY_DEFAULT,
+				'notnull' => false,
+			]);
+			$table->addColumn('last_joined_call', Type::DATETIME, [
+				'notnull' => false,
+			]);
+			$table->addColumn('last_read_message', Type::BIGINT, [
+				'default' => 0,
+				'notnull' => false,
+			]);
+			$table->addColumn('last_mention_message', Type::BIGINT, [
+				'default' => 0,
+				'notnull' => false,
+			]);
+
+			$table->setPrimaryKey(['id']);
+
+			$table->addUniqueIndex(['room_id', 'actor_type', 'actor_id'], 'ta_ident');
+			$table->addIndex(['room_id', 'pin'], 'ta_roompin');
+			$table->addIndex(['room_id'], 'ta_room');
+			$table->addIndex(['actor_type', 'actor_id'], 'ta_actor');
+		}
+
+
+		if (!$schema->hasTable('talk_sessions')) {
+			$table = $schema->createTable('talk_sessions');
+
+			// Auto increment id
+			$table->addColumn('id', Type::BIGINT, [
+				'autoincrement' => true,
+				'notnull' => true,
+			]);
+
+			// Unique key (for now, might remove this in the future,
+			// so a user can join multiple times.
+			$table->addColumn('attendee_id', Type::BIGINT, [
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+
+			// Unique key to avoid duplication issues
+			$table->addColumn('session_id', Type::STRING, [
+				'notnull' => true,
+				'length' => 255,
+			]);
+
+			$table->addColumn('in_call', Type::INTEGER, [
+				'default' => 0,
+			]);
+			$table->addColumn('last_ping', Type::INTEGER, [
+				'notnull' => true,
+				'length' => 11,
+				'default' => 0,
+				'unsigned' => true,
+			]);
+
+			$table->setPrimaryKey(['id']);
+
+			$table->addUniqueIndex(['attendee_id'], 'ts_attendee');
+			$table->addUniqueIndex(['session_id'], 'ts_session');
+			$table->addIndex(['in_call'], 'ts_in_call');
+			$table->addIndex(['last_ping'], 'ts_last_ping');
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+		$insert = $this->connection->getQueryBuilder();
+		$insert->insert('talk_attendees')
+			->values([
+				'room_id' => $insert->createParameter('room_id'),
+				'actor_type' => $insert->createParameter('actor_type'),
+				'actor_id' => $insert->createParameter('actor_id'),
+				'participant_type' => $insert->createParameter('participant_type'),
+				'favorite' => $insert->createParameter('favorite'),
+				'notification_level' => $insert->createParameter('notification_level'),
+				'last_joined_call' => $insert->createParameter('last_joined_call'),
+				'last_read_message' => $insert->createParameter('last_read_message'),
+				'last_mention_message' => $insert->createParameter('last_mention_message'),
+			]);
+
+		$query = $this->connection->getQueryBuilder();
+		$query->select('*')
+			->from('talk_participants')
+			->where($query->expr()->neq('user_id', $query->createNamedParameter('')))
+			->andWhere($query->expr()->isNotNull('user_id'));
+
+
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$lastJoinedCall = null;
+			if (!empty($row['last_joined_call'])) {
+				$lastJoinedCall = $this->timeFactory->getDateTime($row['last_joined_call']);
+			}
+
+			$insert
+				->setParameter('room_id', (int) $row['room_id'], IQueryBuilder::PARAM_INT)
+				->setParameter('actor_type', 'users')
+				->setParameter('actor_id', $row['user_id'])
+				->setParameter('participant_type', (int) $row['participant_type'], IQueryBuilder::PARAM_INT)
+				->setParameter('favorite', (bool) $row['favorite'], IQueryBuilder::PARAM_BOOL)
+				->setParameter('notification_level', (int) $row['notification_level'], IQueryBuilder::PARAM_INT)
+				->setParameter('last_joined_call', $lastJoinedCall, IQueryBuilder::PARAM_DATE)
+				->setParameter('last_read_message', (int) $row['last_read_message'], IQueryBuilder::PARAM_INT)
+				->setParameter('last_mention_message', (int) $row['last_mention_message'], IQueryBuilder::PARAM_INT)
+				;
+
+			$insert->execute();
+		}
+		$result->closeCursor();
+	}
+}
diff --git a/lib/Migration/Version10000Date20201015143852.php b/lib/Migration/Version10000Date20201015143852.php
new file mode 100644
index 00000000000..fcec06cf974
--- /dev/null
+++ b/lib/Migration/Version10000Date20201015143852.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version10000Date20201015143852 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if ($schema->hasTable('talk_participants')) {
+			$schema->dropTable('talk_participants');
+			return $schema;
+		}
+
+		return null;
+	}
+}

From 61ac733f881717eb054a80fb6075c014d9af04bb Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 15 Oct 2020 20:14:39 +0200
Subject: [PATCH 017/129] Move participants table in Manager to attendees

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Command/ActiveCalls.php                   |   3 +-
 lib/Controller/RoomController.php             |   2 +-
 lib/Manager.php                               | 172 ++++++++----------
 .../lib/Controller/ApiController.php          |   5 +-
 4 files changed, 83 insertions(+), 99 deletions(-)

diff --git a/lib/Command/ActiveCalls.php b/lib/Command/ActiveCalls.php
index f79e3c8769e..49282d16731 100644
--- a/lib/Command/ActiveCalls.php
+++ b/lib/Command/ActiveCalls.php
@@ -68,9 +68,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$query = $this->connection->getQueryBuilder();
 		$query->select($query->func()->count('*', 'num_participants'))
-			->from('talk_participants')
+			->from('talk_sessions')
 			->where($query->expr()->gt('in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)))
-			->andWhere($query->expr()->neq('session_id', $query->createNamedParameter('0')))
 			->andWhere($query->expr()->gt('last_ping', $query->createNamedParameter(time() - 60)));
 
 		$result = $query->execute();
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 16dd8a53bb9..54e1edda6db 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -180,7 +180,7 @@ public function getRooms(int $noStatusUpdate = 0): DataResponse {
 			}
 		}
 
-		$rooms = $this->manager->getRoomsForParticipant($this->userId, true);
+		$rooms = $this->manager->getRoomsForUser($this->userId, true);
 
 		$return = [];
 		foreach ($rooms as $room) {
diff --git a/lib/Manager.php b/lib/Manager.php
index 98cba202344..47b90ec3a75 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -182,11 +182,11 @@ public function createParticipantObject(Room $room, array $row): Participant {
 			$this->db,
 			$this->config,
 			$room,
-			(string) $row['user_id'],
+			(string) $row['actor_id'],
 			(int) $row['participant_type'],
-			(int) $row['last_ping'],
-			(string) $row['session_id'],
-			(int) $row['in_call'],
+			0, // FIXME this is in talk_sessions now (int) $row['last_ping'],
+			'0', // FIXME this is in talk_sessions now (string) $row['session_id'],
+			Participant::FLAG_DISCONNECTED, // FIXME this is in talk_sessions now (int) $row['in_call'],
 			(int) $row['notification_level'],
 			(bool) $row['favorite'],
 			(int) $row['last_read_message'],
@@ -241,8 +241,8 @@ public function resetAssignedSignalingServers(ICache $cache): void {
 
 	/**
 	 * @param string $searchToken
-	 * @param int $limit
-	 * @param int $offset
+	 * @param int|null $limit
+	 * @param int|null $offset
 	 * @return Room[]
 	 */
 	public function searchRoomsByToken(string $searchToken = '', int $limit = null, int $offset = null): array {
@@ -282,14 +282,23 @@ public function searchRoomsByToken(string $searchToken = '', int $limit = null,
 	 * @return Room[]
 	 */
 	public function getRoomsForParticipant(string $participant, bool $includeLastMessage = false): array {
+		return [];
+	}
+
+	/**
+	 * @param string $userId
+	 * @param bool $includeLastMessage
+	 * @return Room[]
+	 */
+	public function getRoomsForUser(string $userId, bool $includeLastMessage = false): array {
 		$query = $this->db->getQueryBuilder();
-		$query->select('r.*')->addSelect('p.*')
+		$query->select('r.*')->addSelect('a.*')
 			->from('talk_rooms', 'r')
-			->leftJoin('r', 'talk_participants', 'p', $query->expr()->andX(
-				$query->expr()->eq('p.user_id', $query->createNamedParameter($participant)),
-				$query->expr()->eq('p.room_id', 'r.id')
-			))
-			->where($query->expr()->isNotNull('p.user_id'));
+			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
+				$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+				$query->expr()->eq('a.room_id', 'r.id')
+			));
 
 		if ($includeLastMessage) {
 			$this->loadLastMessageInfo($query);
@@ -304,8 +313,8 @@ public function getRoomsForParticipant(string $participant, bool $includeLastMes
 			}
 
 			$room = $this->createRoomObject($row);
-			if ($participant !== null && isset($row['user_id'])) {
-				$room->setParticipant($row['user_id'], $this->createParticipantObject($room, $row));
+			if ($userId !== null && isset($row['actor_id'])) {
+				$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 			}
 			$rooms[] = $room;
 		}
@@ -323,18 +332,30 @@ public function getRoomsForParticipant(string $participant, bool $includeLastMes
 	 * @throws RoomNotFoundException
 	 */
 	public function getRoomForParticipant(int $roomId, ?string $participant): Room {
+		throw new RoomNotFoundException();
+	}
+
+	/**
+	 * Does *not* return public rooms for participants that have not been invited
+	 *
+	 * @param int $roomId
+	 * @param string|null $userId
+	 * @return Room
+	 * @throws RoomNotFoundException
+	 */
+	public function getRoomForUser(int $roomId, ?string $userId): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
 			->from('talk_rooms', 'r')
 			->where($query->expr()->eq('r.id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)));
 
-		if ($participant !== null) {
+		if ($userId !== null) {
 			// Non guest user
-			$query->leftJoin('r', 'talk_participants', 'p', $query->expr()->andX(
-					$query->expr()->eq('p.user_id', $query->createNamedParameter($participant)),
-					$query->expr()->eq('p.room_id', 'r.id')
-				))
-				->andWhere($query->expr()->isNotNull('p.user_id'));
+			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
+					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+					$query->expr()->eq('a.room_id', 'r.id')
+				));
 		}
 
 		$result = $query->execute();
@@ -351,11 +372,11 @@ public function getRoomForParticipant(int $roomId, ?string $participant): Room {
 		}
 
 		$room = $this->createRoomObject($row);
-		if ($participant !== null && isset($row['user_id'])) {
-			$room->setParticipant($row['user_id'], $this->createParticipantObject($room, $row));
+		if ($userId !== null && isset($row['actor_id'])) {
+			$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 		}
 
-		if ($participant === null && $room->getType() !== Room::PUBLIC_CALL) {
+		if ($userId === null && $room->getType() !== Room::PUBLIC_CALL) {
 			throw new RoomNotFoundException();
 		}
 
@@ -373,18 +394,33 @@ public function getRoomForParticipant(int $roomId, ?string $participant): Room {
 	 * @throws RoomNotFoundException
 	 */
 	public function getRoomForParticipantByToken(string $token, ?string $participant, bool $includeLastMessage = false): Room {
+		throw new RoomNotFoundException();
+	}
+
+	/**
+	 * Also returns public rooms for participants that have not been invited,
+	 * so they can join.
+	 *
+	 * @param string $token
+	 * @param string|null $userId
+	 * @param bool $includeLastMessage
+	 * @return Room
+	 * @throws RoomNotFoundException
+	 */
+	public function getRoomForUserByToken(string $token, ?string $userId, bool $includeLastMessage = false): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->from('talk_rooms', 'r')
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)))
 			->setMaxResults(1);
 
-		if ($participant !== null) {
+		if ($userId !== null) {
 			// Non guest user
 			$query->addSelect('p.*')
-				->leftJoin('r', 'talk_participants', 'p', $query->expr()->andX(
-					$query->expr()->eq('p.user_id', $query->createNamedParameter($participant)),
-					$query->expr()->eq('p.room_id', 'r.id')
+				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
+					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+					$query->expr()->eq('a.room_id', 'r.id')
 				));
 		}
 
@@ -406,15 +442,15 @@ public function getRoomForParticipantByToken(string $token, ?string $participant
 		}
 
 		$room = $this->createRoomObject($row);
-		if ($participant !== null && isset($row['user_id'])) {
-			$room->setParticipant($row['user_id'], $this->createParticipantObject($room, $row));
+		if ($userId !== null && isset($row['actor_id'])) {
+			$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 		}
 
 		if ($room->getType() === Room::PUBLIC_CALL) {
 			return $room;
 		}
 
-		if ($participant !== null && $row['user_id'] === $participant) {
+		if ($userId !== null && $row['actor_id'] === $userId) {
 			return $room;
 		}
 
@@ -450,23 +486,24 @@ public function getRoomById(int $roomId): Room {
 
 	/**
 	 * @param string $token
-	 * @param string|null $preloadParticipant Load this participants information if possible
+	 * @param string|null $preloadUserId Load this participants information if possible
 	 * @return Room
 	 * @throws RoomNotFoundException
 	 */
-	public function getRoomByToken(string $token, ?string $preloadParticipant = null): Room {
-		$preloadParticipant = $preloadParticipant === '' ? null : $preloadParticipant;
+	public function getRoomByToken(string $token, ?string $preloadUserId = null): Room {
+		$preloadUserId = $preloadUserId === '' ? null : $preloadUserId;
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->from('talk_rooms', 'r')
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
 
-		if ($preloadParticipant !== null) {
-			$query->addSelect('p.*')
-				->leftJoin('r', 'talk_participants', 'p', $query->expr()->andX(
-					$query->expr()->eq('p.user_id', $query->createNamedParameter($preloadParticipant)),
-					$query->expr()->eq('p.room_id', 'r.id')
+		if ($preloadUserId !== null) {
+			$query->addSelect('a.*')
+				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+					$query->expr()->eq('a.actor_id', $query->createNamedParameter($preloadUserId)),
+					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+					$query->expr()->eq('a.room_id', 'r.id')
 				));
 		}
 
@@ -484,8 +521,8 @@ public function getRoomByToken(string $token, ?string $preloadParticipant = null
 		}
 
 		$room = $this->createRoomObject($row);
-		if ($preloadParticipant !== null && isset($row['user_id'])) {
-			$room->setParticipant($row['user_id'], $this->createParticipantObject($room, $row));
+		if ($preloadUserId !== null && isset($row['actor_id'])) {
+			$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 		}
 
 		return $room;
@@ -670,61 +707,6 @@ public function createRoom(int $type, string $name = '', string $objectType = ''
 		return $room;
 	}
 
-	/**
-	 * @param string|null $userId
-	 * @return string|null
-	 */
-	public function getCurrentSessionId(?string $userId): ?string {
-		if (empty($userId)) {
-			return null;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)))
-			->andWhere($query->expr()->neq('session_id', $query->createNamedParameter('0')))
-			->orderBy('last_ping', 'DESC')
-			->setMaxResults(1);
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row === false) {
-			return null;
-		}
-
-		return $row['session_id'];
-	}
-
-	/**
-	 * @param string $userId
-	 * @return string[]
-	 */
-	public function getSessionIdsForUser(?string $userId): array {
-		if (!is_string($userId) || $userId === '') {
-			// No deleting messages for guests
-			return [];
-		}
-
-		// Delete all messages from or to the current user
-		$query = $this->db->getQueryBuilder();
-		$query->select('session_id')
-			->from('talk_participants')
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
-		$result = $query->execute();
-
-		$sessionIds = [];
-		while ($row = $result->fetch()) {
-			if ($row['session_id'] !== '0') {
-				$sessionIds[] = $row['session_id'];
-			}
-		}
-		$result->closeCursor();
-
-		return $sessionIds;
-	}
-
 	public function resolveRoomDisplayName(Room $room, string $userId): string {
 		if ($room->getObjectType() === 'share:password') {
 			return $this->l->t('Password request: %s', [$room->getName()]);
diff --git a/tests/integration/spreedcheats/lib/Controller/ApiController.php b/tests/integration/spreedcheats/lib/Controller/ApiController.php
index 8a14f21e7fa..358dbafb27b 100644
--- a/tests/integration/spreedcheats/lib/Controller/ApiController.php
+++ b/tests/integration/spreedcheats/lib/Controller/ApiController.php
@@ -57,7 +57,10 @@ public function resetSpreed() {
 		$query->delete('talk_rooms')->execute();
 
 		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_participants')->execute();
+		$query->delete('talk_attendees')->execute();
+
+		$query = $this->db->getQueryBuilder();
+		$query->delete('talk_sessions')->execute();
 
 		$query = $this->db->getQueryBuilder();
 		$query->delete('share')

From a0e01647dc820e413e480eeb093fd7ca8a8aa047 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 16 Oct 2020 11:26:01 +0200
Subject: [PATCH 018/129] Remove updating-methods from Participant object

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml                              |   2 +-
 lib/Chat/Parser/Command.php                   |   3 +-
 lib/Chat/Parser/SystemMessage.php             |  26 +-
 lib/Chat/Parser/UserMention.php               |   2 +-
 lib/Controller/ChatController.php             |  31 ++-
 lib/Controller/RoomController.php             | 230 +++++++++++-------
 lib/Controller/SignalingController.php        |   7 +-
 lib/Manager.php                               |  57 +++--
 lib/Middleware/InjectionMiddleware.php        |   4 +-
 .../Version10000Date20201015134000.php        |  13 +-
 lib/Model/Attendee.php                        | 113 +++++++++
 lib/Model/AttendeeMapper.php                  |  72 ++++++
 lib/Model/Session.php                         |  71 ++++++
 lib/Model/SessionMapper.php                   |  64 +++++
 lib/Participant.php                           | 174 ++-----------
 lib/Room.php                                  |  35 +--
 lib/Service/SessionService.php                |  60 +++++
 17 files changed, 645 insertions(+), 319 deletions(-)
 create mode 100644 lib/Model/Attendee.php
 create mode 100644 lib/Model/AttendeeMapper.php
 create mode 100644 lib/Model/Session.php
 create mode 100644 lib/Model/SessionMapper.php
 create mode 100644 lib/Service/SessionService.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 474c9fba491..b99152c67d4 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>10.0.3.2</version>
+	<version>10.0.3.3</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/lib/Chat/Parser/Command.php b/lib/Chat/Parser/Command.php
index 4e093c2699c..1e321d8d8d4 100644
--- a/lib/Chat/Parser/Command.php
+++ b/lib/Chat/Parser/Command.php
@@ -44,7 +44,8 @@ public function parseMessage(Message $message): void {
 
 		$participant = $message->getParticipant();
 		if ($data['visibility'] !== \OCA\Talk\Model\Command::RESPONSE_ALL &&
-			  $data['user'] !== $participant->getUser()) {
+			($participant->getAttendee()->getActorType() !== 'users'
+				|| $data['user'] !== $participant->getAttendee()->getActorId())) {
 			$message->setVisibility(false);
 			return;
 		}
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index 1b892c410f1..ef311aa8007 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -92,11 +92,15 @@ public function parseMessage(Message $chatMessage): void {
 
 		$participant = $chatMessage->getParticipant();
 		if (!$participant->isGuest()) {
+			$currentActorId = $participant->getAttendee()->getActorId();
 			$currentUserIsActor = $parsedParameters['actor']['type'] === 'user' &&
-				$participant->getUser() === $parsedParameters['actor']['id'];
+				$participant->getAttendee()->getActorType() === 'users' &&
+				$currentActorId === $parsedParameters['actor']['id'];
 		} else {
 			$currentUserIsActor = $parsedParameters['actor']['type'] === 'guest' &&
-				sha1($participant->getSessionId()) === $parsedParameters['actor']['id'];
+				$participant->getAttendee()->getActorType() === 'guest' &&
+				$participant->getAttendee()->getActorId() === $parsedParameters['actor']['id'];
+			$currentActorId = null;
 		}
 		$cliIsActor = $parsedParameters['actor']['type'] === 'guest' &&
 			'guest/cli' === $parsedParameters['actor']['id'];
@@ -197,7 +201,7 @@ public function parseMessage(Message $chatMessage): void {
 				}
 			} elseif ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You added {user}');
-			} elseif (!$participant->isGuest() && $participant->getUser() === $parsedParameters['user']['id']) {
+			} elseif (!$participant->isGuest() && $currentActorId === $parsedParameters['user']['id']) {
 				$parsedMessage = $this->l->t('{actor} added you');
 				if ($cliIsActor) {
 					$parsedMessage = $this->l->t('An administrator added you');
@@ -217,7 +221,7 @@ public function parseMessage(Message $chatMessage): void {
 				$parsedMessage = $this->l->t('{actor} removed {user}');
 				if ($currentUserIsActor) {
 					$parsedMessage = $this->l->t('You removed {user}');
-				} elseif (!$participant->isGuest() && $participant->getUser() === $parsedParameters['user']['id']) {
+				} elseif (!$participant->isGuest() && $currentActorId === $parsedParameters['user']['id']) {
 					$parsedMessage = $this->l->t('{actor} removed you');
 					if ($cliIsActor) {
 						$parsedMessage = $this->l->t('An administrator removed you');
@@ -231,7 +235,7 @@ public function parseMessage(Message $chatMessage): void {
 			$parsedMessage = $this->l->t('{actor} promoted {user} to moderator');
 			if ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You promoted {user} to moderator');
-			} elseif (!$participant->isGuest() && $participant->getUser() === $parsedParameters['user']['id']) {
+			} elseif (!$participant->isGuest() && $currentActorId === $parsedParameters['user']['id']) {
 				$parsedMessage = $this->l->t('{actor} promoted you to moderator');
 				if ($cliIsActor) {
 					$parsedMessage = $this->l->t('An administrator promoted you to moderator');
@@ -244,7 +248,7 @@ public function parseMessage(Message $chatMessage): void {
 			$parsedMessage = $this->l->t('{actor} demoted {user} from moderator');
 			if ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You demoted {user} from moderator');
-			} elseif (!$participant->isGuest() && $participant->getUser() === $parsedParameters['user']['id']) {
+			} elseif (!$participant->isGuest() && $currentActorId === $parsedParameters['user']['id']) {
 				$parsedMessage = $this->l->t('{actor} demoted you from moderator');
 				if ($cliIsActor) {
 					$parsedMessage = $this->l->t('An administrator demoted you from moderator');
@@ -257,7 +261,7 @@ public function parseMessage(Message $chatMessage): void {
 			$parsedMessage = $this->l->t('{actor} promoted {user} to moderator');
 			if ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You promoted {user} to moderator');
-			} elseif ($participant->isGuest() && $participant->getSessionId() === $parsedParameters['user']['id']) {
+			} elseif ($participant->isGuest() && $currentActorId === $parsedParameters['user']['id']) {
 				$parsedMessage = $this->l->t('{actor} promoted you to moderator');
 				if ($cliIsActor) {
 					$parsedMessage = $this->l->t('An administrator promoted you to moderator');
@@ -270,7 +274,7 @@ public function parseMessage(Message $chatMessage): void {
 			$parsedMessage = $this->l->t('{actor} demoted {user} from moderator');
 			if ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You demoted {user} from moderator');
-			} elseif ($participant->isGuest() && $participant->getSessionId() === $parsedParameters['user']['id']) {
+			} elseif ($participant->isGuest() && $currentActorId === $parsedParameters['user']['id']) {
 				$parsedMessage = $this->l->t('{actor} demoted you from moderator');
 				if ($cliIsActor) {
 					$parsedMessage = $this->l->t('An administrator demoted you from moderator');
@@ -326,8 +330,8 @@ protected function getFileFromShare(Participant $participant, string $shareId):
 		$path = $name;
 
 		if (!$participant->isGuest()) {
-			if ($share->getShareOwner() !== $participant->getUser()) {
-				$userFolder = $this->rootFolder->getUserFolder($participant->getUser());
+			if ($share->getShareOwner() !== $participant->getAttendee()->getActorId()) {
+				$userFolder = $this->rootFolder->getUserFolder($participant->getAttendee()->getActorId());
 				if ($userFolder instanceof Node) {
 					$userNodes = $userFolder->getById($node->getId());
 
@@ -336,7 +340,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
 						// 1. Only be executed on "Waiting for new messages"
 						// 2. Once per request
 						\OC_Util::tearDownFS();
-						\OC_Util::setupFS($participant->getUser());
+						\OC_Util::setupFS($participant->ggetAttendee()->getActorId());
 						$userNodes = $userFolder->getById($node->getId());
 					}
 
diff --git a/lib/Chat/Parser/UserMention.php b/lib/Chat/Parser/UserMention.php
index 38a20a2de01..b311abeca28 100644
--- a/lib/Chat/Parser/UserMention.php
+++ b/lib/Chat/Parser/UserMention.php
@@ -112,7 +112,7 @@ public function parseMessage(Message $chatMessage): void {
 				$messageParameters[$mentionParameterId] = [
 					'type' => $mention['type'],
 					'id' => $chatMessage->getRoom()->getToken(),
-					'name' => $chatMessage->getRoom()->getDisplayName($chatMessage->getParticipant()->getUser()),
+					'name' => $chatMessage->getRoom()->getDisplayName($chatMessage->getParticipant()->getAttendee()->getActorId()),
 					'call-type' => $this->getRoomType($chatMessage->getRoom()),
 				];
 			} elseif ($mention['type'] === 'guest') {
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 6aaf30d8b5f..8a5d48066c0 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Chat\MessageParser;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -67,6 +68,9 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var ChatManager */
 	private $chatManager;
 
+	/** @var AttendeeMapper */
+	private $attendeeMapper;
+
 	/** @var GuestManager */
 	private $guestManager;
 
@@ -103,6 +107,7 @@ public function __construct(string $appName,
 								TalkSession $session,
 								IAppManager $appManager,
 								ChatManager $chatManager,
+								AttendeeMapper $attendeeMapper,
 								GuestManager $guestManager,
 								MessageParser $messageParser,
 								IManager $autoCompleteManager,
@@ -119,6 +124,7 @@ public function __construct(string $appName,
 		$this->session = $session;
 		$this->appManager = $appManager;
 		$this->chatManager = $chatManager;
+		$this->attendeeMapper = $attendeeMapper;
 		$this->guestManager = $guestManager;
 		$this->messageParser = $messageParser;
 		$this->autoCompleteManager = $autoCompleteManager;
@@ -206,7 +212,9 @@ public function sendMessage(string $message, string $actorDisplayName = '', stri
 			return new DataResponse([], Http::STATUS_CREATED);
 		}
 
-		$this->participant->setLastReadMessage((int) $comment->getId());
+		$attendee = $this->participant->getAttendee();
+		$attendee->setLastReadMessage((int) $comment->getId());
+		$this->attendeeMapper->update($attendee);
 
 		$data = $chatMessage->toArray();
 		if ($parentMessage instanceof Message) {
@@ -299,9 +307,12 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 		 * we only update the read marker to the last known id, when it is higher
 		 * then the current read marker.
 		 */
+
+		$attendee = $this->participant->getAttendee();
 		if ($lookIntoFuture && $setReadMarker === 1 &&
-			$lastKnownMessageId > $this->participant->getLastReadMessage()) {
-			$this->participant->setLastReadMessage($lastKnownMessageId);
+			$lastKnownMessageId > $attendee->getLastReadMessage()) {
+			$attendee->setLastReadMessage($lastKnownMessageId);
+			$this->attendeeMapper->update($attendee);
 		}
 
 		$currentUser = $this->userManager->get($this->userId);
@@ -393,14 +404,16 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 		if ($newLastKnown instanceof IComment) {
 			$response->addHeader('X-Chat-Last-Given', $newLastKnown->getId());
 			/**
-			 * This false set the read marker on new messages although you
+			 * This falsely set the read marker on new messages although you
 			 * navigated away to a different chat already. So we removed this
 			 * and instead update the read marker before your next waiting.
 			 * So when you are still there, it will just have a wrong read
 			 * marker for the time until your next request starts, while it will
 			 * not update the value, when you actually left the chat already.
 			 * if ($setReadMarker === 1 && $lookIntoFuture) {
-			 * $this->participant->setLastReadMessage((int) $newLastKnown->getId());
+			 * $attendee = $this->participant->getAttendee();
+			 * $attendee->setLastReadMessage((int) $newLastKnown->getId());
+			 * $this->attendeeMapper->update($attendee);
 			 * }
 			 */
 		}
@@ -416,7 +429,9 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 	 * @return DataResponse
 	 */
 	public function setReadMarker(int $lastReadMessage): DataResponse {
-		$this->participant->setLastReadMessage($lastReadMessage);
+		$attendee = $this->participant->getAttendee();
+		$attendee->setLastReadMessage($lastReadMessage);
+		$this->attendeeMapper->update($attendee);
 		return new DataResponse();
 	}
 
@@ -464,7 +479,9 @@ public function mentions(string $search, int $limit = 20, bool $includeStatus =
 
 		$results = $this->prepareResultArray($results, $statuses);
 
-		$roomDisplayName = $this->room->getDisplayName($this->participant->getUser());
+		$attendee = $this->participant->getAttendee();
+		$userId = $attendee->getActorType() === 'users' ? $attendee->getActorId() : '';
+		$roomDisplayName = $this->room->getDisplayName($userId);
 		if (($search === '' || strpos('all', $search) !== false || stripos($roomDisplayName, $search) !== false) && $this->room->getType() !== Room::ONE_TO_ONE_CALL) {
 			if ($search === '' ||
 				stripos($roomDisplayName, $search) === 0 ||
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 54e1edda6db..30a0de3fd07 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -40,6 +40,8 @@
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\GuestManager;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\AttendeeMapper;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\RoomService;
@@ -79,6 +81,8 @@ class RoomController extends AEnvironmentAwareController {
 	protected $manager;
 	/** @var RoomService */
 	protected $roomService;
+	/** @var AttendeeMapper */
+	protected $attendeeMapper;
 	/** @var GuestManager */
 	protected $guestManager;
 	/** @var IUserStatusManager */
@@ -107,6 +111,7 @@ public function __construct(string $appName,
 								IGroupManager $groupManager,
 								Manager $manager,
 								RoomService $roomService,
+								AttendeeMapper $attendeeMapper,
 								GuestManager $guestManager,
 								IUserStatusManager $statusManager,
 								ChatManager $chatManager,
@@ -124,6 +129,7 @@ public function __construct(string $appName,
 		$this->groupManager = $groupManager;
 		$this->manager = $manager;
 		$this->roomService = $roomService;
+		$this->attendeeMapper = $attendeeMapper;
 		$this->guestManager = $guestManager;
 		$this->statusManager = $statusManager;
 		$this->chatManager = $chatManager;
@@ -332,6 +338,9 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 			return $roomData;
 		}
 
+		$attendee = $currentParticipant->getAttendee();
+		$userId = $attendee->getActorType() === 'users' ? $attendee->getActorId() : '';
+
 		$lastActivity = $room->getLastActivity();
 		if ($lastActivity instanceof \DateTimeInterface) {
 			$lastActivity = $lastActivity->getTimestamp();
@@ -348,25 +357,31 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 
 		$roomData = array_merge($roomData, [
 			'name' => $room->getName(),
-			'displayName' => $room->getDisplayName($currentParticipant->getUser()),
+			'displayName' => $room->getDisplayName($userId),
 			'objectType' => $room->getObjectType(),
 			'objectId' => $room->getObjectId(),
-			'participantType' => $currentParticipant->getParticipantType(),
-			// Deprecated, use participantFlags instead.
-			'participantInCall' => ($currentParticipant->getInCallFlags() & Participant::FLAG_IN_CALL) !== 0,
-			'participantFlags' => $currentParticipant->getInCallFlags(),
+			'participantType' => $attendee->getParticipantType(),
 			'readOnly' => $room->getReadOnly(),
 			'count' => 0, // Deprecated, remove in future API version
 			'hasCall' => $room->getActiveSince() instanceof \DateTimeInterface,
 			'lastActivity' => $lastActivity,
-			'isFavorite' => $currentParticipant->isFavorite(),
-			'notificationLevel' => $currentParticipant->getNotificationLevel(),
+			'isFavorite' => $attendee->isFavorite(),
+			'notificationLevel' => $attendee->getNotificationLevel(),
 			'lobbyState' => $room->getLobbyState(),
 			'lobbyTimer' => $lobbyTimer,
-			'lastPing' => $currentParticipant->getLastPing(),
-			'sessionId' => $currentParticipant->getSessionId(),
 		]);
 
+		$session = $currentParticipant->getSession();
+		if ($session instanceof Session) {
+			$roomData = array_merge($roomData, [
+				// Deprecated, use participantFlags instead.
+				'participantInCall' => ($session->getInCall() & Participant::FLAG_IN_CALL) !== 0,
+				'participantFlags' => $session->getInCall(),
+				'lastPing' => $session->getLastPing(),
+				'sessionId' => $session->getSessionId(),
+			]);
+		}
+
 		if ($roomData['notificationLevel'] === Participant::NOTIFY_DEFAULT) {
 			if ($currentParticipant->isGuest()) {
 				$roomData['notificationLevel'] = Participant::NOTIFY_NEVER;
@@ -390,62 +405,65 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 
 		$roomData['canStartCall'] = $currentParticipant->canStartCall();
 
-		$currentUser = $this->userManager->get($currentParticipant->getUser());
-		if ($currentUser instanceof IUser) {
-			$lastReadMessage = $currentParticipant->getLastReadMessage();
-			if ($lastReadMessage === -1) {
-				/*
-				 * Because the migration from the old comment_read_markers was
-				 * not possible in a programmatic way with a reasonable O(1) or O(n)
-				 * but only with O(user×chat), we do the conversion here.
-				 */
-				$lastReadMessage = $this->chatManager->getLastReadMessageFromLegacy($room, $currentUser);
-				$currentParticipant->setLastReadMessage($lastReadMessage);
-			}
-			$roomData['unreadMessages'] = $this->chatManager->getUnreadCount($room, $lastReadMessage);
+		if ($userId !== '') {
+			$currentUser = $this->userManager->get($userId);
+			if ($currentUser instanceof IUser) {
+				$lastReadMessage = $attendee->getLastReadMessage();
+				if ($lastReadMessage === -1) {
+					/*
+					 * Because the migration from the old comment_read_markers was
+					 * not possible in a programmatic way with a reasonable O(1) or O(n)
+					 * but only with O(user×chat), we do the conversion here.
+					 */
+					$lastReadMessage = $this->chatManager->getLastReadMessageFromLegacy($room, $currentUser);
+					$attendee->setLastReadMessage($lastReadMessage);
+					$this->attendeeMapper->update($attendee);
+				}
+				$roomData['unreadMessages'] = $this->chatManager->getUnreadCount($room, $lastReadMessage);
 
-			$lastMention = $currentParticipant->getLastMentionMessage();
-			$roomData['unreadMention'] = $lastMention !== 0 && $lastReadMessage < $lastMention;
-			$roomData['lastReadMessage'] = $lastReadMessage;
+				$lastMention = $attendee->getLastMentionMessage();
+				$roomData['unreadMention'] = $lastMention !== 0 && $lastReadMessage < $lastMention;
+				$roomData['lastReadMessage'] = $lastReadMessage;
+			}
 		}
 
 		$numActiveGuests = 0;
 		$cleanGuests = false;
 		$participantList = [];
 		$participants = $room->getParticipants();
-		uasort($participants, function (Participant $participant1, Participant $participant2) {
-			return $participant2->getLastPing() - $participant1->getLastPing();
-		});
-
-		foreach ($participants as $participant) {
-			if ($participant->isGuest()) {
-				if ($participant->getLastPing() <= $this->timeFactory->getTime() - 100) {
-					$cleanGuests = true;
-				} else {
-					$numActiveGuests++;
-				}
-			} else {
-				$user = $this->userManager->get($participant->getUser());
-				if ($user instanceof IUser) {
-					$participantList[(string)$user->getUID()] = [
-						'name' => $user->getDisplayName(),
-						'type' => $participant->getParticipantType(),
-						'call' => $participant->getInCallFlags(),
-						'sessionId' => $participant->getSessionId(),
-					];
-
-					if ($room->getType() === Room::ONE_TO_ONE_CALL &&
-						  $user->getUID() !== $currentParticipant->getUser()) {
-						// FIXME This should not be done, but currently all the clients use it to get the avatar of the user …
-						$roomData['name'] = $user->getUID();
-					}
-				}
-
-				if ($participant->getSessionId() !== '0' && $participant->getLastPing() <= $this->timeFactory->getTime() - 100) {
-					$room->leaveRoom($participant->getUser());
-				}
-			}
-		}
+//		uasort($participants, function (Participant $participant1, Participant $participant2) {
+//			return $participant2->getLastPing() - $participant1->getLastPing();
+//		});
+//
+//		foreach ($participants as $participant) {
+//			if ($participant->isGuest()) {
+//				if ($participant->getLastPing() <= $this->timeFactory->getTime() - 100) {
+//					$cleanGuests = true;
+//				} else {
+//					$numActiveGuests++;
+//				}
+//			} else {
+//				$user = $this->userManager->get($participant->getUser());
+//				if ($user instanceof IUser) {
+//					$participantList[(string)$user->getUID()] = [
+//						'name' => $user->getDisplayName(),
+//						'type' => $participant->getParticipantType(),
+//						'call' => $participant->getInCallFlags(),
+//						'sessionId' => $participant->getSessionId(),
+//					];
+//
+//					if ($room->getType() === Room::ONE_TO_ONE_CALL &&
+//						  $user->getUID() !== $currentParticipant->getUser()) {
+//						// FIXME This should not be done, but currently all the clients use it to get the avatar of the user …
+//						$roomData['name'] = $user->getUID();
+//					}
+//				}
+//
+//				if ($participant->getSessionId() !== '0' && $participant->getLastPing() <= $this->timeFactory->getTime() - 100) {
+//					$room->leaveRoom($participant->getUser());
+//				}
+//			}
+//		}
 
 		if ($cleanGuests) {
 			$room->cleanGuestParticipants();
@@ -539,25 +557,34 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 			return $roomData;
 		}
 
+		$attendee = $currentParticipant->getAttendee();
+		$userId = $attendee->getActorType() === 'users' ? $attendee->getActorId() : '';
+
 		$roomData = array_merge($roomData, [
 			'name' => $room->getName(),
-			'displayName' => $room->getDisplayName($currentParticipant->getUser()),
+			'displayName' => $room->getDisplayName($userId),
 			'objectType' => $room->getObjectType(),
 			'objectId' => $room->getObjectId(),
-			'participantType' => $currentParticipant->getParticipantType(),
-			'participantFlags' => $currentParticipant->getInCallFlags(),
+			'participantType' => $attendee->getParticipantType(),
 			'readOnly' => $room->getReadOnly(),
 			'hasCall' => $room->getActiveSince() instanceof \DateTimeInterface,
 			'lastActivity' => $lastActivity,
-			'isFavorite' => $currentParticipant->isFavorite(),
-			'notificationLevel' => $currentParticipant->getNotificationLevel(),
+			'isFavorite' => $attendee->isFavorite(),
+			'notificationLevel' => $attendee->getNotificationLevel(),
 			'lobbyState' => $room->getLobbyState(),
 			'lobbyTimer' => $lobbyTimer,
 			'sipEnabled' => $room->getSIPEnabled(),
-			'lastPing' => $currentParticipant->getLastPing(),
-			'sessionId' => $currentParticipant->getSessionId(),
 		]);
 
+		$session = $currentParticipant->getSession();
+		if ($session instanceof Session) {
+			$roomData = array_merge($roomData, [
+				'participantFlags' => $session->getInCall(),
+				'lastPing' => $session->getLastPing(),
+				'sessionId' => $session->getSessionId(),
+			]);
+		}
+
 		if ($roomData['notificationLevel'] === Participant::NOTIFY_DEFAULT) {
 			if ($currentParticipant->isGuest()) {
 				$roomData['notificationLevel'] = Participant::NOTIFY_NEVER;
@@ -581,40 +608,43 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 
 		$roomData['canStartCall'] = $currentParticipant->canStartCall();
 
-		$currentUser = $this->userManager->get($currentParticipant->getUser());
-		if ($currentUser instanceof IUser) {
-			$lastReadMessage = $currentParticipant->getLastReadMessage();
-			if ($lastReadMessage === -1) {
-				/*
-				 * Because the migration from the old comment_read_markers was
-				 * not possible in a programmatic way with a reasonable O(1) or O(n)
-				 * but only with O(user×chat), we do the conversion here.
-				 */
-				$lastReadMessage = $this->chatManager->getLastReadMessageFromLegacy($room, $currentUser);
-				$currentParticipant->setLastReadMessage($lastReadMessage);
-			}
-			if ($room->getLastMessage() && $lastReadMessage === (int) $room->getLastMessage()->getId()) {
-				// When the last message is the last read message, there are no unread messages,
-				// so we can save the query.
-				$roomData['unreadMessages'] = 0;
-			} else {
-				$roomData['unreadMessages'] = $this->chatManager->getUnreadCount($room, $lastReadMessage);
-			}
+		if ($attendee->getActorType() === 'users') {
+			$currentUser = $this->userManager->get($attendee->getActorId());
+			if ($currentUser instanceof IUser) {
+				$lastReadMessage = $attendee->getLastReadMessage();
+				if ($lastReadMessage === -1) {
+					/*
+					 * Because the migration from the old comment_read_markers was
+					 * not possible in a programmatic way with a reasonable O(1) or O(n)
+					 * but only with O(user×chat), we do the conversion here.
+					 */
+					$lastReadMessage = $this->chatManager->getLastReadMessageFromLegacy($room, $currentUser);
+					$attendee->setLastReadMessage($lastReadMessage);
+					$this->attendeeMapper->update($attendee);
+				}
+				if ($room->getLastMessage() && $lastReadMessage === (int) $room->getLastMessage()->getId()) {
+					// When the last message is the last read message, there are no unread messages,
+					// so we can save the query.
+					$roomData['unreadMessages'] = 0;
+				} else {
+					$roomData['unreadMessages'] = $this->chatManager->getUnreadCount($room, $lastReadMessage);
+				}
 
-			$lastMention = $currentParticipant->getLastMentionMessage();
-			$roomData['unreadMention'] = $lastMention !== 0 && $lastReadMessage < $lastMention;
-			$roomData['lastReadMessage'] = $lastReadMessage;
+				$lastMention = $attendee->getLastMentionMessage();
+				$roomData['unreadMention'] = $lastMention !== 0 && $lastReadMessage < $lastMention;
+				$roomData['lastReadMessage'] = $lastReadMessage;
 
-			$roomData['canDeleteConversation'] = $room->getType() !== Room::ONE_TO_ONE_CALL
-				&& $currentParticipant->hasModeratorPermissions(false);
-			$roomData['canLeaveConversation'] = true;
+				$roomData['canDeleteConversation'] = $room->getType() !== Room::ONE_TO_ONE_CALL
+					&& $currentParticipant->hasModeratorPermissions(false);
+				$roomData['canLeaveConversation'] = true;
+			}
 		}
 
 		// FIXME This should not be done, but currently all the clients use it to get the avatar of the user …
 		if ($room->getType() === Room::ONE_TO_ONE_CALL) {
 			$participants = json_decode($room->getName(), true);
 			foreach ($participants as $participant) {
-				if ($participant !== $currentParticipant->getUser()) {
+				if ($participant !== $attendee->getActorId()) {
 					$roomData['name'] = $participant;
 				}
 			}
@@ -861,7 +891,9 @@ protected function createEmptyRoom(string $roomName, bool $public = true): DataR
 	 * @return DataResponse
 	 */
 	public function addToFavorites(): DataResponse {
-		$this->participant->setFavorite(true);
+		$attendee = $this->participant->getAttendee();
+		$attendee->setFavorite(true);
+		$this->attendeeMapper->update($attendee);
 		return new DataResponse([]);
 	}
 
@@ -872,7 +904,9 @@ public function addToFavorites(): DataResponse {
 	 * @return DataResponse
 	 */
 	public function removeFromFavorites(): DataResponse {
-		$this->participant->setFavorite(false);
+		$attendee = $this->participant->getAttendee();
+		$attendee->setFavorite(false);
+		$this->attendeeMapper->update($attendee);
 		return new DataResponse([]);
 	}
 
@@ -884,10 +918,18 @@ public function removeFromFavorites(): DataResponse {
 	 * @return DataResponse
 	 */
 	public function setNotificationLevel(int $level): DataResponse {
-		if (!$this->participant->setNotificationLevel($level)) {
+		if (!\in_array($level, [
+			Participant::NOTIFY_ALWAYS,
+			Participant::NOTIFY_MENTION,
+			Participant::NOTIFY_NEVER
+		], true)) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
+		$attendee = $this->participant->getAttendee();
+		$attendee->setNotificationLevel($level);
+		$this->attendeeMapper->update($attendee);
+
 		return new DataResponse();
 	}
 
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 4f75a818f74..5ab3c5aeeee 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -32,6 +32,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\SessionService;
 use OCA\Talk\Signaling\Messages;
 use OCA\Talk\TalkSession;
 use OCP\AppFramework\Http;
@@ -60,6 +61,8 @@ class SignalingController extends OCSController {
 	private $session;
 	/** @var Manager */
 	private $manager;
+	/** @var SessionService */
+	private $sessionService;
 	/** @var IDBConnection */
 	private $dbConnection;
 	/** @var Messages */
@@ -81,6 +84,7 @@ public function __construct(string $appName,
 								\OCA\Talk\Signaling\Manager $signalingManager,
 								TalkSession $session,
 								Manager $manager,
+								SessionService $sessionService,
 								IDBConnection $connection,
 								Messages $messages,
 								IUserManager $userManager,
@@ -94,6 +98,7 @@ public function __construct(string $appName,
 		$this->session = $session;
 		$this->dbConnection = $connection;
 		$this->manager = $manager;
+		$this->sessionService = $sessionService;
 		$this->messages = $messages;
 		$this->userManager = $userManager;
 		$this->dispatcher = $dispatcher;
@@ -597,7 +602,7 @@ private function backendPing(array $request): DataResponse {
 		}
 
 		// Ping all active sessions with one query
-		$room->pingSessionIds($pingSessionIds, $now);
+		$this->sessionService->updateMultipleLastPings($pingSessionIds, $now);
 
 		$response = [
 			'type' => 'room',
diff --git a/lib/Manager.php b/lib/Manager.php
index 47b90ec3a75..514080ae244 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -28,6 +28,8 @@
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
+use OCA\Talk\Model\AttendeeMapper;
+use OCA\Talk\Model\SessionMapper;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\Comments\NotFoundException;
@@ -51,6 +53,10 @@ class Manager {
 	private $config;
 	/** @var Config */
 	private $talkConfig;
+	/** @var AttendeeMapper */
+	private $attendeeMapper;
+	/** @var SessionMapper */
+	private $sessionMapper;
 	/** @var ISecureRandom */
 	private $secureRandom;
 	/** @var IUserManager */
@@ -71,6 +77,8 @@ class Manager {
 	public function __construct(IDBConnection $db,
 								IConfig $config,
 								Config $talkConfig,
+								AttendeeMapper $attendeeMapper,
+								SessionMapper $sessionMapper,
 								ISecureRandom $secureRandom,
 								IUserManager $userManager,
 								CommentsManager $commentsManager,
@@ -82,6 +90,8 @@ public function __construct(IDBConnection $db,
 		$this->db = $db;
 		$this->config = $config;
 		$this->talkConfig = $talkConfig;
+		$this->attendeeMapper = $attendeeMapper;
+		$this->sessionMapper = $sessionMapper;
 		$this->secureRandom = $secureRandom;
 		$this->userManager = $userManager;
 		$this->commentsManager = $commentsManager;
@@ -147,7 +157,7 @@ public function createRoomObject(array $row): Room {
 			$this->dispatcher,
 			$this->timeFactory,
 			$this->hasher,
-			(int) $row['id'],
+			(int) $row['r_id'],
 			(int) $row['type'],
 			(int) $row['read_only'],
 			(int) $row['lobby_state'],
@@ -173,25 +183,18 @@ public function createRoomObject(array $row): Room {
 	 * @return Participant
 	 */
 	public function createParticipantObject(Room $room, array $row): Participant {
-		$lastJoinedCall = null;
-		if (!empty($row['last_joined_call'])) {
-			$lastJoinedCall = $this->timeFactory->getDateTime($row['last_joined_call']);
+		$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
+		$session = null;
+		if (!empty($row['s_id'])) {
+			$session = $this->sessionMapper->createSessionFromRow($row);
 		}
 
 		return new Participant(
 			$this->db,
 			$this->config,
 			$room,
-			(string) $row['actor_id'],
-			(int) $row['participant_type'],
-			0, // FIXME this is in talk_sessions now (int) $row['last_ping'],
-			'0', // FIXME this is in talk_sessions now (string) $row['session_id'],
-			Participant::FLAG_DISCONNECTED, // FIXME this is in talk_sessions now (int) $row['in_call'],
-			(int) $row['notification_level'],
-			(bool) $row['favorite'],
-			(int) $row['last_read_message'],
-			(int) $row['last_mention_message'],
-			$lastJoinedCall
+			$attendee,
+			$session
 		);
 	}
 
@@ -248,6 +251,7 @@ public function resetAssignedSignalingServers(ICache $cache): void {
 	public function searchRoomsByToken(string $searchToken = '', int $limit = null, int $offset = null): array {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
+			->selectAlias('id', 'r_id')
 			->from('talk_rooms')
 			->setMaxResults(1);
 
@@ -292,7 +296,10 @@ public function getRoomsForParticipant(string $participant, bool $includeLastMes
 	 */
 	public function getRoomsForUser(string $userId, bool $includeLastMessage = false): array {
 		$query = $this->db->getQueryBuilder();
-		$query->select('r.*')->addSelect('a.*')
+		$query->select('r.*')
+			->addSelect('a.*')
+			->selectAlias('r.id', 'r_id')
+			->selectAlias('a.id', 'a_id')
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
@@ -345,12 +352,15 @@ public function getRoomForParticipant(int $roomId, ?string $participant): Room {
 	 */
 	public function getRoomForUser(int $roomId, ?string $userId): Room {
 		$query = $this->db->getQueryBuilder();
-		$query->select('*')
+		$query->select('r.*')
+			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
 			->where($query->expr()->eq('r.id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)));
 
 		if ($userId !== null) {
 			// Non guest user
+			$query->addSelect('a.*')
+				->selectAlias('a.id', 'a_id');
 			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
@@ -410,14 +420,16 @@ public function getRoomForParticipantByToken(string $token, ?string $participant
 	public function getRoomForUserByToken(string $token, ?string $userId, bool $includeLastMessage = false): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
+			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)))
 			->setMaxResults(1);
 
 		if ($userId !== null) {
 			// Non guest user
-			$query->addSelect('p.*')
-				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+			$query->addSelect('a.*')
+				->selectAlias('a.id', 'a_id');
+			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
 					$query->expr()->eq('a.room_id', 'r.id')
@@ -465,6 +477,7 @@ public function getRoomForUserByToken(string $token, ?string $userId, bool $incl
 	public function getRoomById(int $roomId): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
+			->selectAlias('id', 'r_id')
 			->from('talk_rooms')
 			->where($query->expr()->eq('id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)));
 
@@ -495,12 +508,15 @@ public function getRoomByToken(string $token, ?string $preloadUserId = null): Ro
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
+			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
 
 		if ($preloadUserId !== null) {
+
 			$query->addSelect('a.*')
-				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				->selectAlias('a.id', 'a_id');
+			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($preloadUserId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
 					$query->expr()->eq('a.room_id', 'r.id')
@@ -537,6 +553,7 @@ public function getRoomByToken(string $token, ?string $preloadUserId = null): Ro
 	public function getRoomByObject(string $objectType, string $objectId): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
+			->selectAlias('id', 'r_id')
 			->from('talk_rooms')
 			->where($query->expr()->eq('object_type', $query->createNamedParameter($objectType)))
 			->andWhere($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
@@ -616,6 +633,7 @@ public function getOne2OneRoom(string $participant1, string $participant2): Room
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
+			->selectAlias('id', 'r_id')
 			->from('talk_rooms')
 			->where($query->expr()->eq('type', $query->createNamedParameter(Room::ONE_TO_ONE_CALL, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('name', $query->createNamedParameter($name)));
@@ -645,6 +663,7 @@ public function getOne2OneRoom(string $participant1, string $participant2): Room
 	public function getChangelogRoom(string $userId): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
+			->selectAlias('id', 'r_id')
 			->from('talk_rooms')
 			->where($query->expr()->eq('type', $query->createNamedParameter(Room::CHANGELOG_CONVERSATION, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('name', $query->createNamedParameter($userId)));
diff --git a/lib/Middleware/InjectionMiddleware.php b/lib/Middleware/InjectionMiddleware.php
index 9b7e89427a6..5ef6d17baba 100644
--- a/lib/Middleware/InjectionMiddleware.php
+++ b/lib/Middleware/InjectionMiddleware.php
@@ -117,7 +117,7 @@ public function beforeController($controller, $methodName): void {
 	 */
 	protected function getLoggedIn(AEnvironmentAwareController $controller, bool $moderatorRequired): void {
 		$token = $this->request->getParam('token');
-		$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
+		$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 		$controller->setRoom($room);
 
 		$participant = $room->getParticipant($this->userId);
@@ -136,7 +136,7 @@ protected function getLoggedIn(AEnvironmentAwareController $controller, bool $mo
 	 */
 	protected function getLoggedInOrGuest(AEnvironmentAwareController $controller, bool $moderatorRequired): void {
 		$token = $this->request->getParam('token');
-		$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
+		$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 		$controller->setRoom($room);
 
 		if ($this->userId !== null) {
diff --git a/lib/Migration/Version10000Date20201015134000.php b/lib/Migration/Version10000Date20201015134000.php
index b4b19ff364b..4ed340a149c 100644
--- a/lib/Migration/Version10000Date20201015134000.php
+++ b/lib/Migration/Version10000Date20201015134000.php
@@ -101,8 +101,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'default' => Participant::NOTIFY_DEFAULT,
 				'notnull' => false,
 			]);
-			$table->addColumn('last_joined_call', Type::DATETIME, [
-				'notnull' => false,
+			$table->addColumn('last_joined_call', Type::INTEGER, [
+				'notnull' => true,
+				'length' => 11,
+				'default' => 0,
+				'unsigned' => true,
 			]);
 			$table->addColumn('last_read_message', Type::BIGINT, [
 				'default' => 0,
@@ -194,9 +197,9 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 
 		$result = $query->execute();
 		while ($row = $result->fetch()) {
-			$lastJoinedCall = null;
+			$lastJoinedCall = 0;
 			if (!empty($row['last_joined_call'])) {
-				$lastJoinedCall = $this->timeFactory->getDateTime($row['last_joined_call']);
+				$lastJoinedCall = $this->timeFactory->getDateTime($row['last_joined_call'])->getTimestamp();
 			}
 
 			$insert
@@ -206,7 +209,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 				->setParameter('participant_type', (int) $row['participant_type'], IQueryBuilder::PARAM_INT)
 				->setParameter('favorite', (bool) $row['favorite'], IQueryBuilder::PARAM_BOOL)
 				->setParameter('notification_level', (int) $row['notification_level'], IQueryBuilder::PARAM_INT)
-				->setParameter('last_joined_call', $lastJoinedCall, IQueryBuilder::PARAM_DATE)
+				->setParameter('last_joined_call', $lastJoinedCall, IQueryBuilder::PARAM_INT)
 				->setParameter('last_read_message', (int) $row['last_read_message'], IQueryBuilder::PARAM_INT)
 				->setParameter('last_mention_message', (int) $row['last_mention_message'], IQueryBuilder::PARAM_INT)
 				;
diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php
new file mode 100644
index 00000000000..6c56908039d
--- /dev/null
+++ b/lib/Model/Attendee.php
@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Model;
+
+use OCP\AppFramework\Db\Entity;
+
+/**
+ * @method void setRoomId(int $roomId)
+ * @method string getRoomId()
+ * @method void setActorType(string $actorType)
+ * @method string getActorType()
+ * @method void setActorId(string $actorId)
+ * @method string getActorId()
+ * @method void setPin(string $pin)
+ * @method string getPin()
+ * @method void setParticipantType(int $participantType)
+ * @method int getParticipantType()
+ * @method void setFavorite(bool $favorite)
+ * @method bool isFavorite()
+ * @method void setNotificationLevel(int $notificationLevel)
+ * @method int getNotificationLevel()
+ * @method void setLastJoinedCall(int $lastJoinedCall)
+ * @method int getLastJoinedCall()
+ * @method void setLastReadMessage(int $lastReadMessage)
+ * @method int getLastReadMessage()
+ * @method void setLastMentionMessage(int $lastMentionMessage)
+ * @method int getLastMentionMessage()
+ */
+class Attendee extends Entity {
+
+	/** @var int */
+	protected $roomId;
+
+	/** @var string */
+	protected $actorType;
+
+	/** @var string */
+	protected $actorId;
+
+	/** @var string */
+	protected $pin;
+
+	/** @var int */
+	protected $participantType;
+
+	/** @var bool */
+	protected $favorite;
+
+	/** @var int */
+	protected $notificationLevel;
+
+	/** @var int */
+	protected $lastJoinedCall;
+
+	/** @var int */
+	protected $lastReadMessage;
+
+	/** @var int */
+	protected $lastMentionMessage;
+
+	public function __construct() {
+		$this->addType('room_id', 'int');
+		$this->addType('actor_type', 'string');
+		$this->addType('actor_id', 'string');
+		$this->addType('pin', 'string');
+		$this->addType('participant_type', 'int');
+		$this->addType('favorite', 'bool');
+		$this->addType('notification_level', 'int');
+		$this->addType('last_joined_call', 'int');
+		$this->addType('last_read_message', 'int');
+		$this->addType('last_mention_message', 'int');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function asArray(): array {
+		return [
+			'id' => $this->getId(),
+			'room_id' => $this->getRoomId(),
+			'actor_type' => $this->getActorType(),
+			'actor_id' => $this->getActorId(),
+			'pin' => $this->getPin(),
+			'participant_type' => $this->getParticipantType(),
+			'favorite' => $this->isFavorite(),
+			'notification_level' => $this->getNotificationLevel(),
+			'last_joined_call' => $this->getLastJoinedCall(),
+			'last_read_message' => $this->getLastReadMessage(),
+			'last_mention_message' => $this->getLastMentionMessage(),
+		];
+	}
+}
diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
new file mode 100644
index 00000000000..4c7e7dcd8f1
--- /dev/null
+++ b/lib/Model/AttendeeMapper.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Model;
+
+use OCP\AppFramework\Db\QBMapper;
+use OCP\IDBConnection;
+
+/**
+ * @method Attendee mapRowToEntity(array $row)
+ */
+class AttendeeMapper extends QBMapper {
+
+	/**
+	 * @param IDBConnection $db
+	 */
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'talk_attendees', Attendee::class);
+	}
+
+	/**
+	 * @param string $actorType
+	 * @param string $actorId
+	 * @return Attendee
+	 * @throws \OCP\AppFramework\Db\DoesNotExistException
+	 */
+	public function findByActor(string $actorType, string $actorId): Attendee {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->from($this->getTableName())
+			->where($query->expr()->eq('actor_type', $query->createNamedParameter($actorType)))
+			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($actorId)));
+
+		return $this->findEntity($query);
+	}
+
+	public function createAttendeeFromRow(array $row): Attendee {
+		return $this->mapRowToEntity([
+			'id' => $row['a_id'],
+			'room_id' => $row['id'],
+			'actor_type' => $row['actor_type'],
+			'actor_id' => $row['actor_id'],
+			'pin' => $row['pin'],
+			'participant_type' => (int) $row['participant_type'],
+			'favorite' => (bool) $row['favorite'],
+			'notification_level' => (int) $row['notification_level'],
+			'last_joined_call' => (int) $row['last_joined_call'],
+			'last_read_message' => (int) $row['last_read_message'],
+			'last_mention_message' => (int) $row['last_mention_message'],
+		]);
+	}
+}
diff --git a/lib/Model/Session.php b/lib/Model/Session.php
new file mode 100644
index 00000000000..c647e70823f
--- /dev/null
+++ b/lib/Model/Session.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Model;
+
+use OCP\AppFramework\Db\Entity;
+
+/**
+ * @method void setAttendeeId(int $attendeeId)
+ * @method string getAttendeeId()
+ * @method void setSessionId(string $sessionId)
+ * @method string getSessionId()
+ * @method void setInCall(int $inCall)
+ * @method int getInCall()
+ * @method void setLastPing(int $lastPing)
+ * @method int getLastPing()
+ */
+class Session extends Entity {
+
+	/** @var int */
+	protected $attendeeId;
+
+	/** @var string */
+	protected $sessionId;
+
+	/** @var int */
+	protected $inCall;
+
+	/** @var int */
+	protected $lastPing;
+
+	public function __construct() {
+		$this->addType('attendee_id', 'int');
+		$this->addType('session_id', 'string');
+		$this->addType('in_call', 'int');
+		$this->addType('last_ping', 'int');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function asArray(): array {
+		return [
+			'id' => $this->getId(),
+			'attendee_id' => $this->getAttendeeId(),
+			'session_id' => $this->getSessionId(),
+			'in_call' => $this->getInCall(),
+			'last_ping' => $this->getLastPing(),
+		];
+	}
+}
diff --git a/lib/Model/SessionMapper.php b/lib/Model/SessionMapper.php
new file mode 100644
index 00000000000..c45cafd90e7
--- /dev/null
+++ b/lib/Model/SessionMapper.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Model;
+
+use OCP\AppFramework\Db\QBMapper;
+use OCP\IDBConnection;
+
+/**
+ * @method Session mapRowToEntity(array $row)
+ */
+class SessionMapper extends QBMapper {
+
+	/**
+	 * @param IDBConnection $db
+	 */
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'talk_sessions', Session::class);
+	}
+
+	/**
+	 * @param string $sessionId
+	 * @return Session
+	 * @throws \OCP\AppFramework\Db\DoesNotExistException
+	 */
+	public function findBySessionId(string $sessionId): Session {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->from($this->getTableName())
+			->where($query->expr()->eq('session_id', $query->createNamedParameter($sessionId)));
+
+		return $this->findEntity($query);
+	}
+
+	public function createSessionFromRow(array $row): Session {
+		return $this->mapRowToEntity([
+			'id' => $row['s_id'],
+			'session_id' => $row['session_id'],
+			'attendee_id' => (int) $row['a_id'],
+			'in_call' => (int) $row['in_call'],
+			'last_ping' => (int) $row['last_ping'],
+		]);
+	}
+}
diff --git a/lib/Participant.php b/lib/Participant.php
index 3b6d61c1235..f8bd34a53e0 100644
--- a/lib/Participant.php
+++ b/lib/Participant.php
@@ -25,7 +25,8 @@
 
 namespace OCA\Talk;
 
-use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Model\Session;
 use OCP\IConfig;
 use OCP\IDBConnection;
 
@@ -54,180 +55,43 @@ class Participant {
 	protected $config;
 	/** @var Room */
 	protected $room;
-	/** @var string */
-	protected $user;
-	/** @var int */
-	protected $participantType;
-	/** @var int */
-	protected $lastPing;
-	/** @var string */
-	protected $sessionId;
-	/** @var int */
-	protected $inCall;
-	/** @var int */
-	protected $notificationLevel;
-	/** @var bool */
-	private $isFavorite;
-	/** @var int */
-	private $lastReadMessage;
-	/** @var int */
-	private $lastMentionMessage;
-	/** @var \DateTime|null */
-	private $lastJoinedCall;
+	/** @var Attendee */
+	protected $attendee;
+	/** @var Session|null */
+	protected $session;
 
 	public function __construct(IDBConnection $db,
 								IConfig $config,
 								Room $room,
-								string $user,
-								int $participantType,
-								int $lastPing,
-								string $sessionId,
-								int $inCall,
-								int $notificationLevel,
-								bool $isFavorite,
-								int $lastReadMessage,
-								int $lastMentionMessage,
-								\DateTime $lastJoinedCall = null) {
+								Attendee $attendee,
+								?Session $session) {
 		$this->db = $db;
 		$this->config = $config;
 		$this->room = $room;
-		$this->user = $user;
-		$this->participantType = $participantType;
-		$this->lastPing = $lastPing;
-		$this->sessionId = $sessionId;
-		$this->inCall = $inCall;
-		$this->notificationLevel = $notificationLevel;
-		$this->isFavorite = $isFavorite;
-		$this->lastReadMessage = $lastReadMessage;
-		$this->lastMentionMessage = $lastMentionMessage;
-		$this->lastJoinedCall = $lastJoinedCall;
+		$this->attendee = $attendee;
+		$this->session = $session;
 	}
 
-	public function getUser(): string {
-		return $this->user;
+	public function getAttendee(): Attendee {
+		return $this->attendee;
 	}
 
-	public function getParticipantType(): int {
-		return $this->participantType;
+	public function getSession(): ?Session {
+		return $this->session;
 	}
 
 	public function isGuest(): bool {
-		return \in_array($this->participantType, [self::GUEST, self::GUEST_MODERATOR], true);
+		$participantType = $this->attendee->getParticipantType();
+		return \in_array($participantType, [self::GUEST, self::GUEST_MODERATOR], true);
 	}
 
 	public function hasModeratorPermissions(bool $guestModeratorAllowed = true): bool {
+		$participantType = $this->attendee->getParticipantType();
 		if (!$guestModeratorAllowed) {
-			return \in_array($this->participantType, [self::OWNER, self::MODERATOR], true);
+			return \in_array($participantType, [self::OWNER, self::MODERATOR], true);
 		}
 
-		return \in_array($this->participantType, [self::OWNER, self::MODERATOR, self::GUEST_MODERATOR], true);
-	}
-
-	public function getLastPing(): int {
-		return $this->lastPing;
-	}
-
-	public function getSessionId(): string {
-		return $this->sessionId;
-	}
-
-	public function getInCallFlags(): int {
-		return $this->inCall;
-	}
-
-	/**
-	 * @return \DateTime|null
-	 */
-	public function getJoinedCall(): ?\DateTime {
-		return $this->lastJoinedCall;
-	}
-
-	public function isFavorite(): bool {
-		return $this->isFavorite;
-	}
-
-	public function setFavorite(bool $favor): bool {
-		if (!$this->user) {
-			return false;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('favorite', $query->createNamedParameter((int) $favor, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($this->user)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->room->getId())));
-		$query->execute();
-
-		$this->isFavorite = $favor;
-		return true;
-	}
-
-	public function getNotificationLevel(): int {
-		return $this->notificationLevel;
-	}
-
-	public function setNotificationLevel(int $notificationLevel): bool {
-		if (!$this->user) {
-			return false;
-		}
-
-		if (!\in_array($notificationLevel, [
-			self::NOTIFY_ALWAYS,
-			self::NOTIFY_MENTION,
-			self::NOTIFY_NEVER
-		], true)) {
-			return false;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('notification_level', $query->createNamedParameter($notificationLevel, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($this->user)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->room->getId())));
-		$query->execute();
-
-		$this->notificationLevel = $notificationLevel;
-		return true;
-	}
-
-	public function getLastReadMessage(): int {
-		return $this->lastReadMessage;
-	}
-
-	public function setLastReadMessage(int $messageId): bool {
-		if (!$this->user) {
-			return false;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('last_read_message', $query->createNamedParameter($messageId, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($this->user)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->room->getId())));
-		$query->execute();
-
-		$this->lastReadMessage = $messageId;
-		return true;
-	}
-
-	public function getLastMentionMessage(): int {
-		return $this->lastMentionMessage;
-	}
-
-	public function setLastMentionMessage(int $messageId): bool {
-		if (!$this->user) {
-			return false;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('last_mention_message', $query->createNamedParameter($messageId, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($this->user)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->room->getId())));
-		$query->execute();
-
-		$this->lastMentionMessage = $messageId;
-		return true;
+		return \in_array($participantType, [self::OWNER, self::MODERATOR, self::GUEST_MODERATOR], true);
 	}
 
 	public function canStartCall(): bool {
diff --git a/lib/Room.php b/lib/Room.php
index 62262022426..824f2e9a7a2 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -403,8 +403,8 @@ public function deleteRoom(): void {
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_ROOM_DELETE, $event);
 		$query = $this->db->getQueryBuilder();
 
-		// Delete all participants
-		$query->delete('talk_participants')
+		// Delete attendees
+		$query->delete('talk_attendees')
 			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
 		$query->execute();
 
@@ -583,7 +583,7 @@ public function setType(int $newType): bool {
 		if ($oldType === self::PUBLIC_CALL) {
 			// Kick all guests and users that were not invited
 			$query = $this->db->getQueryBuilder();
-			$query->delete('talk_participants')
+			$query->delete('talk_attendees')
 				->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
 				->andWhere($query->expr()->in('participant_type', $query->createNamedParameter([Participant::GUEST, Participant::USER_SELF_JOINED], IQueryBuilder::PARAM_INT_ARRAY)));
 			$query->execute();
@@ -785,12 +785,14 @@ public function setParticipantType(Participant $participant, int $participantTyp
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_PARTICIPANT_TYPE_SET, $event);
 
 		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
+		$query->update('talk_attendees')
 			->set('participant_type', $query->createNamedParameter($participantType, IQueryBuilder::PARAM_INT))
 			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($participant->getUser())));
+			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($participant->getUser())))
+			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')));
 
 		if ($participant->getUser() === '') {
+			// FIXME
 			$query->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())));
 		}
 
@@ -814,9 +816,10 @@ public function removeUser(IUser $user, string $reason): void {
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_USER_REMOVE, $event);
 
 		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_participants')
+		$query->delete('talk_attendees')
 			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($user->getUID())));
+			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($user->getUID())))
+			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')));
 		$query->execute();
 
 		$this->dispatcher->dispatch(self::EVENT_AFTER_USER_REMOVE, $event);
@@ -929,8 +932,9 @@ public function leaveRoomAsParticipant(Participant $participant, ?string $sessio
 
 		// And kill session when leaving a self joined room
 		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_participants')
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($participant->getUser())))
+		$query->delete('talk_attendees')
+			->where($query->expr()->eq('actor_id', $query->createNamedParameter($participant->getUser())))
+			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')))
 			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('participant_type', $query->createNamedParameter(Participant::USER_SELF_JOINED, IQueryBuilder::PARAM_INT)));
 		if ($sessionId !== null && $sessionId !== '0') {
@@ -1388,17 +1392,4 @@ public function ping(?string $userId, string $sessionId, int $timestamp): void {
 
 		$query->execute();
 	}
-
-	/**
-	 * @param string[] $sessionIds
-	 * @param int $timestamp
-	 */
-	public function pingSessionIds(array $sessionIds, int $timestamp): void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('last_ping', $query->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->in('session_id', $query->createNamedParameter($sessionIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$query->execute();
-	}
 }
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
new file mode 100644
index 00000000000..822a7b710b8
--- /dev/null
+++ b/lib/Service/SessionService.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Service;
+
+use OCA\Talk\Model\SessionMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+
+class SessionService {
+	/** @var SessionMapper */
+	protected $mapper;
+	/** @var IDBConnection */
+	protected $connection;
+
+	public function __construct(SessionMapper $mapper,
+								IDBConnection $connection) {
+		$this->mapper = $mapper;
+		$this->connection = $connection;
+	}
+
+	/**
+	 * Update last ping for multiple sessions
+	 *
+	 * Since this function is called by the HPB with potentially hundreds of
+	 * sessions, we do not use the SessionMapper to get the entities first, as
+	 * that would just not scale good enough.
+	 *
+	 * @param string[] $sessionIds
+	 * @param int $lastPing
+	 */
+	public function updateMultipleLastPings(array $sessionIds, int $lastPing): void {
+		$query = $this->connection->getQueryBuilder();
+		$query->update('talk_sessions')
+			->set('last_ping', $query->createNamedParameter($lastPing, IQueryBuilder::PARAM_INT))
+			->where($query->expr()->in('session_id', $query->createNamedParameter($sessionIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+		$query->execute();
+	}
+}

From f657742b0685d084221a842f4554b7ce51d933fe Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 15:34:25 +0200
Subject: [PATCH 019/129] Fix casting of values

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Model/Attendee.php       | 16 ++++++++--------
 lib/Model/AttendeeMapper.php |  6 ++++--
 lib/Model/Session.php        |  8 ++++----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php
index 6c56908039d..86e0676daca 100644
--- a/lib/Model/Attendee.php
+++ b/lib/Model/Attendee.php
@@ -80,16 +80,16 @@ class Attendee extends Entity {
 	protected $lastMentionMessage;
 
 	public function __construct() {
-		$this->addType('room_id', 'int');
-		$this->addType('actor_type', 'string');
-		$this->addType('actor_id', 'string');
+		$this->addType('roomId', 'int');
+		$this->addType('actorType', 'string');
+		$this->addType('actorId', 'string');
 		$this->addType('pin', 'string');
-		$this->addType('participant_type', 'int');
+		$this->addType('participantType', 'int');
 		$this->addType('favorite', 'bool');
-		$this->addType('notification_level', 'int');
-		$this->addType('last_joined_call', 'int');
-		$this->addType('last_read_message', 'int');
-		$this->addType('last_mention_message', 'int');
+		$this->addType('notificationLevel', 'int');
+		$this->addType('lastJoinedCall', 'int');
+		$this->addType('lastReadMessage', 'int');
+		$this->addType('lastMentionMessage', 'int');
 	}
 
 	/**
diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
index 4c7e7dcd8f1..1c76253ad95 100644
--- a/lib/Model/AttendeeMapper.php
+++ b/lib/Model/AttendeeMapper.php
@@ -39,17 +39,19 @@ public function __construct(IDBConnection $db) {
 	}
 
 	/**
+	 * @param int $roomId
 	 * @param string $actorType
 	 * @param string $actorId
 	 * @return Attendee
 	 * @throws \OCP\AppFramework\Db\DoesNotExistException
 	 */
-	public function findByActor(string $actorType, string $actorId): Attendee {
+	public function findByActor(int $roomId, string $actorType, string $actorId): Attendee {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
 			->from($this->getTableName())
 			->where($query->expr()->eq('actor_type', $query->createNamedParameter($actorType)))
-			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($actorId)));
+			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($actorId)))
+			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($roomId)));
 
 		return $this->findEntity($query);
 	}
diff --git a/lib/Model/Session.php b/lib/Model/Session.php
index c647e70823f..172e39ef9a1 100644
--- a/lib/Model/Session.php
+++ b/lib/Model/Session.php
@@ -50,10 +50,10 @@ class Session extends Entity {
 	protected $lastPing;
 
 	public function __construct() {
-		$this->addType('attendee_id', 'int');
-		$this->addType('session_id', 'string');
-		$this->addType('in_call', 'int');
-		$this->addType('last_ping', 'int');
+		$this->addType('attendeeId', 'int');
+		$this->addType('sessionId', 'string');
+		$this->addType('inCall', 'int');
+		$this->addType('lastPing', 'int');
 	}
 
 	/**

From c6685b42518bd94bb92b1c0251b36141d78b7633 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 15:36:53 +0200
Subject: [PATCH 020/129] Fix function usage

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../Collaborators/RoomPlugin.php              |  2 +-
 .../Resources/ConversationProvider.php        |  2 +-
 lib/Controller/PageController.php             |  2 +-
 lib/Controller/SignalingController.php        |  4 +--
 lib/Flow/Operation.php                        |  2 +-
 lib/Listener/UserDeletedListener.php          |  2 +-
 lib/Manager.php                               | 35 -------------------
 lib/Search/ConversationSearch.php             |  2 +-
 lib/Search/CurrentMessageSearch.php           |  2 +-
 lib/Search/MessageSearch.php                  |  2 +-
 lib/Share/RoomShareProvider.php               |  2 +-
 .../Collaborators/RoomPluginTest.php          |  2 +-
 .../Resources/ConversationProviderTest.php    |  8 ++---
 13 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/lib/Collaboration/Collaborators/RoomPlugin.php b/lib/Collaboration/Collaborators/RoomPlugin.php
index 6d33922f081..e2455caec22 100644
--- a/lib/Collaboration/Collaborators/RoomPlugin.php
+++ b/lib/Collaboration/Collaborators/RoomPlugin.php
@@ -58,7 +58,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
 
 		$result = ['wide' => [], 'exact' => []];
 
-		$rooms = $this->manager->getRoomsForParticipant($userId);
+		$rooms = $this->manager->getRoomsForUser($userId);
 		foreach ($rooms as $room) {
 			if ($room->getReadOnly() === Room::READ_ONLY) {
 				// Can not add new shares to read-only rooms
diff --git a/lib/Collaboration/Resources/ConversationProvider.php b/lib/Collaboration/Resources/ConversationProvider.php
index 4ba797130ed..fc1ffbe05af 100644
--- a/lib/Collaboration/Resources/ConversationProvider.php
+++ b/lib/Collaboration/Resources/ConversationProvider.php
@@ -86,7 +86,7 @@ public function canAccessResource(IResource $resource, IUser $user = null): bool
 		}
 
 		try {
-			$room = $this->manager->getRoomForParticipantByToken(
+			$room = $this->manager->getRoomForUserByToken(
 				$resource->getId(),
 				$userId
 			);
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 7174d527800..78fb51126a8 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -205,7 +205,7 @@ public function index(string $token = '', string $callUser = '', string $passwor
 
 				// If the room is not a public room, check if the user is in the participants
 				if ($room->getType() !== Room::PUBLIC_CALL) {
-					$this->manager->getRoomForParticipant($room->getId(), $this->userId);
+					$this->manager->getRoomForUser($room->getId(), $this->userId);
 				}
 			} catch (RoomNotFoundException $e) {
 				// Room not found, redirect to main page
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 5ab3c5aeeee..7166e6eb8cb 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -116,7 +116,7 @@ public function __construct(string $appName,
 	public function getSettings(string $token = ''): DataResponse {
 		try {
 			if ($token !== '') {
-				$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
+				$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 			} else {
 				// FIXME Soft-fail for legacy support in mobile apps
 				$room = null;
@@ -324,7 +324,7 @@ public function pullMessages(string $token): DataResponse {
 
 			// Was the session killed or the complete conversation?
 			try {
-				$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
+				$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 				if ($this->userId) {
 					// For logged in users we check if they are still part of the public conversation,
 					// if not they were removed instead of having a conflict.
diff --git a/lib/Flow/Operation.php b/lib/Flow/Operation.php
index dd152218adf..a645ad7ed0a 100644
--- a/lib/Flow/Operation.php
+++ b/lib/Flow/Operation.php
@@ -244,7 +244,7 @@ protected function getUser(): IUser {
 	 * @throws RoomNotFoundException
 	 */
 	protected function getRoom(string $token, string $uid): Room {
-		return $this->talkManager->getRoomForParticipantByToken($token, $uid);
+		return $this->talkManager->getRoomForUserByToken($token, $uid);
 	}
 
 	/**
diff --git a/lib/Listener/UserDeletedListener.php b/lib/Listener/UserDeletedListener.php
index 62fc9b373a0..05ed7cfae37 100644
--- a/lib/Listener/UserDeletedListener.php
+++ b/lib/Listener/UserDeletedListener.php
@@ -46,7 +46,7 @@ public function handle(Event $event): void {
 
 		$user = $event->getUser();
 
-		$rooms = $this->manager->getRoomsForParticipant($user->getUID());
+		$rooms = $this->manager->getRoomsForUser($user->getUID());
 
 		foreach ($rooms as $room) {
 			if ($room->getNumberOfParticipants() === 1) {
diff --git a/lib/Manager.php b/lib/Manager.php
index 514080ae244..e59ced8ad09 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -280,15 +280,6 @@ public function searchRoomsByToken(string $searchToken = '', int $limit = null,
 		return $rooms;
 	}
 
-	/**
-	 * @param string $participant
-	 * @param bool $includeLastMessage
-	 * @return Room[]
-	 */
-	public function getRoomsForParticipant(string $participant, bool $includeLastMessage = false): array {
-		return [];
-	}
-
 	/**
 	 * @param string $userId
 	 * @param bool $includeLastMessage
@@ -330,18 +321,6 @@ public function getRoomsForUser(string $userId, bool $includeLastMessage = false
 		return $rooms;
 	}
 
-	/**
-	 * Does *not* return public rooms for participants that have not been invited
-	 *
-	 * @param int $roomId
-	 * @param string $participant
-	 * @return Room
-	 * @throws RoomNotFoundException
-	 */
-	public function getRoomForParticipant(int $roomId, ?string $participant): Room {
-		throw new RoomNotFoundException();
-	}
-
 	/**
 	 * Does *not* return public rooms for participants that have not been invited
 	 *
@@ -393,20 +372,6 @@ public function getRoomForUser(int $roomId, ?string $userId): Room {
 		return $room;
 	}
 
-	/**
-	 * Also returns public rooms for participants that have not been invited,
-	 * so they can join.
-	 *
-	 * @param string $token
-	 * @param string $participant
-	 * @param bool $includeLastMessage
-	 * @return Room
-	 * @throws RoomNotFoundException
-	 */
-	public function getRoomForParticipantByToken(string $token, ?string $participant, bool $includeLastMessage = false): Room {
-		throw new RoomNotFoundException();
-	}
-
 	/**
 	 * Also returns public rooms for participants that have not been invited,
 	 * so they can join.
diff --git a/lib/Search/ConversationSearch.php b/lib/Search/ConversationSearch.php
index 6db88d459a7..89ace0a6242 100644
--- a/lib/Search/ConversationSearch.php
+++ b/lib/Search/ConversationSearch.php
@@ -83,7 +83,7 @@ public function getOrder(string $route, array $routeParameters): int {
 	 * @inheritDoc
 	 */
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$rooms = $this->manager->getRoomsForParticipant($user->getUID());
+		$rooms = $this->manager->getRoomsForUser($user->getUID());
 
 		$result = [];
 		foreach ($rooms as $room) {
diff --git a/lib/Search/CurrentMessageSearch.php b/lib/Search/CurrentMessageSearch.php
index 75b37ebbac1..0b855c166a3 100644
--- a/lib/Search/CurrentMessageSearch.php
+++ b/lib/Search/CurrentMessageSearch.php
@@ -76,7 +76,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 		}
 
 		try {
-			$room = $this->roomManager->getRoomForParticipantByToken(
+			$room = $this->roomManager->getRoomForUserByToken(
 				$currentToken,
 				$user->getUID()
 			);
diff --git a/lib/Search/MessageSearch.php b/lib/Search/MessageSearch.php
index ed65ca91ec2..ada804a2b00 100644
--- a/lib/Search/MessageSearch.php
+++ b/lib/Search/MessageSearch.php
@@ -112,7 +112,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 			$title = $this->l->t('Messages in other conversations');
 		}
 
-		$rooms = $this->roomManager->getRoomsForParticipant($user->getUID());
+		$rooms = $this->roomManager->getRoomsForUser($user->getUID());
 
 		$roomMap = [];
 		foreach ($rooms as $room) {
diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php
index 4c3885f5f51..38a46eb930d 100644
--- a/lib/Share/RoomShareProvider.php
+++ b/lib/Share/RoomShareProvider.php
@@ -776,7 +776,7 @@ public function getSharesByPath(Node $path): array {
 	 * @return IShare[]
 	 */
 	public function getSharedWith($userId, $shareType, $node, $limit, $offset): array {
-		$allRooms = $this->manager->getRoomsForParticipant($userId);
+		$allRooms = $this->manager->getRoomsForUser($userId);
 
 		/** @var IShare[] $shares */
 		$shares = [];
diff --git a/tests/php/Collaboration/Collaborators/RoomPluginTest.php b/tests/php/Collaboration/Collaborators/RoomPluginTest.php
index 424fbefcb3e..31f785332e6 100644
--- a/tests/php/Collaboration/Collaborators/RoomPluginTest.php
+++ b/tests/php/Collaboration/Collaborators/RoomPluginTest.php
@@ -234,7 +234,7 @@ public function testSearch(
 		bool $expectedHasMoreResults
 	) {
 		$this->manager->expects($this->any())
-			->method('getRoomsForParticipant')
+			->method('getRoomsForUser')
 			->with('user0')
 			->willReturn($roomsForParticipant);
 
diff --git a/tests/php/Collaboration/Resources/ConversationProviderTest.php b/tests/php/Collaboration/Resources/ConversationProviderTest.php
index c76c5a752db..0080a6b6e45 100644
--- a/tests/php/Collaboration/Resources/ConversationProviderTest.php
+++ b/tests/php/Collaboration/Resources/ConversationProviderTest.php
@@ -81,7 +81,7 @@ public function testCanAccessResourceThrowsRoom(): void {
 			->willReturn('token');
 
 		$this->manager->expects($this->once())
-			->method('getRoomForParticipantByToken')
+			->method('getRoomForUserByToken')
 			->with('token', 'uid')
 			->willThrowException(new RoomNotFoundException());
 
@@ -105,7 +105,7 @@ public function testCanAccessResourceThrowsParticipant(): void {
 			->willThrowException(new ParticipantNotFoundException());
 
 		$this->manager->expects($this->once())
-			->method('getRoomForParticipantByToken')
+			->method('getRoomForUserByToken')
 			->with('token', 'uid')
 			->willReturn($room);
 
@@ -134,7 +134,7 @@ public function testCanAccessResourceParticipantNotAdded(): void {
 			->willReturn($participant);
 
 		$this->manager->expects($this->once())
-			->method('getRoomForParticipantByToken')
+			->method('getRoomForUserByToken')
 			->with('token', 'uid')
 			->willReturn($room);
 
@@ -174,7 +174,7 @@ public function testCanAccessResourceYes(int $participantType): void {
 			->willReturn($participant);
 
 		$this->manager->expects($this->once())
-			->method('getRoomForParticipantByToken')
+			->method('getRoomForUserByToken')
 			->with('token', 'uid')
 			->willReturn($room);
 

From 10831347b0e0311744d75766d44d195543fa7fbb Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 15:37:19 +0200
Subject: [PATCH 021/129] Currently ignore session handling in chat controller

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/ChatController.php | 40 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 8a5d48066c0..6cc81ab635f 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -275,26 +275,26 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 		$limit = min(200, $limit);
 		$timeout = min(30, $timeout);
 
-		if ($noStatusUpdate === 0 && $this->participant->getSessionId() !== '0') {
-			// The mobile apps dont do internal signaling unless in a call
-			$isMobileApp = $this->request->isUserAgent([
-				IRequest::USER_AGENT_TALK_ANDROID,
-				IRequest::USER_AGENT_TALK_IOS,
-			]);
-			if ($isMobileApp && $this->participant->getInCallFlags() === Participant::FLAG_DISCONNECTED) {
-				$this->room->ping($this->participant->getUser(), $this->participant->getSessionId(), $this->timeFactory->getTime());
-
-				if ($lookIntoFuture) {
-					// Bump the user status again
-					$event = new UserLiveStatusEvent(
-						$this->userManager->get($this->participant->getUser()),
-						IUserStatus::ONLINE,
-						$this->timeFactory->getTime()
-					);
-					$this->eventDispatcher->dispatchTyped($event);
-				}
-			}
-		}
+//		if ($noStatusUpdate === 0 && $this->participant->getSessionId() !== '0') {
+//			// The mobile apps dont do internal signaling unless in a call
+//			$isMobileApp = $this->request->isUserAgent([
+//				IRequest::USER_AGENT_TALK_ANDROID,
+//				IRequest::USER_AGENT_TALK_IOS,
+//			]);
+//			if ($isMobileApp && $this->participant->getInCallFlags() === Participant::FLAG_DISCONNECTED) {
+//				$this->room->ping($this->participant->getUser(), $this->participant->getSessionId(), $this->timeFactory->getTime());
+//
+//				if ($lookIntoFuture) {
+//					// Bump the user status again
+//					$event = new UserLiveStatusEvent(
+//						$this->userManager->get($this->participant->getUser()),
+//						IUserStatus::ONLINE,
+//						$this->timeFactory->getTime()
+//					);
+//					$this->eventDispatcher->dispatchTyped($event);
+//				}
+//			}
+//		}
 
 		/**
 		 * Automatic last read message marking for old clients

From 8dcdcbb71ad6bb5e91723f23ecbfb5e79ce4af23 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 15:39:50 +0200
Subject: [PATCH 022/129] Fix joining a room for users

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  |  55 +++++++-----
 lib/Model/SessionMapper.php        |  13 +++
 lib/Service/ParticipantService.php | 130 +++++++++++++++++++++++++++++
 lib/Service/SessionService.php     |  37 +++++++-
 4 files changed, 209 insertions(+), 26 deletions(-)
 create mode 100644 lib/Service/ParticipantService.php

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 30a0de3fd07..a02b290763e 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -44,6 +44,7 @@
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Service\RoomService;
 use OCA\Talk\TalkSession;
 use OCA\Talk\Webinary;
@@ -81,6 +82,8 @@ class RoomController extends AEnvironmentAwareController {
 	protected $manager;
 	/** @var RoomService */
 	protected $roomService;
+	/** @var ParticipantService */
+	protected $participantService;
 	/** @var AttendeeMapper */
 	protected $attendeeMapper;
 	/** @var GuestManager */
@@ -111,6 +114,7 @@ public function __construct(string $appName,
 								IGroupManager $groupManager,
 								Manager $manager,
 								RoomService $roomService,
+								ParticipantService $participantService,
 								AttendeeMapper $attendeeMapper,
 								GuestManager $guestManager,
 								IUserStatusManager $statusManager,
@@ -129,6 +133,7 @@ public function __construct(string $appName,
 		$this->groupManager = $groupManager;
 		$this->manager = $manager;
 		$this->roomService = $roomService;
+		$this->participantService = $participantService;
 		$this->attendeeMapper = $attendeeMapper;
 		$this->guestManager = $guestManager;
 		$this->statusManager = $statusManager;
@@ -219,7 +224,7 @@ public function getSingleRoom(string $token): DataResponse {
 		$includeLastMessage = !$isSIPBridgeRequest;
 
 		try {
-			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId, $includeLastMessage);
+			$room = $this->manager->getRoomForUserByToken($token, $this->userId, $includeLastMessage);
 
 			$participant = null;
 			try {
@@ -1325,21 +1330,26 @@ public function setPassword(string $password): DataResponse {
 	 */
 	public function joinRoom(string $token, string $password = '', bool $force = true): DataResponse {
 		try {
-			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
+			$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 		} catch (RoomNotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
+		/** @var Participant|null $previousSession */
+		$previousParticipant = null;
+		/** @var Session|null $previousSession */
 		$previousSession = null;
 		if ($this->userId !== null) {
 			try {
-				$previousSession = $room->getParticipant($this->userId);
+				$previousParticipant = $room->getParticipant($this->userId);
+				$previousSession = $previousParticipant->getSession();
 			} catch (ParticipantNotFoundException $e) {
 			}
 		} else {
-			$session = $this->session->getSessionForRoom($token);
+			$sessionForToken = $this->session->getSessionForRoom($token);
 			try {
-				$previousSession = $room->getParticipantBySession($session);
+				$previousParticipant = $room->getParticipantBySession($sessionForToken);
+				$previousSession = $previousParticipant->getSession();
 			} catch (ParticipantNotFoundException $e) {
 			}
 		}
@@ -1349,29 +1359,31 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 				// Previous session was active in the call, show a warning
 				return new DataResponse([
 					'sessionId' => $previousSession->getSessionId(),
-					'inCall' => $previousSession->getInCallFlags(),
+					'inCall' => $previousSession->getInCall(),
 					'lastPing' => $previousSession->getLastPing(),
 				], Http::STATUS_CONFLICT);
 			}
 
-			if ($previousSession->getInCallFlags() !== Participant::FLAG_DISCONNECTED) {
-				$room->changeInCall($previousSession, Participant::FLAG_DISCONNECTED);
-			}
-
-			if ($this->userId === null) {
-				$room->removeParticipantBySession($previousSession, Room::PARTICIPANT_LEFT);
-			} else {
-				$room->leaveRoomAsParticipant($previousSession);
-			}
+//			if ($previousSession->getInCall() !== Participant::FLAG_DISCONNECTED) {
+//				// FIXME Session vs Participant
+//				$room->changeInCall($previousSession, Participant::FLAG_DISCONNECTED);
+//			}
+//
+//			if ($this->userId === null) {
+//				$room->removeParticipantBySession($previousParticipant, Room::PARTICIPANT_LEFT);
+//			} else {
+//				$room->leaveRoomAsParticipant($previousSession);
+//			}
 		}
 
 		$user = $this->userManager->get($this->userId);
 		try {
 			$result = $room->verifyPassword((string) $this->session->getPasswordForRoom($token));
 			if ($user instanceof IUser) {
-				$newSessionId = $room->joinRoom($user, $password, $result['result']);
+				$participant = $this->participantService->joinRoom($room, $user, $password, $result['result']);
 			} else {
-				$newSessionId = $room->joinRoomGuest($password, $result['result']);
+// FIXME				$participant = $this->participantService->joinRoom($room, $user, $password, $result['result']);
+//				$newSessionId = $room->joinRoomGuest($password, $result['result']);
 			}
 		} catch (InvalidPasswordException $e) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
@@ -1380,11 +1392,10 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 		}
 
 		$this->session->removePasswordForRoom($token);
-		$this->session->setSessionForRoom($token, $newSessionId);
-		$room->ping($this->userId, $newSessionId, $this->timeFactory->getTime());
-		$currentParticipant = $room->getParticipantBySession($newSessionId);
+		$this->session->setSessionForRoom($token, $participant->getSession()->getSessionId());
+		$room->ping($this->userId, $participant->getSession()->getSessionId(), $this->timeFactory->getTime());
 
-		return new DataResponse($this->formatRoom($room, $currentParticipant));
+		return new DataResponse($this->formatRoom($room, $participant));
 	}
 
 	/**
@@ -1399,7 +1410,7 @@ public function leaveRoom(string $token): DataResponse {
 		$this->session->removeSessionForRoom($token);
 
 		try {
-			$room = $this->manager->getRoomForParticipantByToken($token, $this->userId);
+			$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 
 			if ($this->userId === null) {
 				$participant = $room->getParticipantBySession($sessionId);
diff --git a/lib/Model/SessionMapper.php b/lib/Model/SessionMapper.php
index c45cafd90e7..4626ed9211d 100644
--- a/lib/Model/SessionMapper.php
+++ b/lib/Model/SessionMapper.php
@@ -24,6 +24,7 @@
 namespace OCA\Talk\Model;
 
 use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /**
@@ -52,6 +53,18 @@ public function findBySessionId(string $sessionId): Session {
 		return $this->findEntity($query);
 	}
 
+	/**
+	 * @param int $attendeeId
+	 * @return int Number of deleted entities
+	 */
+	public function deleteByAttendeeId(int $attendeeId): int {
+		$query = $this->db->getQueryBuilder();
+		$query->delete($this->getTableName())
+			->where($query->expr()->eq('attendee_id', $query->createNamedParameter($attendeeId, IQueryBuilder::PARAM_INT)));
+
+		return (int) $query->execute();
+	}
+
 	public function createSessionFromRow(array $row): Session {
 		return $this->mapRowToEntity([
 			'id' => $row['s_id'],
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
new file mode 100644
index 00000000000..c80979c34c0
--- /dev/null
+++ b/lib/Service/ParticipantService.php
@@ -0,0 +1,130 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Service;
+
+use OCA\Talk\Events\AddParticipantsEvent;
+use OCA\Talk\Events\JoinRoomUserEvent;
+use OCA\Talk\Events\ModifyParticipantEvent;
+use OCA\Talk\Exceptions\InvalidPasswordException;
+use OCA\Talk\Exceptions\UnauthorizedException;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Model\AttendeeMapper;
+use OCA\Talk\Model\SessionMapper;
+use OCA\Talk\Participant;
+use OCA\Talk\Room;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\Comments\IComment;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IUser;
+
+class ParticipantService {
+	/** @var AttendeeMapper */
+	protected $attendeeMapper;
+	/** @var SessionMapper */
+	protected $sessionMapper;
+	/** @var SessionService */
+	protected $sessionService;
+	/** @var IEventDispatcher */
+	private $dispatcher;
+
+	public function __construct(AttendeeMapper $attendeeMapper,
+								SessionMapper $sessionMapper,
+								SessionService $sessionService,
+								IEventDispatcher $dispatcher) {
+		$this->attendeeMapper = $attendeeMapper;
+		$this->sessionMapper = $sessionMapper;
+		$this->sessionService = $sessionService;
+		$this->dispatcher = $dispatcher;
+	}
+
+	/**
+	 * @param Room $room
+	 * @param IUser $user
+	 * @param string $password
+	 * @param bool $passedPasswordProtection
+	 * @return Participant
+	 * @throws InvalidPasswordException
+	 * @throws UnauthorizedException
+	 */
+	public function joinRoom(Room $room, IUser $user, string $password, bool $passedPasswordProtection = false): Participant {
+		$event = new JoinRoomUserEvent($room, $user, $password, $passedPasswordProtection);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_ROOM_CONNECT, $event);
+
+		if ($event->getCancelJoin() === true) {
+			// FIXME $this->removeUser($user, self::PARTICIPANT_LEFT);
+			throw new UnauthorizedException('Participant is not allowed to join');
+		}
+
+		try {
+			$attendee = $this->attendeeMapper->findByActor($room->getId(), 'users', $user->getUID());
+		} catch (DoesNotExistException $e) {
+			if (!$event->getPassedPasswordProtection() && !$room->verifyPassword($password)['result']) {
+				throw new InvalidPasswordException('Provided password is invalid');
+			}
+
+			// User joining a public room, without being invited
+			$this->addUsers($room, [
+				'userId' => $user->getUID(),
+				'participantType' => Participant::USER_SELF_JOINED,
+			]);
+
+			$attendee = $this->attendeeMapper->findByActor($room->getId(), 'users', $user->getUID());
+		}
+
+		$session = $this->sessionService->createSessionForAttendee($attendee);
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_ROOM_CONNECT, $event);
+
+		return new Participant(
+			\OC::$server->getDatabaseConnection(), // FIXME
+			\OC::$server->getConfig(), // FIXME
+			$room, $attendee, $session);
+	}
+
+	/**
+	 * @param Room $room
+	 * @param array ...$participants
+	 */
+	public function addUsers(Room $room, array ...$participants): void {
+		$event = new AddParticipantsEvent($room, $participants);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_USERS_ADD, $event);
+
+		$lastMessage = 0;
+		if ($room->getLastMessage() instanceof IComment) {
+			$lastMessage = (int) $room->getLastMessage()->getId();
+		}
+
+		foreach ($participants as $participant) {
+			$attendee = new Attendee();
+			$attendee->setRoomId($room->getId());
+			$attendee->setActorType('users');
+			$attendee->setActorId($participant['userId']);
+			$attendee->setParticipantType($participant['participantType'] ?? Participant::USER);
+			$attendee->setLastReadMessage($lastMessage);
+			$this->attendeeMapper->insert($attendee);
+		}
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
+	}
+}
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
index 822a7b710b8..de0721e27b1 100644
--- a/lib/Service/SessionService.php
+++ b/lib/Service/SessionService.php
@@ -23,20 +23,28 @@
 
 namespace OCA\Talk\Service;
 
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Model\SessionMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\Security\ISecureRandom;
 
 class SessionService {
 	/** @var SessionMapper */
-	protected $mapper;
+	protected $sessionMapper;
 	/** @var IDBConnection */
 	protected $connection;
+	/** @var ISecureRandom */
+	protected $secureRandom;
 
-	public function __construct(SessionMapper $mapper,
-								IDBConnection $connection) {
-		$this->mapper = $mapper;
+	public function __construct(SessionMapper $sessionMapper,
+								IDBConnection $connection,
+								ISecureRandom $secureRandom) {
+		$this->sessionMapper = $sessionMapper;
 		$this->connection = $connection;
+		$this->secureRandom = $secureRandom;
 	}
 
 	/**
@@ -57,4 +65,25 @@ public function updateMultipleLastPings(array $sessionIds, int $lastPing): void
 
 		$query->execute();
 	}
+
+	public function createSessionForAttendee(Attendee $attendee): Session {
+		// Currently a participant can only join once
+		$this->sessionMapper->deleteByAttendeeId($attendee->getId());
+
+		$session = new Session();
+		$session->setAttendeeId($attendee->getId());
+
+		while (true) {
+			$sessionId = $this->secureRandom->generate(255);
+			$session->setSessionId($sessionId);
+			try {
+				$this->sessionMapper->insert($session);
+				break;
+			} catch (UniqueConstraintViolationException $e) {
+				// 255 chars are not unique? Try again...
+			}
+		}
+
+		return $session;
+	}
 }

From 4f58b21c7832a242a44c89eaf45619c6f5d230c0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 15:40:11 +0200
Subject: [PATCH 023/129] Add a function to change the participant type

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  | 20 ++++++++++++--------
 lib/Service/ParticipantService.php | 13 +++++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index a02b290763e..9f3e3d14729 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1449,11 +1449,12 @@ protected function promoteUserToModerator(Room $room, string $participant): Data
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		if ($targetParticipant->getParticipantType() !== Participant::USER) {
+		$attendee = $targetParticipant->getAttendee();
+		if ($attendee->getParticipantType() !== Participant::USER) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$room->setParticipantType($targetParticipant, Participant::MODERATOR);
+		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::MODERATOR);
 
 		return new DataResponse();
 	}
@@ -1465,11 +1466,12 @@ protected function promoteGuestToModerator(Room $room, string $sessionId): DataR
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		if ($targetParticipant->getParticipantType() !== Participant::GUEST) {
+		$attendee = $targetParticipant->getAttendee();
+		if ($attendee->getParticipantType() !== Participant::GUEST) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$room->setParticipantType($targetParticipant, Participant::GUEST_MODERATOR);
+		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::GUEST_MODERATOR);
 
 		return new DataResponse();
 	}
@@ -1501,11 +1503,12 @@ protected function demoteUserFromModerator(Room $room, string $participant): Dat
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		if ($targetParticipant->getParticipantType() !== Participant::MODERATOR) {
+		$attendee = $targetParticipant->getAttendee();
+		if ($attendee->getParticipantType() !== Participant::MODERATOR) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$room->setParticipantType($targetParticipant, Participant::USER);
+		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::USER);
 
 		return new DataResponse();
 	}
@@ -1521,11 +1524,12 @@ protected function demoteGuestFromModerator(Room $room, string $sessionId): Data
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		if ($targetParticipant->getParticipantType() !== Participant::GUEST_MODERATOR) {
+		$attendee = $targetParticipant->getAttendee();
+		if ($attendee->getParticipantType() !== Participant::GUEST_MODERATOR) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$room->setParticipantType($targetParticipant, Participant::GUEST);
+		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::GUEST);
 
 		return new DataResponse();
 	}
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index c80979c34c0..6e986a0ca22 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -58,6 +58,19 @@ public function __construct(AttendeeMapper $attendeeMapper,
 		$this->dispatcher = $dispatcher;
 	}
 
+	public function updateParticipantType(Room $room, Participant $participant, int $participantType): void {
+		$attendee = $participant->getAttendee();
+		$oldType = $attendee->getParticipantType();
+
+		$event = new ModifyParticipantEvent($room, $participant, 'type', $participantType, $oldType);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_PARTICIPANT_TYPE_SET, $event);
+
+		$attendee->setParticipantType($participantType);
+		$this->attendeeMapper->update($attendee);
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_TYPE_SET, $event);
+	}
+
 	/**
 	 * @param Room $room
 	 * @param IUser $user

From 83a53548a7bc37f95f4a97898ff8b52167376bad Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 17:12:46 +0200
Subject: [PATCH 024/129] Fix loading a Room by session

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Manager.php              | 19 ++++++++++++-------
 lib/Model/AttendeeMapper.php |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index e59ced8ad09..5fb0d2612e4 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -552,20 +552,25 @@ public function getRoomForSession(?string $userId, ?string $sessionId): Room {
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
-			->from('talk_participants', 'p')
-			->leftJoin('p', 'talk_rooms', 'r', $query->expr()->eq('p.room_id', 'r.id'))
-			->where($query->expr()->eq('p.session_id', $query->createNamedParameter($sessionId)))
+			->selectAlias('r.id', 'r_id')
+			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
+			->from('talk_sessions', 's')
+			->leftJoin('s', 'talk_attendees', 'a', $query->expr()->eq('a.id', 's.attendee_id'))
+			->leftJoin('a', 'talk_rooms', 'r', $query->expr()->eq('a.room_id', 'r.id'))
+			->where($query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId)))
 			->setMaxResults(1);
 
 		$result = $query->execute();
 		$row = $result->fetch();
 		$result->closeCursor();
 
-		if ($row === false || !$row['id']) {
+		if ($row === false || !$row['r_id']) {
 			throw new RoomNotFoundException();
 		}
 
-		if ((string) $userId !== $row['user_id']) {
+		if ((string) $userId !== $row['actor_id']) {
+			// FIXME check the actor type too and bail out for guests
 			throw new RoomNotFoundException();
 		}
 
@@ -576,9 +581,9 @@ public function getRoomForSession(?string $userId, ?string $sessionId): Room {
 
 		$room = $this->createRoomObject($row);
 		$participant = $this->createParticipantObject($room, $row);
-		$room->setParticipant($row['user_id'], $participant);
+		$room->setParticipant($row['actor_id'], $participant);
 
-		if ($room->getType() === Room::PUBLIC_CALL || !in_array($participant->getParticipantType(), [Participant::GUEST, Participant::USER_SELF_JOINED], true)) {
+		if ($room->getType() === Room::PUBLIC_CALL || !in_array($participant->getAttendee()->getParticipantType(), [Participant::GUEST, Participant::GUEST_MODERATOR, Participant::USER_SELF_JOINED], true)) {
 			return $room;
 		}
 
diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
index 1c76253ad95..4ff1e3e2cbe 100644
--- a/lib/Model/AttendeeMapper.php
+++ b/lib/Model/AttendeeMapper.php
@@ -59,7 +59,7 @@ public function findByActor(int $roomId, string $actorType, string $actorId): At
 	public function createAttendeeFromRow(array $row): Attendee {
 		return $this->mapRowToEntity([
 			'id' => $row['a_id'],
-			'room_id' => $row['id'],
+			'room_id' => $row['room_id'],
 			'actor_type' => $row['actor_type'],
 			'actor_id' => $row['actor_id'],
 			'pin' => $row['pin'],

From a42222f6e5949537890b28f36485f1dad3930826 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 19 Oct 2020 17:14:16 +0200
Subject: [PATCH 025/129] Fix getting the list of participants

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  | 95 +++++++++++++++++++-----------
 lib/Service/ParticipantService.php | 40 +++++++++++++
 2 files changed, 100 insertions(+), 35 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 9f3e3d14729..cc4dcefa796 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -985,65 +985,90 @@ public function deleteRoom(): DataResponse {
 	 * @return DataResponse
 	 */
 	public function getParticipants(bool $includeStatus = false): DataResponse {
-		if ($this->participant->getParticipantType() === Participant::GUEST) {
+		if ($this->participant->getAttendee()->getParticipantType() === Participant::GUEST) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
 		$maxPingAge = $this->timeFactory->getTime() - 100;
-		$participants = $this->room->getParticipantsLegacy();
+		$participants = $this->participantService->getParticipantsForRoom($this->room);
 		$results = $headers = $statuses = [];
 
 		if ($this->userId !== null
 			&& $includeStatus
-			&& count($participants['users']) < 100
+			&& count($participants) < 100
 			&& $this->appManager->isEnabledForUser('user_status')) {
-			$userIds = array_map('strval', array_keys($participants['users']));
+			$userIds = array_filter(array_map(function(Participant $participant) {
+				if ($participant->getAttendee()->getActorType() === 'users') {
+					return $participant->getAttendee()->getActorId();
+				}
+				return null;
+			}, $participants));
+
 			$statuses = $this->statusManager->getUserStatuses($userIds);
 
 			$headers['X-Nextcloud-Has-User-Statuses'] = true;
 		}
 
-		foreach ($participants['users'] as $userId => $participant) {
-			$userId = (string) $userId;
-			if ($participant['sessionId'] !== '0' && $participant['lastPing'] <= $maxPingAge) {
-				$this->room->leaveRoom($userId);
+		$guestSessions = array_filter(array_map(function(Participant $participant) {
+			$session = $participant->getSession();
+			if (!$session || $participant->getAttendee()->getActorType() !== 'guests') {
+				return null;
 			}
 
-			$user = $this->userManager->get($userId);
-			if (!$user instanceof IUser) {
-				continue;
-			}
+			return sha1($session->getSessionId());
+		}, $participants));
 
-			$participant['userId'] = $userId;
-			$participant['displayName'] = (string) $user->getDisplayName();
+		$cleanGuests = false;
+		$guestNames = $this->guestManager->getNamesBySessionHashes($guestSessions);
 
-			if (isset($statuses[$userId])) {
-				$participant['status'] = $statuses[$userId]->getStatus();
-				$participant['statusIcon'] = $statuses[$userId]->getIcon();
-				$participant['statusMessage'] = $statuses[$userId]->getMessage();
-				$participant['statusClearAt'] = $statuses[$userId]->getClearAt();
+		/** @var Participant[] $participants */
+		foreach ($participants as $participant) {
+			$result = [
+				'inCall' => Participant::FLAG_DISCONNECTED,
+				'lastPing' => 0,
+				'sessionId' => '0', // FIXME empty string or null?
+				'participantType' => $participant->getAttendee()->getParticipantType(),
+			];
+			if ($participant->getSession() instanceof Session) {
+				$result['inCall'] = $participant->getSession()->getInCall();
+				$result['lastPing'] = $participant->getSession()->getLastPing();
+				$result['sessionId'] = $participant->getSession()->getSessionId();
 			}
 
-			$results[] = $participant;
-		}
+			if ($participant->getAttendee()->getActorType() === 'users') {
+				$userId = $participant->getAttendee()->getActorId();
+				$user = $this->userManager->get($userId);
+				if (!$user instanceof IUser) {
+					continue;
+				}
 
-		$guestSessions = [];
-		foreach ($participants['guests'] as $participant) {
-			$guestSessions[] = sha1($participant['sessionId']);
-		}
-		$guestNames = $this->guestManager->getNamesBySessionHashes($guestSessions);
+				if ($result['lastPing'] > 0 && $result['lastPing'] <= $maxPingAge) {
+					$this->room->leaveRoom($userId);
+				}
 
-		$cleanGuests = false;
-		foreach ($participants['guests'] as $participant) {
-			if ($participant['lastPing'] <= $maxPingAge) {
-				$cleanGuests = true;
+				$result['userId'] = $participant->getAttendee()->getActorId();
+				$result['displayName'] = (string) $user->getDisplayName();
+
+				if (isset($statuses[$userId])) {
+					$result['status'] = $statuses[$userId]->getStatus();
+					$result['statusIcon'] = $statuses[$userId]->getIcon();
+					$result['statusMessage'] = $statuses[$userId]->getMessage();
+					$result['statusClearAt'] = $statuses[$userId]->getClearAt();
+				}
+			} elseif ($participant->getAttendee()->getActorType() === 'guests') {
+				if ($result['lastPing'] <= $maxPingAge) {
+					$cleanGuests = true;
+					continue;
+				}
+
+				$result['userId'] = '';
+				$result['displayName'] = $guestNames[$participant->getAttendee()->getActorId()] ?? '';
+			} else {
+				// Skip unknown actor types
+				continue;
 			}
 
-			$sessionHash = sha1($participant['sessionId']);
-			$results[] = array_merge($participant, [
-				'userId' => '',
-				'displayName' => $guestNames[$sessionHash] ?? '',
-			]);
+			$results[] = $result;
 		}
 
 		if ($cleanGuests) {
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 6e986a0ca22..10fbe3f007c 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -35,7 +35,9 @@
 use OCA\Talk\Room;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\Comments\IComment;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IDBConnection;
 use OCP\IUser;
 
 class ParticipantService {
@@ -45,16 +47,20 @@ class ParticipantService {
 	protected $sessionMapper;
 	/** @var SessionService */
 	protected $sessionService;
+	/** @var IDBConnection */
+	protected $connection;
 	/** @var IEventDispatcher */
 	private $dispatcher;
 
 	public function __construct(AttendeeMapper $attendeeMapper,
 								SessionMapper $sessionMapper,
 								SessionService $sessionService,
+								IDBConnection $connection,
 								IEventDispatcher $dispatcher) {
 		$this->attendeeMapper = $attendeeMapper;
 		$this->sessionMapper = $sessionMapper;
 		$this->sessionService = $sessionService;
+		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
 	}
 
@@ -140,4 +146,38 @@ public function addUsers(Room $room, array ...$participants): void {
 
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
 	}
+
+	public function getParticipantsForRoom(Room $room): array {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select('a.*')
+			->selectAlias('a.id', 'a_id')
+			->addSelect('s.*')
+			->selectAlias('s.id', 's_id')
+			->from('talk_attendees', 'a')
+			->leftJoin(
+				'a', 'talk_sessions', 's',
+				$query->expr()->eq('s.attendee_id', 'a.id')
+			)
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)));
+
+		$participants = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
+			if (isset($row['s_id'])) {
+				$session = $this->sessionMapper->createSessionFromRow($row);
+			} else {
+				$session = null;
+			}
+
+			$participants[] = new Participant(
+				\OC::$server->getDatabaseConnection(), // FIXME
+				\OC::$server->getConfig(), // FIXME
+				$room, $attendee, $session);
+		}
+		$result->closeCursor();
+
+		return $participants;
+	}
 }

From 49de30ddf6424260c4ca0bc8be59815568a66b44 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 21 Oct 2020 11:54:28 +0200
Subject: [PATCH 026/129] Fix joining as a guest and leaving a conversation as
 a session

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  | 13 ++---
 lib/Manager.php                    | 11 ++--
 lib/Room.php                       | 21 +++++---
 lib/Service/ParticipantService.php | 86 ++++++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index cc4dcefa796..3d7c63f7efd 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1407,8 +1407,7 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 			if ($user instanceof IUser) {
 				$participant = $this->participantService->joinRoom($room, $user, $password, $result['result']);
 			} else {
-// FIXME				$participant = $this->participantService->joinRoom($room, $user, $password, $result['result']);
-//				$newSessionId = $room->joinRoomGuest($password, $result['result']);
+				$participant = $this->participantService->joinRoomAsNewGuest($room, $password, $result['result']);
 			}
 		} catch (InvalidPasswordException $e) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
@@ -1436,14 +1435,8 @@ public function leaveRoom(string $token): DataResponse {
 
 		try {
 			$room = $this->manager->getRoomForUserByToken($token, $this->userId);
-
-			if ($this->userId === null) {
-				$participant = $room->getParticipantBySession($sessionId);
-				$room->removeParticipantBySession($participant, Room::PARTICIPANT_LEFT);
-			} else {
-				$participant = $room->getParticipant($this->userId);
-				$room->leaveRoomAsParticipant($participant);
-			}
+			$participant = $room->getParticipantBySession($sessionId);
+			$this->participantService->leaveRoomAsSession($room, $participant);
 		} catch (RoomNotFoundException $e) {
 		} catch (ParticipantNotFoundException $e) {
 		}
diff --git a/lib/Manager.php b/lib/Manager.php
index 5fb0d2612e4..47a63d7cd04 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -569,9 +569,14 @@ public function getRoomForSession(?string $userId, ?string $sessionId): Room {
 			throw new RoomNotFoundException();
 		}
 
-		if ((string) $userId !== $row['actor_id']) {
-			// FIXME check the actor type too and bail out for guests
-			throw new RoomNotFoundException();
+		if ($userId !== null) {
+			if ($row['actor_type'] !== 'users' || $userId !== $row['actor_id']) {
+				throw new RoomNotFoundException();
+			}
+		} else {
+			if ($row['actor_type'] !== 'guests') {
+				throw new RoomNotFoundException();
+			}
 		}
 
 		if ($row['token'] === null) {
diff --git a/lib/Room.php b/lib/Room.php
index 824f2e9a7a2..c4b71f5dfb4 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -353,9 +353,14 @@ public function getParticipant(?string $userId): Participant {
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId())));
+			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'))
+			->where($query->expr()->eq('a.actor_type', $query->createNamedParameter('users')))
+			->andWhere($query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)))
+			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
+			->setMaxResults(1);
 		$result = $query->execute();
 		$row = $result->fetch();
 		$result->closeCursor();
@@ -384,9 +389,13 @@ public function getParticipantBySession(?string $sessionId): Participant {
 
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('session_id', $query->createNamedParameter($sessionId)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId())));
+			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
+			->from('talk_sessions', 's')
+			->leftJoin('s', 'talk_attendees', 'a', $query->expr()->eq('a.id', 's.attendee_id'))
+			->where($query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId)))
+			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
+			->setMaxResults(1);
 		$result = $query->execute();
 		$row = $result->fetch();
 		$result->closeCursor();
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 10fbe3f007c..79e61425bd6 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -24,12 +24,16 @@
 namespace OCA\Talk\Service;
 
 use OCA\Talk\Events\AddParticipantsEvent;
+use OCA\Talk\Events\JoinRoomGuestEvent;
 use OCA\Talk\Events\JoinRoomUserEvent;
 use OCA\Talk\Events\ModifyParticipantEvent;
+use OCA\Talk\Events\ParticipantEvent;
+use OCA\Talk\Events\RemoveParticipantEvent;
 use OCA\Talk\Exceptions\InvalidPasswordException;
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\AttendeeMapper;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Model\SessionMapper;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -39,6 +43,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
 use OCP\IUser;
+use OCP\Security\ISecureRandom;
 
 class ParticipantService {
 	/** @var AttendeeMapper */
@@ -47,6 +52,8 @@ class ParticipantService {
 	protected $sessionMapper;
 	/** @var SessionService */
 	protected $sessionService;
+	/** @var ISecureRandom */
+	private $secureRandom;
 	/** @var IDBConnection */
 	protected $connection;
 	/** @var IEventDispatcher */
@@ -55,11 +62,13 @@ class ParticipantService {
 	public function __construct(AttendeeMapper $attendeeMapper,
 								SessionMapper $sessionMapper,
 								SessionService $sessionService,
+								ISecureRandom $secureRandom,
 								IDBConnection $connection,
 								IEventDispatcher $dispatcher) {
 		$this->attendeeMapper = $attendeeMapper;
 		$this->sessionMapper = $sessionMapper;
 		$this->sessionService = $sessionService;
+		$this->secureRandom = $secureRandom;
 		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
 	}
@@ -121,6 +130,55 @@ public function joinRoom(Room $room, IUser $user, string $password, bool $passed
 			$room, $attendee, $session);
 	}
 
+	/**
+	 * @param Room $room
+	 * @param string $password
+	 * @param bool $passedPasswordProtection
+	 * @return Participant
+	 * @throws InvalidPasswordException
+	 * @throws UnauthorizedException
+	 */
+	public function joinRoomAsNewGuest(Room $room, string $password, bool $passedPasswordProtection = false): Participant {
+		$event = new JoinRoomGuestEvent($room, $password, $passedPasswordProtection);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_GUEST_CONNECT, $event);
+
+		if ($event->getCancelJoin()) {
+			throw new UnauthorizedException('Participant is not allowed to join');
+		}
+
+		if (!$event->getPassedPasswordProtection() && !$room->verifyPassword($password)['result']) {
+			throw new InvalidPasswordException();
+		}
+
+		$lastMessage = 0;
+		if ($room->getLastMessage() instanceof IComment) {
+			$lastMessage = (int) $room->getLastMessage()->getId();
+		}
+
+		$randomActorId = $this->secureRandom->generate(255);
+
+		$attendee = new Attendee();
+		$attendee->setRoomId($room->getId());
+		$attendee->setActorType('guests');
+		$attendee->setActorId($randomActorId);
+		$attendee->setParticipantType(Participant::GUEST);
+		$attendee->setLastReadMessage($lastMessage);
+		$this->attendeeMapper->insert($attendee);
+
+		$session = $this->sessionService->createSessionForAttendee($attendee);
+
+		// Update the random guest id
+		$attendee->setActorId(sha1($session->getSessionId()));
+		$this->attendeeMapper->update($attendee);
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_GUEST_CONNECT, $event);
+
+		return new Participant(
+			\OC::$server->getDatabaseConnection(), // FIXME
+			\OC::$server->getConfig(), // FIXME
+			$room, $attendee, $session);
+	}
+
 	/**
 	 * @param Room $room
 	 * @param array ...$participants
@@ -147,6 +205,34 @@ public function addUsers(Room $room, array ...$participants): void {
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
 	}
 
+	public function leaveRoomAsSession(Room $room, Participant $participant): void {
+		if (!$participant->isGuest()) {
+			$event = new ParticipantEvent($room, $participant);
+			$this->dispatcher->dispatch(Room::EVENT_BEFORE_ROOM_DISCONNECT, $event);
+		} else {
+			$event = new RemoveParticipantEvent($room, $participant, Room::PARTICIPANT_LEFT);
+			$this->dispatcher->dispatch(Room::EVENT_BEFORE_PARTICIPANT_REMOVE, $event);
+		}
+
+		$session = $participant->getSession();
+		if ($session instanceof Session) {
+			$this->sessionMapper->delete($session);
+		} else {
+			$this->sessionMapper->deleteByAttendeeId($participant->getAttendee()->getId());
+		}
+
+		if ($participant->isGuest()
+			|| $participant->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED) {
+			$this->attendeeMapper->delete($participant->getAttendee());
+		}
+
+		if (!$participant->isGuest()) {
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_ROOM_DISCONNECT, $event);
+		} else {
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_REMOVE, $event);
+		}
+	}
+
 	public function getParticipantsForRoom(Room $room): array {
 		$query = $this->connection->getQueryBuilder();
 

From e4429603deb4a493f8bd46e2006fa6f6c0e0e98f Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 21 Oct 2020 15:33:16 +0200
Subject: [PATCH 027/129] Fix creating conversations and adding participants

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Activity/Listener.php           |  11 ++-
 lib/Chat/SystemMessage/Listener.php |  20 +++---
 lib/Controller/RoomController.php   | 102 ++++++++++++++++------------
 lib/Notification/Listener.php       |   9 ++-
 lib/Service/ParticipantService.php  |  15 ++--
 lib/Service/RoomService.php         |  13 ++--
 6 files changed, 100 insertions(+), 70 deletions(-)

diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php
index 9928c53a95a..bd71bf587e3 100644
--- a/lib/Activity/Listener.php
+++ b/lib/Activity/Listener.php
@@ -199,13 +199,18 @@ public function generateInvitationActivity(Room $room, array $participants): voi
 		}
 
 		foreach ($participants as $participant) {
-			if ($actorId === $participant['userId']) {
+			if ($participant['actorType'] !== 'users') {
+				// No user => no activity
+				continue;
+			}
+
+			if ($actorId === $participant['actorId']) {
 				// No activity for self-joining and the creator
 				continue;
 			}
 
 			try {
-				$roomName = $room->getDisplayName($participant['userId']);
+				$roomName = $room->getDisplayName($participant['actorId']);
 				$event
 					->setObject('room', $room->getId(), $roomName)
 					->setSubject('invitation', [
@@ -213,7 +218,7 @@ public function generateInvitationActivity(Room $room, array $participants): voi
 						'room' => $room->getId(),
 						'name' => $roomName,
 					])
-					->setAffectedUser($participant['userId']);
+					->setAffectedUser($participant['actorId']);
 				$this->activityManager->publish($event);
 			} catch (\InvalidArgumentException $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index cc5db827621..c8677ff9c27 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -190,10 +190,14 @@ public static function register(IEventDispatcher $dispatcher): void {
 			/** @var self $listener */
 			$listener = \OC::$server->query(self::class);
 			foreach ($participants as $participant) {
+				if ($participant['actorType'] !== 'users') {
+					continue;
+				}
+
 				$userJoinedFileRoom = $room->getObjectType() === 'file' &&
 						(!isset($participant['participantType']) || $participant['participantType'] !== Participant::USER_SELF_JOINED);
-				if ($userJoinedFileRoom || $userId !== $participant['userId']) {
-					$listener->sendSystemMessage($room, 'user_added', ['user' => $participant['userId']]);
+				if ($userJoinedFileRoom || $userId !== $participant['actorId']) {
+					$listener->sendSystemMessage($room, 'user_added', ['user' => $participant['actorId']]);
 				}
 			}
 		});
@@ -214,19 +218,19 @@ public static function register(IEventDispatcher $dispatcher): void {
 			if ($event->getNewValue() === Participant::MODERATOR) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'moderator_promoted', ['user' => $event->getParticipant()->getUser()]);
+				$listener->sendSystemMessage($room, 'moderator_promoted', ['user' => $event->getParticipant()->getAttendee()->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::USER) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'moderator_demoted', ['user' => $event->getParticipant()->getUser()]);
+				$listener->sendSystemMessage($room, 'moderator_demoted', ['user' => $event->getParticipant()->getAttendee()->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::GUEST_MODERATOR) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'guest_moderator_promoted', ['session' => sha1($event->getParticipant()->getSessionId())]);
+				$listener->sendSystemMessage($room, 'guest_moderator_promoted', ['session' => $event->getParticipant()->getAttendee()->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::GUEST) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'guest_moderator_demoted', ['session' => sha1($event->getParticipant()->getSessionId())]);
+				$listener->sendSystemMessage($room, 'guest_moderator_demoted', ['session' => $event->getParticipant()->getAttendee()->getActorId()]);
 			}
 		});
 		$listener = function (GenericEvent $event) {
@@ -253,9 +257,7 @@ public static function register(IEventDispatcher $dispatcher): void {
 	protected function sendSystemMessage(Room $room, string $message, array $parameters = [], Participant $participant = null): void {
 		if ($participant instanceof Participant) {
 			$actorType = $participant->isGuest() ? 'guests' : 'users';
-			$sessionId = $participant->getSessionId();
-			$sessionHash = $sessionId ? sha1($sessionId) : 'failed-to-get-session';
-			$actorId = $participant->isGuest() ? $sessionHash : $participant->getUser();
+			$actorId = $participant->getAttendee()->getActorId();
 		} else {
 			$user = $this->userSession->getUser();
 			if ($user instanceof IUser) {
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 3d7c63f7efd..9f3eda2096c 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -435,40 +435,47 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 		$numActiveGuests = 0;
 		$cleanGuests = false;
 		$participantList = [];
-		$participants = $room->getParticipants();
-//		uasort($participants, function (Participant $participant1, Participant $participant2) {
-//			return $participant2->getLastPing() - $participant1->getLastPing();
-//		});
-//
-//		foreach ($participants as $participant) {
-//			if ($participant->isGuest()) {
-//				if ($participant->getLastPing() <= $this->timeFactory->getTime() - 100) {
-//					$cleanGuests = true;
-//				} else {
-//					$numActiveGuests++;
-//				}
-//			} else {
-//				$user = $this->userManager->get($participant->getUser());
-//				if ($user instanceof IUser) {
-//					$participantList[(string)$user->getUID()] = [
-//						'name' => $user->getDisplayName(),
-//						'type' => $participant->getParticipantType(),
-//						'call' => $participant->getInCallFlags(),
-//						'sessionId' => $participant->getSessionId(),
-//					];
-//
-//					if ($room->getType() === Room::ONE_TO_ONE_CALL &&
-//						  $user->getUID() !== $currentParticipant->getUser()) {
-//						// FIXME This should not be done, but currently all the clients use it to get the avatar of the user …
-//						$roomData['name'] = $user->getUID();
-//					}
-//				}
-//
-//				if ($participant->getSessionId() !== '0' && $participant->getLastPing() <= $this->timeFactory->getTime() - 100) {
-//					$room->leaveRoom($participant->getUser());
-//				}
-//			}
-//		}
+		$participants = $this->participantService->getParticipantsForRoom($room);
+		uasort($participants, function (Participant $participant1, Participant $participant2) {
+			$s1 = $participant1->getSession() ? $participant1->getSession()->getLastPing() : 0;
+			$s2 = $participant2->getSession() ? $participant2->getSession()->getLastPing() : 0;
+			return $s2 - $s1;
+		});
+
+		foreach ($participants as $participant) {
+			/** @var Participant $participant */
+			if ($participant->isGuest()) {
+				if ($participant->getSession()) {
+					if ($participant->getSession()->getLastPing() <= $this->timeFactory->getTime() - 100) {
+						$cleanGuests = true;
+					} else {
+						$numActiveGuests++;
+					}
+				}
+			} else if ($participant->getAttendee()->getActorType() === 'users') {
+				$attendee = $participant->getAttendee();
+				$session = $participant->getSession();
+				$user = $this->userManager->get($attendee->getActorId());
+				if ($user instanceof IUser) {
+					$participantList[(string)$user->getUID()] = [
+						'name' => $user->getDisplayName(),
+						'type' => $attendee->getParticipantType(),
+						'call' => $session ? $session->getInCall() : Participant::FLAG_DISCONNECTED,
+						'sessionId' => $session ? $session->getSessionId() : '0',
+					];
+
+					if ($room->getType() === Room::ONE_TO_ONE_CALL &&
+						  $user->getUID() !== $currentParticipant->getAttendee()->getActorId()) {
+						// FIXME This should not be done, but currently all the clients use it to get the avatar of the user …
+						$roomData['name'] = $user->getUID();
+					}
+				}
+
+				if ($session && $session->getLastPing() <= $this->timeFactory->getTime() - 100) {
+					$this->participantService->leaveRoomAsSession($room, $participant);
+				}
+			}
+		}
 
 		if ($cleanGuests) {
 			$room->cleanGuestParticipants();
@@ -798,11 +805,12 @@ protected function createGroupRoom(string $targetGroupName): DataResponse {
 			}
 
 			$participants[] = [
-				'userId' => $user->getUID(),
+				'actorType' => 'users',
+				'actorId' => $user->getUID(),
 			];
 		}
 
-		\call_user_func_array([$room, 'addUsers'], $participants);
+		$this->participantService->addUsers($room, $participants);
 
 		return new DataResponse($this->formatRoom($room, $room->getParticipant($currentUser->getUID())), Http::STATUS_CREATED);
 	}
@@ -855,11 +863,12 @@ protected function createCircleRoom(string $targetCircleId): DataResponse {
 			}
 
 			$participants[] = [
-				'userId' => $member->getUserId(),
+				'actorType' => 'users',
+				'actorId' => $member->getUserId(),
 			];
 		}
 
-		\call_user_func_array([$room, 'addUsers'], $participants);
+		$this->participantService->addUsers($room, $participants);
 
 		return new DataResponse($this->formatRoom($room, $room->getParticipant($currentUser->getUID())), Http::STATUS_CREATED);
 	}
@@ -1104,9 +1113,10 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				return new DataResponse([]);
 			}
 
-			$this->room->addUsers([
-				'userId' => $newUser->getUID(),
-			]);
+			$this->participantService->addUsers($this->room, [[
+				'actorType' => 'users',
+				'actorId' => $newUser->getUID(),
+			]]);
 		} elseif ($source === 'groups') {
 			$group = $this->groupManager->get($newParticipant);
 			if (!$group instanceof IGroup) {
@@ -1120,7 +1130,8 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				}
 
 				$participantsToAdd[] = [
-					'userId' => $user->getUID(),
+					'actorType' => 'users',
+					'actorId' => $user->getUID(),
 				];
 			}
 
@@ -1128,7 +1139,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				return new DataResponse([]);
 			}
 
-			\call_user_func_array([$this->room, 'addUsers'], $participantsToAdd);
+			$this->participantService->addUsers($this->room, $participantsToAdd);
 		} elseif ($source === 'circles') {
 			if (!$this->appManager->isEnabledForUser('circles')) {
 				return new DataResponse([], Http::STATUS_BAD_REQUEST);
@@ -1158,7 +1169,8 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				}
 
 				$participantsToAdd[] = [
-					'userId' => $member->getUserId(),
+					'actorType' => 'users',
+					'actorId' => $member->getUserId(),
 				];
 			}
 
@@ -1166,7 +1178,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				return new DataResponse([]);
 			}
 
-			\call_user_func_array([$this->room, 'addUsers'], $participantsToAdd);
+			$this->participantService->addUsers($this->room, $participantsToAdd);
 		} elseif ($source === 'emails') {
 			$data = [];
 			if ($this->room->setType(Room::PUBLIC_CALL)) {
diff --git a/lib/Notification/Listener.php b/lib/Notification/Listener.php
index 02cd0aaf728..a0e056427cd 100644
--- a/lib/Notification/Listener.php
+++ b/lib/Notification/Listener.php
@@ -137,13 +137,18 @@ public function generateInvitation(Room $room, array $participants): void {
 		}
 
 		foreach ($participants as $participant) {
-			if ($actorId === $participant['userId']) {
+			if ($participant['actorType'] !== 'users') {
+				// No user => no activity
+				continue;
+			}
+
+			if ($actorId === $participant['actorId']) {
 				// No activity for self-joining and the creator
 				continue;
 			}
 
 			try {
-				$notification->setUser($participant['userId']);
+				$notification->setUser($participant['actorId']);
 				$this->notificationManager->notify($notification);
 			} catch (\InvalidArgumentException $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 79e61425bd6..17ee86dc54f 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -112,10 +112,11 @@ public function joinRoom(Room $room, IUser $user, string $password, bool $passed
 			}
 
 			// User joining a public room, without being invited
-			$this->addUsers($room, [
-				'userId' => $user->getUID(),
+			$this->addUsers($room, [[
+				'actorType' => 'users',
+				'actorId' => $user->getUID(),
 				'participantType' => Participant::USER_SELF_JOINED,
-			]);
+			]]);
 
 			$attendee = $this->attendeeMapper->findByActor($room->getId(), 'users', $user->getUID());
 		}
@@ -181,9 +182,9 @@ public function joinRoomAsNewGuest(Room $room, string $password, bool $passedPas
 
 	/**
 	 * @param Room $room
-	 * @param array ...$participants
+	 * @param array $participants
 	 */
-	public function addUsers(Room $room, array ...$participants): void {
+	public function addUsers(Room $room, array $participants): void {
 		$event = new AddParticipantsEvent($room, $participants);
 		$this->dispatcher->dispatch(Room::EVENT_BEFORE_USERS_ADD, $event);
 
@@ -195,8 +196,8 @@ public function addUsers(Room $room, array ...$participants): void {
 		foreach ($participants as $participant) {
 			$attendee = new Attendee();
 			$attendee->setRoomId($room->getId());
-			$attendee->setActorType('users');
-			$attendee->setActorId($participant['userId']);
+			$attendee->setActorType($participant['actorType']);
+			$attendee->setActorId($participant['actorId']);
 			$attendee->setParticipantType($participant['participantType'] ?? Participant::USER);
 			$attendee->setLastReadMessage($lastMessage);
 			$this->attendeeMapper->insert($attendee);
diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
index 4a1f5debdb6..c3fcec05964 100644
--- a/lib/Service/RoomService.php
+++ b/lib/Service/RoomService.php
@@ -34,9 +34,13 @@ class RoomService {
 
 	/** @var Manager */
 	protected $manager;
+	/** @var ParticipantService */
+	protected $participantService;
 
-	public function __construct(Manager $manager) {
+	public function __construct(Manager $manager,
+					ParticipantService $participantService) {
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 	}
 
 	/**
@@ -113,10 +117,11 @@ public function createConversation(int $type, string $name, ?IUser $owner = null
 		$room = $this->manager->createRoom($type, $name, $objectType, $objectId);
 
 		if ($owner instanceof IUser) {
-			$room->addUsers([
-				'userId' => $owner->getUID(),
+			$this->participantService->addUsers($room, [[
+				'actorType' => 'users',
+				'actorId' => $owner->getUID(),
 				'participantType' => Participant::OWNER,
-			]);
+			]]);
 		}
 
 		return $room;

From a5ab35f4edd6a57b895f6b1e4fa46015f31407a3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 11:35:28 +0200
Subject: [PATCH 028/129] Further adjustments in the RoomController

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/ChatController.php  | 13 +++++-----
 lib/Controller/RoomController.php  | 22 +++++++++++------
 lib/Manager.php                    | 16 ++++++++++--
 lib/Room.php                       | 19 ---------------
 lib/Service/ParticipantService.php | 27 ++++++++++++++++++++-
 lib/Service/RoomService.php        | 20 +++++++++------
 lib/Signaling/Listener.php         | 39 +++++++++++++++++++++---------
 7 files changed, 102 insertions(+), 54 deletions(-)

diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 6cc81ab635f..784d5e50ad8 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -33,6 +33,7 @@
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
@@ -71,6 +72,9 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var AttendeeMapper */
 	private $attendeeMapper;
 
+	/** @var ParticipantService */
+	private $participantService;
+
 	/** @var GuestManager */
 	private $guestManager;
 
@@ -92,9 +96,6 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var ISearchResult */
 	private $searchResult;
 
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
 	/** @var IL10N */
 	private $l;
 	/** @var ITimeFactory */
@@ -108,13 +109,13 @@ public function __construct(string $appName,
 								IAppManager $appManager,
 								ChatManager $chatManager,
 								AttendeeMapper $attendeeMapper,
+								ParticipantService $participantService,
 								GuestManager $guestManager,
 								MessageParser $messageParser,
 								IManager $autoCompleteManager,
 								IUserStatusManager $statusManager,
 								SearchPlugin $searchPlugin,
 								ISearchResult $searchResult,
-								IEventDispatcher $eventDispatcher,
 								ITimeFactory $timeFactory,
 								IL10N $l) {
 		parent::__construct($appName, $request);
@@ -125,13 +126,13 @@ public function __construct(string $appName,
 		$this->appManager = $appManager;
 		$this->chatManager = $chatManager;
 		$this->attendeeMapper = $attendeeMapper;
+		$this->participantService = $participantService;
 		$this->guestManager = $guestManager;
 		$this->messageParser = $messageParser;
 		$this->autoCompleteManager = $autoCompleteManager;
 		$this->statusManager = $statusManager;
 		$this->searchPlugin = $searchPlugin;
 		$this->searchResult = $searchResult;
-		$this->eventDispatcher = $eventDispatcher;
 		$this->timeFactory = $timeFactory;
 		$this->l = $l;
 	}
@@ -194,7 +195,7 @@ public function sendMessage(string $message, string $actorDisplayName = '', stri
 			}
 		}
 
-		$this->room->ensureOneToOneRoomIsFilled();
+		$this->participantService->ensureOneToOneRoomIsFilled($this->room);
 		$creationDateTime = $this->timeFactory->getDateTime('now', new \DateTimeZone('UTC'));
 
 		try {
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 9f3eda2096c..6f24d3856e4 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -751,7 +751,7 @@ protected function createOneToOneRoom(string $targetUserId): DataResponse {
 			// We are only doing this manually here to be able to return different status codes
 			// Actually createOneToOneConversation also checks it.
 			$room = $this->manager->getOne2OneRoom($currentUser->getUID(), $targetUser->getUID());
-			$room->ensureOneToOneRoomIsFilled();
+			$this->participantService->ensureOneToOneRoomIsFilled($room);
 			return new DataResponse(
 				$this->formatRoom($room, $room->getParticipant($currentUser->getUID())),
 				Http::STATUS_OK
@@ -1203,7 +1203,8 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 	 * @return DataResponse
 	 */
 	public function removeParticipantFromRoom(string $participant): DataResponse {
-		if ($this->participant->getUser() === $participant) {
+		$attendee = $this->participant->getAttendee();
+		if ($attendee->getActorType() === 'users' && $attendee->getActorId() === $participant) {
 			// Removing self, abusing moderator power
 			return $this->removeSelfFromRoomLogic($this->room, $this->participant);
 		}
@@ -1222,7 +1223,7 @@ public function removeParticipantFromRoom(string $participant): DataResponse {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		if ($targetParticipant->getParticipantType() === Participant::OWNER) {
+		if ($targetParticipant->getAttendee()->getParticipantType() === Participant::OWNER) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
@@ -1261,7 +1262,7 @@ protected function removeSelfFromRoomLogic(Room $room, Participant $participant)
 			return new DataResponse();
 		}
 
-		$currentUser = $this->userManager->get($participant->getUser());
+		$currentUser = $this->userManager->get($this->userId);
 		if (!$currentUser instanceof IUser) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
@@ -1289,7 +1290,11 @@ public function removeGuestFromRoom(string $participant): DataResponse {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		if ($targetParticipant->getSessionId() === $this->participant->getSessionId()) {
+		$targetSession = $targetParticipant->getSession();
+		$currentSession = $this->participant->getSession();
+		if ($targetSession instanceof Session
+			&& $currentSession instanceof Session
+			&& $targetSession->getSessionId() === $currentSession->getSessionId()) {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
@@ -1428,8 +1433,11 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 		}
 
 		$this->session->removePasswordForRoom($token);
-		$this->session->setSessionForRoom($token, $participant->getSession()->getSessionId());
-		$room->ping($this->userId, $participant->getSession()->getSessionId(), $this->timeFactory->getTime());
+		$session = $participant->getSession();
+		if ($session instanceof Session) {
+			$this->session->setSessionForRoom($token, $session->getSessionId());
+			$room->ping($this->userId, $session->getSessionId(), $this->timeFactory->getTime());
+		}
 
 		return new DataResponse($this->formatRoom($room, $participant));
 	}
diff --git a/lib/Manager.php b/lib/Manager.php
index 47a63d7cd04..acb0915f8e8 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -30,6 +30,7 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\SessionMapper;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\Comments\NotFoundException;
@@ -57,6 +58,8 @@ class Manager {
 	private $attendeeMapper;
 	/** @var SessionMapper */
 	private $sessionMapper;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var ISecureRandom */
 	private $secureRandom;
 	/** @var IUserManager */
@@ -79,6 +82,7 @@ public function __construct(IDBConnection $db,
 								Config $talkConfig,
 								AttendeeMapper $attendeeMapper,
 								SessionMapper $sessionMapper,
+								ParticipantService $participantService,
 								ISecureRandom $secureRandom,
 								IUserManager $userManager,
 								CommentsManager $commentsManager,
@@ -92,6 +96,7 @@ public function __construct(IDBConnection $db,
 		$this->talkConfig = $talkConfig;
 		$this->attendeeMapper = $attendeeMapper;
 		$this->sessionMapper = $sessionMapper;
+		$this->participantService = $participantService;
 		$this->secureRandom = $secureRandom;
 		$this->userManager = $userManager;
 		$this->commentsManager = $commentsManager;
@@ -649,8 +654,12 @@ public function getChangelogRoom(string $userId): Room {
 
 		if ($row === false) {
 			$room = $this->createRoom(Room::CHANGELOG_CONVERSATION, $userId);
-			$room->addUsers(['userId' => $userId]);
 			$room->setReadOnly(Room::READ_ONLY);
+
+			$this->participantService->addUsers($room,[[
+				'actorType' => 'users',
+				'actorId' => $userId,
+			]]);
 			return $room;
 		}
 
@@ -659,7 +668,10 @@ public function getChangelogRoom(string $userId): Room {
 		try {
 			$room->getParticipant($userId);
 		} catch (ParticipantNotFoundException $e) {
-			$room->addUsers(['userId' => $userId]);
+			$this->participantService->addUsers($room,[[
+				'actorType' => 'users',
+				'actorId' => $userId,
+			]]);
 		}
 
 		return $room;
diff --git a/lib/Room.php b/lib/Room.php
index c4b71f5dfb4..40dc20afb6e 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -730,25 +730,6 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 		return true;
 	}
 
-	public function ensureOneToOneRoomIsFilled(): void {
-		if ($this->getType() !== self::ONE_TO_ONE_CALL) {
-			return;
-		}
-
-		$users = json_decode($this->getName(), true);
-		$participants = $this->getParticipantUserIds();
-		$missingUsers = array_diff($users, $participants);
-
-		foreach ($missingUsers as $userId) {
-			if ($this->manager->isValidParticipant($userId)) {
-				$this->addUsers([
-					'userId' => $userId,
-					'participantType' => Participant::OWNER,
-				]);
-			}
-		}
-	}
-
 	/**
 	 * @param array ...$participants
 	 */
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 17ee86dc54f..6f97eb562b2 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -43,6 +43,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
 use OCP\IUser;
+use OCP\IUserManager;
 use OCP\Security\ISecureRandom;
 
 class ParticipantService {
@@ -58,19 +59,23 @@ class ParticipantService {
 	protected $connection;
 	/** @var IEventDispatcher */
 	private $dispatcher;
+	/** @var IUserManager */
+	private $userManager;
 
 	public function __construct(AttendeeMapper $attendeeMapper,
 								SessionMapper $sessionMapper,
 								SessionService $sessionService,
 								ISecureRandom $secureRandom,
 								IDBConnection $connection,
-								IEventDispatcher $dispatcher) {
+								IEventDispatcher $dispatcher,
+								IUserManager $userManager) {
 		$this->attendeeMapper = $attendeeMapper;
 		$this->sessionMapper = $sessionMapper;
 		$this->sessionService = $sessionService;
 		$this->secureRandom = $secureRandom;
 		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
+		$this->userManager = $userManager;
 	}
 
 	public function updateParticipantType(Room $room, Participant $participant, int $participantType): void {
@@ -206,6 +211,26 @@ public function addUsers(Room $room, array $participants): void {
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
 	}
 
+	public function ensureOneToOneRoomIsFilled(Room $room): void {
+		if ($room->getType() !== Room::ONE_TO_ONE_CALL) {
+			return;
+		}
+
+		$users = json_decode($room->getName(), true);
+		$participants = $room->getParticipantUserIds();
+		$missingUsers = array_diff($users, $participants);
+
+		foreach ($missingUsers as $userId) {
+			if ($this->userManager->userExists($userId)) {
+				$this->addUsers($room, [[
+					'actorType' => 'users',
+					'actorId' => $userId,
+					'participantType' => Participant::OWNER,
+				]]);
+			}
+		}
+	}
+
 	public function leaveRoomAsSession(Room $room, Participant $participant): void {
 		if (!$participant->isGuest()) {
 			$event = new ParticipantEvent($room, $participant);
diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
index c3fcec05964..69ade564dac 100644
--- a/lib/Service/RoomService.php
+++ b/lib/Service/RoomService.php
@@ -57,17 +57,23 @@ public function createOneToOneConversation(IUser $actor, IUser $targetUser): Roo
 		try {
 			// If room exists: Reuse that one, otherwise create a new one.
 			$room = $this->manager->getOne2OneRoom($actor->getUID(), $targetUser->getUID());
-			$room->ensureOneToOneRoomIsFilled();
+			$this->participantService->ensureOneToOneRoomIsFilled($room);
 		} catch (RoomNotFoundException $e) {
 			$users = [$actor->getUID(), $targetUser->getUID()];
 			sort($users);
 			$room = $this->manager->createRoom(Room::ONE_TO_ONE_CALL, json_encode($users));
-			$room->addUsers([
-				'userId' => $actor->getUID(),
-				'participantType' => Participant::OWNER,
-			], [
-				'userId' => $targetUser->getUID(),
-				'participantType' => Participant::OWNER,
+
+			$this->participantService->addUsers($room, [
+				[
+					'actorType' => 'users',
+					'actorId' => $actor->getUID(),
+					'participantType' => Participant::OWNER,
+				],
+				[
+					'actorType' => 'users',
+					'actorId' => $targetUser->getUID(),
+					'participantType' => Participant::OWNER,
+				],
 			]);
 		}
 
diff --git a/lib/Signaling/Listener.php b/lib/Signaling/Listener.php
index c24d88debe9..a150b568a11 100644
--- a/lib/Signaling/Listener.php
+++ b/lib/Signaling/Listener.php
@@ -34,6 +34,7 @@
 use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -80,10 +81,10 @@ protected static function registerInternalSignaling(IEventDispatcher $dispatcher
 			// When "addMessageForAllParticipants" is called the participant is
 			// no longer in the room, so the message needs to be explicitly
 			// added for the participant.
-			/** @var Participant $participant */
 			$participant = $event->getParticipant();
-			if ($participant->getSessionId() !== '0') {
-				$messages->addMessage($participant->getSessionId(), $participant->getSessionId(), 'refresh-participant-list');
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$messages->addMessage($session->getSessionId(), $session->getSessionId(), 'refresh-participant-list');
 			}
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_USER_REMOVE, $listener);
@@ -152,8 +153,10 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
 			// If the participant is not active in the room the "participants"
 			// request will be sent anyway, although with an empty "changed"
 			// property.
-			if ($event->getParticipant()->getSessionId()) {
-				$sessionIds[] = $event->getParticipant()->getSessionId();
+			$participant = $event->getParticipant();
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$sessionIds[] = $session->getSessionId();
 			}
 			$notifier->participantsModified($event->getRoom(), $sessionIds);
 		});
@@ -187,7 +190,11 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
 			/** @var BackendNotifier $notifier */
 			$notifier = \OC::$server->query(BackendNotifier::class);
 
-			$notifier->roomSessionsRemoved($event->getRoom(), [$event->getParticipant()->getSessionId()]);
+			$participant = $event->getParticipant();
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$notifier->roomSessionsRemoved($event->getRoom(), [$session->getSessionId()]);
+			}
 		});
 
 		$listener = static function (ModifyParticipantEvent $event) {
@@ -198,11 +205,15 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
 			/** @var BackendNotifier $notifier */
 			$notifier = \OC::$server->query(BackendNotifier::class);
 
-			$notifier->roomInCallChanged(
-				$event->getRoom(),
-				$event->getNewValue(),
-				[$event->getParticipant()->getSessionId()]
-			);
+			$participant = $event->getParticipant();
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$notifier->roomInCallChanged(
+					$event->getRoom(),
+					$event->getNewValue(),
+					[$session->getSessionId()]
+				);
+			}
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_JOIN_CALL, $listener);
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_LEAVE_CALL, $listener);
@@ -228,7 +239,11 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
 			/** @var BackendNotifier $notifier */
 			$notifier = \OC::$server->query(BackendNotifier::class);
 
-			$notifier->participantsModified($event->getRoom(), [$event->getParticipant()->getSessionId()]);
+			$participant = $event->getParticipant();
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$notifier->participantsModified($event->getRoom(), [$session->getSessionId()]);
+			}
 		});
 		$dispatcher->addListener(ChatManager::EVENT_AFTER_MESSAGE_SEND , static function (ChatParticipantEvent $event) {
 			if (self::isUsingInternalSignaling()) {

From b861716836e452c17a29070de4c4bad935d405cc Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 13:17:20 +0200
Subject: [PATCH 029/129] Move Room::getParticipantUserIds() to participant
 service

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Activity/Listener.php          |  8 ++++++-
 lib/Chat/Notifier.php              |  6 +++++
 lib/Controller/RoomController.php  |  2 +-
 lib/Manager.php                    |  2 +-
 lib/Model/AttendeeMapper.php       | 21 ++++++++++++++++++
 lib/PublicShareAuth/Listener.php   | 11 +++++++---
 lib/Room.php                       | 35 ++++++------------------------
 lib/Service/ParticipantService.php | 15 ++++++++++++-
 lib/Share/RoomShareProvider.php    |  7 +++++-
 lib/Signaling/BackendNotifier.php  | 13 +++++++----
 10 files changed, 80 insertions(+), 40 deletions(-)

diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php
index bd71bf587e3..3ddfa9111c7 100644
--- a/lib/Activity/Listener.php
+++ b/lib/Activity/Listener.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\Activity\IManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -46,6 +47,9 @@ class Listener {
 	/** @var ChatManager */
 	protected $chatManager;
 
+	/** @var ParticipantService */
+	protected $participantService;
+
 	/** @var LoggerInterface */
 	protected $logger;
 
@@ -55,11 +59,13 @@ class Listener {
 	public function __construct(IManager $activityManager,
 								IUserSession $userSession,
 								ChatManager $chatManager,
+								ParticipantService $participantService,
 								LoggerInterface $logger,
 								ITimeFactory $timeFactory) {
 		$this->activityManager = $activityManager;
 		$this->userSession = $userSession;
 		$this->chatManager = $chatManager;
+		$this->participantService = $participantService;
 		$this->logger = $logger;
 		$this->timeFactory = $timeFactory;
 	}
@@ -107,7 +113,7 @@ public function generateCallActivity(Room $room): bool {
 		}
 
 		$duration = $this->timeFactory->getTime() - $activeSince->getTimestamp();
-		$userIds = $room->getParticipantUserIds($activeSince);
+		$userIds = $this->participantService->getParticipantUserIds($room, $activeSince);
 
 		if ((\count($userIds) + $room->getActiveGuests()) === 1) {
 			// Single user pinged or guests only => no summary/activity
diff --git a/lib/Chat/Notifier.php b/lib/Chat/Notifier.php
index d4130ef1782..8152561e220 100644
--- a/lib/Chat/Notifier.php
+++ b/lib/Chat/Notifier.php
@@ -30,6 +30,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\Comments\IComment;
 use OCP\IConfig;
 use OCP\Notification\IManager as INotificationManager;
@@ -49,6 +50,8 @@ class Notifier {
 	private $notificationManager;
 	/** @var IUserManager */
 	private $userManager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var Manager */
 	private $manager;
 	/** @var IConfig */
@@ -58,11 +61,13 @@ class Notifier {
 
 	public function __construct(INotificationManager $notificationManager,
 								IUserManager $userManager,
+								ParticipantService $participantService,
 								Manager $manager,
 								IConfig $config,
 								Util $util) {
 		$this->notificationManager = $notificationManager;
 		$this->userManager = $userManager;
+		$this->participantService = $participantService;
 		$this->manager = $manager;
 		$this->config = $config;
 		$this->util = $util;
@@ -91,6 +96,7 @@ public function notifyMentionedUsers(Room $chat, IComment $comment, array $alrea
 		$mentionedAll = array_search('all', $mentionedUserIds, true);
 
 		if ($mentionedAll !== false) {
+			$mentionedUserIds = array_unique(array_merge($mentionedUserIds, $this->participantService->getParticipantUserIds($chat)));
 			$mentionedUserIds = array_unique(array_merge($mentionedUserIds, $chat->getParticipantUserIds()));
 		}
 
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 6f24d3856e4..6bce4d1d211 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1100,7 +1100,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$participants = $this->room->getParticipantUserIds();
+		$participants = $this->participantService->getParticipantUserIds($this->room);
 
 		$participantsToAdd = [];
 		if ($source === 'users') {
diff --git a/lib/Manager.php b/lib/Manager.php
index acb0915f8e8..44d1d3d088e 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -777,7 +777,7 @@ public function resolveRoomDisplayName(Room $room, string $userId): string {
 	}
 
 	protected function getRoomNameByParticipants(Room $room): string {
-		$users = $room->getParticipantUserIds();
+		$users = $this->participantService->getParticipantUserIds($room);
 		$displayNames = [];
 
 		foreach ($users as $participantId) {
diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
index 4ff1e3e2cbe..c2839418506 100644
--- a/lib/Model/AttendeeMapper.php
+++ b/lib/Model/AttendeeMapper.php
@@ -24,6 +24,7 @@
 namespace OCA\Talk\Model;
 
 use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /**
@@ -56,6 +57,26 @@ public function findByActor(int $roomId, string $actorType, string $actorId): At
 		return $this->findEntity($query);
 	}
 
+	/**
+	 * @param int $roomId
+	 * @param string $actorType
+	 * @param \DateTime|null $lastJoinedCall
+	 * @return Attendee[]
+	 */
+	public function getActorsByType(int $roomId, string $actorType, ?\DateTime $lastJoinedCall = null): array {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->from($this->getTableName())
+			->where($query->expr()->eq('room_id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter($actorType)));
+
+		if ($lastJoinedCall instanceof \DateTimeInterface) {
+			$query->andWhere($query->expr()->gte('last_joined_call', $query->createNamedParameter($lastJoinedCall, IQueryBuilder::PARAM_DATE)));
+		}
+
+		return $this->findEntities($query);
+	}
+
 	public function createAttendeeFromRow(array $row): Attendee {
 		return $this->mapRowToEntity([
 			'id' => $row['a_id'],
diff --git a/lib/PublicShareAuth/Listener.php b/lib/PublicShareAuth/Listener.php
index a0518504f26..c029a5fc409 100644
--- a/lib/PublicShareAuth/Listener.php
+++ b/lib/PublicShareAuth/Listener.php
@@ -30,6 +30,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\EventDispatcher\IEventDispatcher;
 
 /**
@@ -83,13 +84,15 @@ public static function preventExtraUsersFromJoining(Room $room, string $userId):
 
 		try {
 			$participant = $room->getParticipant($userId);
-			if ($participant->getParticipantType() === Participant::OWNER) {
+			if ($participant->getAttendee()->getParticipantType() === Participant::OWNER) {
 				return;
 			}
 		} catch (ParticipantNotFoundException $e) {
 		}
 
-		if ($room->getActiveGuests() > 0 || \count($room->getParticipantUserIds()) > 1) {
+		$participantService = \OC::$server->get(ParticipantService::class);
+		$users = $participantService->getParticipantUserIds($room);
+		if ($room->getActiveGuests() > 0 || \count($users) > 1) {
 			throw new \OverflowException('Only the owner and another participant are allowed in rooms to request the password for a share');
 		}
 	}
@@ -108,7 +111,9 @@ public static function preventExtraGuestsFromJoining(Room $room): void {
 			return;
 		}
 
-		if ($room->getActiveGuests() > 0 || \count($room->getParticipantUserIds()) > 1) {
+		$participantService = \OC::$server->get(ParticipantService::class);
+		$users = $participantService->getParticipantUserIds($room);
+		if ($room->getActiveGuests() > 0 || \count($users) > 1) {
 			throw new \OverflowException('Only the owner and another participant are allowed in rooms to request the password for a share');
 		}
 	}
diff --git a/lib/Room.php b/lib/Room.php
index 40dc20afb6e..d071ca8154c 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -42,6 +42,7 @@
 use OCA\Talk\Exceptions\InvalidPasswordException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -250,13 +251,17 @@ public function getToken(): string {
 	public function getName(): string {
 		if ($this->type === self::ONE_TO_ONE_CALL) {
 			if ($this->name === '') {
+				// TODO use DI
+				$participantService = \OC::$server->get(ParticipantService::class);
 				// Fill the room name with the participants for 1-to-1 conversations
-				$users = $this->getParticipantUserIds();
+				$users = $participantService->getParticipantUserIds($this);
 				sort($users);
 				$this->setName(json_encode($users), '');
 			} elseif (strpos($this->name, '["') !== 0) {
+				// TODO use DI
+				$participantService = \OC::$server->get(ParticipantService::class);
 				// Not the json array, but the old fallback when someone left
-				$users = $this->getParticipantUserIds();
+				$users = $participantService->getParticipantUserIds($this);
 				if (count($users) !== 2) {
 					$users[] = $this->name;
 				}
@@ -1183,32 +1188,6 @@ public function getParticipantsLegacy(int $lastPing = 0): array {
 		];
 	}
 
-	/**
-	 * @param null|\DateTime $maxLastJoined When the "last joined call" is older than the given DateTime, the user is ignored
-	 * @return string[]
-	 */
-	public function getParticipantUserIds(\DateTime $maxLastJoined = null): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('user_id')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->nonEmptyString('user_id'));
-
-		if ($maxLastJoined instanceof \DateTimeInterface) {
-			$query->andWhere($query->expr()->gte('last_joined_call', $query->createNamedParameter($maxLastJoined, IQueryBuilder::PARAM_DATE)));
-		}
-
-		$result = $query->execute();
-
-		$users = [];
-		while ($row = $result->fetch()) {
-			$users[] = $row['user_id'];
-		}
-		$result->closeCursor();
-
-		return $users;
-	}
-
 	/**
 	 * @param int $notificationLevel
 	 * @return Participant[] Array of participants
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 6f97eb562b2..6fd6c5ce8a4 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -217,7 +217,7 @@ public function ensureOneToOneRoomIsFilled(Room $room): void {
 		}
 
 		$users = json_decode($room->getName(), true);
-		$participants = $room->getParticipantUserIds();
+		$participants = $this->getParticipantUserIds($room);
 		$missingUsers = array_diff($users, $participants);
 
 		foreach ($missingUsers as $userId) {
@@ -292,4 +292,17 @@ public function getParticipantsForRoom(Room $room): array {
 
 		return $participants;
 	}
+
+	/**
+	 * @param Room $room
+	 * @param \DateTime|null $maxLastJoined
+	 * @return string[]
+	 */
+	public function getParticipantUserIds(Room $room, \DateTime $maxLastJoined = null): array {
+		$attendees = $this->attendeeMapper->getActorsByType($room->getId(), 'users', $maxLastJoined);
+
+		return array_map(function(Attendee $attendee) {
+			return $attendee->getActorId();
+		}, $attendees);
+	}
 }
diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php
index 38a46eb930d..d0f0d837d84 100644
--- a/lib/Share/RoomShareProvider.php
+++ b/lib/Share/RoomShareProvider.php
@@ -37,6 +37,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -82,6 +83,8 @@ class RoomShareProvider implements IShareProvider {
 	private $dispatcher;
 	/** @var Manager */
 	private $manager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var ITimeFactory */
 	protected $timeFactory;
 	/** @var IL10N */
@@ -95,6 +98,7 @@ public function __construct(
 			IShareManager $shareManager,
 			EventDispatcherInterface $dispatcher,
 			Manager $manager,
+			ParticipantService $participantService,
 			ITimeFactory $timeFactory,
 			IL10N $l,
 			IMimeTypeLoader $mimeTypeLoader
@@ -104,6 +108,7 @@ public function __construct(
 		$this->shareManager = $shareManager;
 		$this->dispatcher = $dispatcher;
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 		$this->timeFactory = $timeFactory;
 		$this->l = $l;
 		$this->mimeTypeLoader = $mimeTypeLoader;
@@ -976,7 +981,7 @@ public function getAccessList($nodes, $currentAccess): array {
 					continue;
 				}
 
-				$userList = $room->getParticipantUserIds();
+				$userList = $this->participantService->getParticipantUserIds($room);
 				foreach ($userList as $uid) {
 					$users[$uid] = $users[$uid] ?? [];
 					$users[$uid][$row['id']] = $row;
diff --git a/lib/Signaling/BackendNotifier.php b/lib/Signaling/BackendNotifier.php
index 1ac8743a744..2cdf503213c 100644
--- a/lib/Signaling/BackendNotifier.php
+++ b/lib/Signaling/BackendNotifier.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Config;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\Http\Client\IClientService;
 use OCP\IURLGenerator;
 use OCP\Security\ISecureRandom;
@@ -44,6 +45,8 @@ class BackendNotifier {
 	private $secureRandom;
 	/** @var Manager */
 	private $signalingManager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var IUrlGenerator */
 	private $urlGenerator;
 
@@ -52,12 +55,14 @@ public function __construct(Config $config,
 								IClientService $clientService,
 								ISecureRandom $secureRandom,
 								Manager $signalingManager,
+								ParticipantService $participantService,
 								IURLGenerator $urlGenerator) {
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->clientService = $clientService;
 		$this->secureRandom = $secureRandom;
 		$this->signalingManager = $signalingManager;
+		$this->participantService = $participantService;
 		$this->urlGenerator = $urlGenerator;
 	}
 
@@ -149,7 +154,7 @@ public function roomInvited(Room $room, array $users): void {
 				'userids' => $userIds,
 				// TODO(fancycode): We should try to get rid of 'alluserids' and
 				// find a better way to notify existing users to update the room.
-				'alluserids' => $room->getParticipantUserIds(),
+				'alluserids' => $this->participantService->getParticipantUserIds($room),
 				'properties' => $room->getPropertiesForSignaling(''),
 			],
 		]);
@@ -170,7 +175,7 @@ public function roomsDisinvited(Room $room, array $userIds): void {
 				'userids' => $userIds,
 				// TODO(fancycode): We should try to get rid of 'alluserids' and
 				// find a better way to notify existing users to update the room.
-				'alluserids' => $room->getParticipantUserIds(),
+				'alluserids' => $this->participantService->getParticipantUserIds($room),
 				'properties' => $room->getPropertiesForSignaling(''),
 			],
 		]);
@@ -191,7 +196,7 @@ public function roomSessionsRemoved(Room $room, array $sessionIds): void {
 				'sessionids' => $sessionIds,
 				// TODO(fancycode): We should try to get rid of 'alluserids' and
 				// find a better way to notify existing users to update the room.
-				'alluserids' => $room->getParticipantUserIds(),
+				'alluserids' => $this->participantService->getParticipantUserIds($room),
 				'properties' => $room->getPropertiesForSignaling(''),
 			],
 		]);
@@ -208,7 +213,7 @@ public function roomModified(Room $room): void {
 		$this->backendRequest($room, [
 			'type' => 'update',
 			'update' => [
-				'userids' => $room->getParticipantUserIds(),
+				'userids' => $this->participantService->getParticipantUserIds($room),
 				'properties' => $room->getPropertiesForSignaling(''),
 			],
 		]);

From 30dba355f86011729df4ad4f40328c149bef8445 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 13:47:57 +0200
Subject: [PATCH 030/129] Fix sharing code

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Share/RoomShareProvider.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php
index d0f0d837d84..2276ebbc0ee 100644
--- a/lib/Share/RoomShareProvider.php
+++ b/lib/Share/RoomShareProvider.php
@@ -118,10 +118,10 @@ public static function register(IEventDispatcher $dispatcher): void {
 		$listener = static function (ParticipantEvent $event) {
 			$room = $event->getRoom();
 
-			if ($event->getParticipant()->getParticipantType() === Participant::USER_SELF_JOINED) {
+			if ($event->getParticipant()->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED) {
 				/** @var self $roomShareProvider */
 				$roomShareProvider = \OC::$server->query(self::class);
-				$roomShareProvider->deleteInRoom($room->getToken(), $event->getParticipant()->getUser());
+				$roomShareProvider->deleteInRoom($room->getToken(), $event->getParticipant()->getAttendee()->getActorId());
 			}
 		};
 		$dispatcher->addListener(Room::EVENT_AFTER_ROOM_DISCONNECT, $listener);

From d61a7b5bd884e75e55340eded3b5bceee85c5a97 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 14:36:21 +0200
Subject: [PATCH 031/129] Move counting functions to participant service

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/BackgroundJob/RemoveEmptyRooms.php |  8 +++-
 lib/Controller/RoomController.php      |  6 +--
 lib/Listener/UserDeletedListener.php   |  9 ++++-
 lib/Model/AttendeeMapper.php           | 24 ++++++++++++
 lib/Room.php                           | 52 --------------------------
 lib/Service/ParticipantService.php     | 31 +++++++++++++++
 6 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/lib/BackgroundJob/RemoveEmptyRooms.php b/lib/BackgroundJob/RemoveEmptyRooms.php
index 6446b1aef17..af973880966 100644
--- a/lib/BackgroundJob/RemoveEmptyRooms.php
+++ b/lib/BackgroundJob/RemoveEmptyRooms.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\BackgroundJob;
 
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
 use OCA\Talk\Manager;
@@ -39,6 +40,9 @@ class RemoveEmptyRooms extends TimedJob {
 	/** @var Manager */
 	protected $manager;
 
+	/** @var ParticipantService */
+	protected $participantService;
+
 	/** @var LoggerInterface */
 	protected $logger;
 
@@ -46,6 +50,7 @@ class RemoveEmptyRooms extends TimedJob {
 
 	public function __construct(ITimeFactory $timeFactory,
 								Manager $manager,
+								ParticipantService $participantService,
 								LoggerInterface $logger) {
 		parent::__construct($timeFactory);
 
@@ -53,6 +58,7 @@ public function __construct(ITimeFactory $timeFactory,
 		$this->setInterval(60 * 5);
 
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 		$this->logger = $logger;
 	}
 
@@ -71,7 +77,7 @@ public function callback(Room $room): void {
 			return;
 		}
 
-		if ($room->getNumberOfParticipants(false) === 0 && $room->getObjectType() !== 'file') {
+		if ($this->participantService->getNumberOfActors($room) === 0 && $room->getObjectType() !== 'file') {
 			$room->deleteRoom();
 			$this->numDeletedRooms++;
 		}
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 6bce4d1d211..fd2cad86d15 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1249,15 +1249,15 @@ public function removeSelfFromRoom(): DataResponse {
 	protected function removeSelfFromRoomLogic(Room $room, Participant $participant): DataResponse {
 		if ($room->getType() !== Room::ONE_TO_ONE_CALL) {
 			if ($participant->hasModeratorPermissions(false)
-				&& $room->getNumberOfParticipants() > 1
-				&& $room->getNumberOfModerators() === 1) {
+				&& $this->participantService->getNumberOfUsers($room) > 1
+				&& $this->participantService->getNumberOfModerators($room) === 1) {
 				return new DataResponse([], Http::STATUS_BAD_REQUEST);
 			}
 		}
 
 		if ($room->getType() !== Room::CHANGELOG_CONVERSATION &&
 			$room->getObjectType() !== 'file' &&
-			$room->getNumberOfParticipants() === 1) {
+			$this->participantService->getNumberOfUsers($room) === 1) {
 			$room->deleteRoom();
 			return new DataResponse();
 		}
diff --git a/lib/Listener/UserDeletedListener.php b/lib/Listener/UserDeletedListener.php
index 05ed7cfae37..df94e835d2e 100644
--- a/lib/Listener/UserDeletedListener.php
+++ b/lib/Listener/UserDeletedListener.php
@@ -25,6 +25,7 @@
 
 use OCA\Talk\Manager;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
@@ -33,9 +34,13 @@ class UserDeletedListener implements IEventListener {
 
 	/** @var Manager */
 	private $manager;
+	/** @var ParticipantService */
+	private $participantService;
 
-	public function __construct(Manager $manager) {
+	public function __construct(Manager $manager,
+								ParticipantService $participantService) {
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 	}
 
 	public function handle(Event $event): void {
@@ -49,7 +54,7 @@ public function handle(Event $event): void {
 		$rooms = $this->manager->getRoomsForUser($user->getUID());
 
 		foreach ($rooms as $room) {
-			if ($room->getNumberOfParticipants() === 1) {
+			if ($this->participantService->getNumberOfUsers($room) === 1) {
 				$room->deleteRoom();
 			} else {
 				$room->removeUser($user, Room::PARTICIPANT_REMOVED);
diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
index c2839418506..881874214f7 100644
--- a/lib/Model/AttendeeMapper.php
+++ b/lib/Model/AttendeeMapper.php
@@ -77,6 +77,30 @@ public function getActorsByType(int $roomId, string $actorType, ?\DateTime $last
 		return $this->findEntities($query);
 	}
 
+	/**
+	 * @param int $roomId
+	 * @param int[] $participantType
+	 * @return int
+	 */
+	public function countActorsByParticipantType(int $roomId, array $participantType): int {
+		$query = $this->db->getQueryBuilder();
+		$query->select($query->func()->count('*', 'num_actors'))
+			->from($this->getTableName())
+			->where($query->expr()->eq('room_id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)));
+
+		// TODO Should exclude groups and circles when we add them
+
+		if (!empty($participantType)) {
+			$query->andWhere($query->expr()->in('participant_type', $query->createNamedParameter($participantType, IQueryBuilder::PARAM_INT_ARRAY)));
+		}
+
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		return (int) ($row['num_actors'] ?? 0);
+	}
+
 	public function createAttendeeFromRow(array $row): Attendee {
 		return $this->mapRowToEntity([
 			'id' => $row['a_id'],
diff --git a/lib/Room.php b/lib/Room.php
index d071ca8154c..9390b5493d8 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -1285,58 +1285,6 @@ public function hasSessionsInCall(): bool {
 		return (bool) $row;
 	}
 
-	public function getNumberOfModerators(bool $ignoreGuests = true): int {
-		$types = [
-			Participant::OWNER,
-			Participant::MODERATOR,
-		];
-		if (!$ignoreGuests) {
-			$types[] = Participant::GUEST_MODERATOR;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->count('*', 'num_moderators'))
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->in('participant_type', $query->createNamedParameter($types, IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (int) ($row['num_moderators'] ?? 0);
-	}
-
-	/**
-	 * @param bool $ignoreGuests
-	 * @param int $lastPing When the last ping is older than the given timestamp, the user is ignored
-	 * @return int
-	 */
-	public function getNumberOfParticipants(bool $ignoreGuests = true, int $lastPing = 0): int {
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->count('*', 'num_participants'))
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-
-		if ($lastPing > 0) {
-			$query->andWhere($query->expr()->gt('last_ping', $query->createNamedParameter($lastPing, IQueryBuilder::PARAM_INT)));
-		}
-
-		if ($ignoreGuests) {
-			$query->andWhere($query->expr()->notIn('participant_type', $query->createNamedParameter([
-				Participant::GUEST,
-				Participant::GUEST_MODERATOR,
-				Participant::USER_SELF_JOINED,
-			], IQueryBuilder::PARAM_INT_ARRAY)));
-		}
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (int) ($row['num_participants'] ?? 0);
-	}
-
 	public function markUsersAsMentioned(array $userIds, int $messageId): void {
 		$query = $this->db->getQueryBuilder();
 		$query->update('talk_participants')
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 6fd6c5ce8a4..747a6b4e81c 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -305,4 +305,35 @@ public function getParticipantUserIds(Room $room, \DateTime $maxLastJoined = nul
 			return $attendee->getActorId();
 		}, $attendees);
 	}
+
+	/**
+	 * @param Room $room
+	 * @return int
+	 */
+	public function getNumberOfUsers(Room $room): int {
+		return $this->attendeeMapper->countActorsByParticipantType($room->getId(), [
+			Participant::USER,
+			Participant::MODERATOR,
+			Participant::OWNER,
+		]);
+	}
+
+	/**
+	 * @param Room $room
+	 * @return int
+	 */
+	public function getNumberOfModerators(Room $room): int {
+		return $this->attendeeMapper->countActorsByParticipantType($room->getId(), [
+			Participant::MODERATOR,
+			Participant::OWNER,
+		]);
+	}
+
+	/**
+	 * @param Room $room
+	 * @return int
+	 */
+	public function getNumberOfActors(Room $room): int {
+		return $this->attendeeMapper->countActorsByParticipantType($room->getId(), []);
+	}
 }

From 1056abd085e686516283fdead730f4f20f8c57e8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 15:26:22 +0200
Subject: [PATCH 032/129] Allow to include/ignore guest moderators

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Service/ParticipantService.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 747a6b4e81c..9f1edee1312 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -320,13 +320,18 @@ public function getNumberOfUsers(Room $room): int {
 
 	/**
 	 * @param Room $room
+	 * @param bool $ignoreGuestModerators
 	 * @return int
 	 */
-	public function getNumberOfModerators(Room $room): int {
-		return $this->attendeeMapper->countActorsByParticipantType($room->getId(), [
+	public function getNumberOfModerators(Room $room, bool $ignoreGuestModerators = true): int {
+		$participantTypes = [
 			Participant::MODERATOR,
 			Participant::OWNER,
-		]);
+		];
+		if (!$ignoreGuestModerators) {
+			$participantTypes[] = Participant::GUEST_MODERATOR;
+		}
+		return $this->attendeeMapper->countActorsByParticipantType($room->getId(), $participantTypes);
 	}
 
 	/**

From 80d8cb4cf972e21fea6cc9c5715c01da48540390 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 15:26:44 +0200
Subject: [PATCH 033/129] Fix adding participants to file rooms

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Files/Listener.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Files/Listener.php b/lib/Files/Listener.php
index bcec71a98e0..64b2a82f233 100644
--- a/lib/Files/Listener.php
+++ b/lib/Files/Listener.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
 use OCP\EventDispatcher\IEventDispatcher;
 
@@ -52,12 +53,16 @@ class Listener {
 
 	/** @var Util */
 	protected $util;
+	/** @var ParticipantService */
+	protected $participantService;
 	/** @var TalkSession */
 	protected $talkSession;
 
 	public function __construct(Util $util,
+								ParticipantService $participantService,
 								TalkSession $talkSession) {
 		$this->util = $util;
+		$this->participantService = $participantService;
 		$this->talkSession = $talkSession;
 	}
 
@@ -148,7 +153,10 @@ public function addUserAsPersistentParticipant(Room $room, string $userId): void
 		try {
 			$room->getParticipant($userId);
 		} catch (ParticipantNotFoundException $e) {
-			$room->addUsers(['userId' => $userId]);
+			$this->participantService->addUsers($room, [[
+				'actorType' => 'users',
+				'actorId' => $userId,
+			]]);
 		}
 	}
 

From cea7509e724cfc3ebb6b3ad27504c0b150a198df Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 15:33:26 +0200
Subject: [PATCH 034/129] Only use addUsers and joinRoom from Participant
 service

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/Notifier.php       |   5 +-
 lib/MatterbridgeManager.php |  12 +++-
 lib/Room.php                | 128 ------------------------------------
 3 files changed, 13 insertions(+), 132 deletions(-)

diff --git a/lib/Chat/Notifier.php b/lib/Chat/Notifier.php
index 8152561e220..4f98e3eef1a 100644
--- a/lib/Chat/Notifier.php
+++ b/lib/Chat/Notifier.php
@@ -340,7 +340,10 @@ protected function shouldMentionedUserBeNotified($userId, IComment $comment): bo
 				// so they can see the room in their room list and
 				// the notification can be parsed and links to an existing room,
 				// where they are a participant of.
-				$room->addUsers(['userId' => $userId]);
+				$this->participantService->addUsers($room, [[
+					'actorType' => 'users',
+					'actorId' => $userId,
+				]]);
 				return true;
 			}
 			return false;
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php
index a2a5ebb5fe6..3487f024c6c 100644
--- a/lib/MatterbridgeManager.php
+++ b/lib/MatterbridgeManager.php
@@ -24,6 +24,7 @@
 namespace OCA\Talk;
 
 use OCA\Talk\Exceptions\RoomNotFoundException;
+use OCA\Talk\Service\ParticipantService;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -53,6 +54,8 @@ class MatterbridgeManager {
 	private $userManager;
 	/** @var Manager */
 	private $manager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var ChatManager */
 	private $chatManager;
 	/** @var IAuthTokenProvider */
@@ -71,6 +74,7 @@ public function __construct(IDBConnection $db,
 								IURLGenerator $urlGenerator,
 								IUserManager $userManager,
 								Manager $manager,
+								ParticipantService $participantService,
 								ChatManager $chatManager,
 								IAuthTokenProvider $tokenProvider,
 								ISecureRandom $random,
@@ -83,6 +87,7 @@ public function __construct(IDBConnection $db,
 		$this->urlGenerator = $urlGenerator;
 		$this->userManager = $userManager;
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 		$this->chatManager = $chatManager;
 		$this->tokenProvider = $tokenProvider;
 		$this->random = $random;
@@ -297,10 +302,11 @@ private function checkBotUser(Room $room, bool $create): array {
 		try {
 			$participant = $room->getParticipant($botUserId);
 		} catch (ParticipantNotFoundException $e) {
-			$room->addUsers([
-				'userId' => $botUserId,
+			$this->participantService->addUsers($room, [[
+				'actorType' => 'users',
+				'actorId' => $botUserId,
 				'participantType' => Participant::USER,
-			]);
+			]]);
 		}
 
 		// delete old bot app tokens for this room
diff --git a/lib/Room.php b/lib/Room.php
index 9390b5493d8..e33f20ff47d 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -735,42 +735,6 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 		return true;
 	}
 
-	/**
-	 * @param array ...$participants
-	 */
-	public function addUsers(array ...$participants): void {
-		$event = new AddParticipantsEvent($this, $participants);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_USERS_ADD, $event);
-
-		$lastMessage = 0;
-		if ($this->getLastMessage() instanceof IComment) {
-			$lastMessage = (int) $this->getLastMessage()->getId();
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('talk_participants')
-			->values(
-				[
-					'user_id' => $query->createParameter('user_id'),
-					'session_id' => $query->createParameter('session_id'),
-					'participant_type' => $query->createParameter('participant_type'),
-					'room_id' => $query->createNamedParameter($this->getId()),
-					'last_ping' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
-					'last_read_message' => $query->createNamedParameter($lastMessage, IQueryBuilder::PARAM_INT),
-				]
-			);
-
-		foreach ($participants as $participant) {
-			$query->setParameter('user_id', $participant['userId'])
-				->setParameter('session_id', $participant['sessionId'] ?? '0')
-				->setParameter('participant_type', $participant['participantType'] ?? Participant::USER, IQueryBuilder::PARAM_INT);
-
-			$query->execute();
-		}
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_USERS_ADD, $event);
-	}
-
 	/**
 	 * @param Participant $participant
 	 * @param int $participantType
@@ -837,57 +801,6 @@ public function removeParticipantBySession(Participant $participant, string $rea
 		$this->dispatcher->dispatch(self::EVENT_AFTER_PARTICIPANT_REMOVE, $event);
 	}
 
-	/**
-	 * @param IUser $user
-	 * @param string $password
-	 * @param bool $passedPasswordProtection
-	 * @return string
-	 * @throws InvalidPasswordException
-	 * @throws UnauthorizedException
-	 */
-	public function joinRoom(IUser $user, string $password, bool $passedPasswordProtection = false): string {
-		$event = new JoinRoomUserEvent($this, $user, $password, $passedPasswordProtection);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_ROOM_CONNECT, $event);
-
-		if ($event->getCancelJoin() === true) {
-			$this->removeUser($user, self::PARTICIPANT_LEFT);
-			throw new UnauthorizedException('Participant is not allowed to join');
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('session_id', $query->createParameter('session_id'))
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($user->getUID())));
-
-		$sessionId = $this->secureRandom->generate(255);
-		$query->setParameter('session_id', $sessionId);
-		$result = $query->execute();
-
-		if ($result === 0) {
-			if (!$event->getPassedPasswordProtection() && !$this->verifyPassword($password)['result']) {
-				throw new InvalidPasswordException();
-			}
-
-			// User joining a public room, without being invited
-			$this->addUsers([
-				'userId' => $user->getUID(),
-				'participantType' => Participant::USER_SELF_JOINED,
-				'sessionId' => $sessionId,
-			]);
-		}
-
-		while (!$this->isSessionUnique($sessionId)) {
-			$sessionId = $this->secureRandom->generate(255);
-			$query->setParameter('session_id', $sessionId);
-			$query->execute();
-		}
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_ROOM_CONNECT, $event);
-
-		return $sessionId;
-	}
-
 	/**
 	 * @param string $userId
 	 * @param string|null $sessionId
@@ -942,47 +855,6 @@ public function leaveRoomAsParticipant(Participant $participant, ?string $sessio
 		$this->dispatcher->dispatch(self::EVENT_AFTER_ROOM_DISCONNECT, $event);
 	}
 
-	/**
-	 * @param string $password
-	 * @param bool $passedPasswordProtection
-	 * @return string
-	 * @throws InvalidPasswordException
-	 * @throws UnauthorizedException
-	 */
-	public function joinRoomGuest(string $password, bool $passedPasswordProtection = false): string {
-		$event = new JoinRoomGuestEvent($this, $password, $passedPasswordProtection);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_GUEST_CONNECT, $event);
-
-		if ($event->getCancelJoin()) {
-			throw new UnauthorizedException('Participant is not allowed to join');
-		}
-
-		if (!$event->getPassedPasswordProtection() && !$this->verifyPassword($password)['result']) {
-			throw new InvalidPasswordException();
-		}
-
-		$lastMessage = 0;
-		if ($this->getLastMessage() instanceof IComment) {
-			$lastMessage = (int) $this->getLastMessage()->getId();
-		}
-
-		$sessionId = $this->secureRandom->generate(255);
-		while (!$this->db->insertIfNotExist('*PREFIX*talk_participants', [
-			'user_id' => '',
-			'room_id' => $this->getId(),
-			'last_ping' => 0,
-			'session_id' => $sessionId,
-			'participant_type' => Participant::GUEST,
-			'last_read_message' => $lastMessage,
-		], ['session_id'])) {
-			$sessionId = $this->secureRandom->generate(255);
-		}
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_GUEST_CONNECT, $event);
-
-		return $sessionId;
-	}
-
 	public function changeInCall(Participant $participant, int $flags): void {
 		$event = new ModifyParticipantEvent($this, $participant, 'inCall', $flags, $participant->getInCallFlags());
 		if ($flags !== Participant::FLAG_DISCONNECTED) {

From 7bdde4735740f44b0e012ef1f572d6567d56411a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Oct 2020 16:02:22 +0200
Subject: [PATCH 035/129] Update the session correctly

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 7 ++++++-
 lib/Service/SessionService.php    | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index fd2cad86d15..8471743a9e6 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -46,6 +46,7 @@
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Service\RoomService;
+use OCA\Talk\Service\SessionService;
 use OCA\Talk\TalkSession;
 use OCA\Talk\Webinary;
 use OCP\App\IAppManager;
@@ -84,6 +85,8 @@ class RoomController extends AEnvironmentAwareController {
 	protected $roomService;
 	/** @var ParticipantService */
 	protected $participantService;
+	/** @var SessionService */
+	protected $sessionService;
 	/** @var AttendeeMapper */
 	protected $attendeeMapper;
 	/** @var GuestManager */
@@ -115,6 +118,7 @@ public function __construct(string $appName,
 								Manager $manager,
 								RoomService $roomService,
 								ParticipantService $participantService,
+								SessionService $sessionService,
 								AttendeeMapper $attendeeMapper,
 								GuestManager $guestManager,
 								IUserStatusManager $statusManager,
@@ -134,6 +138,7 @@ public function __construct(string $appName,
 		$this->manager = $manager;
 		$this->roomService = $roomService;
 		$this->participantService = $participantService;
+		$this->sessionService = $sessionService;
 		$this->attendeeMapper = $attendeeMapper;
 		$this->guestManager = $guestManager;
 		$this->statusManager = $statusManager;
@@ -1436,7 +1441,7 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 		$session = $participant->getSession();
 		if ($session instanceof Session) {
 			$this->session->setSessionForRoom($token, $session->getSessionId());
-			$room->ping($this->userId, $session->getSessionId(), $this->timeFactory->getTime());
+			$this->sessionService->updateLastPings($session, $this->timeFactory->getTime());
 		}
 
 		return new DataResponse($this->formatRoom($room, $participant));
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
index de0721e27b1..132e1824fc1 100644
--- a/lib/Service/SessionService.php
+++ b/lib/Service/SessionService.php
@@ -66,6 +66,11 @@ public function updateMultipleLastPings(array $sessionIds, int $lastPing): void
 		$query->execute();
 	}
 
+	public function updateLastPings(Session $session, int $lastPing): void {
+		$session->setLastPing($lastPing);
+		$this->sessionMapper->update($session);
+	}
+
 	public function createSessionForAttendee(Attendee $attendee): Session {
 		// Currently a participant can only join once
 		$this->sessionMapper->deleteByAttendeeId($attendee->getId());

From 161fb5b8cfb0735b9f6dca671282dd9e0586faf2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 13:26:52 +0200
Subject: [PATCH 036/129] Move changeInCall to particiant service

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/CallController.php            | 37 ++++++----
 lib/Controller/RoomController.php            | 15 ++--
 lib/Listener/BeforeUserLoggedOutListener.php | 11 ++-
 lib/Room.php                                 | 29 --------
 lib/Service/ParticipantService.php           | 75 +++++++++++++++++++-
 5 files changed, 112 insertions(+), 55 deletions(-)

diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 2603922e5c4..6e1c66a083d 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -27,7 +27,9 @@
 
 namespace OCA\Talk\Controller;
 
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -35,13 +37,17 @@
 
 class CallController extends AEnvironmentAwareController {
 
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var ITimeFactory */
 	private $timeFactory;
 
 	public function __construct(string $appName,
 								IRequest $request,
+								ParticipantService $participantService,
 								ITimeFactory $timeFactory) {
 		parent::__construct($appName, $request);
+		$this->participantService = $participantService;
 		$this->timeFactory = $timeFactory;
 	}
 
@@ -56,18 +62,25 @@ public function __construct(string $appName,
 	public function getPeersForCall(): DataResponse {
 		$timeout = $this->timeFactory->getTime() - 30;
 		$result = [];
-		$participants = $this->room->getParticipantsInCall();
+		$participants = $this->participantService->getParticipantsInCall($this->room);
 		foreach ($participants as $participant) {
-			if ($participant->getLastPing() < $timeout) {
+			/** @var Session $session */
+			$session = $participant->getSession();
+			if ($session->getLastPing() < $timeout) {
 				// User is not active in call
 				continue;
 			}
 
+			$userId = '';
+			if ($participant->getAttendee()->getActorType() === 'users') {
+				$userId = $participant->getAttendee()->getActorId();
+			}
+
 			$result[] = [
-				'userId' => $participant->getUser(),
+				'userId' => $userId,
 				'token' => $this->room->getToken(),
-				'lastPing' => $participant->getLastPing(),
-				'sessionId' => $participant->getSessionId(),
+				'lastPing' => $session->getLastPing(),
+				'sessionId' => $session->getSessionId(),
 			];
 		}
 
@@ -84,10 +97,10 @@ public function getPeersForCall(): DataResponse {
 	 * @return DataResponse
 	 */
 	public function joinCall(?int $flags): DataResponse {
-		$this->room->ensureOneToOneRoomIsFilled();
+		$this->participantService->ensureOneToOneRoomIsFilled($this->room);
 
-		$sessionId = $this->participant->getSessionId();
-		if ($sessionId === '0') {
+		$session = $this->participant->getSession();
+		if (!$session instanceof Session) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
@@ -96,7 +109,7 @@ public function joinCall(?int $flags): DataResponse {
 			$flags = Participant::FLAG_IN_CALL | Participant::FLAG_WITH_AUDIO | Participant::FLAG_WITH_VIDEO;
 		}
 
-		$this->room->changeInCall($this->participant, $flags);
+		$this->participantService->changeInCall($this->room, $this->participant, $flags);
 
 		return new DataResponse();
 	}
@@ -108,12 +121,12 @@ public function joinCall(?int $flags): DataResponse {
 	 * @return DataResponse
 	 */
 	public function leaveCall(): DataResponse {
-		$sessionId = $this->participant->getSessionId();
-		if ($sessionId === '0') {
+		$session = $this->participant->getSession();
+		if (!$session instanceof Session) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		$this->room->changeInCall($this->participant, Participant::FLAG_DISCONNECTED);
+		$this->participantService->changeInCall($this->room, $this->participant, Participant::FLAG_DISCONNECTED);
 
 		return new DataResponse();
 	}
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 8471743a9e6..035b07b8e53 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1411,16 +1411,11 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 				], Http::STATUS_CONFLICT);
 			}
 
-//			if ($previousSession->getInCall() !== Participant::FLAG_DISCONNECTED) {
-//				// FIXME Session vs Participant
-//				$room->changeInCall($previousSession, Participant::FLAG_DISCONNECTED);
-//			}
-//
-//			if ($this->userId === null) {
-//				$room->removeParticipantBySession($previousParticipant, Room::PARTICIPANT_LEFT);
-//			} else {
-//				$room->leaveRoomAsParticipant($previousSession);
-//			}
+			if ($previousSession->getInCall() !== Participant::FLAG_DISCONNECTED) {
+				$this->participantService->changeInCall($room, $previousParticipant, Participant::FLAG_DISCONNECTED);
+			}
+
+			$this->participantService->leaveRoomAsSession($room, $previousParticipant);
 		}
 
 		$user = $this->userManager->get($this->userId);
diff --git a/lib/Listener/BeforeUserLoggedOutListener.php b/lib/Listener/BeforeUserLoggedOutListener.php
index 160f7b14673..41d65c98740 100644
--- a/lib/Listener/BeforeUserLoggedOutListener.php
+++ b/lib/Listener/BeforeUserLoggedOutListener.php
@@ -27,6 +27,7 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -37,12 +38,16 @@ class BeforeUserLoggedOutListener implements IEventListener {
 
 	/** @var Manager */
 	private $manager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var TalkSession */
 	private $talkSession;
 
 	public function __construct(Manager $manager,
+								ParticipantService $participantService,
 								TalkSession $talkSession) {
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 		$this->talkSession = $talkSession;
 	}
 
@@ -63,10 +68,10 @@ public function handle(Event $event): void {
 			try {
 				$room = $this->manager->getRoomForSession($user->getUID(), $sessionId);
 				$participant = $room->getParticipant($user->getUID());
-				if ($participant->getInCallFlags() !== Participant::FLAG_DISCONNECTED) {
-					$room->changeInCall($participant, Participant::FLAG_DISCONNECTED);
+				if ($participant->getSession() && $participant->getSession()->getInCall() !== Participant::FLAG_DISCONNECTED) {
+					$this->participantService->changeInCall($room, $participant, Participant::FLAG_DISCONNECTED);
 				}
-				$room->leaveRoom($user->getUID(), $sessionId);
+				$this->participantService->leaveRoomAsSession($room, $participant);
 			} catch (RoomNotFoundException $e) {
 			} catch (ParticipantNotFoundException $e) {
 			}
diff --git a/lib/Room.php b/lib/Room.php
index e33f20ff47d..bdeece6b6b4 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -855,35 +855,6 @@ public function leaveRoomAsParticipant(Participant $participant, ?string $sessio
 		$this->dispatcher->dispatch(self::EVENT_AFTER_ROOM_DISCONNECT, $event);
 	}
 
-	public function changeInCall(Participant $participant, int $flags): void {
-		$event = new ModifyParticipantEvent($this, $participant, 'inCall', $flags, $participant->getInCallFlags());
-		if ($flags !== Participant::FLAG_DISCONNECTED) {
-			$this->dispatcher->dispatch(self::EVENT_BEFORE_SESSION_JOIN_CALL, $event);
-		} else {
-			$this->dispatcher->dispatch(self::EVENT_BEFORE_SESSION_LEAVE_CALL, $event);
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('in_call', $query->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-
-		if ($flags !== Participant::FLAG_DISCONNECTED) {
-			$query->set('last_joined_call', $query->createNamedParameter(
-				$this->timeFactory->getDateTime(), IQueryBuilder::PARAM_DATE
-			));
-		}
-
-		$query->execute();
-
-		if ($flags !== Participant::FLAG_DISCONNECTED) {
-			$this->dispatcher->dispatch(self::EVENT_AFTER_SESSION_JOIN_CALL, $event);
-		} else {
-			$this->dispatcher->dispatch(self::EVENT_AFTER_SESSION_LEAVE_CALL, $event);
-		}
-	}
-
 	/**
 	 * @param string $password
 	 * @return array
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 9f1edee1312..9b6a81b6d42 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -38,6 +38,7 @@
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -61,6 +62,8 @@ class ParticipantService {
 	private $dispatcher;
 	/** @var IUserManager */
 	private $userManager;
+	/** @var ITimeFactory */
+	private $timeFactory;
 
 	public function __construct(AttendeeMapper $attendeeMapper,
 								SessionMapper $sessionMapper,
@@ -68,7 +71,8 @@ public function __construct(AttendeeMapper $attendeeMapper,
 								ISecureRandom $secureRandom,
 								IDBConnection $connection,
 								IEventDispatcher $dispatcher,
-								IUserManager $userManager) {
+								IUserManager $userManager,
+								ITimeFactory $timeFactory) {
 		$this->attendeeMapper = $attendeeMapper;
 		$this->sessionMapper = $sessionMapper;
 		$this->sessionService = $sessionService;
@@ -76,6 +80,7 @@ public function __construct(AttendeeMapper $attendeeMapper,
 		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
 		$this->userManager = $userManager;
+		$this->timeFactory = $timeFactory;
 	}
 
 	public function updateParticipantType(Room $room, Participant $participant, int $participantType): void {
@@ -259,6 +264,39 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 		}
 	}
 
+	public function changeInCall(Room $room, Participant $participant, int $flags): void {
+		$session = $participant->getSession();
+		if (!$session instanceof Session) {
+			return;
+		}
+
+		$event = new ModifyParticipantEvent($room, $participant, 'inCall', $flags, $session->getInCall());
+		if ($flags !== Participant::FLAG_DISCONNECTED) {
+			$this->dispatcher->dispatch(Room::EVENT_BEFORE_SESSION_JOIN_CALL, $event);
+		} else {
+			$this->dispatcher->dispatch(Room::EVENT_BEFORE_SESSION_LEAVE_CALL, $event);
+		}
+
+		$session->setInCall($flags);
+		$this->sessionMapper->update($session);
+
+		if ($flags !== Participant::FLAG_DISCONNECTED) {
+			$attendee = $participant->getAttendee();
+			$attendee->setLastJoinedCall($this->timeFactory->getTime());
+			$this->attendeeMapper->update($attendee);
+		}
+
+		if ($flags !== Participant::FLAG_DISCONNECTED) {
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_SESSION_JOIN_CALL, $event);
+		} else {
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_SESSION_LEAVE_CALL, $event);
+		}
+	}
+
+	/**
+	 * @param Room $room
+	 * @return Participant[]
+	 */
 	public function getParticipantsForRoom(Room $room): array {
 		$query = $this->connection->getQueryBuilder();
 
@@ -293,6 +331,41 @@ public function getParticipantsForRoom(Room $room): array {
 		return $participants;
 	}
 
+	/**
+	 * @param Room $room
+	 * @return Participant[]
+	 */
+	public function getParticipantsInCall(Room $room): array {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select('a.*')
+			->selectAlias('a.id', 'a_id')
+			->addSelect('s.*')
+			->selectAlias('s.id', 's_id')
+			->from('talk_sessions', 's')
+			->leftJoin(
+				's', 'talk_attendees', 'a',
+				$query->expr()->eq('s.attendee_id', 'a.id')
+			)
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->neq('s.in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)));
+
+		$participants = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
+			$session = $this->sessionMapper->createSessionFromRow($row);
+
+			$participants[] = new Participant(
+				\OC::$server->getDatabaseConnection(), // FIXME
+				\OC::$server->getConfig(), // FIXME
+				$room, $attendee, $session);
+		}
+		$result->closeCursor();
+
+		return $participants;
+	}
+
 	/**
 	 * @param Room $room
 	 * @param \DateTime|null $maxLastJoined

From be393df84ede7e15ff85a7f8aec2055399c0b324 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 13:59:16 +0200
Subject: [PATCH 037/129] Fix session handling so lobby can kick you correctly

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/SystemMessage/Listener.php    | 4 +++-
 lib/Middleware/InjectionMiddleware.php | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index c8677ff9c27..d443b23124c 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -31,6 +31,7 @@
 use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Share\RoomShareProvider;
@@ -84,7 +85,8 @@ public static function register(IEventDispatcher $dispatcher): void {
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_LEAVE_CALL, static function (ModifyParticipantEvent $event) {
 			$room = $event->getRoom();
 
-			if ($event->getParticipant()->getInCallFlags() === Participant::FLAG_DISCONNECTED) {
+			$session = $event->getParticipant()->getSession();
+			if (!$session instanceof Session || $session->getInCall() === Participant::FLAG_DISCONNECTED) {
 				// This happens in case the user was kicked/lobbied
 				return;
 			}
diff --git a/lib/Middleware/InjectionMiddleware.php b/lib/Middleware/InjectionMiddleware.php
index 5ef6d17baba..3e12c8484c5 100644
--- a/lib/Middleware/InjectionMiddleware.php
+++ b/lib/Middleware/InjectionMiddleware.php
@@ -139,11 +139,11 @@ protected function getLoggedInOrGuest(AEnvironmentAwareController $controller, b
 		$room = $this->manager->getRoomForUserByToken($token, $this->userId);
 		$controller->setRoom($room);
 
-		if ($this->userId !== null) {
-			$participant = $room->getParticipant($this->userId);
-		} else {
-			$sessionId = $this->talkSession->getSessionForRoom($token);
+		$sessionId = $this->talkSession->getSessionForRoom($token);
+		if ($sessionId !== null) {
 			$participant = $room->getParticipantBySession($sessionId);
+		} else {
+			$participant = $room->getParticipant($this->userId);
 		}
 		$controller->setParticipant($participant);
 

From 1183b6fe8054bd891362ec407c20a9015bfeac86 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 14:34:14 +0200
Subject: [PATCH 038/129] Remove users when they are denied (e.g. the share was
 removed)

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Service/ParticipantService.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 9b6a81b6d42..976ae892f46 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -29,7 +29,9 @@
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Events\ParticipantEvent;
 use OCA\Talk\Events\RemoveParticipantEvent;
+use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Exceptions\InvalidPasswordException;
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\AttendeeMapper;
@@ -110,7 +112,7 @@ public function joinRoom(Room $room, IUser $user, string $password, bool $passed
 		$this->dispatcher->dispatch(Room::EVENT_BEFORE_ROOM_CONNECT, $event);
 
 		if ($event->getCancelJoin() === true) {
-			// FIXME $this->removeUser($user, self::PARTICIPANT_LEFT);
+			$this->removeUser($room, $user, Room::PARTICIPANT_LEFT);
 			throw new UnauthorizedException('Participant is not allowed to join');
 		}
 
@@ -264,6 +266,27 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 		}
 	}
 
+	public function removeUser(Room $room, IUser $user, string $reason): void {
+		try {
+			$participant = $room->getParticipant($user->getUID());
+		} catch (ParticipantNotFoundException $e) {
+			return;
+		}
+
+		$event = new RemoveUserEvent($room, $participant, $user, $reason);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_USER_REMOVE, $event);
+
+		$session = $participant->getSession();
+		if ($session instanceof Session) {
+			$this->sessionMapper->delete($session);
+		}
+
+		$attendee = $participant->getAttendee();
+		$this->attendeeMapper->delete($attendee);
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_USER_REMOVE, $event);
+	}
+
 	public function changeInCall(Room $room, Participant $participant, int $flags): void {
 		$session = $participant->getSession();
 		if (!$session instanceof Session) {

From 4d3c53425f1d233fb6977da18321cf6f1d0c57ee Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 14:40:42 +0200
Subject: [PATCH 039/129] Fix PHP CS

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/ChatController.php  | 3 ---
 lib/Controller/RoomController.php  | 6 +++---
 lib/Manager.php                    | 1 -
 lib/Room.php                       | 5 -----
 lib/Service/ParticipantService.php | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 784d5e50ad8..4733ef7e58a 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -31,7 +31,6 @@
 use OCA\Talk\GuestManager;
 use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Message;
-use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
@@ -44,11 +43,9 @@
 use OCP\Comments\IComment;
 use OCP\Comments\MessageTooLongException;
 use OCP\Comments\NotFoundException;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserManager;
-use OCP\User\Events\UserLiveStatusEvent;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use OCP\UserStatus\IUserStatus;
 
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 035b07b8e53..0d939ad2056 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -457,7 +457,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 						$numActiveGuests++;
 					}
 				}
-			} else if ($participant->getAttendee()->getActorType() === 'users') {
+			} elseif ($participant->getAttendee()->getActorType() === 'users') {
 				$attendee = $participant->getAttendee();
 				$session = $participant->getSession();
 				$user = $this->userManager->get($attendee->getActorId());
@@ -1011,7 +1011,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 			&& $includeStatus
 			&& count($participants) < 100
 			&& $this->appManager->isEnabledForUser('user_status')) {
-			$userIds = array_filter(array_map(function(Participant $participant) {
+			$userIds = array_filter(array_map(static function (Participant $participant) {
 				if ($participant->getAttendee()->getActorType() === 'users') {
 					return $participant->getAttendee()->getActorId();
 				}
@@ -1023,7 +1023,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 			$headers['X-Nextcloud-Has-User-Statuses'] = true;
 		}
 
-		$guestSessions = array_filter(array_map(function(Participant $participant) {
+		$guestSessions = array_filter(array_map(static function (Participant $participant) {
 			$session = $participant->getSession();
 			if (!$session || $participant->getAttendee()->getActorType() !== 'guests') {
 				return null;
diff --git a/lib/Manager.php b/lib/Manager.php
index 44d1d3d088e..6dc333a2738 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -483,7 +483,6 @@ public function getRoomByToken(string $token, ?string $preloadUserId = null): Ro
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
 
 		if ($preloadUserId !== null) {
-
 			$query->addSelect('a.*')
 				->selectAlias('a.id', 'a_id');
 			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
diff --git a/lib/Room.php b/lib/Room.php
index bdeece6b6b4..ca88bea5deb 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -27,9 +27,6 @@
 
 namespace OCA\Talk;
 
-use OCA\Talk\Events\AddParticipantsEvent;
-use OCA\Talk\Events\JoinRoomGuestEvent;
-use OCA\Talk\Events\JoinRoomUserEvent;
 use OCA\Talk\Events\ModifyLobbyEvent;
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Events\ModifyRoomEvent;
@@ -39,9 +36,7 @@
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Events\SignalingRoomPropertiesEvent;
 use OCA\Talk\Events\VerifyRoomPasswordEvent;
-use OCA\Talk\Exceptions\InvalidPasswordException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
-use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 976ae892f46..2f2a57e9040 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -397,7 +397,7 @@ public function getParticipantsInCall(Room $room): array {
 	public function getParticipantUserIds(Room $room, \DateTime $maxLastJoined = null): array {
 		$attendees = $this->attendeeMapper->getActorsByType($room->getId(), 'users', $maxLastJoined);
 
-		return array_map(function(Attendee $attendee) {
+		return array_map(static function (Attendee $attendee) {
 			return $attendee->getActorId();
 		}, $attendees);
 	}

From ca00f57089e3ca71257977474b39880b961ca7ec Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 14:56:44 +0200
Subject: [PATCH 040/129] Fix typo in function name

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/Parser/SystemMessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index ef311aa8007..daac5e32947 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -340,7 +340,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
 						// 1. Only be executed on "Waiting for new messages"
 						// 2. Once per request
 						\OC_Util::tearDownFS();
-						\OC_Util::setupFS($participant->ggetAttendee()->getActorId());
+						\OC_Util::setupFS($participant->getAttendee()->getActorId());
 						$userNodes = $userFolder->getById($node->getId());
 					}
 

From a710ccb7a79faf4c13b4feca1b54a34c8b9646aa Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 14:56:55 +0200
Subject: [PATCH 041/129] Fix searching for mention auto completes

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/AutoComplete/SearchPlugin.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Chat/AutoComplete/SearchPlugin.php b/lib/Chat/AutoComplete/SearchPlugin.php
index cfa015adb5f..30db6ef4721 100644
--- a/lib/Chat/AutoComplete/SearchPlugin.php
+++ b/lib/Chat/AutoComplete/SearchPlugin.php
@@ -96,10 +96,11 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 		} else {
 			$participants = $this->room->getParticipants();
 			foreach ($participants as $participant) {
-				if ($participant->isGuest()) {
-					$guestSessionHashes[] = sha1($participant->getSessionId());
-				} else {
-					$userIds[] = $participant->getUser();
+				$attendee = $participant->getAttendee();
+				if ($attendee->getActorType() === 'guests') {
+					$guestSessionHashes[] = $attendee->getActorId();
+				} elseif ($attendee->getActorType() === 'users')  {
+					$userIds[] = $attendee->getActorId();
 				}
 			}
 		}

From 8a8a29f28b501636e4b065e2fe1a880ecacd1b0e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 15:08:46 +0200
Subject: [PATCH 042/129] Fix chat code base

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/AutoComplete/SearchPlugin.php |  7 ++-
 lib/Chat/Notifier.php                  | 21 +++++----
 lib/Chat/Parser/UserMention.php        |  7 ++-
 lib/Chat/SystemMessage/Listener.php    | 15 ++++--
 lib/Controller/ChatController.php      | 64 +++++++++++++++++---------
 lib/Controller/RoomController.php      |  2 +-
 lib/Service/SessionService.php         |  2 +-
 7 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/lib/Chat/AutoComplete/SearchPlugin.php b/lib/Chat/AutoComplete/SearchPlugin.php
index 30db6ef4721..da38d2f093e 100644
--- a/lib/Chat/AutoComplete/SearchPlugin.php
+++ b/lib/Chat/AutoComplete/SearchPlugin.php
@@ -26,6 +26,7 @@
 use OCA\Talk\Files\Util;
 use OCA\Talk\GuestManager;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
 use OCP\Collaboration\Collaborators\ISearchPlugin;
 use OCP\Collaboration\Collaborators\ISearchResult;
@@ -42,6 +43,8 @@ class SearchPlugin implements ISearchPlugin {
 	protected $guestManager;
 	/** @var TalkSession */
 	protected $talkSession;
+	/** @var ParticipantService */
+	protected $participantService;
 	/** @var Util */
 	protected $util;
 	/** @var string|null */
@@ -55,12 +58,14 @@ class SearchPlugin implements ISearchPlugin {
 	public function __construct(IUserManager $userManager,
 								GuestManager $guestManager,
 								TalkSession $talkSession,
+								ParticipantService $participantService,
 								Util $util,
 								?string $userId,
 								IL10N $l) {
 		$this->userManager = $userManager;
 		$this->guestManager = $guestManager;
 		$this->talkSession = $talkSession;
+		$this->participantService = $participantService;
 		$this->util = $util;
 		$this->userId = $userId;
 		$this->l = $l;
@@ -94,7 +99,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 				$userIds[] = $userId;
 			}
 		} else {
-			$participants = $this->room->getParticipants();
+			$participants = $this->participantService->getParticipantsForRoom($this->room);
 			foreach ($participants as $participant) {
 				$attendee = $participant->getAttendee();
 				if ($attendee->getActorType() === 'guests') {
diff --git a/lib/Chat/Notifier.php b/lib/Chat/Notifier.php
index 4f98e3eef1a..a10bebba91b 100644
--- a/lib/Chat/Notifier.php
+++ b/lib/Chat/Notifier.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Files\Util;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -97,7 +98,6 @@ public function notifyMentionedUsers(Room $chat, IComment $comment, array $alrea
 
 		if ($mentionedAll !== false) {
 			$mentionedUserIds = array_unique(array_merge($mentionedUserIds, $this->participantService->getParticipantUserIds($chat)));
-			$mentionedUserIds = array_unique(array_merge($mentionedUserIds, $chat->getParticipantUserIds()));
 		}
 
 		$notification = $this->createNotification($chat, $comment, 'mention');
@@ -173,7 +173,7 @@ public function notifyOtherParticipant(Room $chat, IComment $comment, array $alr
 				continue;
 			}
 
-			$notification->setUser($participant->getUser());
+			$notification->setUser($participant->getAttendee()->getActorId());
 			$this->notificationManager->notify($notification);
 		}
 
@@ -185,7 +185,7 @@ public function notifyOtherParticipant(Room $chat, IComment $comment, array $alr
 					continue;
 				}
 
-				$notification->setUser($participant->getUser());
+				$notification->setUser($participant->getAttendee()->getActorId());
 				$this->notificationManager->notify($notification);
 			}
 		}
@@ -307,7 +307,7 @@ protected function getDefaultGroupNotification(): int {
 	 * @param IComment $comment
 	 * @return bool
 	 */
-	protected function shouldMentionedUserBeNotified($userId, IComment $comment): bool {
+	protected function shouldMentionedUserBeNotified(string $userId, IComment $comment): bool {
 		if ($comment->getActorType() === 'users' && $userId === $comment->getActorId()) {
 			// Do not notify the user if they mentioned themselves
 			return false;
@@ -325,8 +325,8 @@ protected function shouldMentionedUserBeNotified($userId, IComment $comment): bo
 
 		try {
 			$participant = $room->getParticipant($userId);
-			$notificationLevel = $participant->getNotificationLevel();
-			if ($participant->getNotificationLevel() === Participant::NOTIFY_DEFAULT) {
+			$notificationLevel = $participant->getAttendee()->getNotificationLevel();
+			if ($notificationLevel === Participant::NOTIFY_DEFAULT) {
 				if ($room->getType() === Room::ONE_TO_ONE_CALL) {
 					$notificationLevel = Participant::NOTIFY_ALWAYS;
 				} else {
@@ -364,20 +364,21 @@ protected function shouldMentionedUserBeNotified($userId, IComment $comment): bo
 	 * @return bool
 	 */
 	protected function shouldParticipantBeNotified(Participant $participant, IComment $comment, array $alreadyNotifiedUsers): bool {
-		if ($participant->isGuest()) {
+		if ($participant->getAttendee()->getActorType() !== 'users') {
 			return false;
 		}
 
-		if ($comment->getActorType() === 'users' && $participant->getUser() === $comment->getActorId()) {
+		$userId = $participant->getAttendee()->getActorId();
+		if ($comment->getActorType() === 'users' && $userId === $comment->getActorId()) {
 			// Do not notify the author
 			return false;
 		}
 
-		if (\in_array($participant->getUser(), $alreadyNotifiedUsers, true)) {
+		if (\in_array($userId, $alreadyNotifiedUsers, true)) {
 			return false;
 		}
 
-		if ($participant->getSessionId() !== '0') {
+		if ($participant->getSession() instanceof Session) {
 			// User is online
 			return false;
 		}
diff --git a/lib/Chat/Parser/UserMention.php b/lib/Chat/Parser/UserMention.php
index b311abeca28..67faa2bbfbd 100644
--- a/lib/Chat/Parser/UserMention.php
+++ b/lib/Chat/Parser/UserMention.php
@@ -109,10 +109,15 @@ public function parseMessage(Message $chatMessage): void {
 			$message = str_replace($placeholder, '{' . $mentionParameterId . '}', $message);
 
 			if ($mention['type'] === 'call') {
+				$userId = '';
+				if ($chatMessage->getParticipant()->getAttendee()->getActorType() === 'users') {
+					$userId = $chatMessage->getParticipant()->getAttendee()->getActorId();
+				}
+
 				$messageParameters[$mentionParameterId] = [
 					'type' => $mention['type'],
 					'id' => $chatMessage->getRoom()->getToken(),
-					'name' => $chatMessage->getRoom()->getDisplayName($chatMessage->getParticipant()->getAttendee()->getActorId()),
+					'name' => $chatMessage->getRoom()->getDisplayName($userId),
 					'call-type' => $this->getRoomType($chatMessage->getRoom()),
 				];
 			} elseif ($mention['type'] === 'guest') {
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index d443b23124c..0de1484ed94 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -216,23 +216,28 @@ public static function register(IEventDispatcher $dispatcher): void {
 		});
 		$dispatcher->addListener(Room::EVENT_AFTER_PARTICIPANT_TYPE_SET, static function (ModifyParticipantEvent $event) {
 			$room = $event->getRoom();
+			$attendee = $event->getParticipant()->getAttendee();
+
+			if ($attendee->getActorType() !== 'users' && $attendee->getActorType() !== 'guests') {
+				return;
+			}
 
 			if ($event->getNewValue() === Participant::MODERATOR) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'moderator_promoted', ['user' => $event->getParticipant()->getAttendee()->getActorId()]);
+				$listener->sendSystemMessage($room, 'moderator_promoted', ['user' => $attendee->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::USER) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'moderator_demoted', ['user' => $event->getParticipant()->getAttendee()->getActorId()]);
+				$listener->sendSystemMessage($room, 'moderator_demoted', ['user' => $attendee->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::GUEST_MODERATOR) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'guest_moderator_promoted', ['session' => $event->getParticipant()->getAttendee()->getActorId()]);
+				$listener->sendSystemMessage($room, 'guest_moderator_promoted', ['session' => $attendee->getActorId()]);
 			} elseif ($event->getNewValue() === Participant::GUEST) {
 				/** @var self $listener */
 				$listener = \OC::$server->query(self::class);
-				$listener->sendSystemMessage($room, 'guest_moderator_demoted', ['session' => $event->getParticipant()->getAttendee()->getActorId()]);
+				$listener->sendSystemMessage($room, 'guest_moderator_demoted', ['session' => $attendee->getActorId()]);
 			}
 		});
 		$listener = function (GenericEvent $event) {
@@ -258,7 +263,7 @@ public static function register(IEventDispatcher $dispatcher): void {
 
 	protected function sendSystemMessage(Room $room, string $message, array $parameters = [], Participant $participant = null): void {
 		if ($participant instanceof Participant) {
-			$actorType = $participant->isGuest() ? 'guests' : 'users';
+			$actorType = $participant->getAttendee()->getActorType();
 			$actorId = $participant->getAttendee()->getActorId();
 		} else {
 			$user = $this->userSession->getUser();
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 4733ef7e58a..be752d236bc 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -31,8 +31,11 @@
 use OCA\Talk\GuestManager;
 use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Message;
+use OCA\Talk\Model\Session;
+use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
+use OCA\Talk\Service\SessionService;
 use OCA\Talk\TalkSession;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
@@ -43,9 +46,11 @@
 use OCP\Comments\IComment;
 use OCP\Comments\MessageTooLongException;
 use OCP\Comments\NotFoundException;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserManager;
+use OCP\User\Events\UserLiveStatusEvent;
 use OCP\UserStatus\IManager as IUserStatusManager;
 use OCP\UserStatus\IUserStatus;
 
@@ -72,6 +77,9 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var ParticipantService */
 	private $participantService;
 
+	/** @var SessionService */
+	private $sessionService;
+
 	/** @var GuestManager */
 	private $guestManager;
 
@@ -93,11 +101,15 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var ISearchResult */
 	private $searchResult;
 
-	/** @var IL10N */
-	private $l;
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
+	/** @var IEventDispatcher */
+	protected $eventDispatcher;
+
+	/** @var IL10N */
+	private $l;
+
 	public function __construct(string $appName,
 								?string $UserId,
 								IRequest $request,
@@ -107,6 +119,7 @@ public function __construct(string $appName,
 								ChatManager $chatManager,
 								AttendeeMapper $attendeeMapper,
 								ParticipantService $participantService,
+								SessionService $sessionService,
 								GuestManager $guestManager,
 								MessageParser $messageParser,
 								IManager $autoCompleteManager,
@@ -114,6 +127,7 @@ public function __construct(string $appName,
 								SearchPlugin $searchPlugin,
 								ISearchResult $searchResult,
 								ITimeFactory $timeFactory,
+								IEventDispatcher $eventDispatcher,
 								IL10N $l) {
 		parent::__construct($appName, $request);
 
@@ -124,6 +138,7 @@ public function __construct(string $appName,
 		$this->chatManager = $chatManager;
 		$this->attendeeMapper = $attendeeMapper;
 		$this->participantService = $participantService;
+		$this->sessionService = $sessionService;
 		$this->guestManager = $guestManager;
 		$this->messageParser = $messageParser;
 		$this->autoCompleteManager = $autoCompleteManager;
@@ -131,6 +146,7 @@ public function __construct(string $appName,
 		$this->searchPlugin = $searchPlugin;
 		$this->searchResult = $searchResult;
 		$this->timeFactory = $timeFactory;
+		$this->eventDispatcher = $eventDispatcher;
 		$this->l = $l;
 	}
 
@@ -273,26 +289,30 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 		$limit = min(200, $limit);
 		$timeout = min(30, $timeout);
 
-//		if ($noStatusUpdate === 0 && $this->participant->getSessionId() !== '0') {
-//			// The mobile apps dont do internal signaling unless in a call
-//			$isMobileApp = $this->request->isUserAgent([
-//				IRequest::USER_AGENT_TALK_ANDROID,
-//				IRequest::USER_AGENT_TALK_IOS,
-//			]);
-//			if ($isMobileApp && $this->participant->getInCallFlags() === Participant::FLAG_DISCONNECTED) {
-//				$this->room->ping($this->participant->getUser(), $this->participant->getSessionId(), $this->timeFactory->getTime());
-//
-//				if ($lookIntoFuture) {
-//					// Bump the user status again
-//					$event = new UserLiveStatusEvent(
-//						$this->userManager->get($this->participant->getUser()),
-//						IUserStatus::ONLINE,
-//						$this->timeFactory->getTime()
-//					);
-//					$this->eventDispatcher->dispatchTyped($event);
-//				}
-//			}
-//		}
+		$session = $this->participant->getSession();
+		if ($noStatusUpdate === 0 && $session instanceof Session) {
+			// The mobile apps dont do internal signaling unless in a call
+			$isMobileApp = $this->request->isUserAgent([
+				IRequest::USER_AGENT_TALK_ANDROID,
+				IRequest::USER_AGENT_TALK_IOS,
+			]);
+			if ($isMobileApp && $session->getInCall() === Participant::FLAG_DISCONNECTED) {
+				$this->sessionService->updateLastPing($session, $this->timeFactory->getTime());
+
+				if ($lookIntoFuture) {
+					$attendee = $this->participant->getAttendee();
+					if ($attendee->getActorType() === 'users') {
+						// Bump the user status again
+						$event = new UserLiveStatusEvent(
+							$this->userManager->get($attendee->getActorId()),
+							IUserStatus::ONLINE,
+							$this->timeFactory->getTime()
+						);
+						$this->eventDispatcher->dispatchTyped($event);
+					}
+				}
+			}
+		}
 
 		/**
 		 * Automatic last read message marking for old clients
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 0d939ad2056..f638fce4d53 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1436,7 +1436,7 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 		$session = $participant->getSession();
 		if ($session instanceof Session) {
 			$this->session->setSessionForRoom($token, $session->getSessionId());
-			$this->sessionService->updateLastPings($session, $this->timeFactory->getTime());
+			$this->sessionService->updateLastPing($session, $this->timeFactory->getTime());
 		}
 
 		return new DataResponse($this->formatRoom($room, $participant));
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
index 132e1824fc1..c73027f580e 100644
--- a/lib/Service/SessionService.php
+++ b/lib/Service/SessionService.php
@@ -66,7 +66,7 @@ public function updateMultipleLastPings(array $sessionIds, int $lastPing): void
 		$query->execute();
 	}
 
-	public function updateLastPings(Session $session, int $lastPing): void {
+	public function updateLastPing(Session $session, int $lastPing): void {
 		$session->setLastPing($lastPing);
 		$this->sessionMapper->update($session);
 	}

From 36175c422d2e555ba413b2e5c258cd049a73eee4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 16:07:07 +0200
Subject: [PATCH 043/129] Move some more functions to the services

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php      |  4 +-
 lib/Controller/SignalingController.php | 72 +++++++++++++++-----------
 lib/GuestManager.php                   |  2 +-
 lib/Model/AttendeeMapper.php           | 12 +++++
 lib/Model/SessionMapper.php            | 12 +++++
 lib/Room.php                           | 71 -------------------------
 lib/Service/ParticipantService.php     | 42 +++++++++++++++
 lib/Service/SessionService.php         |  7 +++
 8 files changed, 118 insertions(+), 104 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index f638fce4d53..96a05d3101d 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -483,7 +483,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 		}
 
 		if ($cleanGuests) {
-			$room->cleanGuestParticipants();
+			$this->participantService->cleanGuestParticipants($room);
 		}
 
 		$lastMessage = $room->getLastMessage();
@@ -1086,7 +1086,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 		}
 
 		if ($cleanGuests) {
-			$this->room->cleanGuestParticipants();
+			$this->participantService->cleanGuestParticipants($this->room);
 		}
 
 		return new DataResponse($results, Http::STATUS_OK, $headers);
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 7166e6eb8cb..7d638ab5dac 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -30,8 +30,10 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Service\SessionService;
 use OCA\Talk\Signaling\Messages;
 use OCA\Talk\TalkSession;
@@ -61,6 +63,8 @@ class SignalingController extends OCSController {
 	private $session;
 	/** @var Manager */
 	private $manager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var SessionService */
 	private $sessionService;
 	/** @var IDBConnection */
@@ -84,6 +88,7 @@ public function __construct(string $appName,
 								\OCA\Talk\Signaling\Manager $signalingManager,
 								TalkSession $session,
 								Manager $manager,
+								ParticipantService $participantService,
 								SessionService $sessionService,
 								IDBConnection $connection,
 								Messages $messages,
@@ -98,6 +103,7 @@ public function __construct(string $appName,
 		$this->session = $session;
 		$this->dbConnection = $connection;
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 		$this->sessionService = $sessionService;
 		$this->messages = $messages;
 		$this->userManager = $userManager;
@@ -276,9 +282,12 @@ public function pullMessages(string $token): DataResponse {
 			}
 
 			$room = $this->manager->getRoomForSession($this->userId, $sessionId);
+			$participant = $room->getParticipantBySession($sessionId); // FIXME this causes another query
 
 			$pingTimestamp = $this->timeFactory->getTime();
-			$room->ping($this->userId, $sessionId, $pingTimestamp);
+			if ($participant->getSession() instanceof Session) {
+				$this->sessionService->updateLastPing($participant->getSession(), $pingTimestamp);
+			}
 		} catch (RoomNotFoundException $e) {
 			return new DataResponse([['type' => 'usersInRoom', 'data' => []]], Http::STATUS_NOT_FOUND);
 		}
@@ -359,19 +368,25 @@ protected function getUsersInRoom(Room $room, int $pingTimestamp): array {
 		$timestamp = min($this->timeFactory->getTime() - (self::PULL_MESSAGES_TIMEOUT + 10), $pingTimestamp);
 		// "- 1" is needed because only the participants whose last ping is
 		// greater than the given timestamp are returned.
-		$participants = $room->getParticipants($timestamp - 1);
+		$participants = $this->participantService->getParticipantsForRoom($room);
 		foreach ($participants as $participant) {
-			if ($participant->getSessionId() === '0') {
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
 				// User is not active
 				continue;
 			}
 
+			$userId = '';
+			if ($participant->getAttendee()->getActorType() === 'users') {
+				$userId = $participant->getAttendee()->getActorId();
+			}
+
 			$usersInRoom[] = [
-				'userId' => $participant->getUser(),
+				'userId' => $userId,
 				'roomId' => $room->getId(),
-				'lastPing' => $participant->getLastPing(),
-				'sessionId' => $participant->getSessionId(),
-				'inCall' => $participant->getInCallFlags(),
+				'lastPing' => $session->getLastPing(),
+				'sessionId' => $session->getSessionId(),
+				'inCall' => $session->getInCall(),
 			];
 		}
 
@@ -522,33 +537,30 @@ private function backendRoom(array $roomRequest): DataResponse {
 		}
 
 		$participant = null;
-		if (!empty($userId)) {
-			// User trying to join room.
-			try {
-				$participant = $room->getParticipant($userId);
-			} catch (ParticipantNotFoundException $e) {
-				// Ignore, will check for public rooms below.
-			}
-		}
-
-		if (!$participant instanceof Participant) {
-			// User was not invited to the room, check for access to public room.
-			try {
-				$participant = $room->getParticipantBySession($sessionId);
-			} catch (ParticipantNotFoundException $e) {
-				// Return generic error to avoid leaking which rooms exist.
-				return new DataResponse([
-					'type' => 'error',
-					'error' => [
-						'code' => 'no_such_room',
-						'message' => 'The user is not invited to this room.',
-					],
-				]);
+		try {
+			$participant = $room->getParticipantBySession($sessionId);
+		} catch (ParticipantNotFoundException $e) {
+			if (!empty($userId)) {
+				// User trying to join room.
+				try {
+					$participant = $room->getParticipant($userId);
+				} catch (ParticipantNotFoundException $e) {
+					// Return generic error to avoid leaking which rooms exist.
+					return new DataResponse([
+						'type' => 'error',
+						'error' => [
+							'code' => 'no_such_room',
+							'message' => 'The user is not invited to this room.',
+						],
+					]);
+				}
 			}
 		}
 
 		if ($action === 'join') {
-			$room->ping($userId, $sessionId, $this->timeFactory->getTime());
+			if ($participant->getSession() instanceof Session) {
+				$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
+			}
 		} elseif ($action === 'leave') {
 			if (!empty($userId)) {
 				$room->leaveRoom($userId, $sessionId);
diff --git a/lib/GuestManager.php b/lib/GuestManager.php
index 2408ae27d33..47faf3d41d6 100644
--- a/lib/GuestManager.php
+++ b/lib/GuestManager.php
@@ -86,7 +86,7 @@ public function __construct(IDBConnection $connection,
 	 * @throws \Doctrine\DBAL\DBALException
 	 */
 	public function updateName(Room $room, Participant $participant, string $displayName): void {
-		$sessionHash = sha1($participant->getSessionId());
+		$sessionHash = $participant->getAttendee()->getActorId();
 		$dispatchEvent = true;
 
 		try {
diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
index 881874214f7..76cfdf3fc93 100644
--- a/lib/Model/AttendeeMapper.php
+++ b/lib/Model/AttendeeMapper.php
@@ -101,6 +101,18 @@ public function countActorsByParticipantType(int $roomId, array $participantType
 		return (int) ($row['num_actors'] ?? 0);
 	}
 
+	/**
+	 * @param int[] $ids
+	 * @return int Number of deleted entities
+	 */
+	public function deleteByIds(array $ids): int {
+		$query = $this->db->getQueryBuilder();
+		$query->delete($this->getTableName())
+			->where($query->expr()->in('id', $query->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+
+		return (int) $query->execute();
+	}
+
 	public function createAttendeeFromRow(array $row): Attendee {
 		return $this->mapRowToEntity([
 			'id' => $row['a_id'],
diff --git a/lib/Model/SessionMapper.php b/lib/Model/SessionMapper.php
index 4626ed9211d..d623ff335d8 100644
--- a/lib/Model/SessionMapper.php
+++ b/lib/Model/SessionMapper.php
@@ -65,6 +65,18 @@ public function deleteByAttendeeId(int $attendeeId): int {
 		return (int) $query->execute();
 	}
 
+	/**
+	 * @param int[] $ids
+	 * @return int Number of deleted entities
+	 */
+	public function deleteByIds(array $ids): int {
+		$query = $this->db->getQueryBuilder();
+		$query->delete($this->getTableName())
+			->where($query->expr()->in('id', $query->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+
+		return (int) $query->execute();
+	}
+
 	public function createSessionFromRow(array $row): Session {
 		return $this->mapRowToEntity([
 			'id' => $row['s_id'],
diff --git a/lib/Room.php b/lib/Room.php
index ca88bea5deb..ee34210a392 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -871,61 +871,6 @@ public function verifyPassword(string $password): array {
 		];
 	}
 
-	/**
-	 * @param string $sessionId
-	 * @return bool
-	 */
-	protected function isSessionUnique(string $sessionId): bool {
-		$query = $this->db->getQueryBuilder();
-		$query->selectAlias($query->createFunction('COUNT(*)'), 'num_sessions')
-			->from('talk_participants')
-			->where($query->expr()->eq('session_id', $query->createNamedParameter($sessionId)));
-		$result = $query->execute();
-		$numSessions = (int) $result->fetchColumn();
-		$result->closeCursor();
-
-		return $numSessions === 1;
-	}
-
-	public function cleanGuestParticipants(): void {
-		$event = new RoomEvent($this);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_GUESTS_CLEAN, $event);
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->emptyString('user_id'))
-			->andWhere($query->expr()->lte('last_ping', $query->createNamedParameter($this->timeFactory->getTime() - 100, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_GUESTS_CLEAN, $event);
-	}
-
-	/**
-	 * @param int $lastPing When the last ping is older than the given timestamp, the user is ignored
-	 * @return Participant[]
-	 */
-	public function getParticipants(int $lastPing = 0): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-
-		if ($lastPing > 0) {
-			$query->andWhere($query->expr()->gt('last_ping', $query->createNamedParameter($lastPing, IQueryBuilder::PARAM_INT)));
-		}
-
-		$result = $query->execute();
-
-		$participants = [];
-		while ($row = $result->fetch()) {
-			$participants[] = $this->manager->createParticipantObject($this, $row);
-		}
-		$result->closeCursor();
-
-		return $participants;
-	}
-
 	/**
 	 * @param string $search
 	 * @param int $limit
@@ -1131,20 +1076,4 @@ public function markUsersAsMentioned(array $userIds, int $messageId): void {
 			->andWhere($query->expr()->in('user_id', $query->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
 		$query->execute();
 	}
-
-	/**
-	 * @param string|null $userId
-	 * @param string $sessionId
-	 * @param int $timestamp
-	 */
-	public function ping(?string $userId, string $sessionId, int $timestamp): void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('last_ping', $query->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('user_id', $query->createNamedParameter((string) $userId)))
-			->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($sessionId)))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-
-		$query->execute();
-	}
 }
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 2f2a57e9040..998be2d988a 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -30,6 +30,7 @@
 use OCA\Talk\Events\ParticipantEvent;
 use OCA\Talk\Events\RemoveParticipantEvent;
 use OCA\Talk\Events\RemoveUserEvent;
+use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Exceptions\InvalidPasswordException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
@@ -287,6 +288,47 @@ public function removeUser(Room $room, IUser $user, string $reason): void {
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_USER_REMOVE, $event);
 	}
 
+	public function cleanGuestParticipants(Room $room): void {
+		$event = new RoomEvent($room);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_GUESTS_CLEAN, $event);
+
+		$query = $this->connection->getQueryBuilder();
+		$query->selectAlias('s.id', 's_id')
+			->from('talk_sessions', 's')
+			->leftJoin('s', 'talk_attendees', 'a', $query->expr()->eq('s.attendee_id', 'a.id'))
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter('guests')))
+			->andWhere($query->expr()->lte('s.last_ping', $query->createNamedParameter($this->timeFactory->getTime() - 100, IQueryBuilder::PARAM_INT)));
+
+		$sessionTableIds = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$sessionTableIds[] = (int) $row['s_id'];
+		}
+		$result->closeCursor();
+
+		$this->sessionService->deleteSessionsById($sessionTableIds);
+
+		$query = $this->connection->getQueryBuilder();
+		$query->selectAlias('a.id', 'a_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('s.attendee_id', 'a.id'))
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter('guests')))
+			->andWhere($query->expr()->isNull('s.id'));
+
+		$attendeeIds = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$attendeeIds[] = (int) $row['a_id'];
+		}
+		$result->closeCursor();
+
+		$this->attendeeMapper->deleteByIds($attendeeIds);
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_GUESTS_CLEAN, $event);
+	}
+
 	public function changeInCall(Room $room, Participant $participant, int $flags): void {
 		$session = $participant->getSession();
 		if (!$session instanceof Session) {
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
index c73027f580e..37b8d6af46a 100644
--- a/lib/Service/SessionService.php
+++ b/lib/Service/SessionService.php
@@ -71,6 +71,13 @@ public function updateLastPing(Session $session, int $lastPing): void {
 		$this->sessionMapper->update($session);
 	}
 
+	/**
+	 * @param int[] $ids
+	 */
+	public function deleteSessionsById(array $ids): void {
+		$this->sessionMapper->deleteByIds($ids);
+	}
+
 	public function createSessionForAttendee(Attendee $attendee): Session {
 		// Currently a participant can only join once
 		$this->sessionMapper->deleteByAttendeeId($attendee->getId());

From ac228d9014891cc2dd55e385b700102106b4dbe0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Oct 2020 16:09:04 +0200
Subject: [PATCH 044/129] Fix PHP cs

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/AutoComplete/SearchPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Chat/AutoComplete/SearchPlugin.php b/lib/Chat/AutoComplete/SearchPlugin.php
index da38d2f093e..3469339e5c4 100644
--- a/lib/Chat/AutoComplete/SearchPlugin.php
+++ b/lib/Chat/AutoComplete/SearchPlugin.php
@@ -104,7 +104,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 				$attendee = $participant->getAttendee();
 				if ($attendee->getActorType() === 'guests') {
 					$guestSessionHashes[] = $attendee->getActorId();
-				} elseif ($attendee->getActorType() === 'users')  {
+				} elseif ($attendee->getActorType() === 'users') {
 					$userIds[] = $attendee->getActorId();
 				}
 			}

From 7a061b92ecbfe50d8f41b329f08f39a533fef3ea Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 11:27:45 +0100
Subject: [PATCH 045/129] Only return rooms with an attendee match

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Manager.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index 6dc333a2738..6f3362eedae 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -301,7 +301,8 @@ public function getRoomsForUser(string $userId, bool $includeLastMessage = false
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 				$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
 				$query->expr()->eq('a.room_id', 'r.id')
-			));
+			))
+			->where($query->expr()->isNotNull('a.id'));
 
 		if ($includeLastMessage) {
 			$this->loadLastMessageInfo($query);
@@ -344,12 +345,13 @@ public function getRoomForUser(int $roomId, ?string $userId): Room {
 		if ($userId !== null) {
 			// Non guest user
 			$query->addSelect('a.*')
-				->selectAlias('a.id', 'a_id');
-			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				->selectAlias('a.id', 'a_id')
+				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
 					$query->expr()->eq('a.room_id', 'r.id')
-				));
+				))
+				->andWhere($query->expr()->isNotNull('a.id'));
 		}
 
 		$result = $query->execute();

From 94cfce90c5154398df7280a24929d7525e8c1f69 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 12:48:37 +0100
Subject: [PATCH 046/129] Ignore "missing" doctrine classes

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 psalm.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/psalm.xml b/psalm.xml
index b8d2d0fe147..d7f19a41c52 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -21,6 +21,8 @@
 		<UndefinedClass>
 			<errorLevel type="suppress">
 				<referencedClass name="OC" />
+				<referencedClass name="Doctrine\DBAL\Types\Type" />
+				<referencedClass name="Doctrine\DBAL\Exception\UniqueConstraintViolationException" />
 			</errorLevel>
 		</UndefinedClass>
 		<UndefinedDocblockClass>

From 73027e865168c411fa769e74aa980fddca3cd403 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 12:48:58 +0100
Subject: [PATCH 047/129] Fix some more participant handling

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Collaboration/Resources/ConversationProvider.php | 2 +-
 lib/Controller/PageController.php                    | 2 +-
 lib/Flow/Operation.php                               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Collaboration/Resources/ConversationProvider.php b/lib/Collaboration/Resources/ConversationProvider.php
index fc1ffbe05af..528cbf3fd2f 100644
--- a/lib/Collaboration/Resources/ConversationProvider.php
+++ b/lib/Collaboration/Resources/ConversationProvider.php
@@ -94,7 +94,7 @@ public function canAccessResource(IResource $resource, IUser $user = null): bool
 			// Logged in users need to have a regular participant,
 			// before they can do anything with the room.
 			$participant = $room->getParticipant($userId);
-			return $participant->getParticipantType() !== Participant::USER_SELF_JOINED;
+			return $participant->getAttendee()->getParticipantType() !== Participant::USER_SELF_JOINED;
 		} catch (RoomNotFoundException $e) {
 			throw new ResourceException('Conversation not found');
 		} catch (ParticipantNotFoundException $e) {
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 78fb51126a8..79b8fe53c93 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -216,7 +216,7 @@ public function index(string $token = '', string $callUser = '', string $passwor
 				// If the user joined themselves or is not found, they need the password.
 				try {
 					$participant = $room->getParticipant($this->userId);
-					$requirePassword = $participant->getParticipantType() === Participant::USER_SELF_JOINED;
+					$requirePassword = $participant->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED;
 				} catch (ParticipantNotFoundException $e) {
 					$requirePassword = true;
 				}
diff --git a/lib/Flow/Operation.php b/lib/Flow/Operation.php
index a645ad7ed0a..af00807a3f3 100644
--- a/lib/Flow/Operation.php
+++ b/lib/Flow/Operation.php
@@ -138,7 +138,7 @@ public function onEvent(string $eventName, Event $event, IRuleMatcher $ruleMatch
 					$room,
 					$participant,
 					'bots',
-					$participant->getUser(),
+					$participant->getAttendee()->getActorId(),
 					$this->prepareMention($mode, $participant) . $message,
 					new \DateTime(),
 					null,
@@ -173,9 +173,9 @@ protected function prepareMention(int $mode, Participant $participant): string {
 			case self::MESSAGE_MODES['ROOM_MENTION']:
 				return '@all ';
 			case self::MESSAGE_MODES['SELF_MENTION']:
-				$hasWhitespace = strpos($participant->getUser(), ' ') !== false;
+				$hasWhitespace = strpos($participant->getAttendee()->getActorId(), ' ') !== false;
 				$enclosure = $hasWhitespace ? '"' : '';
-				return '@' . $enclosure . $participant->getUser() . $enclosure . ' ';
+				return '@' . $enclosure . $participant->getAttendee()->getActorId() . $enclosure . ' ';
 			case self::MESSAGE_MODES['NO_MENTION']:
 			default:
 				return '';

From 5320e26a9df9283fccb540c1386826da681ee618 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 12:53:11 +0100
Subject: [PATCH 048/129] Fix checking for Session class

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php      | 4 ++--
 lib/Controller/SignalingController.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 96a05d3101d..6eaac02d599 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1401,8 +1401,8 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 			}
 		}
 
-		if ($previousSession instanceof Participant && $previousSession->getSessionId() !== '0') {
-			if ($force === false && $previousSession->getInCallFlags() !== Participant::FLAG_DISCONNECTED) {
+		if ($previousSession instanceof Session && $previousSession->getSessionId() !== '0') {
+			if ($force === false && $previousSession->getInCall() !== Participant::FLAG_DISCONNECTED) {
 				// Previous session was active in the call, show a warning
 				return new DataResponse([
 					'sessionId' => $previousSession->getSessionId(),
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 7d638ab5dac..f0124c058af 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -371,7 +371,7 @@ protected function getUsersInRoom(Room $room, int $pingTimestamp): array {
 		$participants = $this->participantService->getParticipantsForRoom($room);
 		foreach ($participants as $participant) {
 			$session = $participant->getSession();
-			if ($session instanceof Session) {
+			if (!$session instanceof Session) {
 				// User is not active
 				continue;
 			}

From e1adf3ae7372d8a0c28ca6c9703091a74440cf33 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 15:17:22 +0100
Subject: [PATCH 049/129] Move more functions to the services

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/Notifier.php                  |   4 +-
 lib/Controller/RoomController.php      |   4 +-
 lib/Controller/SignalingController.php |   6 +-
 lib/Controller/WebinarController.php   |  18 ++
 lib/Manager.php                        |   2 +-
 lib/Room.php                           | 229 -------------------------
 lib/Service/ParticipantService.php     | 102 +++++++++++
 lib/Signaling/BackendNotifier.php      | 107 +++++++-----
 lib/Signaling/Listener.php             |  21 ++-
 lib/Signaling/Messages.php             |  19 +-
 10 files changed, 223 insertions(+), 289 deletions(-)

diff --git a/lib/Chat/Notifier.php b/lib/Chat/Notifier.php
index a10bebba91b..13fb7d02797 100644
--- a/lib/Chat/Notifier.php
+++ b/lib/Chat/Notifier.php
@@ -165,7 +165,7 @@ public function notifyReplyToAuthor(Room $chat, IComment $comment, IComment $rep
 	 * @param string[] $alreadyNotifiedUsers
 	 */
 	public function notifyOtherParticipant(Room $chat, IComment $comment, array $alreadyNotifiedUsers): void {
-		$participants = $chat->getParticipantsByNotificationLevel(Participant::NOTIFY_ALWAYS);
+		$participants = $this->participantService->getParticipantsByNotificationLevel($chat, Participant::NOTIFY_ALWAYS);
 
 		$notification = $this->createNotification($chat, $comment, 'chat');
 		foreach ($participants as $participant) {
@@ -179,7 +179,7 @@ public function notifyOtherParticipant(Room $chat, IComment $comment, array $alr
 
 		// Also notify default participants in one2one chats or when the admin default is "always"
 		if ($this->getDefaultGroupNotification() === Participant::NOTIFY_ALWAYS || $chat->getType() === Room::ONE_TO_ONE_CALL) {
-			$participants = $chat->getParticipantsByNotificationLevel(Participant::NOTIFY_DEFAULT);
+			$participants = $this->participantService->getParticipantsByNotificationLevel($chat, Participant::NOTIFY_DEFAULT);
 			foreach ($participants as $participant) {
 				if (!$this->shouldParticipantBeNotified($participant, $comment, $alreadyNotifiedUsers)) {
 					continue;
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 6eaac02d599..ae33f359480 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1057,7 +1057,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				}
 
 				if ($result['lastPing'] > 0 && $result['lastPing'] <= $maxPingAge) {
-					$this->room->leaveRoom($userId);
+					$this->participantService->leaveRoomAsSession($this->room, $participant);
 				}
 
 				$result['userId'] = $participant->getAttendee()->getActorId();
@@ -1303,7 +1303,7 @@ public function removeGuestFromRoom(string $participant): DataResponse {
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
-		$this->room->removeParticipantBySession($targetParticipant, Room::PARTICIPANT_REMOVED);
+		$this->participantService->removeAttendee($this->room, $targetParticipant, Room::PARTICIPANT_REMOVED);
 		return new DataResponse([]);
 	}
 
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index f0124c058af..5b41e1d0689 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -562,10 +562,8 @@ private function backendRoom(array $roomRequest): DataResponse {
 				$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
 			}
 		} elseif ($action === 'leave') {
-			if (!empty($userId)) {
-				$room->leaveRoom($userId, $sessionId);
-			} elseif ($participant instanceof Participant) {
-				$room->removeParticipantBySession($participant, Room::PARTICIPANT_LEFT);
+			if ($participant instanceof Participant) {
+				$this->participantService->removeAttendee($room, $participant, Room::PARTICIPANT_LEFT);
 			}
 		}
 
diff --git a/lib/Controller/WebinarController.php b/lib/Controller/WebinarController.php
index 91942870f4a..c6fa35ec5c2 100644
--- a/lib/Controller/WebinarController.php
+++ b/lib/Controller/WebinarController.php
@@ -26,6 +26,9 @@
 namespace OCA\Talk\Controller;
 
 use OCA\Talk\Config;
+use OCA\Talk\Participant;
+use OCA\Talk\Service\ParticipantService;
+use OCA\Talk\Webinary;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -35,15 +38,19 @@ class WebinarController extends AEnvironmentAwareController {
 
 	/** @var ITimeFactory */
 	protected $timeFactory;
+	/** @var ParticipantService */
+	protected $participantService;
 	/** @var Config */
 	protected $talkConfig;
 
 	public function __construct(string $appName,
 								IRequest $request,
 								ITimeFactory $timeFactory,
+								ParticipantService $participantService,
 								Config $talkConfig) {
 		parent::__construct($appName, $request);
 		$this->timeFactory = $timeFactory;
+		$this->participantService = $participantService;
 		$this->talkConfig = $talkConfig;
 	}
 
@@ -70,6 +77,17 @@ public function setLobby(int $state, ?int $timer = null): DataResponse {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
+		if ($state === Webinary::LOBBY_NON_MODERATORS) {
+			$participants = $this->participantService->getParticipantsInCall($this->room);
+			foreach ($participants as $participant) {
+				if ($participant->hasModeratorPermissions()) {
+					continue;
+				}
+
+				$this->participantService->changeInCall($this->room, $participant, Participant::FLAG_DISCONNECTED);
+			}
+		}
+
 		return new DataResponse();
 	}
 
diff --git a/lib/Manager.php b/lib/Manager.php
index 6f3362eedae..71f89ee2d47 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -239,7 +239,7 @@ public function resetAssignedSignalingServers(ICache $cache): void {
 		$result = $query->execute();
 		while ($row = $result->fetch()) {
 			$room = $this->createRoomObject($row);
-			if (!$room->hasActiveSessions()) {
+			if (!$this->participantService->hasActiveSessions($room)) {
 				$room->setAssignedSignalingServer(null);
 				$cache->remove($room->getToken());
 			}
diff --git a/lib/Room.php b/lib/Room.php
index ee34210a392..c74eee07093 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -678,17 +678,6 @@ public function setLobby(int $newState, ?\DateTime $dateTime, bool $timerReached
 
 		$this->dispatcher->dispatch(self::EVENT_AFTER_LOBBY_STATE_SET, $event);
 
-		if ($newState === Webinary::LOBBY_NON_MODERATORS) {
-			$participants = $this->getParticipantsInCall();
-			foreach ($participants as $participant) {
-				if ($participant->hasModeratorPermissions()) {
-					continue;
-				}
-
-				$this->changeInCall($participant, Participant::FLAG_DISCONNECTED);
-			}
-		}
-
 		return true;
 	}
 
@@ -730,31 +719,6 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 		return true;
 	}
 
-	/**
-	 * @param Participant $participant
-	 * @param int $participantType
-	 */
-	public function setParticipantType(Participant $participant, int $participantType): void {
-		$event = new ModifyParticipantEvent($this, $participant, 'type', $participantType, $participant->getParticipantType());
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_PARTICIPANT_TYPE_SET, $event);
-
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_attendees')
-			->set('participant_type', $query->createNamedParameter($participantType, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($participant->getUser())))
-			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')));
-
-		if ($participant->getUser() === '') {
-			// FIXME
-			$query->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())));
-		}
-
-		$query->execute();
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_PARTICIPANT_TYPE_SET, $event);
-	}
-
 	/**
 	 * @param IUser $user
 	 * @param string $reason
@@ -779,77 +743,6 @@ public function removeUser(IUser $user, string $reason): void {
 		$this->dispatcher->dispatch(self::EVENT_AFTER_USER_REMOVE, $event);
 	}
 
-	/**
-	 * @param Participant $participant
-	 * @param string $reason
-	 */
-	public function removeParticipantBySession(Participant $participant, string $reason): void {
-		$event = new RemoveParticipantEvent($this, $participant, $reason);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_PARTICIPANT_REMOVE, $event);
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())));
-		$query->execute();
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_PARTICIPANT_REMOVE, $event);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param string|null $sessionId
-	 */
-	public function leaveRoom(string $userId, ?string $sessionId = null): void {
-		try {
-			$participant = $this->getParticipant($userId);
-		} catch (ParticipantNotFoundException $e) {
-			return;
-		}
-
-		$this->leaveRoomAsParticipant($participant, $sessionId);
-	}
-
-	/**
-	 * @param Participant $participant
-	 * @param string|null $sessionId
-	 */
-	public function leaveRoomAsParticipant(Participant $participant, ?string $sessionId = null): void {
-		$event = new ParticipantEvent($this, $participant);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_ROOM_DISCONNECT, $event);
-
-		// Reset session when leaving a normal room
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('session_id', $query->createNamedParameter('0'))
-			->set('in_call', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('user_id', $query->createNamedParameter($participant->getUser())))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->neq('participant_type', $query->createNamedParameter(Participant::USER_SELF_JOINED, IQueryBuilder::PARAM_INT)));
-		if ($sessionId !== null && $sessionId !== '0') {
-			$query->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($sessionId)));
-		} elseif ($participant->getSessionId() !== '0') {
-			$query->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())));
-		}
-		$query->execute();
-
-		// And kill session when leaving a self joined room
-		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_attendees')
-			->where($query->expr()->eq('actor_id', $query->createNamedParameter($participant->getUser())))
-			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')))
-			->andWhere($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('participant_type', $query->createNamedParameter(Participant::USER_SELF_JOINED, IQueryBuilder::PARAM_INT)));
-		if ($sessionId !== null && $sessionId !== '0') {
-			$query->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($sessionId)));
-		} elseif ($participant->getSessionId() !== '0') {
-			$query->andWhere($query->expr()->eq('session_id', $query->createNamedParameter($participant->getSessionId())));
-		}
-		$query->execute();
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_ROOM_DISCONNECT, $event);
-	}
-
 	/**
 	 * @param string $password
 	 * @return array
@@ -907,128 +800,6 @@ public function searchParticipants(string $search = '', int $limit = null, int $
 		return $participants;
 	}
 
-	/**
-	 * @return Participant[]
-	 */
-	public function getParticipantsInCall(): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->neq('in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)));
-
-		$result = $query->execute();
-
-		$participants = [];
-		while ($row = $result->fetch()) {
-			$participants[] = $this->manager->createParticipantObject($this, $row);
-		}
-		$result->closeCursor();
-
-		return $participants;
-	}
-
-	/**
-	 * @param int $lastPing When the last ping is older than the given timestamp, the user is ignored
-	 * @return array[] Array of users with [users => [userId => [lastPing, sessionId]], guests => [[lastPing, sessionId]]]
-	 * @deprecated Use self::getParticipants() instead
-	 */
-	public function getParticipantsLegacy(int $lastPing = 0): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-
-		if ($lastPing > 0) {
-			$query->andWhere($query->expr()->gt('last_ping', $query->createNamedParameter($lastPing, IQueryBuilder::PARAM_INT)));
-		}
-
-		$result = $query->execute();
-
-		$users = $guests = [];
-		while ($row = $result->fetch()) {
-			if ($row['user_id'] !== '' && $row['user_id'] !== null) {
-				$users[$row['user_id']] = [
-					'inCall' => (int) $row['in_call'],
-					'lastPing' => (int) $row['last_ping'],
-					'sessionId' => $row['session_id'],
-					'participantType' => (int) $row['participant_type'],
-				];
-			} else {
-				$guests[] = [
-					'inCall' => (int) $row['in_call'],
-					'lastPing' => (int) $row['last_ping'],
-					'participantType' => (int) $row['participant_type'],
-					'sessionId' => $row['session_id'],
-				];
-			}
-		}
-		$result->closeCursor();
-
-		return [
-			'users' => $users,
-			'guests' => $guests,
-		];
-	}
-
-	/**
-	 * @param int $notificationLevel
-	 * @return Participant[] Array of participants
-	 */
-	public function getParticipantsByNotificationLevel(int $notificationLevel): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('notification_level', $query->createNamedParameter($notificationLevel, IQueryBuilder::PARAM_INT)));
-		$result = $query->execute();
-
-		$participants = [];
-		while ($row = $result->fetch()) {
-			$participants[] = $this->manager->createParticipantObject($this, $row);
-		}
-		$result->closeCursor();
-
-		return $participants;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function hasActiveSessions(): bool {
-		$query = $this->db->getQueryBuilder();
-		$query->select('room_id')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->neq('session_id', $query->createNamedParameter('0')))
-			->setMaxResults(1);
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool) $row;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getActiveSessions(): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('session_id')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->neq('session_id', $query->createNamedParameter('0')));
-		$result = $query->execute();
-
-		$sessions = [];
-		while ($row = $result->fetch()) {
-			$sessions[] = $row['session_id'];
-		}
-		$result->closeCursor();
-
-		return $sessions;
-	}
-
 	/**
 	 * Get all user ids which are participants in a room but currently not in the call
 	 * @return string[]
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 998be2d988a..d1075fa0dac 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -267,6 +267,16 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 		}
 	}
 
+	public function removeAttendee(Room $room, Participant $participant, string $reason): void {
+		$event = new RemoveParticipantEvent($room, $participant, $reason);
+		$this->dispatcher->dispatch(Room::EVENT_BEFORE_PARTICIPANT_REMOVE, $event);
+
+		$this->sessionMapper->deleteByAttendeeId($participant->getAttendee()->getId());
+		$this->attendeeMapper->delete($participant->getAttendee());
+
+		$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_REMOVE, $event);
+	}
+
 	public function removeUser(Room $room, IUser $user, string $reason): void {
 		try {
 			$participant = $room->getParticipant($user->getUID());
@@ -396,6 +406,41 @@ public function getParticipantsForRoom(Room $room): array {
 		return $participants;
 	}
 
+	/**
+	 * @param Room $room
+	 * @return Participant[]
+	 */
+	public function getParticipantsWithSession(Room $room): array {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select('a.*')
+			->selectAlias('a.id', 'a_id')
+			->addSelect('s.*')
+			->selectAlias('s.id', 's_id')
+			->from('talk_attendees', 'a')
+			->leftJoin(
+				'a', 'talk_sessions', 's',
+				$query->expr()->eq('s.attendee_id', 'a.id')
+			)
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->isNotNull('s.id'));
+
+		$participants = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
+			$session = $this->sessionMapper->createSessionFromRow($row);
+
+			$participants[] = new Participant(
+				\OC::$server->getDatabaseConnection(), // FIXME
+				\OC::$server->getConfig(), // FIXME
+				$room, $attendee, $session);
+		}
+		$result->closeCursor();
+
+		return $participants;
+	}
+
 	/**
 	 * @param Room $room
 	 * @return Participant[]
@@ -431,6 +476,42 @@ public function getParticipantsInCall(Room $room): array {
 		return $participants;
 	}
 
+	/**
+	 * @param Room $room
+	 * @param int $notificationLevel
+	 * @return Participant[]
+	 */
+	public function getParticipantsByNotificationLevel(Room $room, int $notificationLevel): array {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select('a.*')
+			->selectAlias('a.id', 'a_id')
+			->addSelect('s.*')
+			->selectAlias('s.id', 's_id')
+			->from('talk_sessions', 's')
+			->leftJoin(
+				's', 'talk_attendees', 'a',
+				$query->expr()->eq('s.attendee_id', 'a.id')
+			)
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('notification_level', $query->createNamedParameter($notificationLevel, IQueryBuilder::PARAM_INT)));
+
+		$participants = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
+			$session = $this->sessionMapper->createSessionFromRow($row);
+
+			$participants[] = new Participant(
+				\OC::$server->getDatabaseConnection(), // FIXME
+				\OC::$server->getConfig(), // FIXME
+				$room, $attendee, $session);
+		}
+		$result->closeCursor();
+
+		return $participants;
+	}
+
 	/**
 	 * @param Room $room
 	 * @param \DateTime|null $maxLastJoined
@@ -479,4 +560,25 @@ public function getNumberOfModerators(Room $room, bool $ignoreGuestModerators =
 	public function getNumberOfActors(Room $room): int {
 		return $this->attendeeMapper->countActorsByParticipantType($room->getId(), []);
 	}
+
+	/**
+	 * @param Room $room
+	 * @return bool
+	 */
+	public function hasActiveSessions(Room $room): bool {
+		$query = $this->connection->getQueryBuilder();
+		$query->select('a.room_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq(
+				'a.id', 's.attendee_id'
+			))
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->isNotNull('s.id'))
+			->setMaxResults(1);
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		return (bool) $row;
+	}
 }
diff --git a/lib/Signaling/BackendNotifier.php b/lib/Signaling/BackendNotifier.php
index 2cdf503213c..631d99c1fa4 100644
--- a/lib/Signaling/BackendNotifier.php
+++ b/lib/Signaling/BackendNotifier.php
@@ -26,6 +26,7 @@
 namespace OCA\Talk\Signaling;
 
 use OCA\Talk\Config;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -223,12 +224,11 @@ public function roomModified(Room $room): void {
 	 * The given room has been deleted.
 	 *
 	 * @param Room $room
-	 * @param array $participants
+	 * @param string[] $userIds
 	 * @throws \Exception
 	 */
-	public function roomDeleted(Room $room, array $participants): void {
+	public function roomDeleted(Room $room, array $userIds): void {
 		$this->logger->info('Room deleted: ' . $room->getToken());
-		$userIds = array_keys($participants['users']);
 		$this->backendRequest($room, [
 			'type' => 'delete',
 			'delete' => [
@@ -248,29 +248,45 @@ public function participantsModified(Room $room, array $sessionIds): void {
 		$this->logger->info('Room participants modified: ' . $room->getToken() . ' ' . print_r($sessionIds, true));
 		$changed = [];
 		$users = [];
-		$participants = $room->getParticipantsLegacy();
-		foreach ($participants['users'] as $userId => $participant) {
-			$participant['userId'] = $userId;
-			$users[] = $participant;
-			if (\in_array($participant['sessionId'], $sessionIds, true)) {
-				$participant['permissions'] = ['publish-media', 'publish-screen'];
-				if ($participant['participantType'] === Participant::OWNER ||
-						$participant['participantType'] === Participant::MODERATOR) {
-					$participant['permissions'][] = 'control';
-				}
-				$changed[] = $participant;
+		$participants = $this->participantService->getParticipantsForRoom($room);
+		foreach ($participants as $participant) {
+			$attendee = $participant->getAttendee();
+			if ($attendee->getActorType() !== 'users'
+				&& $attendee->getActorType() !== 'guests') {
+				continue;
 			}
-		}
-		foreach ($participants['guests'] as $participant) {
-			if (!isset($participant['participantType'])) {
-				$participant['participantType'] = Participant::GUEST;
+
+			$data = [
+				'inCall' => Participant::FLAG_DISCONNECTED,
+				'lastPing' => 0,
+				'sessionId' => '0',
+				'participantType' => $attendee->getParticipantType(),
+			];
+			if ($attendee->getActorType() !== 'users') {
+				$data['userId'] = $attendee->getActorId();
 			}
-			$users[] = $participant;
-			if (\in_array($participant['sessionId'], $sessionIds, true)) {
-				$participant['permissions'] = ['publish-media', 'publish-screen'];
-				$changed[] = $participant;
+			$users[] = $data;
+
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$data['inCall'] = $session->getInCall();
+				$data['lastPing'] = $session->getLastPing();
+				$data['sessionId'] = $session->getSessionId();
+				$users[] = $data;
+
+				if (\in_array($session->getSessionId(), $sessionIds, true)) {
+					$data['permissions'] = ['publish-media', 'publish-screen'];
+					if ($attendee->getParticipantType() === Participant::OWNER ||
+						$attendee->getParticipantType() === Participant::MODERATOR) {
+						$data['permissions'][] = 'control';
+					}
+					$changed[] = $data;
+				}
+			} else {
+				$users[] = $data;
 			}
 		}
+
 		$this->backendRequest($room, [
 			'type' => 'participants',
 			'participants' => [
@@ -292,25 +308,38 @@ public function roomInCallChanged(Room $room, int $flags, array $sessionIds): vo
 		$this->logger->info('Room in-call status changed: ' . $room->getToken() . ' ' . $flags . ' ' . print_r($sessionIds, true));
 		$changed = [];
 		$users = [];
-		$participants = $room->getParticipantsLegacy();
-		foreach ($participants['users'] as $userId => $participant) {
-			$participant['userId'] = $userId;
-			if ($participant['inCall'] !== Participant::FLAG_DISCONNECTED) {
-				$users[] = $participant;
-			}
-			if (\in_array($participant['sessionId'], $sessionIds, true)) {
-				$changed[] = $participant;
-			}
-		}
-		foreach ($participants['guests'] as $participant) {
-			if (!isset($participant['participantType'])) {
-				$participant['participantType'] = Participant::GUEST;
+
+		$participants = $this->participantService->getParticipantsForRoom($room);
+		foreach ($participants as $participant) {
+			$attendee = $participant->getAttendee();
+			if ($attendee->getActorType() !== 'users'
+				&& $attendee->getActorType() !== 'guests') {
+				continue;
 			}
-			if ($participant['inCall'] !== Participant::FLAG_DISCONNECTED) {
-				$users[] = $participant;
+
+			$data = [
+				'inCall' => Participant::FLAG_DISCONNECTED,
+				'lastPing' => 0,
+				'sessionId' => '0',
+				'participantType' => $attendee->getParticipantType(),
+			];
+			if ($attendee->getActorType() !== 'users') {
+				$data['userId'] = $attendee->getActorId();
 			}
-			if (\in_array($participant['sessionId'], $sessionIds, true)) {
-				$changed[] = $participant;
+
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$data['inCall'] = $session->getInCall();
+				$data['lastPing'] = $session->getLastPing();
+				$data['sessionId'] = $session->getSessionId();
+
+				if ($session->getInCall() !== Participant::FLAG_DISCONNECTED) {
+					$users[] = $data;
+				}
+
+				if (\in_array($session->getSessionId(), $sessionIds, true)) {
+					$changed[] = $data;
+				}
 			}
 		}
 
diff --git a/lib/Signaling/Listener.php b/lib/Signaling/Listener.php
index a150b568a11..8bdc251a985 100644
--- a/lib/Signaling/Listener.php
+++ b/lib/Signaling/Listener.php
@@ -37,6 +37,7 @@
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\EventDispatcher\IEventDispatcher;
 
 class Listener {
@@ -99,12 +100,15 @@ protected static function registerInternalSignaling(IEventDispatcher $dispatcher
 
 			/** @var Messages $messages */
 			$messages = \OC::$server->query(Messages::class);
-			$participants = $room->getParticipantsLegacy();
-			foreach ($participants['users'] as $participant) {
-				$messages->addMessage($participant['sessionId'], $participant['sessionId'], 'refresh-participant-list');
-			}
-			foreach ($participants['guests'] as $participant) {
-				$messages->addMessage($participant['sessionId'], $participant['sessionId'], 'refresh-participant-list');
+			/** @var ParticipantService $participantService */
+			$participantService = \OC::$server->query(ParticipantService::class);
+
+			$participants = $participantService->getParticipantsForRoom($room);
+			foreach ($participants as $participant) {
+				$session = $participant->getSession();
+				if ($session instanceof Session) {
+					$messages->addMessage($session->getSessionId(), $session->getSessionId(), 'refresh-participant-list');
+				}
 			}
 		};
 		$dispatcher->addListener(Room::EVENT_BEFORE_ROOM_DELETE, $listener);
@@ -167,10 +171,11 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
 
 			/** @var BackendNotifier $notifier */
 			$notifier = \OC::$server->query(BackendNotifier::class);
+			/** @var ParticipantService $participantService */
+			$participantService = \OC::$server->query(ParticipantService::class);
 
 			$room = $event->getRoom();
-			$participants = $room->getParticipantsLegacy();
-			$notifier->roomDeleted($room, $participants);
+			$notifier->roomDeleted($room, $participantService->getParticipantUserIds($room));
 		});
 		$dispatcher->addListener(Room::EVENT_AFTER_USER_REMOVE, static function (RemoveUserEvent $event) {
 			if (self::isUsingInternalSignaling()) {
diff --git a/lib/Signaling/Messages.php b/lib/Signaling/Messages.php
index 83407e14458..09d5f5fa6b2 100644
--- a/lib/Signaling/Messages.php
+++ b/lib/Signaling/Messages.php
@@ -23,7 +23,9 @@
 
 namespace OCA\Talk\Signaling;
 
+use OCA\Talk\Model\Session;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
@@ -33,12 +35,17 @@ class Messages {
 	/** @var IDBConnection */
 	protected $db;
 
+	/** @var ParticipantService */
+	protected $participantService;
+
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
 	public function __construct(IDBConnection $db,
+								ParticipantService $participantService,
 								ITimeFactory $timeFactory) {
 		$this->db = $db;
+		$this->participantService = $participantService;
 		$this->timeFactory = $timeFactory;
 	}
 
@@ -88,10 +95,14 @@ public function addMessageForAllParticipants(Room $room, string $message): void
 				]
 			);
 
-		foreach ($room->getActiveSessions() as $sessionId) {
-			$query->setParameter('sender', $sessionId)
-				->setParameter('recipient', $sessionId)
-				->execute();
+		$participants = $this->participantService->getParticipantsWithSession($room);
+		foreach ($participants as $participant) {
+			$session = $participant->getSession();
+			if ($session instanceof Session) {
+				$query->setParameter('sender', $session->getSessionId())
+					->setParameter('recipient', $session->getSessionId())
+					->execute();
+			}
 		}
 	}
 

From 1e425cedff5b95b868210a903571ad06cc367b06 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 15:49:00 +0100
Subject: [PATCH 050/129] Remove last participant modifying functions from Room
 object

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Activity/Listener.php              |   2 +-
 lib/Chat/ChatManager.php               |   7 +-
 lib/Chat/SystemMessage/Listener.php    |   5 +-
 lib/Command/Room/TRoomCommand.php      |  16 +++-
 lib/Controller/RoomController.php      |   4 +-
 lib/Listener/RestrictStartingCalls.php |  10 ++-
 lib/Listener/UserDeletedListener.php   |   2 +-
 lib/Notification/Listener.php          |   7 +-
 lib/Notification/Notifier.php          |  15 ++--
 lib/Room.php                           | 113 -------------------------
 lib/Service/ParticipantService.php     |  62 ++++++++++++++
 11 files changed, 112 insertions(+), 131 deletions(-)

diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php
index 3ddfa9111c7..cc1c69ce5f0 100644
--- a/lib/Activity/Listener.php
+++ b/lib/Activity/Listener.php
@@ -108,7 +108,7 @@ public function setActive(Room $room): void {
 	 */
 	public function generateCallActivity(Room $room): bool {
 		$activeSince = $room->getActiveSince();
-		if (!$activeSince instanceof \DateTime || $room->hasSessionsInCall()) {
+		if (!$activeSince instanceof \DateTime || $this->participantService->hasActiveSessionsInCall($room)) {
 			return false;
 		}
 
diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php
index 4c6ba48a658..11e591d75bd 100644
--- a/lib/Chat/ChatManager.php
+++ b/lib/Chat/ChatManager.php
@@ -30,6 +30,7 @@
 use OCA\Talk\Events\ChatParticipantEvent;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
@@ -67,6 +68,8 @@ class ChatManager {
 	private $connection;
 	/** @var INotificationManager */
 	private $notificationManager;
+	/** @var ParticipantService */
+	private $participantService;
 	/** @var Notifier */
 	private $notifier;
 	/** @var ITimeFactory */
@@ -78,6 +81,7 @@ public function __construct(CommentsManager $commentsManager,
 								IEventDispatcher $dispatcher,
 								IDBConnection $connection,
 								INotificationManager $notificationManager,
+								ParticipantService $participantService,
 								Notifier $notifier,
 								ICacheFactory $cacheFactory,
 								ITimeFactory $timeFactory) {
@@ -85,6 +89,7 @@ public function __construct(CommentsManager $commentsManager,
 		$this->dispatcher = $dispatcher;
 		$this->connection = $connection;
 		$this->notificationManager = $notificationManager;
+		$this->participantService = $participantService;
 		$this->notifier = $notifier;
 		$this->cache = $cacheFactory->createDistributed('talk/lastmsgid');
 		$this->timeFactory = $timeFactory;
@@ -208,7 +213,7 @@ public function sendMessage(Room $chat, Participant $participant, string $actorT
 
 			$alreadyNotifiedUsers = $this->notifier->notifyMentionedUsers($chat, $comment, $alreadyNotifiedUsers);
 			if (!empty($alreadyNotifiedUsers)) {
-				$chat->markUsersAsMentioned($alreadyNotifiedUsers, (int) $comment->getId());
+				$this->participantService->markUsersAsMentioned($chat, $alreadyNotifiedUsers, (int) $comment->getId());
 			}
 
 			// User was not mentioned, send a normal notification
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index 0de1484ed94..a45f42ab844 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -34,6 +34,7 @@
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Share\RoomShareProvider;
 use OCA\Talk\TalkSession;
 use OCA\Talk\Webinary;
@@ -75,8 +76,10 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$room = $event->getRoom();
 			/** @var self $listener */
 			$listener = \OC::$server->query(self::class);
+			/** @var ParticipantService $participantService */
+			$participantService = \OC::$server->query(ParticipantService::class);
 
-			if ($room->hasSessionsInCall()) {
+			if ($participantService->hasActiveSessionsInCall($room)) {
 				$listener->sendSystemMessage($room, 'call_joined');
 			} else {
 				$listener->sendSystemMessage($room, 'call_started');
diff --git a/lib/Command/Room/TRoomCommand.php b/lib/Command/Room/TRoomCommand.php
index a0d85af96bb..cbdb41b3ef2 100644
--- a/lib/Command/Room/TRoomCommand.php
+++ b/lib/Command/Room/TRoomCommand.php
@@ -31,6 +31,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Service\RoomService;
 use OCP\IGroup;
 use OCP\IGroupManager;
@@ -47,6 +48,9 @@ trait TRoomCommand {
 	/** @var RoomService */
 	protected $roomService;
 
+	/** @var ParticipantService */
+	protected $participantService;
+
 	/** @var IUserManager */
 	protected $userManager;
 
@@ -55,12 +59,14 @@ trait TRoomCommand {
 
 	public function __construct(Manager $manager,
 								RoomService $roomService,
+								ParticipantService $participantService,
 								IUserManager $userManager,
 								IGroupManager $groupManager) {
 		parent::__construct();
 
 		$this->manager = $manager;
 		$this->roomService = $roomService;
+		$this->participantService = $participantService;
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 	}
@@ -272,7 +278,7 @@ protected function removeRoomParticipants(Room $room, array $userIds): void {
 		}
 
 		foreach ($users as $user) {
-			$room->removeUser($user, Room::PARTICIPANT_REMOVED);
+			$this->participantService->removeUser($room, $user, Room::PARTICIPANT_REMOVED);
 		}
 	}
 
@@ -371,9 +377,11 @@ protected function completeParticipantValues(CompletionContext $context): array
 		}
 
 		$users = [];
-		foreach ($room->searchParticipants($context->getCurrentWord()) as $participant) {
-			if (!$participant->isGuest()) {
-				$users[] = $participant->getUser();
+		$participants = $this->participantService->getParticipantsForRoom($room);
+		foreach ($participants as $participant) {
+			if ($participant->getAttendee()->getActorType() === 'users'
+				&& stripos($participant->getAttendee()->getActorId(), $context->getCurrentWord()) !== false) {
+				$users[] = $participant->getAttendee()->getActorId();
 			}
 		}
 
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index ae33f359480..9c182209af0 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1237,7 +1237,7 @@ public function removeParticipantFromRoom(string $participant): DataResponse {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		$this->room->removeUser($targetUser, Room::PARTICIPANT_REMOVED);
+		$this->participantService->removeUser($this->room, $targetUser, Room::PARTICIPANT_REMOVED);
 		return new DataResponse([]);
 	}
 
@@ -1272,7 +1272,7 @@ protected function removeSelfFromRoomLogic(Room $room, Participant $participant)
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		$room->removeUser($currentUser, Room::PARTICIPANT_LEFT);
+		$this->participantService->removeUser($room, $currentUser, Room::PARTICIPANT_LEFT);
 
 		return new DataResponse();
 	}
diff --git a/lib/Listener/RestrictStartingCalls.php b/lib/Listener/RestrictStartingCalls.php
index 623e96538e8..b6586d7dce9 100644
--- a/lib/Listener/RestrictStartingCalls.php
+++ b/lib/Listener/RestrictStartingCalls.php
@@ -26,6 +26,7 @@
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Exceptions\ForbiddenException;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 
@@ -34,8 +35,13 @@ class RestrictStartingCalls {
 	/** @var IConfig */
 	protected $config;
 
-	public function __construct(IConfig $config) {
+	/** @var ParticipantService */
+	protected $participantService;
+
+	public function __construct(IConfig $config,
+								ParticipantService $participantService) {
 		$this->config = $config;
+		$this->participantService = $participantService;
 	}
 
 	public static function register(IEventDispatcher $dispatcher): void {
@@ -54,7 +60,7 @@ public function checkStartCallPermissions(ModifyParticipantEvent $event): void {
 		$room = $event->getRoom();
 		$participant = $event->getParticipant();
 
-		if (!$participant->canStartCall() && !$room->hasSessionsInCall()) {
+		if (!$participant->canStartCall() && !$this->participantService->hasActiveSessionsInCall($room)) {
 			throw new ForbiddenException('Can not start a call');
 		}
 	}
diff --git a/lib/Listener/UserDeletedListener.php b/lib/Listener/UserDeletedListener.php
index df94e835d2e..c12a3fd9b10 100644
--- a/lib/Listener/UserDeletedListener.php
+++ b/lib/Listener/UserDeletedListener.php
@@ -57,7 +57,7 @@ public function handle(Event $event): void {
 			if ($this->participantService->getNumberOfUsers($room) === 1) {
 				$room->deleteRoom();
 			} else {
-				$room->removeUser($user, Room::PARTICIPANT_REMOVED);
+				$this->participantService->removeUser($room, $user, Room::PARTICIPANT_REMOVED);
 			}
 		}
 	}
diff --git a/lib/Notification/Listener.php b/lib/Notification/Listener.php
index a0e056427cd..a56d4798028 100644
--- a/lib/Notification/Listener.php
+++ b/lib/Notification/Listener.php
@@ -27,6 +27,7 @@
 use OCA\Talk\Events\JoinRoomUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Notification\IManager;
@@ -38,6 +39,8 @@ class Listener {
 
 	/** @var IManager */
 	protected $notificationManager;
+	/** @var ParticipantService */
+	protected $participantsService;
 	/** @var IEventDispatcher */
 	protected $dispatcher;
 	/** @var IUserSession */
@@ -51,11 +54,13 @@ class Listener {
 	protected $shouldSendCallNotification = false;
 
 	public function __construct(IManager $notificationManager,
+								ParticipantService $participantsService,
 								IEventDispatcher $dispatcher,
 								IUserSession $userSession,
 								ITimeFactory $timeFactory,
 								LoggerInterface $logger) {
 		$this->notificationManager = $notificationManager;
+		$this->participantsService = $participantsService;
 		$this->dispatcher = $dispatcher;
 		$this->userSession = $userSession;
 		$this->timeFactory = $timeFactory;
@@ -241,7 +246,7 @@ public function sendCallNotifications(Room $room): void {
 			return;
 		}
 
-		$userIds = $room->getNotInCallUserIds();
+		$userIds = $this->participantsService->getParticipantUserIdsNotInCall($room);
 		foreach ($userIds as $userId) {
 			if ($actorId === $userId) {
 				continue;
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index 2c5bd965bd7..306e1df7c37 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -32,6 +32,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\Comments\NotFoundException;
 use OCP\IL10N;
 use OCP\IURLGenerator;
@@ -64,6 +65,8 @@ class Notifier implements INotifier {
 	private $shareManager;
 	/** @var Manager */
 	protected $manager;
+	/** @var ParticipantService */
+	protected $participantService;
 	/** @var INotificationManager */
 	protected $notificationManager;
 	/** @var CommentsManager */
@@ -85,6 +88,7 @@ public function __construct(IFactory $lFactory,
 								GuestManager $guestManager,
 								IShareManager $shareManager,
 								Manager $manager,
+								ParticipantService $participantService,
 								INotificationManager $notificationManager,
 								CommentsManager $commentManager,
 								MessageParser $messageParser,
@@ -96,6 +100,7 @@ public function __construct(IFactory $lFactory,
 		$this->guestManager = $guestManager;
 		$this->shareManager = $shareManager;
 		$this->manager = $manager;
+		$this->participantService = $participantService;
 		$this->notificationManager = $notificationManager;
 		$this->commentManager = $commentManager;
 		$this->messageParser = $messageParser;
@@ -487,7 +492,7 @@ protected function parseInvitation(INotification $notification, Room $room, IL10
 		$roomName = $room->getDisplayName($notification->getUser());
 		if ($room->getType() === Room::ONE_TO_ONE_CALL) {
 			$subject = $l->t('{user} invited you to a private conversation');
-			if ($room->hasSessionsInCall()) {
+			if ($this->participantService->hasActiveSessionsInCall($room)) {
 				$notification = $this->addActionButton($notification, $l->t('Join call'));
 			} else {
 				$notification = $this->addActionButton($notification, $l->t('View chat'), false);
@@ -512,7 +517,7 @@ protected function parseInvitation(INotification $notification, Room $room, IL10
 				);
 		} elseif (\in_array($room->getType(), [Room::GROUP_CALL, Room::PUBLIC_CALL], true)) {
 			$subject = $l->t('{user} invited you to a group conversation: {call}');
-			if ($room->hasSessionsInCall()) {
+			if ($this->participantService->hasActiveSessionsInCall($room)) {
 				$notification = $this->addActionButton($notification, $l->t('Join call'));
 			} else {
 				$notification = $this->addActionButton($notification, $l->t('View chat'), false);
@@ -561,7 +566,7 @@ protected function parseCall(INotification $notification, Room $room, IL10N $l):
 			$calleeId = $parameters['callee'];
 			$user = $this->userManager->get($calleeId);
 			if ($user instanceof IUser) {
-				if ($this->notificationManager->isPreparingPushNotification() || $room->hasSessionsInCall()) {
+				if ($this->notificationManager->isPreparingPushNotification() || $this->participantService->hasActiveSessionsInCall($room)) {
 					$notification = $this->addActionButton($notification, $l->t('Answer call'));
 					$subject = $l->t('{user} wants to talk with you');
 				} else {
@@ -590,7 +595,7 @@ protected function parseCall(INotification $notification, Room $room, IL10N $l):
 				throw new AlreadyProcessedException();
 			}
 		} elseif (\in_array($room->getType(), [Room::GROUP_CALL, Room::PUBLIC_CALL], true)) {
-			if ($this->notificationManager->isPreparingPushNotification() || $room->hasSessionsInCall()) {
+			if ($this->notificationManager->isPreparingPushNotification() || $this->participantService->hasActiveSessionsInCall($room)) {
 				$notification = $this->addActionButton($notification, $l->t('Join call'));
 				$subject = $l->t('A group call has started in {call}');
 			} else {
@@ -646,7 +651,7 @@ protected function parsePasswordRequest(INotification $notification, Room $room,
 			throw new AlreadyProcessedException();
 		}
 
-		$callIsActive = $this->notificationManager->isPreparingPushNotification() || $room->hasSessionsInCall();
+		$callIsActive = $this->notificationManager->isPreparingPushNotification() || $this->participantService->hasActiveSessionsInCall($room);
 		if ($callIsActive) {
 			$notification = $this->addActionButton($notification, $l->t('Answer call'));
 		} else {
diff --git a/lib/Room.php b/lib/Room.php
index c74eee07093..932edcfcfe5 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -28,11 +28,7 @@
 namespace OCA\Talk;
 
 use OCA\Talk\Events\ModifyLobbyEvent;
-use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Events\ModifyRoomEvent;
-use OCA\Talk\Events\ParticipantEvent;
-use OCA\Talk\Events\RemoveParticipantEvent;
-use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Events\SignalingRoomPropertiesEvent;
 use OCA\Talk\Events\VerifyRoomPasswordEvent;
@@ -43,7 +39,6 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
-use OCP\IUser;
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
 
@@ -719,30 +714,6 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 		return true;
 	}
 
-	/**
-	 * @param IUser $user
-	 * @param string $reason
-	 */
-	public function removeUser(IUser $user, string $reason): void {
-		try {
-			$participant = $this->getParticipant($user->getUID());
-		} catch (ParticipantNotFoundException $e) {
-			return;
-		}
-
-		$event = new RemoveUserEvent($this, $participant, $user, $reason);
-		$this->dispatcher->dispatch(self::EVENT_BEFORE_USER_REMOVE, $event);
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('talk_attendees')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('actor_id', $query->createNamedParameter($user->getUID())))
-			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')));
-		$query->execute();
-
-		$this->dispatcher->dispatch(self::EVENT_AFTER_USER_REMOVE, $event);
-	}
-
 	/**
 	 * @param string $password
 	 * @return array
@@ -763,88 +734,4 @@ public function verifyPassword(string $password): array {
 			'url' => '',
 		];
 	}
-
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return Participant[]
-	 */
-	public function searchParticipants(string $search = '', int $limit = null, int $offset = null): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId())));
-
-		if ($search !== '') {
-			$query->where($query->expr()->iLike('user_id', $query->createNamedParameter(
-				'%' . $this->db->escapeLikeParameter($search) . '%'
-			)));
-		}
-
-		if ($limit !== null) {
-			$query->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$query->setFirstResult($offset);
-		}
-		$query->orderBy('user_id', 'ASC');
-		$result = $query->execute();
-
-		$participants = [];
-		while ($row = $result->fetch()) {
-			$participants[] = $this->manager->createParticipantObject($this, $row);
-		}
-		$result->closeCursor();
-
-		return $participants;
-	}
-
-	/**
-	 * Get all user ids which are participants in a room but currently not in the call
-	 * @return string[]
-	 */
-	public function getNotInCallUserIds(): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('user_id')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->nonEmptyString('user_id'))
-			->andWhere($query->expr()->eq('in_call', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		$result = $query->execute();
-
-		$userIds = [];
-		while ($row = $result->fetch()) {
-			$userIds[] = $row['user_id'];
-		}
-		$result->closeCursor();
-
-		return $userIds;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function hasSessionsInCall(): bool {
-		$query = $this->db->getQueryBuilder();
-		$query->select('session_id')
-			->from('talk_participants')
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->neq('in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(1);
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool) $row;
-	}
-
-	public function markUsersAsMentioned(array $userIds, int $messageId): void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('talk_participants')
-			->set('last_mention_message', $query->createNamedParameter($messageId, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('room_id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->in('user_id', $query->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-		$query->execute();
-	}
 }
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index d1075fa0dac..ae3580d8588 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -368,6 +368,16 @@ public function changeInCall(Room $room, Participant $participant, int $flags):
 		}
 	}
 
+	public function markUsersAsMentioned(Room $room, array $userIds, int $messageId): void {
+		$query = $this->connection->getQueryBuilder();
+		$query->update('talk_attendees')
+			->set('last_mention_message', $query->createNamedParameter($messageId, IQueryBuilder::PARAM_INT))
+			->where($query->expr()->eq('room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')))
+			->andWhere($query->expr()->in('actor_id', $query->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+		$query->execute();
+	}
+
 	/**
 	 * @param Room $room
 	 * @return Participant[]
@@ -525,6 +535,36 @@ public function getParticipantUserIds(Room $room, \DateTime $maxLastJoined = nul
 		}, $attendees);
 	}
 
+	/**
+	 * @param Room $room
+	 * @return string[]
+	 */
+	public function getParticipantUserIdsNotInCall(Room $room): array {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select('a.actor_id')
+			->from('talk_sessions', 's')
+			->leftJoin(
+				's', 'talk_attendees', 'a',
+				$query->expr()->eq('s.attendee_id', 'a.id')
+			)
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter('users')))
+			->andWhere($query->expr()->orX(
+				$query->expr()->eq('s.in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)),
+				$query->expr()->isNull('s.in_call')
+			));
+
+		$userIds = [];
+		$result = $query->execute();
+		while ($row = $result->fetch()) {
+			$userIds[] = $row['actor_id'];
+		}
+		$result->closeCursor();
+
+		return $userIds;
+	}
+
 	/**
 	 * @param Room $room
 	 * @return int
@@ -581,4 +621,26 @@ public function hasActiveSessions(Room $room): bool {
 
 		return (bool) $row;
 	}
+
+	/**
+	 * @param Room $room
+	 * @return bool
+	 */
+	public function hasActiveSessionsInCall(Room $room): bool {
+		$query = $this->connection->getQueryBuilder();
+		$query->select('a.room_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq(
+				'a.id', 's.attendee_id'
+			))
+			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->isNotNull('s.in_call'))
+			->andWhere($query->expr()->neq('s.in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)))
+			->setMaxResults(1);
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		return (bool) $row;
+	}
 }

From d4fb7fa6ae219e6e42300077271e3dfed3f4232b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 15:55:48 +0100
Subject: [PATCH 051/129] Simplify query methods and inject the config on the
 method

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php      |  4 +-
 lib/Listener/RestrictStartingCalls.php |  2 +-
 lib/Manager.php                        |  8 +--
 lib/Participant.php                    | 15 +----
 lib/Service/ParticipantService.php     | 78 +++++++-------------------
 5 files changed, 26 insertions(+), 81 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 9c182209af0..3a48f0c3cd1 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -413,7 +413,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 			return $roomData;
 		}
 
-		$roomData['canStartCall'] = $currentParticipant->canStartCall();
+		$roomData['canStartCall'] = $currentParticipant->canStartCall($this->config);
 
 		if ($userId !== '') {
 			$currentUser = $this->userManager->get($userId);
@@ -623,7 +623,7 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 			return $roomData;
 		}
 
-		$roomData['canStartCall'] = $currentParticipant->canStartCall();
+		$roomData['canStartCall'] = $currentParticipant->canStartCall($this->config);
 
 		if ($attendee->getActorType() === 'users') {
 			$currentUser = $this->userManager->get($attendee->getActorId());
diff --git a/lib/Listener/RestrictStartingCalls.php b/lib/Listener/RestrictStartingCalls.php
index b6586d7dce9..316f5564b05 100644
--- a/lib/Listener/RestrictStartingCalls.php
+++ b/lib/Listener/RestrictStartingCalls.php
@@ -60,7 +60,7 @@ public function checkStartCallPermissions(ModifyParticipantEvent $event): void {
 		$room = $event->getRoom();
 		$participant = $event->getParticipant();
 
-		if (!$participant->canStartCall() && !$this->participantService->hasActiveSessionsInCall($room)) {
+		if (!$participant->canStartCall($this->config) && !$this->participantService->hasActiveSessionsInCall($room)) {
 			throw new ForbiddenException('Can not start a call');
 		}
 	}
diff --git a/lib/Manager.php b/lib/Manager.php
index 71f89ee2d47..8bec0e5f0c9 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -194,13 +194,7 @@ public function createParticipantObject(Room $room, array $row): Participant {
 			$session = $this->sessionMapper->createSessionFromRow($row);
 		}
 
-		return new Participant(
-			$this->db,
-			$this->config,
-			$room,
-			$attendee,
-			$session
-		);
+		return new Participant($room, $attendee, $session);
 	}
 
 	public function createCommentObject(array $row): ?IComment {
diff --git a/lib/Participant.php b/lib/Participant.php
index f8bd34a53e0..9044c8736e7 100644
--- a/lib/Participant.php
+++ b/lib/Participant.php
@@ -28,7 +28,6 @@
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCP\IConfig;
-use OCP\IDBConnection;
 
 class Participant {
 	public const OWNER = 1;
@@ -49,10 +48,6 @@ class Participant {
 	public const NOTIFY_MENTION = 2;
 	public const NOTIFY_NEVER = 3;
 
-	/** @var IDBConnection */
-	protected $db;
-	/** @var IConfig */
-	protected $config;
 	/** @var Room */
 	protected $room;
 	/** @var Attendee */
@@ -60,13 +55,9 @@ class Participant {
 	/** @var Session|null */
 	protected $session;
 
-	public function __construct(IDBConnection $db,
-								IConfig $config,
-								Room $room,
+	public function __construct(Room $room,
 								Attendee $attendee,
 								?Session $session) {
-		$this->db = $db;
-		$this->config = $config;
 		$this->room = $room;
 		$this->attendee = $attendee;
 		$this->session = $session;
@@ -94,8 +85,8 @@ public function hasModeratorPermissions(bool $guestModeratorAllowed = true): boo
 		return \in_array($participantType, [self::OWNER, self::MODERATOR, self::GUEST_MODERATOR], true);
 	}
 
-	public function canStartCall(): bool {
-		$defaultStartCall = (int) $this->config->getAppValue('spreed', 'start_calls', Room::START_CALL_EVERYONE);
+	public function canStartCall(IConfig $config): bool {
+		$defaultStartCall = (int) $config->getAppValue('spreed', 'start_calls', Room::START_CALL_EVERYONE);
 
 		if ($defaultStartCall === Room::START_CALL_EVERYONE) {
 			return true;
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index ae3580d8588..6b6bb42c563 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -138,10 +138,7 @@ public function joinRoom(Room $room, IUser $user, string $password, bool $passed
 
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_ROOM_CONNECT, $event);
 
-		return new Participant(
-			\OC::$server->getDatabaseConnection(), // FIXME
-			\OC::$server->getConfig(), // FIXME
-			$room, $attendee, $session);
+		return new Participant($room, $attendee, $session);
 	}
 
 	/**
@@ -187,10 +184,7 @@ public function joinRoomAsNewGuest(Room $room, string $password, bool $passedPas
 
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_GUEST_CONNECT, $event);
 
-		return new Participant(
-			\OC::$server->getDatabaseConnection(), // FIXME
-			\OC::$server->getConfig(), // FIXME
-			$room, $attendee, $session);
+		return new Participant($room, $attendee, $session);
 	}
 
 	/**
@@ -396,24 +390,7 @@ public function getParticipantsForRoom(Room $room): array {
 			)
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)));
 
-		$participants = [];
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
-			if (isset($row['s_id'])) {
-				$session = $this->sessionMapper->createSessionFromRow($row);
-			} else {
-				$session = null;
-			}
-
-			$participants[] = new Participant(
-				\OC::$server->getDatabaseConnection(), // FIXME
-				\OC::$server->getConfig(), // FIXME
-				$room, $attendee, $session);
-		}
-		$result->closeCursor();
-
-		return $participants;
+		return $this->getParticipantsFromQuery($query, $room);
 	}
 
 	/**
@@ -435,20 +412,7 @@ public function getParticipantsWithSession(Room $room): array {
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->isNotNull('s.id'));
 
-		$participants = [];
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
-			$session = $this->sessionMapper->createSessionFromRow($row);
-
-			$participants[] = new Participant(
-				\OC::$server->getDatabaseConnection(), // FIXME
-				\OC::$server->getConfig(), // FIXME
-				$room, $attendee, $session);
-		}
-		$result->closeCursor();
-
-		return $participants;
+		return $this->getParticipantsFromQuery($query, $room);
 	}
 
 	/**
@@ -470,20 +434,7 @@ public function getParticipantsInCall(Room $room): array {
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->neq('s.in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)));
 
-		$participants = [];
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
-			$session = $this->sessionMapper->createSessionFromRow($row);
-
-			$participants[] = new Participant(
-				\OC::$server->getDatabaseConnection(), // FIXME
-				\OC::$server->getConfig(), // FIXME
-				$room, $attendee, $session);
-		}
-		$result->closeCursor();
-
-		return $participants;
+		return $this->getParticipantsFromQuery($query, $room);
 	}
 
 	/**
@@ -506,16 +457,25 @@ public function getParticipantsByNotificationLevel(Room $room, int $notification
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('notification_level', $query->createNamedParameter($notificationLevel, IQueryBuilder::PARAM_INT)));
 
+		return $this->getParticipantsFromQuery($query, $room);
+	}
+
+	/**
+	 * @param IQueryBuilder $query
+	 * @return Participant[]
+	 */
+	protected function getParticipantsFromQuery(IQueryBuilder $query, Room $room): array {
 		$participants = [];
 		$result = $query->execute();
 		while ($row = $result->fetch()) {
 			$attendee = $this->attendeeMapper->createAttendeeFromRow($row);
-			$session = $this->sessionMapper->createSessionFromRow($row);
+			if (isset($row['s_id'])) {
+				$session = $this->sessionMapper->createSessionFromRow($row);
+			} else {
+				$session = null;
+			}
 
-			$participants[] = new Participant(
-				\OC::$server->getDatabaseConnection(), // FIXME
-				\OC::$server->getConfig(), // FIXME
-				$room, $attendee, $session);
+			$participants[] = new Participant($room, $attendee, $session);
 		}
 		$result->closeCursor();
 

From 01b205c4898f490ed749502c4023b01b4676e1dc Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 16:26:53 +0100
Subject: [PATCH 052/129] Fix commands

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Command/Room/TRoomCommand.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/Command/Room/TRoomCommand.php b/lib/Command/Room/TRoomCommand.php
index cbdb41b3ef2..2c59205e26e 100644
--- a/lib/Command/Room/TRoomCommand.php
+++ b/lib/Command/Room/TRoomCommand.php
@@ -115,10 +115,6 @@ protected function setRoomPublic(Room $room, bool $public): void {
 			return;
 		}
 
-		if (!$public && $room->hasPassword()) {
-			throw new InvalidArgumentException('Unable to change password protected public room to private room.');
-		}
-
 		if (!$room->setType($public ? Room::PUBLIC_CALL : Room::GROUP_CALL)) {
 			throw new InvalidArgumentException('Unable to change room type.');
 		}
@@ -175,7 +171,7 @@ protected function setRoomOwner(Room $room, string $userId): void {
 
 		$this->unsetRoomOwner($room);
 
-		$room->setParticipantType($participant, Participant::OWNER);
+		$this->participantService->updateParticipantType($room, $participant, Participant::OWNER);
 	}
 
 	/**
@@ -184,9 +180,10 @@ protected function setRoomOwner(Room $room, string $userId): void {
 	 * @throws InvalidArgumentException
 	 */
 	protected function unsetRoomOwner(Room $room): void {
-		foreach ($room->getParticipants() as $participant) {
-			if ($participant->getParticipantType() === Participant::OWNER) {
-				$room->setParticipantType($participant, Participant::USER);
+		$participants = $this->participantService->getParticipantsForRoom($room);
+		foreach ($participants as $participant) {
+			if ($participant->getAttendee()->getParticipantType() === Participant::OWNER) {
+				$this->participantService->updateParticipantType($room, $participant, Participant::USER);
 			}
 		}
 	}
@@ -216,7 +213,7 @@ protected function addRoomParticipantsByGroup(Room $room, array $groupIds): void
 			$users = array_merge($users, array_values($groupUsers));
 		}
 
-		$this->addRoomParticipants($room, $users);
+		$this->addRoomParticipants($room, array_unique($users));
 	}
 
 	/**
@@ -251,12 +248,13 @@ protected function addRoomParticipants(Room $room, array $userIds): void {
 				// we expect the user not to be a participant yet
 			}
 
-			$participants[$user->getUID()] = [
-				'userId' => $user->getUID(),
+			$participants[] = [
+				'actorType' => 'users',
+				'actorId' => $user->getUID(),
 			];
 		}
 
-		\call_user_func_array([$room, 'addUsers'], $participants);
+		$this->participantService->addUsers($room, $participants);
 	}
 
 	/**
@@ -297,13 +295,13 @@ protected function addRoomModerators(Room $room, array $userIds): void {
 				throw new InvalidArgumentException(sprintf("User '%s' is no participant.", $userId));
 			}
 
-			if ($participant->getParticipantType() !== Participant::OWNER) {
+			if ($participant->getAttendee()->getParticipantType() !== Participant::OWNER) {
 				$participants[] = $participant;
 			}
 		}
 
 		foreach ($participants as $participant) {
-			$room->setParticipantType($participant, Participant::MODERATOR);
+			$this->participantService->updateParticipantType($room, $participant, Participant::MODERATOR);
 		}
 	}
 
@@ -322,13 +320,13 @@ protected function removeRoomModerators(Room $room, array $userIds): void {
 				throw new InvalidArgumentException(sprintf("User '%s' is no participant.", $userId));
 			}
 
-			if ($participant->getParticipantType() === Participant::MODERATOR) {
+			if ($participant->getAttendee()->getParticipantType() === Participant::MODERATOR) {
 				$participants[] = $participant;
 			}
 		}
 
 		foreach ($participants as $participant) {
-			$room->setParticipantType($participant, Participant::USER);
+			$this->participantService->updateParticipantType($room, $participant, Participant::USER);
 		}
 	}
 

From 345528472f039237f340a17a608928cfd15ddf52 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 17:09:43 +0100
Subject: [PATCH 053/129] Start integration tests for commands

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../features/bootstrap/CommandLineTrait.php   | 177 ++++++++++++++++++
 .../features/bootstrap/FeatureContext.php     |   2 +
 .../features/command/active-calls.feature     |  41 ++++
 3 files changed, 220 insertions(+)
 create mode 100644 tests/integration/features/bootstrap/CommandLineTrait.php
 create mode 100644 tests/integration/features/command/active-calls.feature

diff --git a/tests/integration/features/bootstrap/CommandLineTrait.php b/tests/integration/features/bootstrap/CommandLineTrait.php
new file mode 100644
index 00000000000..d8dd7f5d998
--- /dev/null
+++ b/tests/integration/features/bootstrap/CommandLineTrait.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Robin Appelman <robin@icewind.nl>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+trait CommandLineTrait {
+
+	/** @var int return code of last command */
+	private $lastCode;
+	/** @var string stdout of last command */
+	private $lastStdOut;
+	/** @var string stderr of last command */
+	private $lastStdErr;
+
+	/** @var string */
+	protected $ocPath = '../../../..';
+
+	/**
+	 * Invokes an OCC command
+	 *
+	 * @param []string $args OCC command, the part behind "occ". For example: "files:transfer-ownership"
+	 * @return int exit code
+	 */
+	public function runOcc($args = []) {
+		$args = array_map(function ($arg) {
+			return escapeshellarg($arg);
+		}, $args);
+		$args[] = '--no-ansi';
+		$args = implode(' ', $args);
+
+		$descriptor = [
+			0 => ['pipe', 'r'],
+			1 => ['pipe', 'w'],
+			2 => ['pipe', 'w'],
+		];
+		$process = proc_open('php console.php ' . $args, $descriptor, $pipes, $this->ocPath);
+		$this->lastStdOut = stream_get_contents($pipes[1]);
+		$this->lastStdErr = stream_get_contents($pipes[2]);
+		$this->lastCode = proc_close($process);
+
+		// Clean opcode cache
+		$client = new GuzzleHttp\Client();
+		$client->request('GET', 'http://localhost:8080/apps/testing/clean_opcode_cache.php');
+
+		return $this->lastCode;
+	}
+
+	/**
+	 * @Given /^invoking occ with "([^"]*)"$/
+	 */
+	public function invokingTheCommand($cmd) {
+		$args = explode(' ', $cmd);
+		$this->runOcc($args);
+	}
+
+	/**
+	 * Find exception texts in stderr
+	 */
+	public function findExceptions() {
+		$exceptions = [];
+		$captureNext = false;
+		// the exception text usually appears after an "[Exception"] row
+		foreach (explode("\n", $this->lastStdErr) as $line) {
+			if (preg_match('/\[Exception\]/', $line)) {
+				$captureNext = true;
+				continue;
+			}
+			if ($captureNext) {
+				$exceptions[] = trim($line);
+				$captureNext = false;
+			}
+		}
+
+		return $exceptions;
+	}
+
+	/**
+	 * Finds all lines containing the given text
+	 *
+	 * @param string $input stdout or stderr output
+	 * @param string $text text to search for
+	 * @return array array of lines that matched
+	 */
+	public function findLines($input, $text) {
+		$results = [];
+		// the exception text usually appears after an "[Exception"] row
+		foreach (explode("\n", $input) as $line) {
+			if (strpos($line, $text) !== false) {
+				$results[] = $line;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * @Then /^the command was successful$/
+	 */
+	public function theCommandWasSuccessful() {
+		$exceptions = $this->findExceptions();
+		if ($this->lastCode !== 0) {
+			$msg = 'The command was not successful, exit code was ' . $this->lastCode . '.';
+			if (!empty($exceptions)) {
+				$msg .= ' Exceptions: ' . implode(', ', $exceptions);
+			}
+			throw new \Exception($msg);
+		} elseif (!empty($exceptions)) {
+			$msg = 'The command was successful but triggered exceptions: ' . implode(', ', $exceptions);
+			throw new \Exception($msg);
+		}
+	}
+
+	/**
+	 * @Then /^the command failed with exit code ([0-9]+)$/
+	 */
+	public function theCommandFailedWithExitCode($exitCode) {
+		if ($this->lastCode !== (int)$exitCode) {
+			throw new \Exception('The command was expected to fail with exit code ' . $exitCode . ' but got ' . $this->lastCode);
+		}
+	}
+
+	/**
+	 * @Then /^the command failed with exception text "([^"]*)"$/
+	 */
+	public function theCommandFailedWithException($exceptionText) {
+		$exceptions = $this->findExceptions();
+		if (empty($exceptions)) {
+			throw new \Exception('The command did not throw any exceptions');
+		}
+
+		if (!in_array($exceptionText, $exceptions)) {
+			throw new \Exception('The command did not throw any exception with the text "' . $exceptionText . '"');
+		}
+	}
+
+	/**
+	 * @Then /^the command output contains the text "([^"]*)"$/
+	 */
+	public function theCommandOutputContainsTheText($text) {
+		$lines = $this->findLines($this->lastStdOut, $text);
+		if (empty($lines)) {
+			throw new \Exception('The command did not output the expected text on stdout "' . $text . '"');
+		}
+	}
+
+	/**
+	 * @Then /^the command error output contains the text "([^"]*)"$/
+	 */
+	public function theCommandErrorOutputContainsTheText($text) {
+		$lines = $this->findLines($this->lastStdErr, $text);
+		if (empty($lines)) {
+			throw new \Exception('The command did not output the expected text on stderr "' . $text . '"');
+		}
+	}
+}
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index b95e5d67f0e..b9b3a20cb81 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -74,6 +74,8 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	/** @var SharingContext */
 	private $sharingContext;
 
+	use CommandLineTrait;
+
 	public static function getTokenForIdentifier(string $identifier) {
 		return self::$identifierToToken[$identifier];
 	}
diff --git a/tests/integration/features/command/active-calls.feature b/tests/integration/features/command/active-calls.feature
new file mode 100644
index 00000000000..f73145c774b
--- /dev/null
+++ b/tests/integration/features/command/active-calls.feature
@@ -0,0 +1,41 @@
+Feature: create
+
+  Background:
+    Given user "participant1" exists
+
+  Scenario: No call in progress
+    Given invoking occ with "talk:active-calls"
+    Then the command was successful
+    And the command output contains the text "No calls in progress"
+
+  Scenario: Users only chatting
+    When user "participant1" creates room "room"
+      | roomType | 3 |
+      | roomName | room |
+    Then user "participant1" joins room "room" with 200
+
+    Given invoking occ with "talk:active-calls"
+    Then the command was successful
+    And the command output contains the text "No calls in progress"
+
+    Then user "participant1" leaves room "room" with 200
+
+
+  Scenario: Call in progress
+    When user "participant1" creates room "room"
+      | roomType | 3 |
+      | roomName | room |
+
+    Then user "participant1" joins room "room" with 200
+    And user "participant1" joins call "room" with 200
+
+    Given invoking occ with "talk:active-calls"
+    Then the command failed with exit code 1
+    And the command output contains the text "There are currently 1 calls in progress with 1 participants"
+
+    Then user "participant1" leaves call "room" with 200
+    And user "participant1" leaves room "room" with 200
+
+    Given invoking occ with "talk:active-calls"
+    Then the command was successful
+    And the command output contains the text "No calls in progress"

From 3f1c0cdec9c323a1045357ac948dbb58f009f0e7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 26 Oct 2020 17:12:14 +0100
Subject: [PATCH 054/129] Execute integration tests on drone

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .drone.yml | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index f12a6e62b2b..f6628e34f41 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -453,6 +453,41 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: int-sqlite-command
+
+steps:
+  - name: integration-command
+    image: nextcloudci/php7.3:php7.3-5
+    environment:
+      APP_NAME: spreed
+      CORE_BRANCH: master
+      DATABASEHOST: sqlite
+    commands:
+      - bash tests/drone-run-integration-tests.sh || exit 0
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
+      - cd ../server
+      - ./occ app:enable $APP_NAME
+      - cd apps/$APP_NAME
+
+      # Run integration tests
+      - cd tests/integration/
+      - bash run.sh features/command
+
+services:
+  - name: cache
+    image: redis
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: int-sqlite-conversation
@@ -613,6 +648,51 @@ trigger:
 #    - pull_request
     - push
 
+---
+kind: pipeline
+name: int-mysql-command
+
+steps:
+  - name: integration-command
+    image: nextcloudci/php7.3:php7.3-5
+    environment:
+      APP_NAME: spreed
+      CORE_BRANCH: master
+      DATABASEHOST: mysql
+    commands:
+      - bash tests/drone-run-integration-tests.sh || exit 0
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
+      - cd ../server
+      - ./occ app:enable $APP_NAME
+      - cd apps/$APP_NAME
+
+      # Run integration tests
+      - cd tests/integration/
+      - bash run.sh features/command
+
+services:
+  - name: cache
+    image: redis
+  - name: mysql
+    image: mysql:5.7.22
+    environment:
+      MYSQL_ROOT_PASSWORD: owncloud
+      MYSQL_USER: oc_autotest
+      MYSQL_PASSWORD: owncloud
+      MYSQL_DATABASE: oc_autotest
+    command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+    tmpfs:
+      - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+#    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: int-mysql-conversation
@@ -791,6 +871,50 @@ trigger:
 #    - pull_request
     - push
 
+---
+kind: pipeline
+name: int-pgsql-command
+
+steps:
+  - name: integration-command
+    image: nextcloudci/php7.3:php7.3-5
+    environment:
+      APP_NAME: spreed
+      CORE_BRANCH: master
+      DATABASEHOST: pgsql
+    commands:
+      - bash tests/drone-run-integration-tests.sh || exit 0
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
+      - cd ../server
+      - ./occ app:enable $APP_NAME
+      - cd apps/$APP_NAME
+
+      # Run integration tests
+      - cd tests/integration/
+      - bash run.sh features/command
+
+services:
+  - name: cache
+    image: redis
+  - name: pgsql
+    image: postgres:10
+    environment:
+      POSTGRES_USER: oc_autotest
+      POSTGRES_DB: oc_autotest_dummy
+      POSTGRES_HOST_AUTH_METHOD: trust
+      POSTGRES_PASSWORD:
+    tmpfs:
+      - /var/lib/postgresql/data
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+#    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: int-pgsql-conversation

From d009fe688b96f10a507a45092d466993abb854db Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Oct 2020 10:12:03 +0100
Subject: [PATCH 055/129] Add integration tests for creation (as that tests all
 parts of the service)

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../features/bootstrap/CommandLineTrait.php   | 41 +++++---------
 .../features/bootstrap/FeatureContext.php     | 30 ++++++++---
 .../features/command/create.feature           | 53 +++++++++++++++++++
 3 files changed, 90 insertions(+), 34 deletions(-)
 create mode 100644 tests/integration/features/command/create.feature

diff --git a/tests/integration/features/bootstrap/CommandLineTrait.php b/tests/integration/features/bootstrap/CommandLineTrait.php
index d8dd7f5d998..973dd213b59 100644
--- a/tests/integration/features/bootstrap/CommandLineTrait.php
+++ b/tests/integration/features/bootstrap/CommandLineTrait.php
@@ -23,6 +23,8 @@
  *
  */
 
+use PHPUnit\Framework\Assert;
+
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait CommandLineTrait {
@@ -96,25 +98,6 @@ public function findExceptions() {
 		return $exceptions;
 	}
 
-	/**
-	 * Finds all lines containing the given text
-	 *
-	 * @param string $input stdout or stderr output
-	 * @param string $text text to search for
-	 * @return array array of lines that matched
-	 */
-	public function findLines($input, $text) {
-		$results = [];
-		// the exception text usually appears after an "[Exception"] row
-		foreach (explode("\n", $input) as $line) {
-			if (strpos($line, $text) !== false) {
-				$results[] = $line;
-			}
-		}
-
-		return $results;
-	}
-
 	/**
 	 * @Then /^the command was successful$/
 	 */
@@ -136,9 +119,7 @@ public function theCommandWasSuccessful() {
 	 * @Then /^the command failed with exit code ([0-9]+)$/
 	 */
 	public function theCommandFailedWithExitCode($exitCode) {
-		if ($this->lastCode !== (int)$exitCode) {
-			throw new \Exception('The command was expected to fail with exit code ' . $exitCode . ' but got ' . $this->lastCode);
-		}
+		Assert::assertEquals($exitCode, $this->lastCode, 'The commands exit code did not match');
 	}
 
 	/**
@@ -159,19 +140,23 @@ public function theCommandFailedWithException($exceptionText) {
 	 * @Then /^the command output contains the text "([^"]*)"$/
 	 */
 	public function theCommandOutputContainsTheText($text) {
-		$lines = $this->findLines($this->lastStdOut, $text);
-		if (empty($lines)) {
-			throw new \Exception('The command did not output the expected text on stdout "' . $text . '"');
+		if ($this->lastStdOut === '' && $this->lastStdErr !== '') {
+			Assert::assertContains($text, $this->lastStdErr, 'The command did not output the expected text on stdout');
+			Assert::assertTrue(false, 'The command did not output the expected text on stdout but stderr');
 		}
+
+		Assert::assertContains($text, $this->lastStdOut, 'The command did not output the expected text on stdout');
 	}
 
 	/**
 	 * @Then /^the command error output contains the text "([^"]*)"$/
 	 */
 	public function theCommandErrorOutputContainsTheText($text) {
-		$lines = $this->findLines($this->lastStdErr, $text);
-		if (empty($lines)) {
-			throw new \Exception('The command did not output the expected text on stderr "' . $text . '"');
+		if ($this->lastStdErr === '' && $this->lastStdOut !== '') {
+			Assert::assertContains($text, $this->lastStdOut, 'The command did not output the expected text on stdout');
+			Assert::assertTrue(false, 'The command did not output the expected text on stdout but stderr');
 		}
+
+		Assert::assertContains($text, $this->lastStdErr, 'The command did not output the expected text on stderr');
 	}
 }
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index b9b3a20cb81..492f275d47f 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -171,12 +171,30 @@ public function userIsParticipantOfRooms($user, TableNode $formData = null) {
 				$participantNames[$lastParticipantKey] .= ' [exact order]';
 			}
 
-			return [
-				'id' => self::$tokenToIdentifier[$room['token']],
-				'type' => (string) $room['type'],
-				'participantType' => (string) $room['participantType'],
-				'participants' => implode(', ', $participantNames),
-			];
+			$data = [];
+			if (isset($expectedRoom['id'])) {
+				$data['id'] = self::$tokenToIdentifier[$room['token']];
+			}
+			if (isset($expectedRoom['name'])) {
+				$data['name'] = $room['name'];
+			}
+			if (isset($expectedRoom['type'])) {
+				$data['type'] = (string) $room['type'];
+			}
+			if (isset($expectedRoom['hasPassword'])) {
+				$data['hasPassword'] = (string) $room['hasPassword'];
+			}
+			if (isset($expectedRoom['readOnly'])) {
+				$data['readOnly'] = (string) $room['readOnly'];
+			}
+			if (isset($expectedRoom['participantType'])) {
+				$data['participantType'] = (string) $room['participantType'];
+			}
+			if (isset($expectedRoom['participants'])) {
+				$data['participants'] = implode(', ', $participantNames);
+			}
+
+			return $data;
 		}, $rooms, $formData->getHash()));
 	}
 
diff --git a/tests/integration/features/command/create.feature b/tests/integration/features/command/create.feature
new file mode 100644
index 00000000000..4148a7aec8a
--- /dev/null
+++ b/tests/integration/features/command/create.feature
@@ -0,0 +1,53 @@
+Feature: create
+
+  Background:
+    Given user "participant1" exists
+    Given user "participant2" exists
+    Given group "group1" exists
+    Given user "participant2" is member of group "group1"
+
+  Scenario: Create a room group room for participant1
+    Given invoking occ with "talk:room:create room1 --user participant1"
+    And the command output contains the text "Room successfully created"
+    Then the command was successful
+    And user "participant1" is participant of the following rooms
+      | name  | type | participantType | participants |
+      | room1 | 2    | 3               | participant1-displayname |
+
+  Scenario: Create a room group room for participant1 as moderator
+    Given invoking occ with "talk:room:create room1 --user participant1 --moderator participant1"
+    And the command output contains the text "Room successfully created"
+    Then the command was successful
+    And user "participant1" is participant of the following rooms
+      | name  | type | participantType | participants |
+      | room1 | 2    | 2               | participant1-displayname |
+
+  Scenario: Create a room group room for participant1 as owner
+    Given invoking occ with "talk:room:create room1 --user participant1 --owner participant1"
+    And the command output contains the text "Room successfully created"
+    Then the command was successful
+    And user "participant1" is participant of the following rooms
+      | name  | type | participantType | participants |
+      | room1 | 2    | 1               | participant1-displayname |
+
+  Scenario: Create a room public room for participant1 as owner group1 as users
+    Given invoking occ with "talk:room:create room1 --user participant1 --owner participant1 --public --group group1"
+    And the command output contains the text "Room successfully created"
+    Then the command was successful
+    And user "participant1" is participant of the following rooms
+      | name  | type | participantType | participants |
+      | room1 | 3    | 1               | participant1-displayname, participant2-displayname |
+    And user "participant2" is participant of the following rooms
+      | name  | type | participantType | participants |
+      | room1 | 3    | 3               | participant1-displayname, participant2-displayname |
+
+  Scenario: Create a room public room for participant1 as owner group1 as users with password and readonly
+    Given invoking occ with "talk:room:create room1 --user participant1 --owner participant1 --public --group group1 --readonly --password test"
+    And the command output contains the text "Room successfully created"
+    Then the command was successful
+    And user "participant1" is participant of the following rooms
+      | name  | type | readOnly | hasPassword | participantType | participants |
+      | room1 | 3    | 1        | 1           | 1               | participant1-displayname, participant2-displayname |
+    And user "participant2" is participant of the following rooms
+      | name  | type | readOnly | hasPassword | participantType | participants |
+      | room1 | 3    | 1        | 1           | 3               | participant1-displayname, participant2-displayname |

From 794a4b9faabd753dbc783e53751141d9ee073d13 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Oct 2020 13:56:06 +0100
Subject: [PATCH 056/129] Remove talk:room:* unit tests as they don't work
 anymore and should be integration tests mostly anyway

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/php/Command/Room/AddTest.php           | 337 -----------------
 tests/php/Command/Room/CreateTest.php        | 362 -------------------
 tests/php/Command/Room/DeleteTest.php        | 159 --------
 tests/php/Command/Room/DemoteTest.php        | 257 -------------
 tests/php/Command/Room/PromoteTest.php       | 241 ------------
 tests/php/Command/Room/RemoveTest.php        | 224 ------------
 tests/php/Command/Room/RoomMockContainer.php | 221 -----------
 tests/php/Command/Room/TRoomCommandTest.php  | 125 -------
 tests/php/Command/Room/UpdateTest.php        | 362 -------------------
 9 files changed, 2288 deletions(-)
 delete mode 100644 tests/php/Command/Room/AddTest.php
 delete mode 100644 tests/php/Command/Room/CreateTest.php
 delete mode 100644 tests/php/Command/Room/DeleteTest.php
 delete mode 100644 tests/php/Command/Room/DemoteTest.php
 delete mode 100644 tests/php/Command/Room/PromoteTest.php
 delete mode 100644 tests/php/Command/Room/RemoveTest.php
 delete mode 100644 tests/php/Command/Room/RoomMockContainer.php
 delete mode 100644 tests/php/Command/Room/TRoomCommandTest.php
 delete mode 100644 tests/php/Command/Room/UpdateTest.php

diff --git a/tests/php/Command/Room/AddTest.php b/tests/php/Command/Room/AddTest.php
deleted file mode 100644
index b0583d0f9b5..00000000000
--- a/tests/php/Command/Room/AddTest.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCA\Talk\Command\Room\Add;
-use OCA\Talk\Exceptions\RoomNotFoundException;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class AddTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Add */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Add(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-
-		$this->createTestUserMocks();
-		$this->createTestGroupMocks();
-	}
-
-	public function testMissingArguments(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "token").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $expectedRoomData, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Users successfully added to room.\n", $tester->getDisplay());
-
-		$this->assertEquals($expectedRoomData, $this->roomMockContainer->getRoomData());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-				],
-				RoomMockContainer::prepareRoomData([]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--user' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--user' => ['user1', 'user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--user' => ['user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--user' => ['user3'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1', 'group2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1', 'group2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user4', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user4', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1'],
-					'--user' => ['user4'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user4', 'participantType' => Participant::USER],
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1'],
-					'--user' => ['user4'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-						['userId' => 'user4', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-invalid',
-				],
-				"Room not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-				],
-				"Room is no group call.\n",
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::ONE_TO_ONE_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--user' => ['user1','invalid']
-				],
-				"User 'invalid' not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--group' => ['group1','invalid']
-				],
-				"Group 'invalid' not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-		];
-	}
-}
diff --git a/tests/php/Command/Room/CreateTest.php b/tests/php/Command/Room/CreateTest.php
deleted file mode 100644
index 762d5dad3bc..00000000000
--- a/tests/php/Command/Room/CreateTest.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use InvalidArgumentException;
-use OCA\Talk\Command\Room\Create;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class CreateTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Create */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Create(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-
-		$this->createTestUserMocks();
-		$this->createTestGroupMocks();
-	}
-
-	public function testMissingArguments(): void {
-		$this->roomService->expects($this->never())
-			->method('createConversation');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "name").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $expectedRoomData): void {
-		$this->roomService
-			->method('createConversation')
-			->willReturnCallback(function (int $type, string $name): Room {
-				return $this->roomMockContainer->create(['name' => $name, 'type' => $type]);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Room successfully created.\n", $tester->getDisplay());
-
-		$this->assertEquals($expectedRoomData, $this->roomMockContainer->getRoomData());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--public' => true,
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'type' => Room::PUBLIC_CALL,
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--readonly' => true,
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'readOnly' => Room::READ_ONLY,
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--public' => true,
-					'--password' => 'my-secret-password',
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'type' => Room::PUBLIC_CALL,
-					'password' => 'my-secret-password',
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1', 'user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1', 'user2'],
-					'--moderator' => ['user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1', 'user2', 'user3'],
-					'--moderator' => ['user2', 'user3'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user3', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1', 'user2'],
-					'--owner' => 'user2',
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::OWNER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--group' => ['group1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--group' => ['group1', 'group2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--group' => ['group1'],
-					'--user' => ['user4'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user4', 'participantType' => Participant::USER],
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--group' => ['group1'],
-					'--moderator' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--group' => ['group1'],
-					'--owner' => 'user1',
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room',
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput): void {
-		if ($input['name'] !== 'PHPUnit Test Room') {
-			$this->roomService
-				->method('createConversation')
-				->willThrowException(new InvalidArgumentException('name'));
-		} else {
-			$this->roomService
-				->method('createConversation')
-				->willReturnCallback(function (int $type, string $name): Room {
-					return $this->roomMockContainer->create(['name' => $name, 'type' => $type]);
-				});
-		}
-
-		$this->roomMockContainer->registerCallback(function (object $room) {
-			/** @var Room|MockObject $room */
-			$room->expects($this->once())
-				->method('deleteRoom');
-		});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'name' => '',
-				],
-				"Invalid room name.\n",
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--password' => 'my-secret-password',
-				],
-				"Unable to add password protection to private room.\n",
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1','invalid'],
-				],
-				"User 'invalid' not found.\n",
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--group' => ['group1','invalid'],
-				],
-				"Group 'invalid' not found.\n",
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1'],
-					'--moderator' => ['user2'],
-				],
-				"User 'user2' is no participant.\n",
-			],
-			[
-				[
-					'name' => 'PHPUnit Test Room',
-					'--user' => ['user1'],
-					'--owner' => 'user2',
-				],
-				"User 'user2' is no participant.\n",
-			],
-		];
-	}
-}
diff --git a/tests/php/Command/Room/DeleteTest.php b/tests/php/Command/Room/DeleteTest.php
deleted file mode 100644
index 2c938ada57b..00000000000
--- a/tests/php/Command/Room/DeleteTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCA\Talk\Command\Room\Delete;
-use OCA\Talk\Exceptions\RoomNotFoundException;
-use OCA\Talk\Manager;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class DeleteTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Delete */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Delete(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-	}
-
-	public function testMissingArguments(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "token").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$this->roomMockContainer->registerCallback(function (object $room) {
-			/** @var Room|MockObject $room */
-			$room->expects($this->once())
-				->method('deleteRoom');
-		});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Room successfully deleted.\n", $tester->getDisplay());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-				],
-				RoomMockContainer::prepareRoomData([]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-invalid',
-				],
-				"Room not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-				],
-				"Room is no group call.\n",
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::ONE_TO_ONE_CALL,
-				]),
-			],
-		];
-	}
-}
diff --git a/tests/php/Command/Room/DemoteTest.php b/tests/php/Command/Room/DemoteTest.php
deleted file mode 100644
index b2ea5e78d1d..00000000000
--- a/tests/php/Command/Room/DemoteTest.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCA\Talk\Command\Room\Demote;
-use OCA\Talk\Exceptions\RoomNotFoundException;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class DemoteTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Demote */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Demote(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-
-		$this->createTestUserMocks();
-		$this->createTestGroupMocks();
-	}
-
-	public function testMissingArguments(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "token, participant").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	public function testMissingArgumentParticipant(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "participant").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([
-			'token' => '__test-room',
-		]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $expectedRoomData, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Participants successfully demoted to regular users.\n", $tester->getDisplay());
-
-		$this->assertEquals($expectedRoomData, $this->roomMockContainer->getRoomData());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1', 'user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user2', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-invalid',
-					'participant' => [''],
-				],
-				"Room not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => [''],
-				],
-				"Room is no group call.\n",
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::ONE_TO_ONE_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1','invalid']
-				],
-				"User 'user1' is no participant.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1','invalid']
-				],
-				"User 'invalid' is no participant.\n",
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-}
diff --git a/tests/php/Command/Room/PromoteTest.php b/tests/php/Command/Room/PromoteTest.php
deleted file mode 100644
index f27139365c0..00000000000
--- a/tests/php/Command/Room/PromoteTest.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCA\Talk\Command\Room\Promote;
-use OCA\Talk\Exceptions\RoomNotFoundException;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class PromoteTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Promote */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Promote(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-
-		$this->createTestUserMocks();
-		$this->createTestGroupMocks();
-	}
-
-	public function testMissingArguments(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "token, participant").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	public function testMissingArgumentParticipant(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "participant").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([
-			'token' => '__test-room',
-		]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $expectedRoomData, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Participants successfully promoted to moderators.\n", $tester->getDisplay());
-
-		$this->assertEquals($expectedRoomData, $this->roomMockContainer->getRoomData());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1', 'user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::MODERATOR],
-						['userId' => 'user2', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-					],
-				]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-invalid',
-					'participant' => [''],
-				],
-				"Room not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => [''],
-				],
-				"Room is no group call.\n",
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::ONE_TO_ONE_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1','invalid']
-				],
-				"User 'user1' is no participant.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1','invalid']
-				],
-				"User 'invalid' is no participant.\n",
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-}
diff --git a/tests/php/Command/Room/RemoveTest.php b/tests/php/Command/Room/RemoveTest.php
deleted file mode 100644
index 737d75ba3e3..00000000000
--- a/tests/php/Command/Room/RemoveTest.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCA\Talk\Command\Room\Remove;
-use OCA\Talk\Exceptions\RoomNotFoundException;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class RemoveTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Remove */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Remove(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->createTestUserMocks();
-		$this->createTestGroupMocks();
-	}
-
-	public function testMissingArguments(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "token, participant").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	public function testMissingArgumentUser(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "participant").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([
-			'token' => '__test-room',
-		]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $expectedRoomData, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Users successfully removed from room.\n", $tester->getDisplay());
-
-		$this->assertEquals($expectedRoomData, $this->roomMockContainer->getRoomData());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1'],
-				],
-				RoomMockContainer::prepareRoomData([]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1', 'user2'],
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user3', 'participantType' => Participant::USER],
-						['userId' => 'user4', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-						['userId' => 'user3', 'participantType' => Participant::USER],
-						['userId' => 'user4', 'participantType' => Participant::MODERATOR],
-					],
-				]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-invalid',
-					'participant' => [''],
-				],
-				"Room not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => [''],
-				],
-				"Room is no group call.\n",
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::ONE_TO_ONE_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1','invalid']
-				],
-				"User 'user1' is no participant.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'participant' => ['user1','invalid']
-				],
-				"User 'invalid' is no participant.\n",
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-}
diff --git a/tests/php/Command/Room/RoomMockContainer.php b/tests/php/Command/Room/RoomMockContainer.php
deleted file mode 100644
index abe712a1abc..00000000000
--- a/tests/php/Command/Room/RoomMockContainer.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use InvalidArgumentException;
-use OCA\Talk\Exceptions\ParticipantNotFoundException;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCP\IUser;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class RoomMockContainer {
-	/** @var TestCase */
-	private $testCase;
-
-	/** @var callable[] */
-	private $callbacks = [];
-
-	/** @var Room|null */
-	private $room;
-
-	/** @var array|null */
-	private $roomData;
-
-	/** @var Participant[] */
-	private $participants = [];
-
-	/** @var array[] */
-	private $participantData = [];
-
-	public function __construct(TestCase $testCase) {
-		$this->testCase = $testCase;
-	}
-
-	public function create(array $data = []): Room {
-		if ($this->room !== null) {
-			throw new InvalidArgumentException(__METHOD__ . ' must not be called multiple times.');
-		}
-
-		/** @var Room|MockObject $room */
-		$room = $this->createMock(Room::class);
-
-		$this->room = $room;
-		$this->roomData = self::prepareRoomData($data);
-
-		// simple getter
-		foreach (['token', 'name', 'type', 'readOnly'] as $key) {
-			$room->method('get' . ucfirst($key))
-				->willReturnCallback(function () use ($key) {
-					return $this->roomData[$key];
-				});
-		}
-
-		// simple setter
-		foreach (['name', 'type', 'readOnly', 'password'] as $key) {
-			$room->method('set' . ucfirst($key))
-				->willReturnCallback(function ($value) use ($key): bool {
-					$this->roomData[$key] = $value;
-					return true;
-				});
-		}
-
-		// password
-		$room->method('hasPassword')
-			->willReturnCallback(function (): bool {
-				return $this->roomData['password'] !== '';
-			});
-
-		$room->method('verifyPassword')
-			->willReturnCallback(function (string $password): array {
-				return [
-					'result' => in_array($this->roomData['password'], ['', $password], true),
-					'url' => '',
-				];
-			});
-
-		// participants
-		$room->method('getParticipants')
-			->willReturnCallback(function (): array {
-				return $this->participants;
-			});
-
-		$room->method('getParticipant')
-			->willReturnCallback(function (?string $userId): Participant {
-				if (in_array($userId, [null, ''], true)) {
-					throw new ParticipantNotFoundException('Not a user');
-				}
-				if (!isset($this->participants[$userId])) {
-					throw new ParticipantNotFoundException('User is not a participant');
-				}
-
-				return $this->participants[$userId];
-			});
-
-		$room->method('addUsers')
-			->willReturnCallback(function (array ...$participants): void {
-				foreach ($participants as $participant) {
-					$userId = $participant['userId'];
-					$participantType = $participant['participantType'] ?? Participant::USER;
-
-					$this->createParticipant($userId, ['participantType' => $participantType]);
-				}
-			});
-
-		$room->method('removeUser')
-			->willReturnCallback(function (IUser $user): void {
-				$this->removeParticipant($user->getUID());
-			});
-
-		$room->method('setParticipantType')
-			->willReturnCallback(function (Participant $participant, int $participantType): void {
-				$userId = $participant->getUser();
-				$this->updateParticipant($userId, ['participantType' => $participantType]);
-			});
-
-		// add participants
-		foreach ($this->roomData['participants'] as $participant) {
-			$userId = $participant['userId'];
-			$participantType = $participant['participantType'] ?? Participant::USER;
-
-			$this->createParticipant($userId, ['participantType' => $participantType]);
-		}
-
-		unset($this->roomData['participants']);
-
-		// execute callbacks
-		foreach ($this->callbacks as $callback) {
-			$callback($room);
-		}
-
-		return $room;
-	}
-
-	protected function createParticipant(string $userId, array $data): Participant {
-		/** @var Participant|MockObject $participant */
-		$participant = $this->createMock(Participant::class);
-
-		$this->participants[$userId] = $participant;
-		$this->participantData[$userId] = ['userId' => $userId] + $data;
-
-		$participant->method('getUser')
-			->willReturnCallback(function () use ($userId): string {
-				return $this->participantData[$userId]['userId'];
-			});
-
-		$participant->method('getParticipantType')
-			->willReturnCallback(function () use ($userId): int {
-				return $this->participantData[$userId]['participantType'];
-			});
-
-		return $participant;
-	}
-
-	protected function updateParticipant(string $userId, array $data): void {
-		$this->participantData[$userId] = array_merge($this->participantData[$userId], $data);
-	}
-
-	protected function removeParticipant(string $userId): void {
-		unset($this->participants[$userId], $this->participantData[$userId]);
-	}
-
-	public function registerCallback(callable $callback): void {
-		$this->callbacks[] = $callback;
-	}
-
-	protected function createMock(string $originalClassName): MockObject {
-		return $this->testCase->getMockBuilder($originalClassName)
-			->disableOriginalConstructor()
-			->disableOriginalClone()
-			->disableArgumentCloning()
-			->disallowMockingUnknownTypes()
-			->disableAutoReturnValueGeneration()
-			->getMock();
-	}
-
-	public function getRoom(): ?Room {
-		return $this->room;
-	}
-
-	public function getRoomData(): ?array {
-		$participants = array_values($this->participantData);
-		return $this->roomData + ['participants' => $participants];
-	}
-
-	public static function prepareRoomData(array $data): array {
-		$data += [
-			'token' => '__test-room',
-			'name' => 'PHPUnit Test Room',
-			'type' => Room::GROUP_CALL,
-			'readOnly' => Room::READ_WRITE,
-			'password' => '',
-			'participants' => [],
-		];
-
-		return $data;
-	}
-}
diff --git a/tests/php/Command/Room/TRoomCommandTest.php b/tests/php/Command/Room/TRoomCommandTest.php
deleted file mode 100644
index 1757d889541..00000000000
--- a/tests/php/Command/Room/TRoomCommandTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCP\IGroup;
-use OCP\IGroupManager;
-use OCP\IUser;
-use OCP\IUserManager;
-use PHPUnit\Framework\MockObject\MockObject;
-
-trait TRoomCommandTest {
-	/** @var IUserManager|MockObject */
-	protected $userManager;
-
-	/** @var IGroupManager|MockObject */
-	protected $groupManager;
-
-	/** @var IUser[] */
-	private $userMocks;
-
-	/** @var IGroup[] */
-	private $groupMocks;
-
-	protected function registerUserManagerMock(): void {
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$this->userManager->method('get')
-			->willReturnCallback([$this, 'getUserMock']);
-
-		$this->overwriteService(IUserManager::class, $this->userManager);
-	}
-
-	protected function createTestUserMocks(): void {
-		$this->createUserMock('user1');
-		$this->createUserMock('user2');
-		$this->createUserMock('user3');
-		$this->createUserMock('user4');
-		$this->createUserMock('other');
-	}
-
-	public function getUserMock(string $uid): ?IUser {
-		return $this->userMocks[$uid] ?? null;
-	}
-
-	protected function createUserMock(string $uid): IUser {
-		/** @var IUser|MockObject $user */
-		$user = $this->createMock(IUser::class);
-
-		$this->userMocks[$uid] = $user;
-
-		$user->method('getUID')
-			->willReturn($uid);
-
-		return $user;
-	}
-
-	protected function registerGroupManagerMock(): void {
-		$this->groupManager = $this->createMock(IGroupManager::class);
-
-		$this->groupManager->method('get')
-			->willReturnCallback([$this, 'getGroupMock']);
-
-		$this->overwriteService(IGroupManager::class, $this->groupManager);
-	}
-
-	protected function createTestGroupMocks(): void {
-		$this->createGroupMock('group1', ['user1', 'user2']);
-		$this->createGroupMock('group2', ['user2', 'user3']);
-		$this->createGroupMock('other', ['other']);
-	}
-
-	public function getGroupMock(string $gid): ?IGroup {
-		return $this->groupMocks[$gid] ?? null;
-	}
-
-	protected function createGroupMock(string $gid, array $userIds): IGroup {
-		/** @var IGroup|MockObject $group */
-		$group = $this->createMock(IGroup::class);
-
-		$this->groupMocks[$gid] = $group;
-
-		$group->method('getGID')
-			->willReturn($gid);
-
-		$group->method('getUsers')
-			->willReturnCallback(function () use ($userIds) {
-				return array_map([$this, 'getUserMock'], $userIds);
-			});
-
-		return $group;
-	}
-
-	protected function createMock($originalClassName): MockObject {
-		return $this->getMockBuilder($originalClassName)
-			->disableOriginalConstructor()
-			->disableOriginalClone()
-			->disableArgumentCloning()
-			->disallowMockingUnknownTypes()
-			->disableAutoReturnValueGeneration()
-			->getMock();
-	}
-}
diff --git a/tests/php/Command/Room/UpdateTest.php b/tests/php/Command/Room/UpdateTest.php
deleted file mode 100644
index dc7f11d6bee..00000000000
--- a/tests/php/Command/Room/UpdateTest.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Command\Room;
-
-use OCA\Talk\Command\Room\Update;
-use OCA\Talk\Exceptions\RoomNotFoundException;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Component\Console\Exception\RuntimeException as ConsoleRuntimeException;
-use Symfony\Component\Console\Tester\CommandTester;
-use Test\TestCase;
-
-class UpdateTest extends TestCase {
-	use TRoomCommandTest;
-
-	/** @var Update */
-	private $command;
-
-	/** @var Manager|MockObject */
-	private $manager;
-
-	/** @var RoomService|MockObject */
-	private $roomService;
-
-	/** @var RoomMockContainer */
-	private $roomMockContainer;
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->command = new Update(
-			$this->manager,
-			$this->roomService,
-			$this->userManager,
-			$this->groupManager
-		);
-
-		$this->roomMockContainer = new RoomMockContainer($this);
-
-		$this->registerUserManagerMock();
-		$this->registerGroupManagerMock();
-
-		$this->createTestUserMocks();
-		$this->createTestGroupMocks();
-	}
-
-	public function testMissingArguments(): void {
-		$this->manager->expects($this->never())
-			->method('getRoomByToken');
-
-		$this->expectException(ConsoleRuntimeException::class);
-		$this->expectExceptionMessage('Not enough arguments (missing: "token").');
-
-		$tester = new CommandTester($this->command);
-		$tester->execute([]);
-	}
-
-	/**
-	 * @dataProvider validProvider
-	 */
-	public function testValid(array $input, array $expectedRoomData, array $initialRoomData): void {
-		$this->manager->expects($this->once())
-			->method('getRoomByToken')
-			->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-				if ($token !== $initialRoomData['token']) {
-					throw new RoomNotFoundException();
-				}
-
-				return $this->roomMockContainer->create($initialRoomData);
-			});
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals("Room successfully updated.\n", $tester->getDisplay());
-
-		$this->assertEquals($expectedRoomData, $this->roomMockContainer->getRoomData());
-	}
-
-	public function validProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-				],
-				RoomMockContainer::prepareRoomData([]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--name' => 'PHPUnit Test Room 2'
-				],
-				RoomMockContainer::prepareRoomData([
-					'name' => 'PHPUnit Test Room 2',
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--public' => '1'
-				],
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::PUBLIC_CALL,
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--public' => '0'
-				],
-				RoomMockContainer::prepareRoomData([]),
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::PUBLIC_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--readonly' => '1'
-				],
-				RoomMockContainer::prepareRoomData([
-					'readOnly' => Room::READ_ONLY,
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--readonly' => '0'
-				],
-				RoomMockContainer::prepareRoomData([]),
-				RoomMockContainer::prepareRoomData([
-					'readOnly' => Room::READ_ONLY,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--readonly' => '1'
-				],
-				RoomMockContainer::prepareRoomData([
-					'readOnly' => Room::READ_ONLY,
-				]),
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--password' => 'my-secret-password'
-				],
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::PUBLIC_CALL,
-					'password' => 'my-secret-password',
-				]),
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::PUBLIC_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--password' => ''
-				],
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::PUBLIC_CALL,
-				]),
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::PUBLIC_CALL,
-					'password' => 'my-secret-password',
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--owner' => 'user1'
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--owner' => 'user2'
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::OWNER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--owner' => ''
-				],
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::USER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-				RoomMockContainer::prepareRoomData([
-					'participants' => [
-						['userId' => 'user1', 'participantType' => Participant::OWNER],
-						['userId' => 'user2', 'participantType' => Participant::USER],
-					],
-				]),
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidProvider
-	 */
-	public function testInvalid(array $input, string $expectedOutput, array $initialRoomData = null): void {
-		if ($initialRoomData !== null) {
-			$this->manager->expects($this->once())
-				->method('getRoomByToken')
-				->willReturnCallback(function (string $token) use ($initialRoomData): Room {
-					if ($token !== $initialRoomData['token']) {
-						throw new RoomNotFoundException();
-					}
-
-					return $this->roomMockContainer->create($initialRoomData);
-				});
-		} else {
-			$this->manager->expects($this->never())
-				->method('getRoomByToken');
-		}
-
-		$tester = new CommandTester($this->command);
-		$tester->execute($input);
-
-		$this->assertEquals($expectedOutput, $tester->getDisplay());
-	}
-
-	public function invalidProvider(): array {
-		return [
-			[
-				[
-					'token' => '__test-room',
-					'--public' => '',
-				],
-				"Invalid value for option \"--public\" given.\n",
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--readonly' => '',
-				],
-				"Invalid value for option \"--readonly\" given.\n",
-			],
-			[
-				[
-					'token' => '__test-invalid',
-				],
-				"Room not found.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-				],
-				"Room is no group call.\n",
-				RoomMockContainer::prepareRoomData([
-					'type' => Room::ONE_TO_ONE_CALL,
-				]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--name' => '',
-				],
-				"Invalid room name.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--name' => '  ',
-				],
-				"Invalid room name.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--name' => str_repeat('x', 256),
-				],
-				"Invalid room name.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--password' => 'my-secret-password',
-				],
-				"Unable to add password protection to private room.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-			[
-				[
-					'token' => '__test-room',
-					'--owner' => 'invalid',
-				],
-				"User 'invalid' is no participant.\n",
-				RoomMockContainer::prepareRoomData([]),
-			],
-		];
-	}
-}

From 545f35b2170db3ddba338a51c03387e81640f3cd Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Oct 2020 15:31:32 +0100
Subject: [PATCH 057/129] Fix the unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/Parser/SystemMessage.php             |   2 +-
 lib/Controller/SignalingController.php        |  40 +++--
 lib/Signaling/BackendNotifier.php             |   9 +-
 .../Chat/AutoComplete/SearchPluginTest.php    |  32 +++-
 tests/php/Chat/ChatManagerTest.php            |   5 +
 tests/php/Chat/NotifierTest.php               |   5 +
 tests/php/Chat/Parser/SystemMessageTest.php   |  56 ++++--
 .../Resources/ConversationProviderTest.php    |  23 ++-
 tests/php/Controller/ChatControllerTest.php   |  17 +-
 tests/php/Controller/RoomControllerTest.php   | 167 ------------------
 .../Controller/SignalingControllerTest.php    |  65 +++++--
 tests/php/Notification/NotifierTest.php       |   5 +
 tests/php/RoomTest.php                        |   1 +
 tests/php/Service/RoomServiceTest.php         |  41 +++--
 tests/php/Signaling/BackendNotifierTest.php   | 124 +++++++++----
 15 files changed, 307 insertions(+), 285 deletions(-)
 delete mode 100644 tests/php/Controller/RoomControllerTest.php

diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index daac5e32947..6ee2c6ecf96 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -97,10 +97,10 @@ public function parseMessage(Message $chatMessage): void {
 				$participant->getAttendee()->getActorType() === 'users' &&
 				$currentActorId === $parsedParameters['actor']['id'];
 		} else {
+			$currentActorId = $participant->getAttendee()->getActorId();
 			$currentUserIsActor = $parsedParameters['actor']['type'] === 'guest' &&
 				$participant->getAttendee()->getActorType() === 'guest' &&
 				$participant->getAttendee()->getActorId() === $parsedParameters['actor']['id'];
-			$currentActorId = null;
 		}
 		$cliIsActor = $parsedParameters['actor']['type'] === 'guest' &&
 			'guest/cli' === $parsedParameters['actor']['id'];
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 5b41e1d0689..931c9498a7f 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -537,26 +537,32 @@ private function backendRoom(array $roomRequest): DataResponse {
 		}
 
 		$participant = null;
-		try {
-			$participant = $room->getParticipantBySession($sessionId);
-		} catch (ParticipantNotFoundException $e) {
-			if (!empty($userId)) {
-				// User trying to join room.
-				try {
-					$participant = $room->getParticipant($userId);
-				} catch (ParticipantNotFoundException $e) {
-					// Return generic error to avoid leaking which rooms exist.
-					return new DataResponse([
-						'type' => 'error',
-						'error' => [
-							'code' => 'no_such_room',
-							'message' => 'The user is not invited to this room.',
-						],
-					]);
-				}
+		if ($sessionId) {
+			try {
+				$participant = $room->getParticipantBySession($sessionId);
+			} catch (ParticipantNotFoundException $e) {
+			}
+		}
+
+		if (!empty($userId)) {
+			// User trying to join room.
+			try {
+				$participant = $room->getParticipant($userId);
+			} catch (ParticipantNotFoundException $e) {
 			}
 		}
 
+		if (!$participant instanceof Participant) {
+			// Return generic error to avoid leaking which rooms exist.
+			return new DataResponse([
+				'type' => 'error',
+				'error' => [
+					'code' => 'no_such_room',
+					'message' => 'The user is not invited to this room.',
+				],
+			]);
+		}
+
 		if ($action === 'join') {
 			if ($participant->getSession() instanceof Session) {
 				$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
diff --git a/lib/Signaling/BackendNotifier.php b/lib/Signaling/BackendNotifier.php
index 631d99c1fa4..1ada571c703 100644
--- a/lib/Signaling/BackendNotifier.php
+++ b/lib/Signaling/BackendNotifier.php
@@ -147,7 +147,9 @@ public function roomInvited(Room $room, array $users): void {
 		$this->logger->info('Now invited to ' . $room->getToken() . ': ' . print_r($users, true));
 		$userIds = [];
 		foreach ($users as $user) {
-			$userIds[] = $user['userId'];
+			if ($user['actorType'] === 'users') {
+				$userIds[] = $user['actorId'];
+			}
 		}
 		$this->backendRequest($room, [
 			'type' => 'invite',
@@ -262,10 +264,9 @@ public function participantsModified(Room $room, array $sessionIds): void {
 				'sessionId' => '0',
 				'participantType' => $attendee->getParticipantType(),
 			];
-			if ($attendee->getActorType() !== 'users') {
+			if ($attendee->getActorType() === 'users') {
 				$data['userId'] = $attendee->getActorId();
 			}
-			$users[] = $data;
 
 			$session = $participant->getSession();
 			if ($session instanceof Session) {
@@ -323,7 +324,7 @@ public function roomInCallChanged(Room $room, int $flags, array $sessionIds): vo
 				'sessionId' => '0',
 				'participantType' => $attendee->getParticipantType(),
 			];
-			if ($attendee->getActorType() !== 'users') {
+			if ($attendee->getActorType() === 'users') {
 				$data['userId'] = $attendee->getActorId();
 			}
 
diff --git a/tests/php/Chat/AutoComplete/SearchPluginTest.php b/tests/php/Chat/AutoComplete/SearchPluginTest.php
index 67e094f2fac..e7cb50051f2 100644
--- a/tests/php/Chat/AutoComplete/SearchPluginTest.php
+++ b/tests/php/Chat/AutoComplete/SearchPluginTest.php
@@ -24,8 +24,11 @@
 use OCA\Talk\Chat\AutoComplete\SearchPlugin;
 use OCA\Talk\Files\Util;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
 use OCP\Collaboration\Collaborators\ISearchResult;
 use OCP\IL10N;
@@ -41,6 +44,8 @@ class SearchPluginTest extends \Test\TestCase {
 	protected $guestManager;
 	/** @var TalkSession|MockObject */
 	protected $talkSession;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
 	/** @var Util|MockObject */
 	protected $util;
 	/** @var IL10N|MockObject */
@@ -56,6 +61,7 @@ public function setUp(): void {
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->guestManager = $this->createMock(GuestManager::class);
 		$this->talkSession = $this->createMock(TalkSession::class);
+		$this->participantService = $this->createMock(ParticipantService::class);
 		$this->util = $this->createMock(Util::class);
 		$this->userId = 'current';
 		$this->l = $this->createMock(IL10N::class);
@@ -76,6 +82,7 @@ protected function getPlugin(array $methods = []) {
 				$this->userManager,
 				$this->guestManager,
 				$this->talkSession,
+				$this->participantService,
 				$this->util,
 				$this->userId,
 				$this->l
@@ -87,6 +94,7 @@ protected function getPlugin(array $methods = []) {
 				$this->userManager,
 				$this->guestManager,
 				$this->talkSession,
+				$this->participantService,
 				$this->util,
 				$this->userId,
 				$this->l,
@@ -98,15 +106,24 @@ protected function getPlugin(array $methods = []) {
 	protected function createParticipantMock(string $uid, string $session = ''): Participant {
 		/** @var Participant|MockObject $p */
 		$p = $this->createMock(Participant::class);
+		$a = Attendee::fromRow([
+			'actor_type' => $uid ? 'users' : 'guests',
+			'actor_id' => $uid ? $uid : sha1($session),
+		]);
+		$s = Session::fromRow([
+			'session_id' => $session,
+		]);
 		$p->expects($this->any())
-			->method('getUser')
-			->willReturn($uid);
+			->method('getAttendee')
+			->willReturn($a);
+		$p->expects($this->any())
+			->method('getSession')
+			->willReturn($s);
+
 		$p->expects($this->any())
 			->method('isGuest')
 			->willReturn($uid === '');
-		$p->expects($this->any())
-			->method('getSessionId')
-			->willReturn($session);
+
 		return $p;
 	}
 
@@ -114,8 +131,9 @@ public function testSearch() {
 		$result = $this->createMock(ISearchResult::class);
 		$room = $this->createMock(Room::class);
 
-		$room->expects($this->once())
-			->method('getParticipants')
+		$this->participantService->expects($this->once())
+			->method('getParticipantsForRoom')
+			->with($room)
 			->willReturn([
 				$this->createParticipantMock('123'),
 				$this->createParticipantMock('foo'),
diff --git a/tests/php/Chat/ChatManagerTest.php b/tests/php/Chat/ChatManagerTest.php
index b3684e1ecc8..3cd63aefa2e 100644
--- a/tests/php/Chat/ChatManagerTest.php
+++ b/tests/php/Chat/ChatManagerTest.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Chat\Notifier;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
@@ -50,6 +51,8 @@ class ChatManagerTest extends TestCase {
 	protected $dispatcher;
 	/** @var INotificationManager|MockObject */
 	protected $notificationManager;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
 	/** @var Notifier|MockObject */
 	protected $notifier;
 	/** @var ITimeFactory|MockObject */
@@ -63,6 +66,7 @@ public function setUp(): void {
 		$this->commentsManager = $this->createMock(CommentsManager::class);
 		$this->dispatcher = $this->createMock(IEventDispatcher::class);
 		$this->notificationManager = $this->createMock(INotificationManager::class);
+		$this->participantService = $this->createMock(ParticipantService::class);
 		$this->notifier = $this->createMock(Notifier::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$cacheFactory = $this->createMock(ICacheFactory::class);
@@ -72,6 +76,7 @@ public function setUp(): void {
 			$this->dispatcher,
 			\OC::$server->getDatabaseConnection(),
 			$this->notificationManager,
+			$this->participantService,
 			$this->notifier,
 			$cacheFactory,
 			$this->timeFactory
diff --git a/tests/php/Chat/NotifierTest.php b/tests/php/Chat/NotifierTest.php
index 8c5827e4a4b..d0214a305e1 100644
--- a/tests/php/Chat/NotifierTest.php
+++ b/tests/php/Chat/NotifierTest.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\Comments\IComment;
 use OCP\IConfig;
 use OCP\Notification\IManager as INotificationManager;
@@ -43,6 +44,8 @@ class NotifierTest extends TestCase {
 	protected $notificationManager;
 	/** @var IUserManager|MockObject */
 	protected $userManager;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
 	/** @var Manager|MockObject */
 	protected $manager;
 	/** @var IConfig|MockObject */
@@ -65,6 +68,7 @@ public function setUp(): void {
 				return $userId !== 'unknownUser';
 			});
 
+		$this->participantService = $this->createMock(ParticipantService::class);
 		$this->manager = $this->createMock(Manager::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->util = $this->createMock(Util::class);
@@ -72,6 +76,7 @@ public function setUp(): void {
 		$this->notifier = new Notifier(
 			$this->notificationManager,
 			$this->userManager,
+			$this->participantService,
 			$this->manager,
 			$this->config,
 			$this->util
diff --git a/tests/php/Chat/Parser/SystemMessageTest.php b/tests/php/Chat/Parser/SystemMessageTest.php
index 955cfaf3c8e..2f45e0b96c0 100644
--- a/tests/php/Chat/Parser/SystemMessageTest.php
+++ b/tests/php/Chat/Parser/SystemMessageTest.php
@@ -24,7 +24,9 @@
 use OCA\Talk\Chat\Parser\SystemMessage;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
+use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Share\RoomShareProvider;
@@ -312,20 +314,32 @@ public function testParseMessage(string $message, array $parameters, $recipientI
 		/** @var Participant|MockObject $participant */
 		$participant = $this->createMock(Participant::class);
 		if ($recipientId && strpos($recipientId, 'guest::') !== false) {
+			$attendee = Attendee::fromRow([
+				'actor_type' => 'guests',
+				'actor_id' => substr($recipientId, strlen('guest::')),
+			]);
+			$session = Session::fromRow([
+				'session_id' => substr($recipientId, strlen('guest::')),
+			]);
 			$participant->expects($this->atLeastOnce())
 				->method('isGuest')
 				->willReturn(true);
-			$participant->expects($this->atLeastOnce())
-				->method('getSessionId')
-				->willReturn(substr($recipientId, strlen('guest::')));
 		} else {
 			$participant->expects($this->atLeastOnce())
 				->method('isGuest')
 				->willReturn(false);
-			$participant->expects($this->atLeastOnce())
-				->method('getUser')
-				->willReturn($recipientId);
+			$attendee = Attendee::fromRow([
+				'actor_type' => 'users',
+				'actor_id' => $recipientId,
+			]);
+			$session = null;
 		}
+		$participant->expects($this->any())
+			->method('getAttendee')
+			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getSession')
+			->willReturn($session);
 
 		/** @var IComment|MockObject $comment */
 		$comment = $this->createMock(IComment::class);
@@ -520,9 +534,13 @@ public function testGetFileFromShareForOwner() {
 		$participant->expects($this->once())
 			->method('isGuest')
 			->willReturn(false);
-		$participant->expects($this->once())
-			->method('getUser')
-			->willReturn('owner');
+		$attendee = Attendee::fromRow([
+			'actor_type' => 'users',
+			'actor_id' => 'owner',
+		]);
+		$participant->expects($this->any())
+			->method('getAttendee')
+			->willReturn($attendee);
 
 		$parser = $this->getParser();
 		$this->assertSame([
@@ -557,9 +575,13 @@ public function testGetFileFromShareForRecipient() {
 		$participant->expects($this->once())
 			->method('isGuest')
 			->willReturn(false);
-		$participant->expects($this->exactly(2))
-			->method('getUser')
-			->willReturn('user');
+		$attendee = Attendee::fromRow([
+			'actor_type' => 'users',
+			'actor_id' => 'user',
+		]);
+		$participant->expects($this->any())
+			->method('getAttendee')
+			->willReturn($attendee);
 
 		$this->shareProvider->expects($this->once())
 			->method('getShareById')
@@ -627,9 +649,13 @@ public function testGetFileFromShareForRecipientThrows() {
 		$participant->expects($this->once())
 			->method('isGuest')
 			->willReturn(false);
-		$participant->expects($this->exactly(3))
-			->method('getUser')
-			->willReturn('user');
+		$attendee = Attendee::fromRow([
+			'actor_type' => 'users',
+			'actor_id' => 'user',
+		]);
+		$participant->expects($this->any())
+			->method('getAttendee')
+			->willReturn($attendee);
 
 		$this->shareProvider->expects($this->once())
 			->method('getShareById')
diff --git a/tests/php/Collaboration/Resources/ConversationProviderTest.php b/tests/php/Collaboration/Resources/ConversationProviderTest.php
index 0080a6b6e45..df80d82ed7d 100644
--- a/tests/php/Collaboration/Resources/ConversationProviderTest.php
+++ b/tests/php/Collaboration/Resources/ConversationProviderTest.php
@@ -27,6 +27,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCP\Collaboration\Resources\IResource;
@@ -124,9 +125,14 @@ public function testCanAccessResourceParticipantNotAdded(): void {
 			->willReturn('token');
 
 		$participant = $this->createMock(Participant::class);
-		$participant->expects($this->once())
-			->method('getParticipantType')
-			->willReturn(Participant::USER_SELF_JOINED);
+		$attendee = Attendee::fromRow([
+			'actor_type' => 'users',
+			'actor_id' => 'uid',
+			'participant_type' => Participant::USER_SELF_JOINED,
+		]);
+		$participant->expects($this->any())
+			->method('getAttendee')
+			->willReturn($attendee);
 		$room = $this->createMock(Room::class);
 		$room->expects($this->once())
 			->method('getParticipant')
@@ -164,9 +170,14 @@ public function testCanAccessResourceYes(int $participantType): void {
 			->willReturn('token');
 
 		$participant = $this->createMock(Participant::class);
-		$participant->expects($this->once())
-			->method('getParticipantType')
-			->willReturn($participantType);
+		$attendee = Attendee::fromRow([
+			'actor_type' => 'users',
+			'actor_id' => 'uid',
+			'participant_type' => $participantType,
+		]);
+		$participant->expects($this->any())
+			->method('getAttendee')
+			->willReturn($attendee);
 		$room = $this->createMock(Room::class);
 		$room->expects($this->once())
 			->method('getParticipant')
diff --git a/tests/php/Controller/ChatControllerTest.php b/tests/php/Controller/ChatControllerTest.php
index 1143546b116..ace37089ab0 100644
--- a/tests/php/Controller/ChatControllerTest.php
+++ b/tests/php/Controller/ChatControllerTest.php
@@ -28,9 +28,12 @@
 use OCA\Talk\Chat\MessageParser;
 use OCA\Talk\Controller\ChatController;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
+use OCA\Talk\Service\SessionService;
 use OCA\Talk\TalkSession;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
@@ -61,6 +64,12 @@ class ChatControllerTest extends TestCase {
 	private $appManager;
 	/** @var ChatManager|MockObject */
 	protected $chatManager;
+	/** @var AttendeeMapper|MockObject */
+	protected $attendeeMapper;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
+	/** @var SessionService|MockObject */
+	protected $sessionService;
 	/** @var GuestManager|MockObject */
 	protected $guestManager;
 	/** @var MessageParser|MockObject */
@@ -97,6 +106,9 @@ public function setUp(): void {
 		$this->session = $this->createMock(TalkSession::class);
 		$this->appManager = $this->createMock(IAppManager::class);
 		$this->chatManager = $this->createMock(ChatManager::class);
+		$this->attendeeMapper = $this->createMock(AttendeeMapper::class);
+		$this->participantService = $this->createMock(ParticipantService::class);
+		$this->sessionService = $this->createMock(SessionService::class);
 		$this->guestManager = $this->createMock(GuestManager::class);
 		$this->messageParser = $this->createMock(MessageParser::class);
 		$this->autoCompleteManager = $this->createMock(IManager::class);
@@ -128,14 +140,17 @@ private function recreateChatController() {
 			$this->session,
 			$this->appManager,
 			$this->chatManager,
+			$this->attendeeMapper,
+			$this->participantService,
+			$this->sessionService,
 			$this->guestManager,
 			$this->messageParser,
 			$this->autoCompleteManager,
 			$this->statusManager,
 			$this->searchPlugin,
 			$this->searchResult,
-			$this->eventDispatcher,
 			$this->timeFactory,
+			$this->eventDispatcher,
 			$this->l
 		);
 	}
diff --git a/tests/php/Controller/RoomControllerTest.php b/tests/php/Controller/RoomControllerTest.php
deleted file mode 100644
index 06807707b8c..00000000000
--- a/tests/php/Controller/RoomControllerTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-/**
- *
- * @copyright Copyright (c) 2017, Daniel Calviño Sánchez (danxuliu@gmail.com)
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Tests\php\Controller;
-
-use OCA\Talk\Chat\ChatManager;
-use OCA\Talk\Chat\MessageParser;
-use OCA\Talk\Config;
-use OCA\Talk\Controller\RoomController;
-use OCA\Talk\GuestManager;
-use OCA\Talk\Manager;
-use OCA\Talk\Participant;
-use OCA\Talk\Room;
-use OCA\Talk\Service\RoomService;
-use OCA\Talk\TalkSession;
-use OCP\App\IAppManager;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IConfig;
-use OCP\IGroupManager;
-use OCP\IL10N;
-use OCP\IRequest;
-use OCP\IUserManager;
-use OCP\UserStatus\IManager as IUserStatusManager;
-use PHPUnit\Framework\MockObject\MockObject;
-use Test\TestCase;
-
-class RoomControllerTest extends TestCase {
-
-	/** @var string */
-	private $userId;
-	/** @var IAppManager|MockObject */
-	private $appManager;
-	/** @var TalkSession|MockObject */
-	private $talkSession;
-	/** @var IUserManager|MockObject */
-	protected $userManager;
-	/** @var IGroupManager|MockObject */
-	protected $groupManager;
-	/** @var IUserStatusManager|MockObject */
-	protected $statusManager;
-	/** @var Manager|MockObject */
-	protected $manager;
-	/** @var RoomService|MockObject */
-	protected $roomService;
-	/** @var ChatManager|MockObject */
-	protected $chatManager;
-	/** @var GuestManager|MockObject */
-	protected $guestManager;
-	/** @var IEventDispatcher|MockObject */
-	protected $dispatcher;
-	/** @var MessageParser|MockObject */
-	protected $messageParser;
-	/** @var ITimeFactory|MockObject */
-	protected $timeFactory;
-	/** @var IL10N|MockObject */
-	private $l;
-	/** @var IConfig|MockObject */
-	private $serverConfig;
-	/** @var Config|MockObject */
-	private $talkConfig;
-
-
-	public function setUp(): void {
-		parent::setUp();
-
-		$this->userId = 'testUser';
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->talkSession = $this->createMock(TalkSession::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->manager = $this->createMock(Manager::class);
-		$this->roomService = $this->createMock(RoomService::class);
-		$this->guestManager = $this->createMock(GuestManager::class);
-		$this->statusManager = $this->createMock(IUserStatusManager::class);
-		$this->chatManager = $this->createMock(ChatManager::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-		$this->messageParser = $this->createMock(MessageParser::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->l = $this->createMock(IL10N::class);
-		$this->serverConfig = $this->createMock(IConfig::class);
-		$this->talkConfig = $this->createMock(Config::class);
-	}
-
-	/**
-	 * @param Room|MockObject $room
-	 * @param Participant|MockObject $participant
-	 * @return RoomController
-	 */
-	private function getController(Room $room, Participant $participant): RoomController {
-		$controller = new RoomController(
-			'spreed',
-			$this->userId,
-			$this->createMock(IRequest::class),
-			$this->appManager,
-			$this->talkSession,
-			$this->userManager,
-			$this->groupManager,
-			$this->manager,
-			$this->roomService,
-			$this->guestManager,
-			$this->statusManager,
-			$this->chatManager,
-			$this->dispatcher,
-			$this->messageParser,
-			$this->timeFactory,
-			$this->l,
-			$this->serverConfig,
-			$this->talkConfig
-		);
-		$controller->setRoom($room);
-		$controller->setParticipant($participant);
-		return $controller;
-	}
-
-	public function dataSetNotificationLevel(): array {
-		return [
-			[Participant::NOTIFY_ALWAYS, true],
-			[Participant::NOTIFY_MENTION, true],
-			[Participant::NOTIFY_NEVER, true],
-			[Participant::NOTIFY_DEFAULT, false, Http::STATUS_BAD_REQUEST],
-		];
-	}
-
-	/**
-	 * @dataProvider dataSetNotificationLevel
-	 * @param int $level
-	 * @param bool $validSet
-	 * @param int $status
-	 */
-	public function testSetNotificationLevel(int $level, bool $validSet, int $status = Http::STATUS_OK) {
-		$participant = $this->createMock(Participant::class);
-		$participant->expects($this->once())
-			->method('setNotificationLevel')
-			->with($level)
-			->willReturn($validSet);
-
-		$room = $this->createMock(Room::class);
-
-		$controller = $this->getController($room, $participant);
-		$expected = new DataResponse([], $status);
-
-		$this->assertEquals($expected, $controller->setNotificationLevel($level));
-	}
-}
diff --git a/tests/php/Controller/SignalingControllerTest.php b/tests/php/Controller/SignalingControllerTest.php
index 7b80df49bf0..e9da6f7f2f7 100644
--- a/tests/php/Controller/SignalingControllerTest.php
+++ b/tests/php/Controller/SignalingControllerTest.php
@@ -29,8 +29,12 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\AttendeeMapper;
+use OCA\Talk\Model\SessionMapper;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
+use OCA\Talk\Service\SessionService;
 use OCA\Talk\Signaling\Messages;
 use OCA\Talk\TalkSession;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -70,6 +74,10 @@ class SignalingControllerTest extends \Test\TestCase {
 	private $signalingManager;
 	/** @var Manager|MockObject */
 	protected $manager;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
+	/** @var SessionService|MockObject */
+	protected $sessionService;
 	/** @var IDBConnection|MockObject */
 	protected $dbConnection;
 	/** @var Messages|MockObject */
@@ -108,6 +116,8 @@ public function setUp(): void {
 		$this->dbConnection = \OC::$server->getDatabaseConnection();
 		$this->signalingManager = $this->createMock(\OCA\Talk\Signaling\Manager::class);
 		$this->manager = $this->createMock(Manager::class);
+		$this->participantService = $this->createMock(ParticipantService::class);
+		$this->sessionService = $this->createMock(SessionService::class);
 		$this->messages = $this->createMock(Messages::class);
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
@@ -124,6 +134,8 @@ private function recreateSignalingController() {
 			$this->signalingManager,
 			$this->session,
 			$this->manager,
+			$this->participantService,
+			$this->sessionService,
 			$this->dbConnection,
 			$this->messages,
 			$this->userManager,
@@ -580,8 +592,8 @@ public function testBackendRoomInvitedPublic() {
 
 		$participant = $this->createMock(Participant::class);
 		$room->expects($this->once())
-			->method('getParticipant')
-			->with($this->userId)
+			->method('getParticipantBySession')
+			->with($sessionId)
 			->willThrowException(new ParticipantNotFoundException());
 		$room->expects($this->once())
 			->method('getParticipantBySession')
@@ -632,7 +644,6 @@ public function testBackendRoomAnonymousOneToOne() {
 			->with($roomToken)
 			->willReturn($room);
 
-		$participant = $this->createMock(Participant::class);
 		$room->expects($this->once())
 			->method('getParticipantBySession')
 			->willThrowException(new ParticipantNotFoundException());
@@ -755,9 +766,12 @@ public function testBackendPingUser() {
 		$room->expects($this->once())
 			->method('getToken')
 			->willReturn($roomToken);
-		$room->expects($this->once())
-			->method('pingSessionIds')
-			->with([$sessionId]);
+
+		$this->timeFactory->method('getTime')
+			->willReturn(123456);
+		$this->sessionService->expects($this->once())
+			->method('updateMultipleLastPings')
+			->with([$sessionId], 123456);
 
 		$result = $this->performBackendRequest([
 			'type' => 'ping',
@@ -791,9 +805,12 @@ public function testBackendPingAnonymous() {
 		$room->expects($this->once())
 			->method('getToken')
 			->willReturn($roomToken);
-		$room->expects($this->once())
-			->method('pingSessionIds')
-			->with([$sessionId]);
+
+		$this->timeFactory->method('getTime')
+			->willReturn(1234567);
+		$this->sessionService->expects($this->once())
+			->method('updateMultipleLastPings')
+			->with([$sessionId], 1234567);
 
 		$result = $this->performBackendRequest([
 			'type' => 'ping',
@@ -827,9 +844,12 @@ public function testBackendPingMixedAndInactive() {
 		$room->expects($this->once())
 			->method('getToken')
 			->willReturn($roomToken);
-		$room->expects($this->once())
-			->method('pingSessionIds')
-			->with([$sessionId . '1', $sessionId . '2']);
+
+		$this->timeFactory->method('getTime')
+			->willReturn(234567);
+		$this->sessionService->expects($this->once())
+			->method('updateMultipleLastPings')
+			->with([$sessionId . '1', $sessionId . '2'], 234567);
 
 		$result = $this->performBackendRequest([
 			'type' => 'ping',
@@ -865,10 +885,17 @@ public function testLeaveRoomWithOldSession() {
 		// Make sure that leaving a user with an old session id doesn't remove
 		// the current user from the room if he re-joined in the meantime.
 		$dbConnection = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->query(IEventDispatcher::class);
+		$dispatcher = \OC::$server->get(IEventDispatcher::class);
+		/** @var ParticipantService $participantService */
+		$participantService = \OC::$server->get(ParticipantService::class);
+
 		$this->manager = new Manager(
 			$dbConnection,
 			\OC::$server->getConfig(),
+			$this->createMock(Config::class),
+			\OC::$server->get(AttendeeMapper::class),
+			\OC::$server->get(SessionMapper::class),
+			$participantService,
 			$this->secureRandom,
 			$this->createMock(IUserManager::class),
 			$this->createMock(CommentsManager::class),
@@ -891,7 +918,8 @@ public function testLeaveRoomWithOldSession() {
 		$room = $this->manager->createRoom(Room::PUBLIC_CALL);
 
 		// The user joined the room.
-		$oldSessionId = $room->joinRoom($testUser, '');
+		$oldParticipant = $participantService->joinRoom($room, $testUser, '');
+		$oldSessionId = $oldParticipant->getSession()->getSessionId();
 		$result = $this->performBackendRequest([
 			'type' => 'room',
 			'room' => [
@@ -902,11 +930,12 @@ public function testLeaveRoomWithOldSession() {
 			],
 		]);
 		$participant = $room->getParticipant($this->userId);
-		$this->assertEquals($oldSessionId, $participant->getSessionId());
+		$this->assertEquals($oldSessionId, $participant->getSession()->getSessionId());
 
 		// The user is reloading the browser which will join him with another
 		// session id.
-		$newSessionId = $room->joinRoom($testUser, '');
+		$newParticipant = $participantService->joinRoom($room, $testUser, '');
+		$newSessionId = $newParticipant->getSession()->getSessionId();
 		$result = $this->performBackendRequest([
 			'type' => 'room',
 			'room' => [
@@ -919,7 +948,7 @@ public function testLeaveRoomWithOldSession() {
 
 		// Now the new session id is stored in the database.
 		$participant = $room->getParticipant($this->userId);
-		$this->assertEquals($newSessionId, $participant->getSessionId());
+		$this->assertEquals($newSessionId, $participant->getSession()->getSessionId());
 
 		// Leaving the old session id...
 		$result = $this->performBackendRequest([
@@ -934,6 +963,6 @@ public function testLeaveRoomWithOldSession() {
 
 		// ...will keep the new session id in the database.
 		$participant = $room->getParticipant($this->userId);
-		$this->assertEquals($newSessionId, $participant->getSessionId());
+		$this->assertEquals($newSessionId, $participant->getSession()->getSessionId());
 	}
 }
diff --git a/tests/php/Notification/NotifierTest.php b/tests/php/Notification/NotifierTest.php
index b327e2d6035..fddf8fceb87 100644
--- a/tests/php/Notification/NotifierTest.php
+++ b/tests/php/Notification/NotifierTest.php
@@ -32,6 +32,7 @@
 use OCA\Talk\Notification\Notifier;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCP\Comments\IComment;
 use OCP\IL10N;
 use OCP\IURLGenerator;
@@ -61,6 +62,8 @@ class NotifierTest extends \Test\TestCase {
 	protected $shareManager;
 	/** @var Manager|MockObject */
 	protected $manager;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
 	/** @var INotificationManager|MockObject */
 	protected $notificationManager;
 	/** @var CommentsManager|MockObject */
@@ -82,6 +85,7 @@ public function setUp(): void {
 		$this->guestManager = $this->createMock(GuestManager::class);
 		$this->shareManager = $this->createMock(IShareManager::class);
 		$this->manager = $this->createMock(Manager::class);
+		$this->participantService = $this->createMock(ParticipantService::class);
 		$this->notificationManager = $this->createMock(INotificationManager::class);
 		$this->commentsManager = $this->createMock(CommentsManager::class);
 		$this->messageParser = $this->createMock(MessageParser::class);
@@ -95,6 +99,7 @@ public function setUp(): void {
 			$this->guestManager,
 			$this->shareManager,
 			$this->manager,
+			$this->participantService,
 			$this->notificationManager,
 			$this->commentsManager,
 			$this->messageParser,
diff --git a/tests/php/RoomTest.php b/tests/php/RoomTest.php
index e3a3a384697..e1bba40b948 100644
--- a/tests/php/RoomTest.php
+++ b/tests/php/RoomTest.php
@@ -64,6 +64,7 @@ public function testVerifyPassword() {
 			Room::PUBLIC_CALL,
 			Room::READ_WRITE,
 			Webinary::LOBBY_NONE,
+			0,
 			null,
 			'foobar',
 			'Test',
diff --git a/tests/php/Service/RoomServiceTest.php b/tests/php/Service/RoomServiceTest.php
index 4eba57d4390..d223c4c3ccc 100644
--- a/tests/php/Service/RoomServiceTest.php
+++ b/tests/php/Service/RoomServiceTest.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Service\RoomService;
 use OCP\IUser;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -37,6 +38,8 @@ class RoomServiceTest extends TestCase {
 
 	/** @var Manager|MockObject */
 	protected $manager;
+	/** @var ParticipantService|MockObject */
+	protected $participantService;
 	/** @var RoomService */
 	private $service;
 
@@ -45,8 +48,10 @@ public function setUp(): void {
 		parent::setUp();
 
 		$this->manager = $this->createMock(Manager::class);
+		$this->participantService = $this->createMock(ParticipantService::class);
 		$this->service = new RoomService(
-			$this->manager
+			$this->manager,
+			$this->participantService
 		);
 	}
 
@@ -69,8 +74,9 @@ public function testCreateOneToOneConversationAlreadyExists(): void {
 			->willReturn('uid2');
 
 		$room = $this->createMock(Room::class);
-		$room->expects($this->once())
-			->method('ensureOneToOneRoomIsFilled');
+		$this->participantService->expects($this->once())
+			->method('ensureOneToOneRoomIsFilled')
+			->with($room);
 
 		$this->manager->expects($this->once())
 			->method('getOne2OneRoom')
@@ -89,17 +95,21 @@ public function testCreateOneToOneConversationCreated(): void {
 			->willReturn('uid2');
 
 		$room = $this->createMock(Room::class);
-		$room->expects($this->never())
-			->method('ensureOneToOneRoomIsFilled');
-		$room->expects($this->once())
+		$this->participantService->expects($this->once())
 			->method('addUsers')
-			->with([
-				'userId' => 'uid1',
+			->with($room, [[
+				'actorType' => 'users',
+				'actorId' => 'uid1',
 				'participantType' => Participant::OWNER,
 			], [
-				'userId' => 'uid2',
+				'actorType' => 'users',
+				'actorId' => 'uid2',
 				'participantType' => Participant::OWNER,
-			]);
+			]]);
+
+		$this->participantService->expects($this->never())
+			->method('ensureOneToOneRoomIsFilled')
+			->with($room);
 
 		$this->manager->expects($this->once())
 			->method('getOne2OneRoom')
@@ -204,15 +214,16 @@ public function testCreateConversation(int $type, string $name, string $ownerId,
 			$owner->method('getUID')
 				->willReturn($ownerId);
 
-			$room->expects($this->once())
+			$this->participantService->expects($this->once())
 				->method('addUsers')
-				->with([
-					'userId' => $ownerId,
+				->with($room, [[
+					'actorType' => 'users',
+					'actorId' => $ownerId,
 					'participantType' => Participant::OWNER,
-				]);
+				]]);
 		} else {
 			$owner = null;
-			$room->expects($this->never())
+			$this->participantService->expects($this->never())
 				->method('addUsers');
 		}
 
diff --git a/tests/php/Signaling/BackendNotifierTest.php b/tests/php/Signaling/BackendNotifierTest.php
index c775b68c59d..47777bbb744 100644
--- a/tests/php/Signaling/BackendNotifierTest.php
+++ b/tests/php/Signaling/BackendNotifierTest.php
@@ -27,8 +27,11 @@
 use OCA\Talk\Config;
 use OCA\Talk\Events\SignalingRoomPropertiesEvent;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\AttendeeMapper;
+use OCA\Talk\Model\SessionMapper;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\Signaling\BackendNotifier;
 use OCA\Talk\TalkSession;
 use OCA\Talk\Webinary;
@@ -75,6 +78,8 @@ class BackendNotifierTest extends \Test\TestCase {
 	private $secureRandom;
 	/** @var ITimeFactory|MockObject */
 	private $timeFactory;
+	/** @var ParticipantService|MockObject */
+	private $participantService;
 	/** @var \OCA\Talk\Signaling\Manager|MockObject */
 	private $signalingManager;
 	/** @var IURLGenerator|MockObject */
@@ -119,6 +124,7 @@ public function setUp(): void {
 			],
 		]));
 
+		$this->participantService = \OC::$server->get(ParticipantService::class);
 		$this->signalingManager = $this->createMock(\OCA\Talk\Signaling\Manager::class);
 		$this->signalingManager->expects($this->any())
 			->method('getSignalingServerForConversation')
@@ -134,6 +140,10 @@ public function setUp(): void {
 		$this->manager = new Manager(
 			$dbConnection,
 			$config,
+			$this->config,
+			\OC::$server->get(AttendeeMapper::class),
+			\OC::$server->get(SessionMapper::class),
+			$this->participantService,
 			$this->secureRandom,
 			$this->createMock(IUserManager::class),
 			$this->createMock(CommentsManager::class),
@@ -159,6 +169,7 @@ private function recreateBackendNotifier() {
 			$this->createMock(IClientService::class),
 			$this->secureRandom,
 			$this->signalingManager,
+			$this->participantService,
 			$this->urlGenerator
 		);
 	}
@@ -194,7 +205,7 @@ private function assertMessageWasSent(Room $room, array $message): void {
 
 		$bodies = array_map([$this, 'sortParticipantUsers'], $bodies);
 		$message = $this->sortParticipantUsers($message);
-		$this->assertContains($message, $bodies);
+		$this->assertContains($message, $bodies, json_encode($bodies, JSON_PRETTY_PRINT));
 	}
 
 	private function sortParticipantUsers(array $message): array {
@@ -207,14 +218,24 @@ private function sortParticipantUsers(array $message): array {
 					;
 			});
 		}
+		if ($message['type'] === 'incall') {
+			usort($message['incall']['users'], static function ($a, $b) {
+				return
+					[$a['userId'] ?? '', $a['participantType'], $a['sessionId'], $a['lastPing']]
+					<=>
+					[$b['userId'] ?? '', $b['participantType'], $b['sessionId'], $b['lastPing']]
+					;
+			});
+		}
 		return $message;
 	}
 
 	public function testRoomInvite() {
 		$room = $this->manager->createRoom(Room::PUBLIC_CALL);
-		$room->addUsers([
-			'userId' => $this->userId,
-		]);
+		$this->participantService->addUsers($room, [[
+			'actorType' => 'users',
+			'actorId' => $this->userId,
+		]]);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'invite',
@@ -232,6 +253,7 @@ public function testRoomInvite() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -239,16 +261,17 @@ public function testRoomInvite() {
 
 	public function testRoomDisinvite() {
 		$room = $this->manager->createRoom(Room::PUBLIC_CALL);
-		$room->addUsers([
-			'userId' => $this->userId,
-		]);
+		$this->participantService->addUsers($room, [[
+			'actorType' => 'users',
+			'actorId' => $this->userId,
+		]]);
 		$this->controller->clearRequests();
 		/** @var IUser|MockObject $testUser */
 		$testUser = $this->createMock(IUser::class);
 		$testUser->expects($this->any())
 			->method('getUID')
 			->willReturn($this->userId);
-		$room->removeUser($testUser, Room::PARTICIPANT_REMOVED);
+		$this->participantService->removeUser($room, $testUser, Room::PARTICIPANT_REMOVED);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'disinvite',
@@ -265,6 +288,7 @@ public function testRoomDisinvite() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -286,6 +310,7 @@ public function testRoomNameChanged() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -307,6 +332,7 @@ public function testRoomPasswordChanged() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -328,6 +354,7 @@ public function testRoomTypeChanged() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -349,6 +376,7 @@ public function testRoomReadOnlyChanged() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_ONLY,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -370,6 +398,7 @@ public function testRoomLobbyStateChanged() {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 				],
 			],
 		]);
@@ -377,9 +406,10 @@ public function testRoomLobbyStateChanged() {
 
 	public function testRoomDelete() {
 		$room = $this->manager->createRoom(Room::PUBLIC_CALL);
-		$room->addUsers([
-			'userId' => $this->userId,
-		]);
+		$this->participantService->addUsers($room, [[
+			'actorType' => 'users',
+			'actorId' => $this->userId,
+		]]);
 		$room->deleteRoom();
 
 		$this->assertMessageWasSent($room, [
@@ -394,13 +424,22 @@ public function testRoomDelete() {
 
 	public function testRoomInCallChanged() {
 		$room = $this->manager->createRoom(Room::PUBLIC_CALL);
-		$userSession = 'user-session';
-		$room->addUsers([
-			'userId' => $this->userId,
-			'sessionId' => $userSession,
-		]);
+		$this->participantService->addUsers($room, [[
+			'actorType' => 'users',
+			'actorId' => $this->userId,
+		]]);
+
+		/** @var IUser|MockObject $testUser */
+		$testUser = $this->createMock(IUser::class);
+		$testUser->expects($this->any())
+			->method('getUID')
+			->willReturn($this->userId);
+
+		$participant = $this->participantService->joinRoom($room, $testUser, '');
+		$userSession = $participant->getSession()->getSessionId();
 		$participant = $room->getParticipantBySession($userSession);
-		$room->changeInCall($participant, Participant::FLAG_IN_CALL | Participant::FLAG_WITH_AUDIO | Participant::FLAG_WITH_VIDEO);
+
+		$this->participantService->changeInCall($room, $participant, Participant::FLAG_IN_CALL | Participant::FLAG_WITH_AUDIO | Participant::FLAG_WITH_VIDEO);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'incall',
@@ -428,9 +467,11 @@ public function testRoomInCallChanged() {
 		]);
 
 		$this->controller->clearRequests();
-		$guestSession = $room->joinRoomGuest('');
+
+		$guestParticipant = $this->participantService->joinRoomAsNewGuest($room, '');
+		$guestSession = $guestParticipant->getSession()->getSessionId();
 		$guestParticipant = $room->getParticipantBySession($guestSession);
-		$room->changeInCall($guestParticipant, Participant::FLAG_IN_CALL);
+		$this->participantService->changeInCall($room, $guestParticipant, Participant::FLAG_IN_CALL);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'incall',
@@ -463,7 +504,7 @@ public function testRoomInCallChanged() {
 		]);
 
 		$this->controller->clearRequests();
-		$room->changeInCall($participant, Participant::FLAG_DISCONNECTED);
+		$this->participantService->changeInCall($room, $participant, Participant::FLAG_DISCONNECTED);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'incall',
@@ -515,6 +556,7 @@ public function testRoomPropertiesEvent(): void {
 					'lobby-timer' => null,
 					'read-only' => Room::READ_WRITE,
 					'active-since' => null,
+					'sip-enabled' => 0,
 					'foo' => 'bar',
 					'room' => $room->getToken(),
 				],
@@ -524,13 +566,22 @@ public function testRoomPropertiesEvent(): void {
 
 	public function testParticipantsTypeChanged() {
 		$room = $this->manager->createRoom(Room::PUBLIC_CALL);
-		$userSession = 'user-session';
-		$room->addUsers([
-			'userId' => $this->userId,
-			'sessionId' => $userSession,
-		]);
+		$this->participantService->addUsers($room, [[
+			'actorType' => 'users',
+			'actorId' => $this->userId,
+		]]);
+
+		/** @var IUser|MockObject $testUser */
+		$testUser = $this->createMock(IUser::class);
+		$testUser->expects($this->any())
+			->method('getUID')
+			->willReturn($this->userId);
+
+		$participant = $this->participantService->joinRoom($room, $testUser, '');
+		$userSession = $participant->getSession()->getSessionId();
 		$participant = $room->getParticipantBySession($userSession);
-		$room->setParticipantType($participant, Participant::MODERATOR);
+
+		$this->participantService->updateParticipantType($room, $participant, Participant::MODERATOR);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'participants',
@@ -558,9 +609,12 @@ public function testParticipantsTypeChanged() {
 		]);
 
 		$this->controller->clearRequests();
-		$guestSession = $room->joinRoomGuest('');
+
+		$guestParticipant = $this->participantService->joinRoomAsNewGuest($room, '');
+		$guestSession = $guestParticipant->getSession()->getSessionId();
 		$guestParticipant = $room->getParticipantBySession($guestSession);
-		$room->setParticipantType($guestParticipant, Participant::GUEST_MODERATOR);
+
+		$this->participantService->updateParticipantType($room, $guestParticipant, Participant::GUEST_MODERATOR);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'participants',
@@ -594,11 +648,13 @@ public function testParticipantsTypeChanged() {
 
 		$this->controller->clearRequests();
 		$notJoinedUserId = 'not-joined-user-id';
-		$room->addUsers([
-			'userId' => $notJoinedUserId,
-		]);
+		$this->participantService->addUsers($room, [[
+			'actorType' => 'users',
+			'actorId' => $notJoinedUserId,
+		]]);
+
 		$notJoinedParticipant = $room->getParticipant($notJoinedUserId);
-		$room->setParticipantType($notJoinedParticipant, Participant::MODERATOR);
+		$this->participantService->updateParticipantType($room, $notJoinedParticipant, Participant::MODERATOR);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'participants',
@@ -631,7 +687,7 @@ public function testParticipantsTypeChanged() {
 		]);
 
 		$this->controller->clearRequests();
-		$room->setParticipantType($participant, Participant::USER);
+		$this->participantService->updateParticipantType($room, $participant, Participant::USER);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'participants',
@@ -672,7 +728,7 @@ public function testParticipantsTypeChanged() {
 		]);
 
 		$this->controller->clearRequests();
-		$room->setParticipantType($guestParticipant, Participant::GUEST);
+		$this->participantService->updateParticipantType($room, $guestParticipant, Participant::GUEST);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'participants',

From bad829df6cf0522d092ff7a1538e3bca9969a75f Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Oct 2020 15:34:07 +0100
Subject: [PATCH 058/129] ===================================================

End of participant splitting

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b99152c67d4..0e2de97ca6c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>10.0.3.3</version>
+	<version>10.0.3.4</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>

From 3321c83bf53d1e80fadc59d07072c494a8a961df Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Oct 2020 16:49:16 +0100
Subject: [PATCH 059/129] Add an endpoint to validate a PIN for a given
 conversation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                | 10 ++++++++++
 docs/participant.md               | 15 +++++++++++++++
 lib/Controller/RoomController.php | 24 ++++++++++++++++++++++++
 lib/Room.php                      | 26 ++++++++++++++++++++++++++
 4 files changed, 75 insertions(+)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index b3a793732b4..97fe70b98cf 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -353,6 +353,16 @@
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
+		[
+			'name' => 'Room#getParticipantByDialInPin',
+			'url' => '/api/{apiVersion}/room/{token}/pin/{pin}',
+			'verb' => 'GET',
+			'requirements' => [
+				'apiVersion' => 'v2',
+				'token' => '^[a-z0-9]{4,30}$',
+				'pin' => '^\d{7,32}$',
+			],
+		],
 		[
 			'name' => 'Room#setNotificationLevel',
 			'url' => '/api/{apiVersion}/room/{token}/notify',
diff --git a/docs/participant.md b/docs/participant.md
index 245ea387d2c..ef69972685e 100644
--- a/docs/participant.md
+++ b/docs/participant.md
@@ -190,6 +190,21 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
         + `404 Not Found` When the conversation could not be found for the participant
         + `404 Not Found` When the participant to demote could not be found
 
+## Get a participant by their pin
+
+Note: This is only allowed with validate SIP bridge requests
+
+* Method: `GET`
+* Endpoint: `/room/{token}/pin/{pin}`
+
+* Response:
+    - Status code:
+        + `200 OK`
+        + `401 Unauthorized` When the validation as SIP bridge failed
+        + `404 Not Found` When the conversation or participant could not be found
+
+    - Data: See array definition in `Get user´s conversations`
+
 ## Set display name as a guest
 
 * Method: `POST`
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 3a48f0c3cd1..8544731cfd8 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1442,6 +1442,30 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 		return new DataResponse($this->formatRoom($room, $participant));
 	}
 
+	/**
+	 * @PublicPage
+	 *
+	 * @param string $pin
+	 * @return DataResponse
+	 */
+	public function getParticipantByDialInPin(string $pin): DataResponse {
+		try {
+			if (!$this->validateSIPBridgeRequest($this->room->getToken())) {
+				return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+			}
+		} catch (UnauthorizedException $e) {
+			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+		}
+
+		try {
+			$participant = $this->room->getParticipantByPin($pin);
+		} catch (ParticipantNotFoundException $e) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+
+		return new DataResponse($this->formatRoom($this->room, $participant));
+	}
+
 	/**
 	 * @PublicPage
 	 * @UseSession
diff --git a/lib/Room.php b/lib/Room.php
index 932edcfcfe5..16a267a8545 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -402,6 +402,32 @@ public function getParticipantBySession(?string $sessionId): Participant {
 		return $this->manager->createParticipantObject($this, $row);
 	}
 
+	/**
+	 * @param string $pin
+	 * @return Participant
+	 * @throws ParticipantNotFoundException When the pin is not valid (has no participant assigned)
+	 */
+	public function getParticipantByPin(string $pin): Participant {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'))
+			->andWhere($query->expr()->eq('a.pin', $query->createNamedParameter($pin)))
+			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
+			->setMaxResults(1);
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		if ($row === false) {
+			throw new ParticipantNotFoundException('User is not a participant');
+		}
+
+		return $this->manager->createParticipantObject($this, $row);
+	}
+
 	public function deleteRoom(): void {
 		$event = new RoomEvent($this);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_ROOM_DELETE, $event);

From caac804be1ad22bea595e179e84c89e52f9140eb Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 27 Oct 2020 17:11:07 +0100
Subject: [PATCH 060/129] Generate a PIN when inviting an email address

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  |  4 ++-
 lib/GuestManager.php               | 12 +++++++-
 lib/Service/ParticipantService.php | 47 ++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 8544731cfd8..b5d393494ca 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1190,7 +1190,9 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				$data = ['type' => $this->room->getType()];
 			}
 
-			$this->guestManager->inviteByEmail($this->room, $newParticipant);
+			$participant = $this->participantService->inviteEmailAddress($this->room, $newParticipant);
+
+			$this->guestManager->sendEmailInvitation($this->room, $participant);
 
 			return new DataResponse($data);
 		} else {
diff --git a/lib/GuestManager.php b/lib/GuestManager.php
index 47faf3d41d6..6689145c5b7 100644
--- a/lib/GuestManager.php
+++ b/lib/GuestManager.php
@@ -163,7 +163,10 @@ public function getNamesBySessionHashes(array $sessionHashes): array {
 		return $map;
 	}
 
-	public function inviteByEmail(Room $room, string $email): void {
+	public function sendEmailInvitation(Room $room, Participant $participant): void {
+		$email = $participant->getAttendee()->getActorId();
+		$pin = $participant->getAttendee()->getPin();
+
 		$event = new AddEmailEvent($room, $email);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_EMAIL_INVITE, $event);
 
@@ -178,6 +181,8 @@ public function inviteByEmail(Room $room, string $email): void {
 			'invitee' => $invitee,
 			'roomName' => $room->getDisplayName(''),
 			'roomLink' => $link,
+			'email' => $email,
+			'pin' => $pin,
 		]);
 
 		if ($user instanceof IUser) {
@@ -196,6 +201,11 @@ public function inviteByEmail(Room $room, string $email): void {
 			$subject
 		);
 
+		if ($pin) {
+			// FIXME wrap in text
+			$template->addBodyText($pin);
+		}
+
 		$template->addBodyButton(
 			$this->l->t('Join »%s«', [$room->getDisplayName('')]),
 			$link
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 6b6bb42c563..722d09c562e 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\Service;
 
+use OCA\Talk\Events\AddEmailEvent;
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\JoinRoomGuestEvent;
 use OCA\Talk\Events\JoinRoomUserEvent;
@@ -34,6 +35,7 @@
 use OCA\Talk\Exceptions\InvalidPasswordException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
+use OCA\Talk\GuestManager;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Session;
@@ -49,6 +51,7 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Security\ISecureRandom;
+use OCP\Util;
 
 class ParticipantService {
 	/** @var AttendeeMapper */
@@ -83,6 +86,7 @@ public function __construct(AttendeeMapper $attendeeMapper,
 		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
 		$this->userManager = $userManager;
+		$this->userManager = $userManager;
 		$this->timeFactory = $timeFactory;
 	}
 
@@ -213,6 +217,33 @@ public function addUsers(Room $room, array $participants): void {
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
 	}
 
+	/**
+	 * @param Room $room
+	 * @param string $email
+	 * @return Participant
+	 */
+	public function inviteEmailAddress(Room $room, string $email): Participant {
+		$lastMessage = 0;
+		if ($room->getLastMessage() instanceof IComment) {
+			$lastMessage = (int) $room->getLastMessage()->getId();
+		}
+
+		$attendee = new Attendee();
+		$attendee->setRoomId($room->getId());
+		$attendee->setActorType('emails');
+		$attendee->setActorId($email);
+
+		// FIXME Only do this when SIP is enabled?
+		$attendee->setPin($this->generatePin());
+
+		$attendee->setParticipantType(Participant::GUEST);
+		$attendee->setLastReadMessage($lastMessage);
+		$this->attendeeMapper->insert($attendee);
+		// FIXME handle duplicate invites gracefully
+
+		return new Participant($room, $attendee, null);
+	}
+
 	public function ensureOneToOneRoomIsFilled(Room $room): void {
 		if ($room->getType() !== Room::ONE_TO_ONE_CALL) {
 			return;
@@ -603,4 +634,20 @@ public function hasActiveSessionsInCall(Room $room): bool {
 
 		return (bool) $row;
 	}
+
+	protected function generatePin(int $entropy = 7): string {
+		$pin = '';
+		// Do not allow to start with a '0' as that is a special mode on the phone server
+		// Also there are issues with some providers when you enter the same number twice
+		// consecutive too fast, so we avoid this as well.
+		$lastDigit = '0';
+		for ($i = 0; $i < $entropy; $i++) {
+			$lastDigit = $this->secureRandom->generate(1,
+				str_replace($lastDigit, '', ISecureRandom::CHAR_DIGITS)
+			);
+			$pin .= $lastDigit;
+		}
+
+		return $pin;
+	}
 }

From d0fdcb530d1c9e816979a01b7a41e3ff9df27944 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 28 Oct 2020 10:54:35 +0100
Subject: [PATCH 061/129] Fix PHP CS

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Service/ParticipantService.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 722d09c562e..de47f1e49de 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -23,7 +23,6 @@
 
 namespace OCA\Talk\Service;
 
-use OCA\Talk\Events\AddEmailEvent;
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\JoinRoomGuestEvent;
 use OCA\Talk\Events\JoinRoomUserEvent;
@@ -35,7 +34,6 @@
 use OCA\Talk\Exceptions\InvalidPasswordException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
-use OCA\Talk\GuestManager;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Session;
@@ -51,7 +49,6 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Security\ISecureRandom;
-use OCP\Util;
 
 class ParticipantService {
 	/** @var AttendeeMapper */

From e2c2796db29cd04a2b6b49c2d88f256d2d6157be Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 28 Oct 2020 12:28:24 +0100
Subject: [PATCH 062/129] Inject the room into the pin validation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php      |  1 +
 lib/Middleware/InjectionMiddleware.php | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index b5d393494ca..3649c3f2686 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1446,6 +1446,7 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 
 	/**
 	 * @PublicPage
+	 * @RequireRoom
 	 *
 	 * @param string $pin
 	 * @return DataResponse
diff --git a/lib/Middleware/InjectionMiddleware.php b/lib/Middleware/InjectionMiddleware.php
index 3e12c8484c5..9d099d69746 100644
--- a/lib/Middleware/InjectionMiddleware.php
+++ b/lib/Middleware/InjectionMiddleware.php
@@ -101,6 +101,10 @@ public function beforeController($controller, $methodName): void {
 			$this->getLoggedInOrGuest($controller, true);
 		}
 
+		if ($this->reflector->hasAnnotation('RequireRoom')) {
+			$this->getRoom($controller);
+		}
+
 		if ($this->reflector->hasAnnotation('RequireReadWriteConversation')) {
 			$this->checkReadOnlyState($controller);
 		}
@@ -110,6 +114,15 @@ public function beforeController($controller, $methodName): void {
 		}
 	}
 
+	/**
+	 * @param AEnvironmentAwareController $controller
+	 */
+	protected function getRoom(AEnvironmentAwareController $controller): void {
+		$token = $this->request->getParam('token');
+		$room = $this->manager->getRoomByToken($token, $this->userId);
+		$controller->setRoom($room);
+	}
+
 	/**
 	 * @param AEnvironmentAwareController $controller
 	 * @param bool $moderatorRequired

From da4ec776040c24f9e5588daa5744778f3a2fb9c4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 28 Oct 2020 14:29:55 +0100
Subject: [PATCH 063/129] Add API v3 with actor type and id

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                | 46 +++++++++++++++----------------
 lib/Controller/RoomController.php | 33 ++++++++++++++++++----
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 97fe70b98cf..11f77f37890 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -180,7 +180,7 @@
 			'url' => '/api/{apiVersion}/room',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 			],
 		],
 		[
@@ -188,7 +188,7 @@
 			'url' => '/api/{apiVersion}/room',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 			],
 		],
 		[
@@ -196,7 +196,7 @@
 			'url' => '/api/{apiVersion}/room/{token}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -205,7 +205,7 @@
 			'url' => '/api/{apiVersion}/room/{token}',
 			'verb' => 'PUT',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -214,7 +214,7 @@
 			'url' => '/api/{apiVersion}/room/{token}',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -223,7 +223,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/public',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -232,7 +232,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/public',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -241,7 +241,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/read-only',
 			'verb' => 'PUT',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -250,7 +250,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/password',
 			'verb' => 'PUT',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -259,7 +259,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -268,7 +268,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -277,7 +277,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -286,7 +286,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants/self',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -295,7 +295,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants/guests',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -304,7 +304,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants/active',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -313,7 +313,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/participants/active',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -322,7 +322,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/moderators',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -331,7 +331,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/moderators',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -340,7 +340,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/favorite',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -349,7 +349,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/favorite',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -358,7 +358,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/pin/{pin}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v2',
+				'apiVersion' => 'v(2|3)', // FIXME v3 only?
 				'token' => '^[a-z0-9]{4,30}$',
 				'pin' => '^\d{7,32}$',
 			],
@@ -368,7 +368,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/notify',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -508,7 +508,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/{webinar}/sip',
 			'verb' => 'PUT',
 			'requirements' => [
-				'apiVersion' => 'v(1|2)',
+				'apiVersion' => 'v(1|2)',// FIXME v2 only?
 				'webinar' => 'webinary?',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 3649c3f2686..6f473d16a82 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -297,8 +297,8 @@ private function validateSIPBridgeRequest(string $data): bool {
 	 * @throws RoomNotFoundException
 	 */
 	protected function formatRoom(Room $room, ?Participant $currentParticipant, bool $isSIPBridgeRequest = false): array {
-		if ($this->getAPIVersion() === 2) {
-			return $this->formatRoomV2($room, $currentParticipant, $isSIPBridgeRequest);
+		if ($this->getAPIVersion() !== 1) {
+			return $this->formatRoomV2andV3($room, $currentParticipant, $isSIPBridgeRequest);
 		}
 
 		return $this->formatRoomV1($room, $currentParticipant);
@@ -509,7 +509,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 	 * @return array
 	 * @throws RoomNotFoundException
 	 */
-	protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bool $isSIPBridgeRequest = false): array {
+	protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipant, bool $isSIPBridgeRequest = false): array {
 		$roomData = [
 			'id' => $room->getId(),
 			'token' => $room->getToken(),
@@ -540,6 +540,12 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 			'guestList' => '',
 			'lastMessage' => [],
 		];
+		if ($this->getAPIVersion() === 3) {
+			$roomData = array_merge($roomData, [
+				'actorType' => '',
+				'actorId' => '',
+			]);
+		}
 
 		$lastActivity = $room->getLastActivity();
 		if ($lastActivity instanceof \DateTimeInterface) {
@@ -592,6 +598,12 @@ protected function formatRoomV2(Room $room, ?Participant $currentParticipant, bo
 			'lobbyTimer' => $lobbyTimer,
 			'sipEnabled' => $room->getSIPEnabled(),
 		]);
+		if ($this->getAPIVersion() === 3) {
+			$roomData = array_merge($roomData, [
+				'actorType' => $attendee->getActorType(),
+				'actorId' => $attendee->getActorId(),
+			]);
+		}
 
 		$session = $currentParticipant->getSession();
 		if ($session instanceof Session) {
@@ -1043,6 +1055,10 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				'sessionId' => '0', // FIXME empty string or null?
 				'participantType' => $participant->getAttendee()->getParticipantType(),
 			];
+			if ($this->getAPIVersion() === 3) {
+				$result['actorId'] = $participant->getAttendee()->getActorId();
+				$result['actorType'] = $participant->getAttendee()->getActorType();
+			}
 			if ($participant->getSession() instanceof Session) {
 				$result['inCall'] = $participant->getSession()->getInCall();
 				$result['lastPing'] = $participant->getSession()->getLastPing();
@@ -1060,7 +1076,9 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 					$this->participantService->leaveRoomAsSession($this->room, $participant);
 				}
 
-				$result['userId'] = $participant->getAttendee()->getActorId();
+				if ($this->getAPIVersion() !== 3) {
+					$result['userId'] = $participant->getAttendee()->getActorId();
+				}
 				$result['displayName'] = (string) $user->getDisplayName();
 
 				if (isset($statuses[$userId])) {
@@ -1075,8 +1093,13 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 					continue;
 				}
 
-				$result['userId'] = '';
+				if ($this->getAPIVersion() !== 3) {
+					$result['userId'] = '';
+				}
 				$result['displayName'] = $guestNames[$participant->getAttendee()->getActorId()] ?? '';
+			} elseif ($this->getAPIVersion() === 3) {
+				// Other types are only reported on V3
+				$result['displayName'] = $participant->getAttendee()->getActorId();
 			} else {
 				// Skip unknown actor types
 				continue;

From 2a0c494c7bf522f83b669acacffd9d8e360ced8d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 28 Oct 2020 15:00:36 +0100
Subject: [PATCH 064/129] User v3 APIs to display email invites

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../CurrentParticipants.vue                   |  3 ++-
 .../Participant/Participant.vue               |  9 ++++----
 .../ParticipantsList/ParticipantsList.vue     |  4 ++--
 .../Participants/ParticipantsTab.vue          |  4 ++--
 src/services/conversationsService.js          |  4 ++--
 src/services/participantsService.js           | 22 +++++++++----------
 src/store/actorStore.js                       |  5 ++++-
 src/store/conversationsStore.js               |  2 ++
 src/store/participantsStore.js                |  8 +++----
 9 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
index 67b07745154..328c76efd3f 100644
--- a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
+++ b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
@@ -89,7 +89,8 @@ export default {
 			this.$store.dispatch('updateUser', {
 				token: this.token,
 				participantIdentifier: {
-					userId: state.userId,
+					actorType: 'users',
+					actorId: state.userId,
 				},
 				updatedData: {
 					status: state.status,
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index 4e578373f23..dd2382a1234 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -36,7 +36,7 @@
 			:show-user-status="showUserStatus && !isSearched"
 			:show-user-status-compact="false"
 			:name="computedName"
-			:source="participant.source"
+			:source="participant.source || participant.actorType"
 			:offline="isOffline" />
 		<div
 			class="participant-row__user-wrapper"
@@ -208,7 +208,7 @@ export default {
 		 * @returns {boolean}
 		 */
 		isSearched() {
-			return this.participant.userId === undefined
+			return this.participant.label !== undefined
 		},
 		computedName() {
 			if (!this.isSearched) {
@@ -228,7 +228,7 @@ export default {
 		},
 		computedId() {
 			if (!this.isSearched) {
-				return this.participant.userId
+				return this.participant.actorId
 			}
 			return this.participant.id
 		},
@@ -321,7 +321,8 @@ export default {
 				}
 			} else {
 				data = {
-					userId: this.computedId,
+					actorType: 'users',
+					actorId: this.computedId,
 				}
 			}
 			return data
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
index c4483f47d6f..f56da84dc5c 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
@@ -92,8 +92,8 @@ export default {
 
 		generateKey(participant) {
 			let key = 'i#' + participant.id
-			if (participant.userId) {
-				key = 'u#' + participant.userId
+			if (participant.actorType === 'users') {
+				key = 'u#' + participant.actorId
 			} else if (participant.sessionId) {
 				key = 's#' + participant.sessionId
 			}
diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
index bc874f095bb..5508b5aec7e 100644
--- a/src/components/RightSidebar/Participants/ParticipantsTab.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -243,13 +243,13 @@ export default {
 							actorId: Hex.stringify(SHA1(participant.sessionId)),
 							actorDisplayName: participant.displayName,
 						})
-					} else if (hasUserStatuses) {
+					} else if (participant.actorType === 'users' && hasUserStatuses) {
 						emit('user_status:status.updated', {
 							status: participant.status,
 							message: participant.statusMessage,
 							icon: participant.statusIcon,
 							clearAt: participant.statusClearAt,
-							userId: participant.userId,
+							userId: participant.actorId,
 						})
 					}
 				})
diff --git a/src/services/conversationsService.js b/src/services/conversationsService.js
index 670bc4db340..ea454412172 100644
--- a/src/services/conversationsService.js
+++ b/src/services/conversationsService.js
@@ -33,7 +33,7 @@ let maintenanceWarning = null
  */
 const fetchConversations = async function() {
 	try {
-		const response = await axios.get(generateOcsUrl('apps/spreed/api/v2', 2) + 'room')
+		const response = await axios.get(generateOcsUrl('apps/spreed/api/v3', 2) + 'room')
 
 		if (maintenanceWarning) {
 			maintenanceWarning.hideToast()
@@ -59,7 +59,7 @@ const fetchConversations = async function() {
  */
 const fetchConversation = async function(token) {
 	try {
-		const response = await axios.get(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}`)
+		const response = await axios.get(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}`)
 
 		if (maintenanceWarning) {
 			maintenanceWarning.hideToast()
diff --git a/src/services/participantsService.js b/src/services/participantsService.js
index 26321ee56c9..06eb3a52c95 100644
--- a/src/services/participantsService.js
+++ b/src/services/participantsService.js
@@ -46,7 +46,7 @@ const joinConversation = async(token) => {
 	const forceJoin = SessionStorage.getItem('joined_conversation') === token
 
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants/active`, {
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants/active`, {
 			force: forceJoin,
 		})
 
@@ -131,7 +131,7 @@ const forceJoinConversation = async(token) => {
  * @param {string} token The conversation token;
  */
 const rejoinConversation = async(token) => {
-	return axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants/active`)
+	return axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants/active`)
 }
 
 /**
@@ -144,7 +144,7 @@ const leaveConversation = async function(token) {
 		// FIXME Signaling should not be synchronous
 		await signalingLeaveConversation(token)
 
-		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants/active`)
+		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants/active`)
 		return response
 	} catch (error) {
 		console.debug(error)
@@ -157,7 +157,7 @@ const leaveConversation = async function(token) {
  * @param {string} token The conversation token;
  */
 const leaveConversationSync = function(token) {
-	axios.delete(generateOcsUrl('apps/spreed/api/v2/room', 2) + token + '/participants/active')
+	axios.delete(generateOcsUrl('apps/spreed/api/v3/room', 2) + token + '/participants/active')
 }
 
 /**
@@ -167,7 +167,7 @@ const leaveConversationSync = function(token) {
  * @param {string} source the source Source of the participant as returned by the autocomplete suggestion endpoint (default is users)
  */
 const addParticipant = async function(token, newParticipant, source) {
-	const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants`, {
+	const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants`, {
 		newParticipant,
 		source,
 	})
@@ -180,13 +180,13 @@ const addParticipant = async function(token, newParticipant, source) {
  * @param {string} token The conversation token;
  */
 const removeCurrentUserFromConversation = async function(token) {
-	const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants/self`)
+	const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants/self`)
 	return response
 }
 
 const removeUserFromConversation = async function(token, userId) {
 	try {
-		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants`, {
+		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants`, {
 			params: {
 				participant: userId,
 			},
@@ -199,7 +199,7 @@ const removeUserFromConversation = async function(token, userId) {
 
 const removeGuestFromConversation = async function(token, sessionId) {
 	try {
-		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/participants/guests`, {
+		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/participants/guests`, {
 			params: {
 				participant: sessionId,
 			},
@@ -211,12 +211,12 @@ const removeGuestFromConversation = async function(token, sessionId) {
 }
 
 const promoteToModerator = async(token, options) => {
-	const response = await axios.post(generateOcsUrl('apps/spreed/api/v2/room', 2) + token + '/moderators', options)
+	const response = await axios.post(generateOcsUrl('apps/spreed/api/v3/room', 2) + token + '/moderators', options)
 	return response
 }
 
 const demoteFromModerator = async(token, options) => {
-	const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2/room', 2) + token + '/moderators', {
+	const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3/room', 2) + token + '/moderators', {
 		params: options,
 	})
 	return response
@@ -226,7 +226,7 @@ const fetchParticipants = async(token, options) => {
 	options = options || {}
 	options.params = options.params || {}
 	options.params.includeStatus = true
-	const response = await axios.get(generateOcsUrl('apps/spreed/api/v2/room', 2) + token + '/participants', options)
+	const response = await axios.get(generateOcsUrl('apps/spreed/api/v3/room', 2) + token + '/participants', options)
 	return response
 }
 
diff --git a/src/store/actorStore.js b/src/store/actorStore.js
index d75fa4e2e77..076f0da957d 100644
--- a/src/store/actorStore.js
+++ b/src/store/actorStore.js
@@ -61,11 +61,13 @@ const getters = {
 	getParticipantIdentifier: (state) => () => {
 		if (state.actorType === 'guests') {
 			return {
+				actorType: 'guests',
 				sessionId: state.sessionId,
 			}
 		}
 		return {
-			userId: state.userId,
+			actorType: 'users',
+			actorId: state.actorId,
 		}
 	},
 }
@@ -134,6 +136,7 @@ const actions = {
 		context.commit('setUserId', user.uid)
 		context.commit('setDisplayName', user.displayName || user.uid)
 		context.commit('setActorType', 'users')
+		context.commit('setActorId', user.uid)
 	},
 
 	/**
diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index 17d3f093f87..67951e45108 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -110,6 +110,8 @@ const actions = {
 				lastPing: conversation.lastPing,
 				sessionId: conversation.sessionId,
 				participantType: conversation.participantType,
+				actorType: conversation.actorType,
+				actorId: conversation.actorId, // FIXME check public share page handling
 				userId: currentUser ? currentUser.uid : '',
 				displayName: currentUser && currentUser.displayName ? currentUser.displayName : '', // TODO guest name from localstore?
 			},
diff --git a/src/store/participantsStore.js b/src/store/participantsStore.js
index 91a5ca695ab..6ebd762eef1 100644
--- a/src/store/participantsStore.js
+++ b/src/store/participantsStore.js
@@ -62,8 +62,8 @@ const getters = {
 
 		let index
 
-		if (participantIdentifier.hasOwnProperty('userId')) {
-			index = state.participants[token].findIndex(participant => participant.userId === participantIdentifier.userId)
+		if (participantIdentifier.hasOwnProperty('actorId') && participantIdentifier.hasOwnProperty('actorType')) {
+			index = state.participants[token].findIndex(participant => participant.actorId === participantIdentifier.actorId && participant.actorType === participantIdentifier.actorType)
 		} else {
 			index = state.participants[token].findIndex(participant => participant.sessionId === participantIdentifier.sessionId)
 		}
@@ -189,8 +189,8 @@ const actions = {
 		}
 
 		const participant = getters.getParticipant(token, index)
-		if (participant.userId) {
-			await removeUserFromConversation(token, participant.userId)
+		if (participant.actorType === 'users') {
+			await removeUserFromConversation(token, participant.actorId)
 		} else {
 			await removeGuestFromConversation(token, participant.sessionId)
 		}

From a783f86149d5b668bf87144a98275b19981fd0a6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 09:29:22 +0100
Subject: [PATCH 065/129] Only remove attendee in case of a guest for now
 (needs fixing in the future so email pins remain)

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 931c9498a7f..1acb977133e 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -569,7 +569,11 @@ private function backendRoom(array $roomRequest): DataResponse {
 			}
 		} elseif ($action === 'leave') {
 			if ($participant instanceof Participant) {
-				$this->participantService->removeAttendee($room, $participant, Room::PARTICIPANT_LEFT);
+				if (!empty($userId)) {
+					$this->participantService->leaveRoomAsSession($room, $participant);
+				} else {
+					$this->participantService->removeAttendee($room, $participant, Room::PARTICIPANT_LEFT);
+				}
 			}
 		}
 

From 5426af68ad68a1a570b45ce1021ae835572f6e42 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 10:01:29 +0100
Subject: [PATCH 066/129] last_joined_call is not a timestamp not a date field

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Model/AttendeeMapper.php       | 8 ++++----
 lib/Service/ParticipantService.php | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/Model/AttendeeMapper.php b/lib/Model/AttendeeMapper.php
index 76cfdf3fc93..d071c753cc5 100644
--- a/lib/Model/AttendeeMapper.php
+++ b/lib/Model/AttendeeMapper.php
@@ -60,18 +60,18 @@ public function findByActor(int $roomId, string $actorType, string $actorId): At
 	/**
 	 * @param int $roomId
 	 * @param string $actorType
-	 * @param \DateTime|null $lastJoinedCall
+	 * @param int|null $lastJoinedCall
 	 * @return Attendee[]
 	 */
-	public function getActorsByType(int $roomId, string $actorType, ?\DateTime $lastJoinedCall = null): array {
+	public function getActorsByType(int $roomId, string $actorType, ?int $lastJoinedCall = null): array {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
 			->from($this->getTableName())
 			->where($query->expr()->eq('room_id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter($actorType)));
 
-		if ($lastJoinedCall instanceof \DateTimeInterface) {
-			$query->andWhere($query->expr()->gte('last_joined_call', $query->createNamedParameter($lastJoinedCall, IQueryBuilder::PARAM_DATE)));
+		if ($lastJoinedCall !== null) {
+			$query->andWhere($query->expr()->gte('last_joined_call', $query->createNamedParameter($lastJoinedCall, IQueryBuilder::PARAM_INT)));
 		}
 
 		return $this->findEntities($query);
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index de47f1e49de..7a22a20e1ef 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -516,7 +516,11 @@ protected function getParticipantsFromQuery(IQueryBuilder $query, Room $room): a
 	 * @return string[]
 	 */
 	public function getParticipantUserIds(Room $room, \DateTime $maxLastJoined = null): array {
-		$attendees = $this->attendeeMapper->getActorsByType($room->getId(), 'users', $maxLastJoined);
+		$maxLastJoinedTimestamp = null;
+		if ($maxLastJoined !== null) {
+			$maxLastJoinedTimestamp = $maxLastJoined->getTimestamp();
+		}
+		$attendees = $this->attendeeMapper->getActorsByType($room->getId(), 'users', $maxLastJoinedTimestamp);
 
 		return array_map(static function (Attendee $attendee) {
 			return $attendee->getActorId();

From 3a86707a36233b84692a0fc7454cf6cdec40b891 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 11:40:25 +0100
Subject: [PATCH 067/129] Allow moderator interactions based on attendee id

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php             | 118 +++++++-----------
 lib/Room.php                                  |  26 ++++
 .../Participant/Participant.vue               |   5 +-
 src/store/participantsStore.js                |  36 ++----
 4 files changed, 89 insertions(+), 96 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 6f473d16a82..a3cf9527b94 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -544,6 +544,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 			$roomData = array_merge($roomData, [
 				'actorType' => '',
 				'actorId' => '',
+				'attendeeId' => 0,
 			]);
 		}
 
@@ -602,6 +603,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 			$roomData = array_merge($roomData, [
 				'actorType' => $attendee->getActorType(),
 				'actorId' => $attendee->getActorId(),
+				'attendeeId' => $attendee->getId(),
 			]);
 		}
 
@@ -1056,6 +1058,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				'participantType' => $participant->getAttendee()->getParticipantType(),
 			];
 			if ($this->getAPIVersion() === 3) {
+				$result['attendeeId'] = $participant->getAttendee()->getId();
 				$result['actorId'] = $participant->getAttendee()->getActorId();
 				$result['actorType'] = $participant->getAttendee()->getActorType();
 			}
@@ -1518,106 +1521,79 @@ public function leaveRoom(string $token): DataResponse {
 	 * @PublicPage
 	 * @RequireModeratorParticipant
 	 *
+	 * @param int|null $attendeeId
 	 * @param string|null $participant
 	 * @param string|null $sessionId
 	 * @return DataResponse
 	 */
-	public function promoteModerator(?string $participant, ?string $sessionId): DataResponse {
-		if ($participant !== null) {
-			return $this->promoteUserToModerator($this->room, $participant);
-		}
-
-		return $this->promoteGuestToModerator($this->room, $sessionId);
-	}
-
-	protected function promoteUserToModerator(Room $room, string $participant): DataResponse {
-		try {
-			$targetParticipant = $room->getParticipant($participant);
-		} catch (ParticipantNotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$attendee = $targetParticipant->getAttendee();
-		if ($attendee->getParticipantType() !== Participant::USER) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::MODERATOR);
-
-		return new DataResponse();
-	}
-
-	protected function promoteGuestToModerator(Room $room, string $sessionId): DataResponse {
-		try {
-			$targetParticipant = $room->getParticipantBySession($sessionId);
-		} catch (ParticipantNotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$attendee = $targetParticipant->getAttendee();
-		if ($attendee->getParticipantType() !== Participant::GUEST) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::GUEST_MODERATOR);
-
-		return new DataResponse();
+	public function promoteModerator(?int $attendeeId, ?string $participant, ?string $sessionId): DataResponse {
+		return $this->toggleParticipantType($attendeeId, $participant, $sessionId);
 	}
 
 	/**
 	 * @PublicPage
 	 * @RequireModeratorParticipant
 	 *
+	 * @param int|null $attendeeId
 	 * @param string|null $participant
 	 * @param string|null $sessionId
 	 * @return DataResponse
 	 */
-	public function demoteModerator(?string $participant, ?string $sessionId): DataResponse {
-		if ($participant !== null) {
-			return $this->demoteUserFromModerator($this->room, $participant);
-		}
-
-		return $this->demoteGuestFromModerator($this->room, $sessionId);
+	public function demoteModerator(?int $attendeeId, ?string $participant, ?string $sessionId): DataResponse {
+		return $this->toggleParticipantType($attendeeId, $participant, $sessionId);
 	}
 
-	protected function demoteUserFromModerator(Room $room, string $participant): DataResponse {
-		if ($this->userId === $participant) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
+	/**
+	 * Toggle a user/guest to moderator/guest-moderator or vice-versa based on
+	 * attendeeId (v3) or userId/sessionId (v1+v2)
+	 *
+	 * @param int|null $attendeeId
+	 * @param string|null $userId
+	 * @param string|null $sessionId
+	 * @return DataResponse
+	 */
+	protected function toggleParticipantType(?int $attendeeId, ?string $userId, ?string $sessionId): DataResponse {
 		try {
-			$targetParticipant = $room->getParticipant($participant);
+			if ($attendeeId !== null) {
+				$targetParticipant = $this->room->getParticipantByAttendeeId($attendeeId);
+			} elseif ($userId !== null) {
+				$targetParticipant = $this->room->getParticipant($userId);
+			} else {
+				$targetParticipant =  $this->room->getParticipantBySession($sessionId);
+			}
 		} catch (ParticipantNotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
 		$attendee = $targetParticipant->getAttendee();
-		if ($attendee->getParticipantType() !== Participant::MODERATOR) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::USER);
 
-		return new DataResponse();
-	}
-
-	protected function demoteGuestFromModerator(Room $room, string $sessionId): DataResponse {
-		if ($this->session->getSessionForRoom($room->getToken()) === $sessionId) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
+		// Prevent users/moderators modifying themselves
+		if ($attendee->getActorType() === 'users') {
+			if ($attendee->getActorId() === $this->userId) {
+				return new DataResponse([], Http::STATUS_FORBIDDEN);
+			}
+		} elseif ($attendee->getActorType() === 'guests') {
+			$session = $targetParticipant->getSession();
+			$currentSessionId = $this->session->getSessionForRoom($this->room->getToken());
 
-		try {
-			$targetParticipant = $room->getParticipantBySession($sessionId);
-		} catch (ParticipantNotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
+			if ($session instanceof Session && $currentSessionId === $session->getSessionId()) {
+				return new DataResponse([], Http::STATUS_FORBIDDEN);
+			}
 		}
 
-		$attendee = $targetParticipant->getAttendee();
-		if ($attendee->getParticipantType() !== Participant::GUEST_MODERATOR) {
+		if ($attendee->getParticipantType() === Participant::USER) {
+			$newType = Participant::MODERATOR;
+		} elseif ($attendee->getParticipantType() === Participant::GUEST) {
+			$newType = Participant::GUEST_MODERATOR;
+		} elseif ($attendee->getParticipantType() === Participant::MODERATOR) {
+			$newType = Participant::USER;
+		} elseif ($attendee->getParticipantType() === Participant::GUEST_MODERATOR) {
+			$newType = Participant::GUEST;
+		} else {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$this->participantService->updateParticipantType($room, $targetParticipant, Participant::GUEST);
+		$this->participantService->updateParticipantType($this->room, $targetParticipant, $newType);
 
 		return new DataResponse();
 	}
diff --git a/lib/Room.php b/lib/Room.php
index 16a267a8545..e7e13c93fbf 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -428,6 +428,32 @@ public function getParticipantByPin(string $pin): Participant {
 		return $this->manager->createParticipantObject($this, $row);
 	}
 
+	/**
+	 * @param int $attendeeId
+	 * @return Participant
+	 * @throws ParticipantNotFoundException When the pin is not valid (has no participant assigned)
+	 */
+	public function getParticipantByAttendeeId(int $attendeeId): Participant {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'))
+			->andWhere($query->expr()->eq('a.id', $query->createNamedParameter($attendeeId, IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
+			->setMaxResults(1);
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		if ($row === false) {
+			throw new ParticipantNotFoundException('User is not a participant');
+		}
+
+		return $this->manager->createParticipantObject($this, $row);
+	}
+
 	public function deleteRoom(): void {
 		$event = new RoomEvent($this);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_ROOM_DELETE, $event);
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index dd2382a1234..0c226e1db6f 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -314,6 +314,7 @@ export default {
 		},
 
 		participantIdentifier() {
+
 			let data = {}
 			if (this.isGuest) {
 				data = {
@@ -354,13 +355,13 @@ export default {
 		async promoteToModerator() {
 			await this.$store.dispatch('promoteToModerator', {
 				token: this.token,
-				participantIdentifier: this.participantIdentifier,
+				attendeeId: this.participant.attendeeId,
 			})
 		},
 		async demoteFromModerator() {
 			await this.$store.dispatch('demoteFromModerator', {
 				token: this.token,
-				participantIdentifier: this.participantIdentifier,
+				attendeeId: this.participant.attendeeId,
 			})
 		},
 		async removeParticipant() {
diff --git a/src/store/participantsStore.js b/src/store/participantsStore.js
index 6ebd762eef1..f897ca5deb3 100644
--- a/src/store/participantsStore.js
+++ b/src/store/participantsStore.js
@@ -62,7 +62,9 @@ const getters = {
 
 		let index
 
-		if (participantIdentifier.hasOwnProperty('actorId') && participantIdentifier.hasOwnProperty('actorType')) {
+		if (participantIdentifier.hasOwnProperty('attendeeId')) {
+			index = state.participants[token].findIndex(participant => participant.attendeeId === participantIdentifier.attendeeId)
+		} else if (participantIdentifier.hasOwnProperty('actorId') && participantIdentifier.hasOwnProperty('actorType')) {
 			index = state.participants[token].findIndex(participant => participant.actorId === participantIdentifier.actorId && participant.actorType === participantIdentifier.actorType)
 		} else {
 			index = state.participants[token].findIndex(participant => participant.sessionId === participantIdentifier.sessionId)
@@ -138,21 +140,15 @@ const actions = {
 			commit('addParticipant', { token, participant })
 		}
 	},
-	async promoteToModerator({ commit, getters }, { token, participantIdentifier }) {
-		const index = getters.getParticipantIndex(token, participantIdentifier)
+	async promoteToModerator({ commit, getters }, { token, attendeeId }) {
+		const index = getters.getParticipantIndex(token, { attendeeId })
 		if (index === -1) {
 			return
 		}
 
-		if (participantIdentifier.userId) {
-			// Moderation endpoint requires "participant" instead of "userId"
-			await promoteToModerator(token, {
-				participant: participantIdentifier.userId,
-			})
-		} else {
-			// Guests are identified by sessionId in both cases
-			await promoteToModerator(token, participantIdentifier)
-		}
+		await promoteToModerator(token, {
+			attendeeId,
+		})
 
 		const participant = getters.getParticipant(token, index)
 		const updatedData = {
@@ -160,21 +156,15 @@ const actions = {
 		}
 		commit('updateParticipant', { token, index, updatedData })
 	},
-	async demoteFromModerator({ commit, getters }, { token, participantIdentifier }) {
-		const index = getters.getParticipantIndex(token, participantIdentifier)
+	async demoteFromModerator({ commit, getters }, { token, attendeeId }) {
+		const index = getters.getParticipantIndex(token, { attendeeId })
 		if (index === -1) {
 			return
 		}
 
-		if (participantIdentifier.userId) {
-			// Moderation endpoint requires "participant" instead of "userId"
-			await demoteFromModerator(token, {
-				participant: participantIdentifier.userId,
-			})
-		} else {
-			// Guests are identified by sessionId in both cases
-			await demoteFromModerator(token, participantIdentifier)
-		}
+		await demoteFromModerator(token, {
+			attendeeId,
+		})
 
 		const participant = getters.getParticipant(token, index)
 		const updatedData = {

From a1a142bd0d3b1e0763f6c6b241a3f9a81c79a40d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 14:15:31 +0100
Subject: [PATCH 068/129] Add an endpoint to delete a participant by attendee
 id

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                            |  9 ++++++
 lib/Controller/RoomController.php             | 31 +++++++++++++++++++
 lib/Service/ParticipantService.php            | 18 +++++++++--
 .../Participant/Participant.vue               | 19 +-----------
 src/services/participantsService.js           | 10 ++++++
 src/store/participantsStore.js                | 14 +++------
 6 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 11f77f37890..a97fc9fb1e6 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -299,6 +299,15 @@
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
+		[
+			'name' => 'Room#removeAttendeeFromRoom',
+			'url' => '/api/{apiVersion}/room/{token}/attendees',
+			'verb' => 'DELETE',
+			'requirements' => [
+				'apiVersion' => 'v3',
+				'token' => '^[a-z0-9]{4,30}$',
+			],
+		],
 		[
 			'name' => 'Room#joinRoom',
 			'url' => '/api/{apiVersion}/room/{token}/participants/active',
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index a3cf9527b94..9d16f4ad7d0 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1335,6 +1335,37 @@ public function removeGuestFromRoom(string $participant): DataResponse {
 		return new DataResponse([]);
 	}
 
+	/**
+	 * @PublicPage
+	 * @RequireModeratorParticipant
+	 *
+	 * @param int $attendeeId
+	 * @return DataResponse
+	 */
+	public function removeAttendeeFromRoom(int $attendeeId): DataResponse {
+		try {
+			$targetParticipant = $this->room->getParticipantByAttendeeId($attendeeId);
+		} catch (ParticipantNotFoundException $e) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+
+		if ($this->room->getType() === Room::ONE_TO_ONE_CALL) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		if ($this->participant->getAttendee()->getId() === $targetParticipant->getAttendee()->getId()) {
+			// FIXME switch to removeSelfFromRoomLogic()
+			return new DataResponse([], Http::STATUS_FORBIDDEN);
+		}
+
+		if ($targetParticipant->getAttendee()->getParticipantType() === Participant::OWNER) {
+			return new DataResponse([], Http::STATUS_FORBIDDEN);
+		}
+
+		$this->participantService->removeAttendee($this->room, $targetParticipant, Room::PARTICIPANT_REMOVED);
+		return new DataResponse([]);
+	}
+
 	/**
 	 * @NoAdminRequired
 	 * @RequireLoggedInModeratorParticipant
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 7a22a20e1ef..293092c9364 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -290,13 +290,25 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 	}
 
 	public function removeAttendee(Room $room, Participant $participant, string $reason): void {
-		$event = new RemoveParticipantEvent($room, $participant, $reason);
-		$this->dispatcher->dispatch(Room::EVENT_BEFORE_PARTICIPANT_REMOVE, $event);
+		$isUser = $participant->getAttendee()->getActorType() === 'users';
+
+		if ($isUser) {
+			$user = $this->userManager->get($participant->getAttendee()->getActorId());
+			$event = new RemoveUserEvent($room, $participant, $user, $reason);
+			$this->dispatcher->dispatch(Room::EVENT_BEFORE_USER_REMOVE, $event);
+		} else {
+			$event = new RemoveParticipantEvent($room, $participant, $reason);
+			$this->dispatcher->dispatch(Room::EVENT_BEFORE_PARTICIPANT_REMOVE, $event);
+		}
 
 		$this->sessionMapper->deleteByAttendeeId($participant->getAttendee()->getId());
 		$this->attendeeMapper->delete($participant->getAttendee());
 
-		$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_REMOVE, $event);
+		if ($isUser) {
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_USER_REMOVE, $event);
+		} else {
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_REMOVE, $event);
+		}
 	}
 
 	public function removeUser(Room $room, IUser $user, string $reason): void {
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index 0c226e1db6f..2255817a172 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -312,23 +312,6 @@ export default {
 		canBePromoted() {
 			return this.canModerate && !this.isModerator
 		},
-
-		participantIdentifier() {
-
-			let data = {}
-			if (this.isGuest) {
-				data = {
-					sessionId: this.sessionId,
-				}
-			} else {
-				data = {
-					actorType: 'users',
-					actorId: this.computedId,
-				}
-			}
-			return data
-		},
-
 	},
 
 	methods: {
@@ -367,7 +350,7 @@ export default {
 		async removeParticipant() {
 			await this.$store.dispatch('removeParticipant', {
 				token: this.token,
-				participantIdentifier: this.participantIdentifier,
+				attendeeId: this.participant.attendeeId,
 			})
 		},
 	},
diff --git a/src/services/participantsService.js b/src/services/participantsService.js
index 06eb3a52c95..f906cdb3709 100644
--- a/src/services/participantsService.js
+++ b/src/services/participantsService.js
@@ -210,6 +210,15 @@ const removeGuestFromConversation = async function(token, sessionId) {
 	}
 }
 
+const removeAttendeeFromConversation = async function(token, attendeeId) {
+	const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/attendees`, {
+		params: {
+			attendeeId,
+		},
+	})
+	return response
+}
+
 const promoteToModerator = async(token, options) => {
 	const response = await axios.post(generateOcsUrl('apps/spreed/api/v3/room', 2) + token + '/moderators', options)
 	return response
@@ -246,6 +255,7 @@ export {
 	removeCurrentUserFromConversation,
 	removeUserFromConversation,
 	removeGuestFromConversation,
+	removeAttendeeFromConversation,
 	promoteToModerator,
 	demoteFromModerator,
 	fetchParticipants,
diff --git a/src/store/participantsStore.js b/src/store/participantsStore.js
index f897ca5deb3..1da71d610ec 100644
--- a/src/store/participantsStore.js
+++ b/src/store/participantsStore.js
@@ -23,8 +23,7 @@ import Vue from 'vue'
 import {
 	promoteToModerator,
 	demoteFromModerator,
-	removeUserFromConversation,
-	removeGuestFromConversation,
+	removeAttendeeFromConversation,
 } from '../services/participantsService'
 import {
 	joinCall,
@@ -172,18 +171,13 @@ const actions = {
 		}
 		commit('updateParticipant', { token, index, updatedData })
 	},
-	async removeParticipant({ commit, getters }, { token, participantIdentifier }) {
-		const index = getters.getParticipantIndex(token, participantIdentifier)
+	async removeParticipant({ commit, getters }, { token, attendeeId }) {
+		const index = getters.getParticipantIndex(token, { attendeeId })
 		if (index === -1) {
 			return
 		}
 
-		const participant = getters.getParticipant(token, index)
-		if (participant.actorType === 'users') {
-			await removeUserFromConversation(token, participant.actorId)
-		} else {
-			await removeGuestFromConversation(token, participant.sessionId)
-		}
+		await removeAttendeeFromConversation(token, attendeeId)
 		commit('deleteParticipant', { token, index })
 	},
 	/**

From 8073eb84bc8554f96862cd55546efad35ea18d92 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 14:32:00 +0100
Subject: [PATCH 069/129] userId is no more

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../CurrentParticipants/CurrentParticipants.vue             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
index 328c76efd3f..6595c991c5b 100644
--- a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
+++ b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
@@ -69,7 +69,11 @@ export default {
 
 			if (this.searchText !== '') {
 				const lowerSearchText = this.searchText.toLowerCase()
-				participants = participants.filter(participant => participant.displayName.toLowerCase().indexOf(lowerSearchText) !== -1 || participant.userId.toLowerCase().indexOf(lowerSearchText) !== -1)
+				participants = participants.filter(participant => {
+					return participant.displayName.toLowerCase().indexOf(lowerSearchText) !== -1
+						|| (participant.actorType !== 'guests'
+							&& participant.actorId.toLowerCase().indexOf(lowerSearchText) !== -1)
+				})
 			}
 
 			return participants.slice().sort(this.sortParticipants)

From 45f7108bfcb6b9bdc0a1cc922c5496ec2cabc9be Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 14:32:08 +0100
Subject: [PATCH 070/129] Update the docs a bit

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 docs/conversation.md |  4 +++
 docs/participant.md  | 69 ++++++++++++++++++++++++++++++++------------
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/docs/conversation.md b/docs/conversation.md
index f6722359717..6eadff048b4 100644
--- a/docs/conversation.md
+++ b/docs/conversation.md
@@ -2,6 +2,7 @@
 
 * Base endpoint for API v1 is: `/ocs/v2.php/apps/spreed/api/v1`
 * Base endpoint for API v2 is: `/ocs/v2.php/apps/spreed/api/v2`
+* Base endpoint for API v3 is: `/ocs/v2.php/apps/spreed/api/v3`
 
 ## Get user´s conversations
 
@@ -29,6 +30,9 @@
         `name` | string | * | Name of the conversation (can also be empty)
         `displayName` | string | * | `name` if non empty, otherwise it falls back to a list of participants
         `participantType` | int | * | Permissions level of the current user
+        `attendeeId` | int | v3 | Unique attendee id
+        `actorType` | string | v3 | Currently known `users|guests|emails|groups`
+        `actorId` | string | v3 | The unique identifier for the given actor type
         `participantInCall` | bool | 🏴 v1 | Flag if the current user is in the call (deprecated, use `participantFlags` instead)
         `participantFlags` | int | * | Flags of the current user (only available with `in-call-flags` capability)
         `readOnly` | int | * | Read-only state for the current user (only available with `read-only-rooms` capability)
diff --git a/docs/participant.md b/docs/participant.md
index ef69972685e..8b149ff1936 100644
--- a/docs/participant.md
+++ b/docs/participant.md
@@ -1,6 +1,8 @@
 # Participant API
 
-Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
+* Base endpoint for API v1 is: `/ocs/v2.php/apps/spreed/api/v1`
+* Base endpoint for API v2 is: `/ocs/v2.php/apps/spreed/api/v2`
+* Base endpoint for API v3 is: `/ocs/v2.php/apps/spreed/api/v3`
 
 ## Get list of participants in a conversation
 
@@ -22,16 +24,19 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
     - Data:
         Array of participants, each participant has at least:
 
-        field | type | Description
-        ------|------|------------
-        `userId` | string | Is empty for guests
-        `displayName` | string | Can be empty for guests
-        `participantType` | int | Permissions level of the participant
-        `lastPing` | int | Timestamp of the last ping of the user (should be used for sorting)
-        `sessionId` | string | `'0'` if not connected, otherwise a 512 character long string
-        `status` | string | Optional: Only available with `includeStatus=true` and for users with a set status
-        `statusIcon` | string | Optional: Only available with `includeStatus=true` and for users with a set status
-        `statusMessage` | string | Optional: Only available with `includeStatus=true` and for users with a set status
+        field | type | API | Description
+        ------|------|-----|------------
+        `userId` | string | v1 + v2| Is empty for guests
+        `attendeeId` | int | v3 | Unique attendee id
+        `actorType` | string | v3 | Currently known `users|guests|emails|groups`
+        `actorId` | string | v3 | The unique identifier for the given actor type
+        `displayName` | string | | Can be empty for guests
+        `participantType` | int | | Permissions level of the participant
+        `lastPing` | int | | Timestamp of the last ping of the user (should be used for sorting)
+        `sessionId` | string | | `'0'` if not connected, otherwise a 512 character long string
+        `status` | string | | Optional: Only available with `includeStatus=true` and for users with a set status
+        `statusIcon` | string | | Optional: Only available with `includeStatus=true` and for users with a set status
+        `statusMessage` | string | | Optional: Only available with `includeStatus=true` and for users with a set status
 
 ## Add a participant to a conversation
 
@@ -59,8 +64,30 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
         ------|------|------------
         `type` | int | In case the conversation type changed, the new value is returned
 
+## Delete an attendee by id from a conversation
+
+* API: Only `v3` or later
+* Method: `DELETE`
+* Endpoint: `/room/{token}/attendees`
+* Data:
+
+    field | type | Description
+    ------|------|------------
+    `attendeeId` | int | The participant to delete
+
+* Response:
+    - Status code:
+        + `200 OK`
+        + `400 Bad Request` When the participant is a moderator or owner
+        + `400 Bad Request` When there are no other moderators or owners left
+        + `403 Forbidden` When the current user is not a moderator or owner
+        + `403 Forbidden` When the participant to remove is an owner
+        + `404 Not Found` When the conversation could not be found for the participant
+        + `404 Not Found` When the participant to remove could not be found
+
 ## Delete a participant from a conversation
 
+* API: Only `v1` and `v2`
 * Method: `DELETE`
 * Endpoint: `/room/{token}/participants`
 * Data:
@@ -92,6 +119,7 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 
 ## Remove a guest from a conversation
 
+* API: Only `v1` and `v2`
 * Method: `DELETE`
 * Endpoint: `/room/{token}/participants/guests`
 * Data:
@@ -156,10 +184,11 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 * Endpoint: `/room/{token}/moderators`
 * Data:
 
-    field | type | Description
-    ------|------|------------
-    `participant` | string or null | User to promote
-    `sessionId` | string or null | Guest session to promote
+    field | type | API | Description
+    ------|------|-----|------------
+    `participant` | string or null | v1 + v2 | User to demote
+    `sessionId` | string or null | v1 + v2 | Guest session to demote
+    `attendeeId` | int or null | v3 | Attendee id can be used for guests and users
 
 * Response:
     - Status code:
@@ -176,10 +205,11 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 * Endpoint: `/room/{token}/moderators`
 * Data:
 
-    field | type | Description
-    ------|------|------------
-    `participant` | string or null | User to demote
-    `sessionId` | string or null | Guest session to demote
+    field | type | API | Description
+    ------|------|-----|------------
+    `participant` | string or null | v1 + v2 | User to demote
+    `sessionId` | string or null | v1 + v2 | Guest session to demote
+    `attendeeId` | int or null | v3 | Attendee id can be used for guests and users
 
 * Response:
     - Status code:
@@ -194,6 +224,7 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 
 Note: This is only allowed with validate SIP bridge requests
 
+* API: Only `v3` or later
 * Method: `GET`
 * Endpoint: `/room/{token}/pin/{pin}`
 

From 49ad14e3e2f88c8ed0d70a7a9a08446337193917 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 20:26:02 +0100
Subject: [PATCH 071/129] Only use the Mapper in the Services

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/ChatController.php           | 21 +++-----------
 lib/Controller/RoomController.php           | 31 +++++---------------
 lib/Service/ParticipantService.php          | 32 ++++++++++++++++++++-
 tests/php/Controller/ChatControllerTest.php |  5 ----
 4 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index be752d236bc..41da215e198 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -29,7 +29,6 @@
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Chat\MessageParser;
 use OCA\Talk\GuestManager;
-use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
@@ -71,9 +70,6 @@ class ChatController extends AEnvironmentAwareController {
 	/** @var ChatManager */
 	private $chatManager;
 
-	/** @var AttendeeMapper */
-	private $attendeeMapper;
-
 	/** @var ParticipantService */
 	private $participantService;
 
@@ -117,7 +113,6 @@ public function __construct(string $appName,
 								TalkSession $session,
 								IAppManager $appManager,
 								ChatManager $chatManager,
-								AttendeeMapper $attendeeMapper,
 								ParticipantService $participantService,
 								SessionService $sessionService,
 								GuestManager $guestManager,
@@ -136,7 +131,6 @@ public function __construct(string $appName,
 		$this->session = $session;
 		$this->appManager = $appManager;
 		$this->chatManager = $chatManager;
-		$this->attendeeMapper = $attendeeMapper;
 		$this->participantService = $participantService;
 		$this->sessionService = $sessionService;
 		$this->guestManager = $guestManager;
@@ -226,9 +220,7 @@ public function sendMessage(string $message, string $actorDisplayName = '', stri
 			return new DataResponse([], Http::STATUS_CREATED);
 		}
 
-		$attendee = $this->participant->getAttendee();
-		$attendee->setLastReadMessage((int) $comment->getId());
-		$this->attendeeMapper->update($attendee);
+		$this->participantService->updateLastReadMessage($this->participant, (int) $comment->getId());
 
 		$data = $chatMessage->toArray();
 		if ($parentMessage instanceof Message) {
@@ -329,8 +321,7 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 		$attendee = $this->participant->getAttendee();
 		if ($lookIntoFuture && $setReadMarker === 1 &&
 			$lastKnownMessageId > $attendee->getLastReadMessage()) {
-			$attendee->setLastReadMessage($lastKnownMessageId);
-			$this->attendeeMapper->update($attendee);
+			$this->participantService->updateLastReadMessage($this->participant, $lastKnownMessageId);
 		}
 
 		$currentUser = $this->userManager->get($this->userId);
@@ -429,9 +420,7 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 			 * marker for the time until your next request starts, while it will
 			 * not update the value, when you actually left the chat already.
 			 * if ($setReadMarker === 1 && $lookIntoFuture) {
-			 * $attendee = $this->participant->getAttendee();
-			 * $attendee->setLastReadMessage((int) $newLastKnown->getId());
-			 * $this->attendeeMapper->update($attendee);
+			 * $this->participantService->updateLastReadMessage($this->participant, (int) $newLastKnown->getId());
 			 * }
 			 */
 		}
@@ -447,9 +436,7 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 	 * @return DataResponse
 	 */
 	public function setReadMarker(int $lastReadMessage): DataResponse {
-		$attendee = $this->participant->getAttendee();
-		$attendee->setLastReadMessage($lastReadMessage);
-		$this->attendeeMapper->update($attendee);
+		$this->participantService->updateLastReadMessage($this->participant, $lastReadMessage);
 		return new DataResponse();
 	}
 
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 9d16f4ad7d0..6a9ef18e217 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -40,7 +40,6 @@
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\GuestManager;
 use OCA\Talk\Manager;
-use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -87,8 +86,6 @@ class RoomController extends AEnvironmentAwareController {
 	protected $participantService;
 	/** @var SessionService */
 	protected $sessionService;
-	/** @var AttendeeMapper */
-	protected $attendeeMapper;
 	/** @var GuestManager */
 	protected $guestManager;
 	/** @var IUserStatusManager */
@@ -119,7 +116,6 @@ public function __construct(string $appName,
 								RoomService $roomService,
 								ParticipantService $participantService,
 								SessionService $sessionService,
-								AttendeeMapper $attendeeMapper,
 								GuestManager $guestManager,
 								IUserStatusManager $statusManager,
 								ChatManager $chatManager,
@@ -139,7 +135,6 @@ public function __construct(string $appName,
 		$this->roomService = $roomService;
 		$this->participantService = $participantService;
 		$this->sessionService = $sessionService;
-		$this->attendeeMapper = $attendeeMapper;
 		$this->guestManager = $guestManager;
 		$this->statusManager = $statusManager;
 		$this->chatManager = $chatManager;
@@ -426,8 +421,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 					 * but only with O(user×chat), we do the conversion here.
 					 */
 					$lastReadMessage = $this->chatManager->getLastReadMessageFromLegacy($room, $currentUser);
-					$attendee->setLastReadMessage($lastReadMessage);
-					$this->attendeeMapper->update($attendee);
+					$this->participantService->updateLastReadMessage($currentParticipant, $lastReadMessage);
 				}
 				$roomData['unreadMessages'] = $this->chatManager->getUnreadCount($room, $lastReadMessage);
 
@@ -650,8 +644,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 					 * but only with O(user×chat), we do the conversion here.
 					 */
 					$lastReadMessage = $this->chatManager->getLastReadMessageFromLegacy($room, $currentUser);
-					$attendee->setLastReadMessage($lastReadMessage);
-					$this->attendeeMapper->update($attendee);
+					$this->participantService->updateLastReadMessage($currentParticipant, $lastReadMessage);
 				}
 				if ($room->getLastMessage() && $lastReadMessage === (int) $room->getLastMessage()->getId()) {
 					// When the last message is the last read message, there are no unread messages,
@@ -924,9 +917,7 @@ protected function createEmptyRoom(string $roomName, bool $public = true): DataR
 	 * @return DataResponse
 	 */
 	public function addToFavorites(): DataResponse {
-		$attendee = $this->participant->getAttendee();
-		$attendee->setFavorite(true);
-		$this->attendeeMapper->update($attendee);
+		$this->participantService->updateFavoriteStatus($this->participant, true);
 		return new DataResponse([]);
 	}
 
@@ -937,9 +928,7 @@ public function addToFavorites(): DataResponse {
 	 * @return DataResponse
 	 */
 	public function removeFromFavorites(): DataResponse {
-		$attendee = $this->participant->getAttendee();
-		$attendee->setFavorite(false);
-		$this->attendeeMapper->update($attendee);
+		$this->participantService->updateFavoriteStatus($this->participant, false);
 		return new DataResponse([]);
 	}
 
@@ -951,18 +940,12 @@ public function removeFromFavorites(): DataResponse {
 	 * @return DataResponse
 	 */
 	public function setNotificationLevel(int $level): DataResponse {
-		if (!\in_array($level, [
-			Participant::NOTIFY_ALWAYS,
-			Participant::NOTIFY_MENTION,
-			Participant::NOTIFY_NEVER
-		], true)) {
+		try {
+			$this->participantService->updateNotificationLevel($this->participant, $level);
+		} catch (\InvalidArgumentException $e) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		$attendee = $this->participant->getAttendee();
-		$attendee->setNotificationLevel($level);
-		$this->attendeeMapper->update($attendee);
-
 		return new DataResponse();
 	}
 
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 293092c9364..1b0458b3f8a 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -83,7 +83,6 @@ public function __construct(AttendeeMapper $attendeeMapper,
 		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
 		$this->userManager = $userManager;
-		$this->userManager = $userManager;
 		$this->timeFactory = $timeFactory;
 	}
 
@@ -100,6 +99,37 @@ public function updateParticipantType(Room $room, Participant $participant, int
 		$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_TYPE_SET, $event);
 	}
 
+	public function updateLastReadMessage(Participant $participant, int $lastReadMessage): void {
+		$attendee = $participant->getAttendee();
+		$attendee->setLastReadMessage($lastReadMessage);
+		$this->attendeeMapper->update($attendee);
+	}
+
+	public function updateFavoriteStatus(Participant $participant, bool $isFavorite): void {
+		$attendee = $participant->getAttendee();
+		$attendee->setFavorite($isFavorite);
+		$this->attendeeMapper->update($attendee);
+	}
+
+	/**
+	 * @param Participant $participant
+	 * @param int $level
+	 * @throws \InvalidArgumentException When the notification level is invalid
+	 */
+	public function updateNotificationLevel(Participant $participant, int $level): void {
+		if (!\in_array($level, [
+			Participant::NOTIFY_ALWAYS,
+			Participant::NOTIFY_MENTION,
+			Participant::NOTIFY_NEVER
+		], true)) {
+			throw new \InvalidArgumentException('Invalid notification level');
+		}
+
+		$attendee = $participant->getAttendee();
+		$attendee->setNotificationLevel($level);
+		$this->attendeeMapper->update($attendee);
+	}
+
 	/**
 	 * @param Room $room
 	 * @param IUser $user
diff --git a/tests/php/Controller/ChatControllerTest.php b/tests/php/Controller/ChatControllerTest.php
index ace37089ab0..7b7dddd622b 100644
--- a/tests/php/Controller/ChatControllerTest.php
+++ b/tests/php/Controller/ChatControllerTest.php
@@ -28,7 +28,6 @@
 use OCA\Talk\Chat\MessageParser;
 use OCA\Talk\Controller\ChatController;
 use OCA\Talk\GuestManager;
-use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -64,8 +63,6 @@ class ChatControllerTest extends TestCase {
 	private $appManager;
 	/** @var ChatManager|MockObject */
 	protected $chatManager;
-	/** @var AttendeeMapper|MockObject */
-	protected $attendeeMapper;
 	/** @var ParticipantService|MockObject */
 	protected $participantService;
 	/** @var SessionService|MockObject */
@@ -106,7 +103,6 @@ public function setUp(): void {
 		$this->session = $this->createMock(TalkSession::class);
 		$this->appManager = $this->createMock(IAppManager::class);
 		$this->chatManager = $this->createMock(ChatManager::class);
-		$this->attendeeMapper = $this->createMock(AttendeeMapper::class);
 		$this->participantService = $this->createMock(ParticipantService::class);
 		$this->sessionService = $this->createMock(SessionService::class);
 		$this->guestManager = $this->createMock(GuestManager::class);
@@ -140,7 +136,6 @@ private function recreateChatController() {
 			$this->session,
 			$this->appManager,
 			$this->chatManager,
-			$this->attendeeMapper,
 			$this->participantService,
 			$this->sessionService,
 			$this->guestManager,

From 266ed787648cc9a31bc65a6325fbb534fe8c3dc3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 29 Oct 2020 20:40:10 +0100
Subject: [PATCH 072/129] Add an empty display_name column as preparation to
 merge the oc_talk_guests table in

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Migration/Version10000Date20201015134000.php | 5 +++++
 lib/Model/Attendee.php                           | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/Migration/Version10000Date20201015134000.php b/lib/Migration/Version10000Date20201015134000.php
index 4ed340a149c..b050619ff09 100644
--- a/lib/Migration/Version10000Date20201015134000.php
+++ b/lib/Migration/Version10000Date20201015134000.php
@@ -83,6 +83,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'notnull' => true,
 				'length' => 255,
 			]);
+			$table->addColumn('display_name', Type::STRING, [
+				'notnull' => false,
+				'default' => '',
+				'length' => 64,
+			]);
 
 			$table->addColumn('pin', Type::STRING, [
 				'notnull' => false,
diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php
index 86e0676daca..121139d158e 100644
--- a/lib/Model/Attendee.php
+++ b/lib/Model/Attendee.php
@@ -32,6 +32,8 @@
  * @method string getActorType()
  * @method void setActorId(string $actorId)
  * @method string getActorId()
+ * @method void setDisplayName(string $displayName)
+ * @method string getDisplayName()
  * @method void setPin(string $pin)
  * @method string getPin()
  * @method void setParticipantType(int $participantType)
@@ -58,6 +60,9 @@ class Attendee extends Entity {
 	/** @var string */
 	protected $actorId;
 
+	/** @var string */
+	protected $displayName;
+
 	/** @var string */
 	protected $pin;
 
@@ -83,6 +88,7 @@ public function __construct() {
 		$this->addType('roomId', 'int');
 		$this->addType('actorType', 'string');
 		$this->addType('actorId', 'string');
+		$this->addType('displayName', 'string');
 		$this->addType('pin', 'string');
 		$this->addType('participantType', 'int');
 		$this->addType('favorite', 'bool');
@@ -101,6 +107,7 @@ public function asArray(): array {
 			'room_id' => $this->getRoomId(),
 			'actor_type' => $this->getActorType(),
 			'actor_id' => $this->getActorId(),
+			// FIXME 'display_name' => $this->getDisplayName(),
 			'pin' => $this->getPin(),
 			'participant_type' => $this->getParticipantType(),
 			'favorite' => $this->isFavorite(),

From 7d25ee9a1543a4960a0db29837756ef067ebb66d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 13:13:34 +0100
Subject: [PATCH 073/129] Make the version checks future proof

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 6a9ef18e217..d38cf787393 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -218,7 +218,7 @@ public function getSingleRoom(string $token): DataResponse {
 			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
 		}
 
-		if ($isSIPBridgeRequest && $this->getAPIVersion() === 1) {
+		if ($isSIPBridgeRequest && $this->getAPIVersion() < 3) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 		$includeLastMessage = !$isSIPBridgeRequest;
@@ -292,7 +292,7 @@ private function validateSIPBridgeRequest(string $data): bool {
 	 * @throws RoomNotFoundException
 	 */
 	protected function formatRoom(Room $room, ?Participant $currentParticipant, bool $isSIPBridgeRequest = false): array {
-		if ($this->getAPIVersion() !== 1) {
+		if ($this->getAPIVersion() >= 2) {
 			return $this->formatRoomV2andV3($room, $currentParticipant, $isSIPBridgeRequest);
 		}
 
@@ -534,7 +534,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 			'guestList' => '',
 			'lastMessage' => [],
 		];
-		if ($this->getAPIVersion() === 3) {
+		if ($this->getAPIVersion() >= 3) {
 			$roomData = array_merge($roomData, [
 				'actorType' => '',
 				'actorId' => '',
@@ -593,7 +593,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 			'lobbyTimer' => $lobbyTimer,
 			'sipEnabled' => $room->getSIPEnabled(),
 		]);
-		if ($this->getAPIVersion() === 3) {
+		if ($this->getAPIVersion() >= 3) {
 			$roomData = array_merge($roomData, [
 				'actorType' => $attendee->getActorType(),
 				'actorId' => $attendee->getActorId(),
@@ -1040,7 +1040,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				'sessionId' => '0', // FIXME empty string or null?
 				'participantType' => $participant->getAttendee()->getParticipantType(),
 			];
-			if ($this->getAPIVersion() === 3) {
+			if ($this->getAPIVersion() >= 3) {
 				$result['attendeeId'] = $participant->getAttendee()->getId();
 				$result['actorId'] = $participant->getAttendee()->getActorId();
 				$result['actorType'] = $participant->getAttendee()->getActorType();
@@ -1062,7 +1062,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 					$this->participantService->leaveRoomAsSession($this->room, $participant);
 				}
 
-				if ($this->getAPIVersion() !== 3) {
+				if ($this->getAPIVersion() < 3) {
 					$result['userId'] = $participant->getAttendee()->getActorId();
 				}
 				$result['displayName'] = (string) $user->getDisplayName();
@@ -1079,12 +1079,12 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 					continue;
 				}
 
-				if ($this->getAPIVersion() !== 3) {
+				if ($this->getAPIVersion() < 3) {
 					$result['userId'] = '';
 				}
 				$result['displayName'] = $guestNames[$participant->getAttendee()->getActorId()] ?? '';
-			} elseif ($this->getAPIVersion() === 3) {
-				// Other types are only reported on V3
+			} elseif ($this->getAPIVersion() >= 3) {
+				// Other types are only reported on v3 or later
 				$result['displayName'] = $participant->getAttendee()->getActorId();
 			} else {
 				// Skip unknown actor types

From ebc05f839b11d3bdfe41acdbbcb09cbd3ef9fca4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 13:22:53 +0100
Subject: [PATCH 074/129] Add a comment why the last comment is not included
 for sip

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index d38cf787393..5dabc37ee10 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -221,6 +221,8 @@ public function getSingleRoom(string $token): DataResponse {
 		if ($isSIPBridgeRequest && $this->getAPIVersion() < 3) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
+
+		// The SIP bridge only needs room details (public, sip enabled, lobby state, etc)
 		$includeLastMessage = !$isSIPBridgeRequest;
 
 		try {

From cbfdf863e9b6136f9084c927f4af94f5a2d742f9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 13:28:21 +0100
Subject: [PATCH 075/129] Use $this->request to access header and add docs
 about the return value

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 5dabc37ee10..23155e45bf5 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -254,21 +254,21 @@ public function getSingleRoom(string $token): DataResponse {
 	 * configuration.
 	 *
 	 * @param string $data
-	 * @return bool
-	 * @throws UnauthorizedException when the request tried to sign as SIP bridge but failed
+	 * @return bool True if the request is from the SIP bridge and valid, false if not from SIP bridge
+	 * @throws UnauthorizedException when the request tried to sign as SIP bridge but is not valid
 	 */
 	private function validateSIPBridgeRequest(string $data): bool {
-		if (!isset($_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'])
-			&& !isset($_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'])) {
+		$random = $this->request->getHeader('TALK_SIPBRIDGE_RANDOM');
+		$checksum = $this->request->getHeader('TALK_SIPBRIDGE_CHECKSUM');
+
+		if ($random === '' && $checksum === '') {
 			return false;
 		}
 
-		$random = $_SERVER['HTTP_TALK_SIPBRIDGE_RANDOM'] ?? '';
 		if (strlen($random) < 32) {
 			throw new UnauthorizedException('Invalid random provided');
 		}
 
-		$checksum = $_SERVER['HTTP_TALK_SIPBRIDGE_CHECKSUM'] ?? '';
 		if (empty($checksum)) {
 			throw new UnauthorizedException('Invalid checksum provided');
 		}

From 9513626325166b037d47e02cc90327b404f61778 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 13:32:33 +0100
Subject: [PATCH 076/129] Prevent concurrent promotion/demotion requests to
 revert by accident

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 23155e45bf5..92c5acf71db 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1543,7 +1543,7 @@ public function leaveRoom(string $token): DataResponse {
 	 * @return DataResponse
 	 */
 	public function promoteModerator(?int $attendeeId, ?string $participant, ?string $sessionId): DataResponse {
-		return $this->toggleParticipantType($attendeeId, $participant, $sessionId);
+		return $this->changeParticipantType($attendeeId, $participant, $sessionId, true);
 	}
 
 	/**
@@ -1556,7 +1556,7 @@ public function promoteModerator(?int $attendeeId, ?string $participant, ?string
 	 * @return DataResponse
 	 */
 	public function demoteModerator(?int $attendeeId, ?string $participant, ?string $sessionId): DataResponse {
-		return $this->toggleParticipantType($attendeeId, $participant, $sessionId);
+		return $this->changeParticipantType($attendeeId, $participant, $sessionId, false);
 	}
 
 	/**
@@ -1566,9 +1566,10 @@ public function demoteModerator(?int $attendeeId, ?string $participant, ?string
 	 * @param int|null $attendeeId
 	 * @param string|null $userId
 	 * @param string|null $sessionId
+	 * @param bool $promote Shall the attendee be promoted or demoted
 	 * @return DataResponse
 	 */
-	protected function toggleParticipantType(?int $attendeeId, ?string $userId, ?string $sessionId): DataResponse {
+	protected function changeParticipantType(?int $attendeeId, ?string $userId, ?string $sessionId, bool $promote): DataResponse {
 		try {
 			if ($attendeeId !== null) {
 				$targetParticipant = $this->room->getParticipantByAttendeeId($attendeeId);
@@ -1597,6 +1598,11 @@ protected function toggleParticipantType(?int $attendeeId, ?string $userId, ?str
 			}
 		}
 
+		if ($promote === $targetParticipant->hasModeratorPermissions()) {
+			// Prevent concurrent changes
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
 		if ($attendee->getParticipantType() === Participant::USER) {
 			$newType = Participant::MODERATOR;
 		} elseif ($attendee->getParticipantType() === Participant::GUEST) {

From 40ec79c429b9c21fbc08494cb10f0e6ecd3dcb9e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 13:41:11 +0100
Subject: [PATCH 077/129] Add a comment about the session

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Model/Session.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Model/Session.php b/lib/Model/Session.php
index 172e39ef9a1..0acabf59383 100644
--- a/lib/Model/Session.php
+++ b/lib/Model/Session.php
@@ -26,6 +26,14 @@
 use OCP\AppFramework\Db\Entity;
 
 /**
+ * A session is the "I'm online in this conversation" state of Talk, you get one
+ * when opening the conversation while the inCall flag tells if you are just
+ * online (chatting), or in a call (with audio, camera or even sip).
+ * Currently it's limited to 1 per attendee, but the plan is to remove this
+ * restriction in the future, so e.g. in the future you can join with your phone
+ * on the SIP bridge, have your video/screenshare on the laptop and chat in the
+ * mobile app.
+ *
  * @method void setAttendeeId(int $attendeeId)
  * @method string getAttendeeId()
  * @method void setSessionId(string $sessionId)

From ba6535cb7db2f8a815c0f34d2fc64ee78433be63 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 13:50:11 +0100
Subject: [PATCH 078/129] Fix copyright year

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/AdminSettings/SIPBridge.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue
index e626261512f..6559c4b0a36 100644
--- a/src/components/AdminSettings/SIPBridge.vue
+++ b/src/components/AdminSettings/SIPBridge.vue
@@ -1,5 +1,5 @@
 <!--
- - @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
+ - @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
  -
  - @author Joas Schilling <coding@schilljs.com>
  -

From 5f94c2c540e0e3185515dbe0e8c315f3444baa34 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 14:03:37 +0100
Subject: [PATCH 079/129] Introduce constants for the actor types

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Activity/Listener.php                     |  5 +--
 lib/Chat/AutoComplete/SearchPlugin.php        |  5 +--
 lib/Chat/ChatManager.php                      |  3 +-
 lib/Chat/Command/Executor.php                 |  7 ++--
 lib/Chat/MessageParser.php                    |  5 +--
 lib/Chat/Notifier.php                         | 11 ++++---
 lib/Chat/Parser/Changelog.php                 |  3 +-
 lib/Chat/Parser/Command.php                   |  3 +-
 lib/Chat/Parser/SystemMessage.php             |  5 +--
 lib/Chat/Parser/UserMention.php               |  3 +-
 lib/Chat/SystemMessage/Listener.php           |  7 ++--
 lib/Command/Room/TRoomCommand.php             |  5 +--
 lib/Controller/CallController.php             |  3 +-
 lib/Controller/ChatController.php             | 11 ++++---
 lib/Controller/RoomController.php             | 33 ++++++++++---------
 lib/Controller/SignalingController.php        |  3 +-
 lib/Files/Listener.php                        |  3 +-
 lib/Manager.php                               | 17 +++++-----
 lib/MatterbridgeManager.php                   |  5 +--
 .../Version10000Date20201015134000.php        |  3 +-
 lib/Model/Attendee.php                        |  4 +++
 lib/Model/Message.php                         |  2 +-
 lib/Notification/Listener.php                 |  3 +-
 lib/Room.php                                  |  3 +-
 lib/Search/MessageSearch.php                  |  3 +-
 lib/Service/ParticipantService.php            | 24 +++++++-------
 lib/Service/RoomService.php                   |  7 ++--
 lib/Signaling/BackendNotifier.php             | 15 +++++----
 28 files changed, 115 insertions(+), 86 deletions(-)

diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php
index cc1c69ce5f0..47449606775 100644
--- a/lib/Activity/Listener.php
+++ b/lib/Activity/Listener.php
@@ -27,6 +27,7 @@
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\ModifyParticipantEvent;
 use OCA\Talk\Events\RoomEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCP\Activity\IManager;
@@ -129,7 +130,7 @@ public function generateCallActivity(Room $room): bool {
 		}
 
 		$actorId = $userIds[0] ?? 'guests-only';
-		$actorType = $actorId !== 'guests-only' ? 'users' : 'guests';
+		$actorType = $actorId !== 'guests-only' ? Attendee::ACTOR_USERS : Attendee::ACTOR_GUESTS;
 		$this->chatManager->addSystemMessage($room, $actorType, $actorId, json_encode([
 			'message' => 'call_ended',
 			'parameters' => [
@@ -205,7 +206,7 @@ public function generateInvitationActivity(Room $room, array $participants): voi
 		}
 
 		foreach ($participants as $participant) {
-			if ($participant['actorType'] !== 'users') {
+			if ($participant['actorType'] !== Attendee::ACTOR_USERS) {
 				// No user => no activity
 				continue;
 			}
diff --git a/lib/Chat/AutoComplete/SearchPlugin.php b/lib/Chat/AutoComplete/SearchPlugin.php
index 3469339e5c4..770c963634b 100644
--- a/lib/Chat/AutoComplete/SearchPlugin.php
+++ b/lib/Chat/AutoComplete/SearchPlugin.php
@@ -25,6 +25,7 @@
 
 use OCA\Talk\Files\Util;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
@@ -102,9 +103,9 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 			$participants = $this->participantService->getParticipantsForRoom($this->room);
 			foreach ($participants as $participant) {
 				$attendee = $participant->getAttendee();
-				if ($attendee->getActorType() === 'guests') {
+				if ($attendee->getActorType() === Attendee::ACTOR_GUESTS) {
 					$guestSessionHashes[] = $attendee->getActorId();
-				} elseif ($attendee->getActorType() === 'users') {
+				} elseif ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 					$userIds[] = $attendee->getActorId();
 				}
 			}
diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php
index 11e591d75bd..13ead6d8ca4 100644
--- a/lib/Chat/ChatManager.php
+++ b/lib/Chat/ChatManager.php
@@ -28,6 +28,7 @@
 use OC\Memcache\NullCache;
 use OCA\Talk\Events\ChatEvent;
 use OCA\Talk\Events\ChatParticipantEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -144,7 +145,7 @@ public function addSystemMessage(Room $chat, string $actorType, string $actorId,
 	 * @return IComment
 	 */
 	public function addChangelogMessage(Room $chat, string $message): IComment {
-		$comment = $this->commentsManager->create('guests', 'changelog', 'chat', (string) $chat->getId());
+		$comment = $this->commentsManager->create(Attendee::ACTOR_GUESTS, 'changelog', 'chat', (string) $chat->getId());
 
 		$comment->setMessage($message, self::MAX_CHAT_LENGTH);
 		$comment->setCreationDateTime($this->timeFactory->getDateTime());
diff --git a/lib/Chat/Command/Executor.php b/lib/Chat/Command/Executor.php
index 21a01fce954..0862936c4bb 100644
--- a/lib/Chat/Command/Executor.php
+++ b/lib/Chat/Command/Executor.php
@@ -25,6 +25,7 @@
 
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Events\CommandEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Command;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -90,7 +91,7 @@ public function exec(Room $room, IComment $message, Command $command, string $ar
 		try {
 			$command = $this->commandService->resolveAlias($command);
 		} catch (DoesNotExistException $e) {
-			$user = $message->getActorType() === 'users' ? $message->getActorId() : '';
+			$user = $message->getActorType() === Attendee::ACTOR_USERS ? $message->getActorId() : '';
 			$message->setMessage(json_encode([
 				'user' => $user,
 				'visibility' => $command->getResponse(),
@@ -109,7 +110,7 @@ public function exec(Room $room, IComment $message, Command $command, string $ar
 			$output = $this->execShell($room, $message, $command, $arguments);
 		}
 
-		$user = $message->getActorType() === 'users' ? $message->getActorId() : '';
+		$user = $message->getActorType() === Attendee::ACTOR_USERS ? $message->getActorId() : '';
 		$message->setMessage(json_encode([
 			'user' => $user,
 			'visibility' => $command->getResponse(),
@@ -205,7 +206,7 @@ public function execShell(Room $room, IComment $message, Command $command, strin
 				$command->getScript(),
 				$arguments,
 				$room->getToken(),
-				$message->getActorType() === 'users' ? $message->getActorId() : ''
+				$message->getActorType() === Attendee::ACTOR_USERS ? $message->getActorId() : ''
 			);
 		} catch (\InvalidArgumentException $e) {
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
diff --git a/lib/Chat/MessageParser.php b/lib/Chat/MessageParser.php
index 176be751e68..ebea4d20bea 100644
--- a/lib/Chat/MessageParser.php
+++ b/lib/Chat/MessageParser.php
@@ -27,6 +27,7 @@
 use OCA\Talk\Events\ChatMessageEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -79,10 +80,10 @@ protected function setActor(Message $message): void {
 		$comment = $message->getComment();
 
 		$displayName = '';
-		if ($comment->getActorType() === 'users') {
+		if ($comment->getActorType() === Attendee::ACTOR_USERS) {
 			$user = $this->userManager->get($comment->getActorId());
 			$displayName = $user instanceof IUser ? $user->getDisplayName() : $comment->getActorId();
-		} elseif ($comment->getActorType() === 'guests') {
+		} elseif ($comment->getActorType() === Attendee::ACTOR_GUESTS) {
 			if (isset($guestNames[$comment->getActorId()])) {
 				$displayName = $this->guestNames[$comment->getActorId()];
 			} else {
diff --git a/lib/Chat/Notifier.php b/lib/Chat/Notifier.php
index 13fb7d02797..0b5db45eb3e 100644
--- a/lib/Chat/Notifier.php
+++ b/lib/Chat/Notifier.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Files\Util;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -135,7 +136,7 @@ public function notifyMentionedUsers(Room $chat, IComment $comment, array $alrea
 	 * @return string[] Users that were mentioned
 	 */
 	public function notifyReplyToAuthor(Room $chat, IComment $comment, IComment $replyTo): array {
-		if ($replyTo->getActorType() !== 'users') {
+		if ($replyTo->getActorType() !== Attendee::ACTOR_USERS) {
 			// No reply notification when the replyTo-author was not a user
 			return [];
 		}
@@ -308,7 +309,7 @@ protected function getDefaultGroupNotification(): int {
 	 * @return bool
 	 */
 	protected function shouldMentionedUserBeNotified(string $userId, IComment $comment): bool {
-		if ($comment->getActorType() === 'users' && $userId === $comment->getActorId()) {
+		if ($comment->getActorType() === Attendee::ACTOR_USERS && $userId === $comment->getActorId()) {
 			// Do not notify the user if they mentioned themselves
 			return false;
 		}
@@ -341,7 +342,7 @@ protected function shouldMentionedUserBeNotified(string $userId, IComment $comme
 				// the notification can be parsed and links to an existing room,
 				// where they are a participant of.
 				$this->participantService->addUsers($room, [[
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $userId,
 				]]);
 				return true;
@@ -364,12 +365,12 @@ protected function shouldMentionedUserBeNotified(string $userId, IComment $comme
 	 * @return bool
 	 */
 	protected function shouldParticipantBeNotified(Participant $participant, IComment $comment, array $alreadyNotifiedUsers): bool {
-		if ($participant->getAttendee()->getActorType() !== 'users') {
+		if ($participant->getAttendee()->getActorType() !== Attendee::ACTOR_USERS) {
 			return false;
 		}
 
 		$userId = $participant->getAttendee()->getActorId();
-		if ($comment->getActorType() === 'users' && $userId === $comment->getActorId()) {
+		if ($comment->getActorType() === Attendee::ACTOR_USERS && $userId === $comment->getActorId()) {
 			// Do not notify the author
 			return false;
 		}
diff --git a/lib/Chat/Parser/Changelog.php b/lib/Chat/Parser/Changelog.php
index 2f6621848d2..d1c8ce12927 100644
--- a/lib/Chat/Parser/Changelog.php
+++ b/lib/Chat/Parser/Changelog.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\Chat\Parser;
 
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 
 class Changelog {
@@ -32,7 +33,7 @@ class Changelog {
 	 * @throws \OutOfBoundsException
 	 */
 	public function parseMessage(Message $chatMessage): void {
-		if ($chatMessage->getActorType() !== 'guests' ||
+		if ($chatMessage->getActorType() !== Attendee::ACTOR_GUESTS ||
 			$chatMessage->getActorId() !== 'changelog') {
 			throw new \OutOfBoundsException('Not a changelog');
 		}
diff --git a/lib/Chat/Parser/Command.php b/lib/Chat/Parser/Command.php
index 1e321d8d8d4..6a69f2c8223 100644
--- a/lib/Chat/Parser/Command.php
+++ b/lib/Chat/Parser/Command.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\Chat\Parser;
 
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 
 class Command {
@@ -44,7 +45,7 @@ public function parseMessage(Message $message): void {
 
 		$participant = $message->getParticipant();
 		if ($data['visibility'] !== \OCA\Talk\Model\Command::RESPONSE_ALL &&
-			($participant->getAttendee()->getActorType() !== 'users'
+			($participant->getAttendee()->getActorType() !== Attendee::ACTOR_USERS
 				|| $data['user'] !== $participant->getAttendee()->getActorId())) {
 			$message->setVisibility(false);
 			return;
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index 6ee2c6ecf96..3a89a96cf32 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -25,6 +25,7 @@
 
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Participant;
 use OCA\Talk\Share\RoomShareProvider;
@@ -94,7 +95,7 @@ public function parseMessage(Message $chatMessage): void {
 		if (!$participant->isGuest()) {
 			$currentActorId = $participant->getAttendee()->getActorId();
 			$currentUserIsActor = $parsedParameters['actor']['type'] === 'user' &&
-				$participant->getAttendee()->getActorType() === 'users' &&
+				$participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS &&
 				$currentActorId === $parsedParameters['actor']['id'];
 		} else {
 			$currentActorId = $participant->getAttendee()->getActorId();
@@ -382,7 +383,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
 	}
 
 	protected function getActor(IComment $comment): array {
-		if ($comment->getActorType() === 'guests') {
+		if ($comment->getActorType() === Attendee::ACTOR_GUESTS) {
 			return $this->getGuest($comment->getActorId());
 		}
 
diff --git a/lib/Chat/Parser/UserMention.php b/lib/Chat/Parser/UserMention.php
index 67faa2bbfbd..688a54e57ad 100644
--- a/lib/Chat/Parser/UserMention.php
+++ b/lib/Chat/Parser/UserMention.php
@@ -26,6 +26,7 @@
 
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Room;
 use OCP\Comments\ICommentsManager;
@@ -110,7 +111,7 @@ public function parseMessage(Message $chatMessage): void {
 
 			if ($mention['type'] === 'call') {
 				$userId = '';
-				if ($chatMessage->getParticipant()->getAttendee()->getActorType() === 'users') {
+				if ($chatMessage->getParticipant()->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 					$userId = $chatMessage->getParticipant()->getAttendee()->getActorId();
 				}
 
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index a45f42ab844..b69e50a063a 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -31,6 +31,7 @@
 use OCA\Talk\Events\RemoveUserEvent;
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -221,7 +222,7 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$room = $event->getRoom();
 			$attendee = $event->getParticipant()->getAttendee();
 
-			if ($attendee->getActorType() !== 'users' && $attendee->getActorType() !== 'guests') {
+			if ($attendee->getActorType() !== Attendee::ACTOR_USERS && $attendee->getActorType() !== Attendee::ACTOR_GUESTS) {
 				return;
 			}
 
@@ -274,10 +275,10 @@ protected function sendSystemMessage(Room $room, string $message, array $paramet
 				$actorType = 'users';
 				$actorId = $user->getUID();
 			} elseif (\OC::$CLI) {
-				$actorType = 'guests';
+				$actorType = Attendee::ACTOR_GUESTS;
 				$actorId = 'cli';
 			} else {
-				$actorType = 'guests';
+				$actorType = Attendee::ACTOR_GUESTS;
 				$sessionId = $this->talkSession->getSessionForRoom($room->getToken());
 				$actorId = $sessionId ? sha1($sessionId) : 'failed-to-get-session';
 			}
diff --git a/lib/Command/Room/TRoomCommand.php b/lib/Command/Room/TRoomCommand.php
index 2c59205e26e..b69c4e5e321 100644
--- a/lib/Command/Room/TRoomCommand.php
+++ b/lib/Command/Room/TRoomCommand.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
@@ -249,7 +250,7 @@ protected function addRoomParticipants(Room $room, array $userIds): void {
 			}
 
 			$participants[] = [
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $user->getUID(),
 			];
 		}
@@ -377,7 +378,7 @@ protected function completeParticipantValues(CompletionContext $context): array
 		$users = [];
 		$participants = $this->participantService->getParticipantsForRoom($room);
 		foreach ($participants as $participant) {
-			if ($participant->getAttendee()->getActorType() === 'users'
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS
 				&& stripos($participant->getAttendee()->getActorId(), $context->getCurrentWord()) !== false) {
 				$users[] = $participant->getAttendee()->getActorId();
 			}
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 6e1c66a083d..6a43b49ff18 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -27,6 +27,7 @@
 
 namespace OCA\Talk\Controller;
 
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Service\ParticipantService;
@@ -72,7 +73,7 @@ public function getPeersForCall(): DataResponse {
 			}
 
 			$userId = '';
-			if ($participant->getAttendee()->getActorType() === 'users') {
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 				$userId = $participant->getAttendee()->getActorId();
 			}
 
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 41da215e198..6e97a747bf0 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Chat\ChatManager;
 use OCA\Talk\Chat\MessageParser;
 use OCA\Talk\GuestManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Message;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
@@ -165,7 +166,7 @@ public function __construct(string $appName,
 	 */
 	public function sendMessage(string $message, string $actorDisplayName = '', string $referenceId = '', int $replyTo = 0): DataResponse {
 		if ($this->userId === null) {
-			$actorType = 'guests';
+			$actorType = Attendee::ACTOR_GUESTS;
 			$sessionId = $this->session->getSessionForRoom($this->room->getToken());
 			// The character limit for actorId is 64, but the spreed-session is
 			// 256 characters long, so it has to be hashed to get an ID that
@@ -178,7 +179,7 @@ public function sendMessage(string $message, string $actorDisplayName = '', stri
 				$this->guestManager->updateName($this->room, $this->participant, $actorDisplayName);
 			}
 		} else {
-			$actorType = 'users';
+			$actorType = Attendee::ACTOR_USERS;
 			$actorId = $this->userId;
 		}
 
@@ -293,7 +294,7 @@ public function receiveMessages(int $lookIntoFuture, int $limit = 100, int $last
 
 				if ($lookIntoFuture) {
 					$attendee = $this->participant->getAttendee();
-					if ($attendee->getActorType() === 'users') {
+					if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 						// Bump the user status again
 						$event = new UserLiveStatusEvent(
 							$this->userManager->get($attendee->getActorId()),
@@ -485,7 +486,7 @@ public function mentions(string $search, int $limit = 20, bool $includeStatus =
 		$results = $this->prepareResultArray($results, $statuses);
 
 		$attendee = $this->participant->getAttendee();
-		$userId = $attendee->getActorType() === 'users' ? $attendee->getActorId() : '';
+		$userId = $attendee->getActorType() === Attendee::ACTOR_USERS ? $attendee->getActorId() : '';
 		$roomDisplayName = $this->room->getDisplayName($userId);
 		if (($search === '' || strpos('all', $search) !== false || stripos($roomDisplayName, $search) !== false) && $this->room->getType() !== Room::ONE_TO_ONE_CALL) {
 			if ($search === '' ||
@@ -524,7 +525,7 @@ protected function prepareResultArray(array $results, array $statuses): array {
 					'source' => $type,
 				];
 
-				if ($type === 'users' && isset($statuses[$data['id']])) {
+				if ($type === Attendee::ACTOR_USERS && isset($statuses[$data['id']])) {
 					$data['status'] = $statuses[$data['id']]->getStatus();
 					$data['statusIcon'] = $statuses[$data['id']]->getIcon();
 					$data['statusMessage'] = $statuses[$data['id']]->getMessage();
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 92c5acf71db..7634f8645e5 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -40,6 +40,7 @@
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\GuestManager;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -346,7 +347,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 		}
 
 		$attendee = $currentParticipant->getAttendee();
-		$userId = $attendee->getActorType() === 'users' ? $attendee->getActorId() : '';
+		$userId = $attendee->getActorType() === Attendee::ACTOR_USERS ? $attendee->getActorId() : '';
 
 		$lastActivity = $room->getLastActivity();
 		if ($lastActivity instanceof \DateTimeInterface) {
@@ -453,7 +454,7 @@ protected function formatRoomV1(Room $room, ?Participant $currentParticipant): a
 						$numActiveGuests++;
 					}
 				}
-			} elseif ($participant->getAttendee()->getActorType() === 'users') {
+			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 				$attendee = $participant->getAttendee();
 				$session = $participant->getSession();
 				$user = $this->userManager->get($attendee->getActorId());
@@ -578,7 +579,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 		}
 
 		$attendee = $currentParticipant->getAttendee();
-		$userId = $attendee->getActorType() === 'users' ? $attendee->getActorId() : '';
+		$userId = $attendee->getActorType() === Attendee::ACTOR_USERS ? $attendee->getActorId() : '';
 
 		$roomData = array_merge($roomData, [
 			'name' => $room->getName(),
@@ -635,7 +636,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 
 		$roomData['canStartCall'] = $currentParticipant->canStartCall($this->config);
 
-		if ($attendee->getActorType() === 'users') {
+		if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 			$currentUser = $this->userManager->get($attendee->getActorId());
 			if ($currentUser instanceof IUser) {
 				$lastReadMessage = $attendee->getLastReadMessage();
@@ -819,7 +820,7 @@ protected function createGroupRoom(string $targetGroupName): DataResponse {
 			}
 
 			$participants[] = [
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $user->getUID(),
 			];
 		}
@@ -877,7 +878,7 @@ protected function createCircleRoom(string $targetCircleId): DataResponse {
 			}
 
 			$participants[] = [
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $member->getUserId(),
 			];
 		}
@@ -1011,7 +1012,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 			&& count($participants) < 100
 			&& $this->appManager->isEnabledForUser('user_status')) {
 			$userIds = array_filter(array_map(static function (Participant $participant) {
-				if ($participant->getAttendee()->getActorType() === 'users') {
+				if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 					return $participant->getAttendee()->getActorId();
 				}
 				return null;
@@ -1024,7 +1025,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 
 		$guestSessions = array_filter(array_map(static function (Participant $participant) {
 			$session = $participant->getSession();
-			if (!$session || $participant->getAttendee()->getActorType() !== 'guests') {
+			if (!$session || $participant->getAttendee()->getActorType() !== Attendee::ACTOR_GUESTS) {
 				return null;
 			}
 
@@ -1053,7 +1054,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				$result['sessionId'] = $participant->getSession()->getSessionId();
 			}
 
-			if ($participant->getAttendee()->getActorType() === 'users') {
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 				$userId = $participant->getAttendee()->getActorId();
 				$user = $this->userManager->get($userId);
 				if (!$user instanceof IUser) {
@@ -1075,7 +1076,7 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 					$result['statusMessage'] = $statuses[$userId]->getMessage();
 					$result['statusClearAt'] = $statuses[$userId]->getClearAt();
 				}
-			} elseif ($participant->getAttendee()->getActorType() === 'guests') {
+			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_GUESTS) {
 				if ($result['lastPing'] <= $maxPingAge) {
 					$cleanGuests = true;
 					continue;
@@ -1130,7 +1131,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 			}
 
 			$this->participantService->addUsers($this->room, [[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $newUser->getUID(),
 			]]);
 		} elseif ($source === 'groups') {
@@ -1146,7 +1147,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				}
 
 				$participantsToAdd[] = [
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $user->getUID(),
 				];
 			}
@@ -1185,7 +1186,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				}
 
 				$participantsToAdd[] = [
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $member->getUserId(),
 				];
 			}
@@ -1222,7 +1223,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 	 */
 	public function removeParticipantFromRoom(string $participant): DataResponse {
 		$attendee = $this->participant->getAttendee();
-		if ($attendee->getActorType() === 'users' && $attendee->getActorId() === $participant) {
+		if ($attendee->getActorType() === Attendee::ACTOR_USERS && $attendee->getActorId() === $participant) {
 			// Removing self, abusing moderator power
 			return $this->removeSelfFromRoomLogic($this->room, $this->participant);
 		}
@@ -1585,11 +1586,11 @@ protected function changeParticipantType(?int $attendeeId, ?string $userId, ?str
 		$attendee = $targetParticipant->getAttendee();
 
 		// Prevent users/moderators modifying themselves
-		if ($attendee->getActorType() === 'users') {
+		if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 			if ($attendee->getActorId() === $this->userId) {
 				return new DataResponse([], Http::STATUS_FORBIDDEN);
 			}
-		} elseif ($attendee->getActorType() === 'guests') {
+		} elseif ($attendee->getActorType() === Attendee::ACTOR_GUESTS) {
 			$session = $targetParticipant->getSession();
 			$currentSessionId = $this->session->getSessionForRoom($this->room->getToken());
 
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 1acb977133e..3016c3c77f4 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -30,6 +30,7 @@
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -377,7 +378,7 @@ protected function getUsersInRoom(Room $room, int $pingTimestamp): array {
 			}
 
 			$userId = '';
-			if ($participant->getAttendee()->getActorType() === 'users') {
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 				$userId = $participant->getAttendee()->getActorId();
 			}
 
diff --git a/lib/Files/Listener.php b/lib/Files/Listener.php
index 64b2a82f233..f6f2f0e9454 100644
--- a/lib/Files/Listener.php
+++ b/lib/Files/Listener.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Events\JoinRoomUserEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCA\Talk\TalkSession;
@@ -154,7 +155,7 @@ public function addUserAsPersistentParticipant(Room $room, string $userId): void
 			$room->getParticipant($userId);
 		} catch (ParticipantNotFoundException $e) {
 			$this->participantService->addUsers($room, [[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $userId,
 			]]);
 		}
diff --git a/lib/Manager.php b/lib/Manager.php
index 8bec0e5f0c9..4f8244d0894 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -28,6 +28,7 @@
 use OCA\Talk\Events\RoomEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\AttendeeMapper;
 use OCA\Talk\Model\SessionMapper;
 use OCA\Talk\Service\ParticipantService;
@@ -293,7 +294,7 @@ public function getRoomsForUser(string $userId, bool $includeLastMessage = false
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
-				$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+				$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
 			->where($query->expr()->isNotNull('a.id'));
@@ -342,7 +343,7 @@ public function getRoomForUser(int $roomId, ?string $userId): Room {
 				->selectAlias('a.id', 'a_id')
 				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
-					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
 				))
 				->andWhere($query->expr()->isNotNull('a.id'));
@@ -397,7 +398,7 @@ public function getRoomForUserByToken(string $token, ?string $userId, bool $incl
 				->selectAlias('a.id', 'a_id');
 			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
-					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
 				));
 		}
@@ -483,7 +484,7 @@ public function getRoomByToken(string $token, ?string $preloadUserId = null): Ro
 				->selectAlias('a.id', 'a_id');
 			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($preloadUserId)),
-					$query->expr()->eq('a.actor_type', $query->createNamedParameter('users')),
+					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
 				));
 		}
@@ -570,11 +571,11 @@ public function getRoomForSession(?string $userId, ?string $sessionId): Room {
 		}
 
 		if ($userId !== null) {
-			if ($row['actor_type'] !== 'users' || $userId !== $row['actor_id']) {
+			if ($row['actor_type'] !== Attendee::ACTOR_USERS || $userId !== $row['actor_id']) {
 				throw new RoomNotFoundException();
 			}
 		} else {
-			if ($row['actor_type'] !== 'guests') {
+			if ($row['actor_type'] !== Attendee::ACTOR_GUESTS) {
 				throw new RoomNotFoundException();
 			}
 		}
@@ -652,7 +653,7 @@ public function getChangelogRoom(string $userId): Room {
 			$room->setReadOnly(Room::READ_ONLY);
 
 			$this->participantService->addUsers($room,[[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $userId,
 			]]);
 			return $room;
@@ -664,7 +665,7 @@ public function getChangelogRoom(string $userId): Room {
 			$room->getParticipant($userId);
 		} catch (ParticipantNotFoundException $e) {
 			$this->participantService->addUsers($room,[[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $userId,
 			]]);
 		}
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php
index 3487f024c6c..19047268a90 100644
--- a/lib/MatterbridgeManager.php
+++ b/lib/MatterbridgeManager.php
@@ -24,6 +24,7 @@
 namespace OCA\Talk;
 
 use OCA\Talk\Exceptions\RoomNotFoundException;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Service\ParticipantService;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -303,7 +304,7 @@ private function checkBotUser(Room $room, bool $create): array {
 			$participant = $room->getParticipant($botUserId);
 		} catch (ParticipantNotFoundException $e) {
 			$this->participantService->addUsers($room, [[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $botUserId,
 				'participantType' => Participant::USER,
 			]]);
@@ -651,7 +652,7 @@ private function compareBridgeParts(array $part1, array $part2): bool {
 	private function sendSystemMessage(Room $room, string $userId, string $message): void {
 		$this->chatManager->addSystemMessage(
 			$room,
-			'users',
+			Attendee::ACTOR_USERS,
 			$userId,
 			json_encode(['message' => $message, 'parameters' => []]),
 			$this->timeFactory->getDateTime(),
diff --git a/lib/Migration/Version10000Date20201015134000.php b/lib/Migration/Version10000Date20201015134000.php
index b050619ff09..a56e76a7694 100644
--- a/lib/Migration/Version10000Date20201015134000.php
+++ b/lib/Migration/Version10000Date20201015134000.php
@@ -27,6 +27,7 @@
 
 use Closure;
 use Doctrine\DBAL\Types\Type;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\DB\ISchemaWrapper;
@@ -209,7 +210,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 
 			$insert
 				->setParameter('room_id', (int) $row['room_id'], IQueryBuilder::PARAM_INT)
-				->setParameter('actor_type', 'users')
+				->setParameter('actor_type', Attendee::ACTOR_USERS)
 				->setParameter('actor_id', $row['user_id'])
 				->setParameter('participant_type', (int) $row['participant_type'], IQueryBuilder::PARAM_INT)
 				->setParameter('favorite', (bool) $row['favorite'], IQueryBuilder::PARAM_BOOL)
diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php
index 121139d158e..8725c365d02 100644
--- a/lib/Model/Attendee.php
+++ b/lib/Model/Attendee.php
@@ -51,6 +51,10 @@
  */
 class Attendee extends Entity {
 
+	public const ACTOR_USERS = 'users';
+	public const ACTOR_GUESTS = 'guests';
+	public const ACTOR_EMAILS = 'emails';
+
 	/** @var int */
 	protected $roomId;
 
diff --git a/lib/Model/Message.php b/lib/Model/Message.php
index 6d54f04c546..97d578c184e 100644
--- a/lib/Model/Message.php
+++ b/lib/Model/Message.php
@@ -158,7 +158,7 @@ public function getActorDisplayName(): string {
 	public function isReplyable(): bool {
 		return $this->getMessageType() !== 'system' &&
 			$this->getMessageType() !== 'command' &&
-			\in_array($this->getActorType(), ['users', 'guests']);
+			\in_array($this->getActorType(), [Attendee::ACTOR_USERS, Attendee::ACTOR_GUESTS]);
 	}
 
 	public function toArray(): array {
diff --git a/lib/Notification/Listener.php b/lib/Notification/Listener.php
index a56d4798028..1ba06641f49 100644
--- a/lib/Notification/Listener.php
+++ b/lib/Notification/Listener.php
@@ -26,6 +26,7 @@
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\JoinRoomUserEvent;
 use OCA\Talk\Events\RoomEvent;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -142,7 +143,7 @@ public function generateInvitation(Room $room, array $participants): void {
 		}
 
 		foreach ($participants as $participant) {
-			if ($participant['actorType'] !== 'users') {
+			if ($participant['actorType'] !== Attendee::ACTOR_USERS) {
 				// No user => no activity
 				continue;
 			}
diff --git a/lib/Room.php b/lib/Room.php
index e7e13c93fbf..2061284f79c 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -33,6 +33,7 @@
 use OCA\Talk\Events\SignalingRoomPropertiesEvent;
 use OCA\Talk\Events\VerifyRoomPasswordEvent;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Service\ParticipantService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
@@ -352,7 +353,7 @@ public function getParticipant(?string $userId): Participant {
 			->selectAlias('s.id', 's_id')
 			->from('talk_attendees', 'a')
 			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'))
-			->where($query->expr()->eq('a.actor_type', $query->createNamedParameter('users')))
+			->where($query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)))
 			->andWhere($query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)))
 			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
 			->setMaxResults(1);
diff --git a/lib/Search/MessageSearch.php b/lib/Search/MessageSearch.php
index ada804a2b00..84b727a9762 100644
--- a/lib/Search/MessageSearch.php
+++ b/lib/Search/MessageSearch.php
@@ -29,6 +29,7 @@
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Exceptions\UnauthorizedException;
 use OCA\Talk\Manager as RoomManager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Room;
 use OCP\Comments\IComment;
 use OCP\IL10N;
@@ -193,7 +194,7 @@ protected function commentToSearchResultEntry(Room $room, IUser $user, IComment
 		}
 
 		$iconUrl = '';
-		if ($message->getActorType() === 'users') {
+		if ($message->getActorType() === Attendee::ACTOR_USERS) {
 			$iconUrl = $this->url->linkToRouteAbsolute('core.avatar.getAvatar', [
 				'userId' => $message->getActorId(),
 				'size' => 64,
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 1b0458b3f8a..0649dfa185a 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -149,7 +149,7 @@ public function joinRoom(Room $room, IUser $user, string $password, bool $passed
 		}
 
 		try {
-			$attendee = $this->attendeeMapper->findByActor($room->getId(), 'users', $user->getUID());
+			$attendee = $this->attendeeMapper->findByActor($room->getId(), Attendee::ACTOR_USERS, $user->getUID());
 		} catch (DoesNotExistException $e) {
 			if (!$event->getPassedPasswordProtection() && !$room->verifyPassword($password)['result']) {
 				throw new InvalidPasswordException('Provided password is invalid');
@@ -157,12 +157,12 @@ public function joinRoom(Room $room, IUser $user, string $password, bool $passed
 
 			// User joining a public room, without being invited
 			$this->addUsers($room, [[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $user->getUID(),
 				'participantType' => Participant::USER_SELF_JOINED,
 			]]);
 
-			$attendee = $this->attendeeMapper->findByActor($room->getId(), 'users', $user->getUID());
+			$attendee = $this->attendeeMapper->findByActor($room->getId(), Attendee::ACTOR_USERS, $user->getUID());
 		}
 
 		$session = $this->sessionService->createSessionForAttendee($attendee);
@@ -201,7 +201,7 @@ public function joinRoomAsNewGuest(Room $room, string $password, bool $passedPas
 
 		$attendee = new Attendee();
 		$attendee->setRoomId($room->getId());
-		$attendee->setActorType('guests');
+		$attendee->setActorType(Attendee::ACTOR_GUESTS);
 		$attendee->setActorId($randomActorId);
 		$attendee->setParticipantType(Participant::GUEST);
 		$attendee->setLastReadMessage($lastMessage);
@@ -257,7 +257,7 @@ public function inviteEmailAddress(Room $room, string $email): Participant {
 
 		$attendee = new Attendee();
 		$attendee->setRoomId($room->getId());
-		$attendee->setActorType('emails');
+		$attendee->setActorType(Attendee::ACTOR_EMAILS);
 		$attendee->setActorId($email);
 
 		// FIXME Only do this when SIP is enabled?
@@ -283,7 +283,7 @@ public function ensureOneToOneRoomIsFilled(Room $room): void {
 		foreach ($missingUsers as $userId) {
 			if ($this->userManager->userExists($userId)) {
 				$this->addUsers($room, [[
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $userId,
 					'participantType' => Participant::OWNER,
 				]]);
@@ -320,7 +320,7 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 	}
 
 	public function removeAttendee(Room $room, Participant $participant, string $reason): void {
-		$isUser = $participant->getAttendee()->getActorType() === 'users';
+		$isUser = $participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS;
 
 		if ($isUser) {
 			$user = $this->userManager->get($participant->getAttendee()->getActorId());
@@ -371,7 +371,7 @@ public function cleanGuestParticipants(Room $room): void {
 			->from('talk_sessions', 's')
 			->leftJoin('s', 'talk_attendees', 'a', $query->expr()->eq('s.attendee_id', 'a.id'))
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter('guests')))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_GUESTS)))
 			->andWhere($query->expr()->lte('s.last_ping', $query->createNamedParameter($this->timeFactory->getTime() - 100, IQueryBuilder::PARAM_INT)));
 
 		$sessionTableIds = [];
@@ -388,7 +388,7 @@ public function cleanGuestParticipants(Room $room): void {
 			->from('talk_attendees', 'a')
 			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('s.attendee_id', 'a.id'))
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter('guests')))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_GUESTS)))
 			->andWhere($query->expr()->isNull('s.id'));
 
 		$attendeeIds = [];
@@ -437,7 +437,7 @@ public function markUsersAsMentioned(Room $room, array $userIds, int $messageId)
 		$query->update('talk_attendees')
 			->set('last_mention_message', $query->createNamedParameter($messageId, IQueryBuilder::PARAM_INT))
 			->where($query->expr()->eq('room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter('users')))
+			->andWhere($query->expr()->eq('actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)))
 			->andWhere($query->expr()->in('actor_id', $query->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
 		$query->execute();
 	}
@@ -562,7 +562,7 @@ public function getParticipantUserIds(Room $room, \DateTime $maxLastJoined = nul
 		if ($maxLastJoined !== null) {
 			$maxLastJoinedTimestamp = $maxLastJoined->getTimestamp();
 		}
-		$attendees = $this->attendeeMapper->getActorsByType($room->getId(), 'users', $maxLastJoinedTimestamp);
+		$attendees = $this->attendeeMapper->getActorsByType($room->getId(), Attendee::ACTOR_USERS, $maxLastJoinedTimestamp);
 
 		return array_map(static function (Attendee $attendee) {
 			return $attendee->getActorId();
@@ -583,7 +583,7 @@ public function getParticipantUserIdsNotInCall(Room $room): array {
 				$query->expr()->eq('s.attendee_id', 'a.id')
 			)
 			->where($query->expr()->eq('a.room_id', $query->createNamedParameter($room->getId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter('users')))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)))
 			->andWhere($query->expr()->orX(
 				$query->expr()->eq('s.in_call', $query->createNamedParameter(Participant::FLAG_DISCONNECTED)),
 				$query->expr()->isNull('s.in_call')
diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
index 69ade564dac..afc87851f8c 100644
--- a/lib/Service/RoomService.php
+++ b/lib/Service/RoomService.php
@@ -26,6 +26,7 @@
 use InvalidArgumentException;
 use OCA\Talk\Exceptions\RoomNotFoundException;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCP\IUser;
@@ -65,12 +66,12 @@ public function createOneToOneConversation(IUser $actor, IUser $targetUser): Roo
 
 			$this->participantService->addUsers($room, [
 				[
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $actor->getUID(),
 					'participantType' => Participant::OWNER,
 				],
 				[
-					'actorType' => 'users',
+					'actorType' => Attendee::ACTOR_USERS,
 					'actorId' => $targetUser->getUID(),
 					'participantType' => Participant::OWNER,
 				],
@@ -124,7 +125,7 @@ public function createConversation(int $type, string $name, ?IUser $owner = null
 
 		if ($owner instanceof IUser) {
 			$this->participantService->addUsers($room, [[
-				'actorType' => 'users',
+				'actorType' => Attendee::ACTOR_USERS,
 				'actorId' => $owner->getUID(),
 				'participantType' => Participant::OWNER,
 			]]);
diff --git a/lib/Signaling/BackendNotifier.php b/lib/Signaling/BackendNotifier.php
index 1ada571c703..e1429f9e90f 100644
--- a/lib/Signaling/BackendNotifier.php
+++ b/lib/Signaling/BackendNotifier.php
@@ -26,6 +26,7 @@
 namespace OCA\Talk\Signaling;
 
 use OCA\Talk\Config;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Model\Session;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
@@ -147,7 +148,7 @@ public function roomInvited(Room $room, array $users): void {
 		$this->logger->info('Now invited to ' . $room->getToken() . ': ' . print_r($users, true));
 		$userIds = [];
 		foreach ($users as $user) {
-			if ($user['actorType'] === 'users') {
+			if ($user['actorType'] === Attendee::ACTOR_USERS) {
 				$userIds[] = $user['actorId'];
 			}
 		}
@@ -253,8 +254,8 @@ public function participantsModified(Room $room, array $sessionIds): void {
 		$participants = $this->participantService->getParticipantsForRoom($room);
 		foreach ($participants as $participant) {
 			$attendee = $participant->getAttendee();
-			if ($attendee->getActorType() !== 'users'
-				&& $attendee->getActorType() !== 'guests') {
+			if ($attendee->getActorType() !== Attendee::ACTOR_USERS
+				&& $attendee->getActorType() !== Attendee::ACTOR_GUESTS) {
 				continue;
 			}
 
@@ -264,7 +265,7 @@ public function participantsModified(Room $room, array $sessionIds): void {
 				'sessionId' => '0',
 				'participantType' => $attendee->getParticipantType(),
 			];
-			if ($attendee->getActorType() === 'users') {
+			if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 				$data['userId'] = $attendee->getActorId();
 			}
 
@@ -313,8 +314,8 @@ public function roomInCallChanged(Room $room, int $flags, array $sessionIds): vo
 		$participants = $this->participantService->getParticipantsForRoom($room);
 		foreach ($participants as $participant) {
 			$attendee = $participant->getAttendee();
-			if ($attendee->getActorType() !== 'users'
-				&& $attendee->getActorType() !== 'guests') {
+			if ($attendee->getActorType() !== Attendee::ACTOR_USERS
+				&& $attendee->getActorType() !== Attendee::ACTOR_GUESTS) {
 				continue;
 			}
 
@@ -324,7 +325,7 @@ public function roomInCallChanged(Room $room, int $flags, array $sessionIds): vo
 				'sessionId' => '0',
 				'participantType' => $attendee->getParticipantType(),
 			];
-			if ($attendee->getActorType() === 'users') {
+			if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 				$data['userId'] = $attendee->getActorId();
 			}
 

From b537422d364335a7f3be9963ccedd42af8b0d0ab Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 14:08:34 +0100
Subject: [PATCH 080/129] Add a comment about the non-0 exit code of the
 talk:active-call command

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/features/command/active-calls.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/features/command/active-calls.feature b/tests/integration/features/command/active-calls.feature
index f73145c774b..e7ab23b5c44 100644
--- a/tests/integration/features/command/active-calls.feature
+++ b/tests/integration/features/command/active-calls.feature
@@ -30,6 +30,7 @@ Feature: create
     And user "participant1" joins call "room" with 200
 
     Given invoking occ with "talk:active-calls"
+    # It didn't really fail, it just has an exit code that is not 0
     Then the command failed with exit code 1
     And the command output contains the text "There are currently 1 calls in progress with 1 participants"
 

From c14a8ff4fc26632380b10d5c4eadb0b14f3dd53f Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Fri, 30 Oct 2020 14:33:15 +0100
Subject: [PATCH 081/129] Add method to get room by actorId / actorType.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
---
 lib/Manager.php | 60 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index 4f8244d0894..3ca8e940eaf 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -466,29 +466,25 @@ public function getRoomById(int $roomId): Room {
 
 	/**
 	 * @param string $token
-	 * @param string|null $preloadUserId Load this participants information if possible
+	 * @param string $actorId
+	 * @param string $actorType
 	 * @return Room
 	 * @throws RoomNotFoundException
 	 */
-	public function getRoomByToken(string $token, ?string $preloadUserId = null): Room {
-		$preloadUserId = $preloadUserId === '' ? null : $preloadUserId;
-
+	public function getRoomByActor(string $token, string $actorId, string $actorType): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
+			->addSelect('a.*')
+			->selectAlias('a.id', 'a_id')
 			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
+			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
+				$query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)),
+				$query->expr()->eq('a.room_id', 'r.id')
+			))
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
 
-		if ($preloadUserId !== null) {
-			$query->addSelect('a.*')
-				->selectAlias('a.id', 'a_id');
-			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
-					$query->expr()->eq('a.actor_id', $query->createNamedParameter($preloadUserId)),
-					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
-					$query->expr()->eq('a.room_id', 'r.id')
-				));
-		}
-
 		$result = $query->execute();
 		$row = $result->fetch();
 		$result->closeCursor();
@@ -503,13 +499,47 @@ public function getRoomByToken(string $token, ?string $preloadUserId = null): Ro
 		}
 
 		$room = $this->createRoomObject($row);
-		if ($preloadUserId !== null && isset($row['actor_id'])) {
+		if (isset($row['actor_id'])) {
 			$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 		}
 
 		return $room;
 	}
 
+	/**
+	 * @param string $token
+	 * @param string|null $preloadUserId Load this participants information if possible
+	 * @return Room
+	 * @throws RoomNotFoundException
+	 */
+	public function getRoomByToken(string $token, ?string $preloadUserId = null): Room {
+		$preloadUserId = $preloadUserId === '' ? null : $preloadUserId;
+		if ($preloadUserId !== null) {
+			return $this->getRoomByActor($token, $preloadUserId, Attendee::ACTOR_USERS);
+		}
+
+		$query = $this->db->getQueryBuilder();
+		$query->select('r.*')
+			->selectAlias('r.id', 'r_id')
+			->from('talk_rooms', 'r')
+			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
+
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		if ($row === false) {
+			throw new RoomNotFoundException();
+		}
+
+		if ($row['token'] === null) {
+			// FIXME Temporary solution for the Talk6 release
+			throw new RoomNotFoundException();
+		}
+
+		return $this->createRoomObject($row);
+	}
+
 	/**
 	 * @param string $objectType
 	 * @param string $objectId

From 6615318c9af06c15c3013e7cfb5181ef453ac663 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Fri, 30 Oct 2020 14:33:51 +0100
Subject: [PATCH 082/129] Get room by actorId / actorType if given in request.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
---
 lib/Controller/SignalingController.php | 62 +++++++++++++++++---------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 3016c3c77f4..08fd8572c8f 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -524,33 +524,55 @@ private function backendRoom(array $roomRequest): DataResponse {
 		$userId = $roomRequest['userid'];
 		$sessionId = $roomRequest['sessionid'];
 		$action = !empty($roomRequest['action']) ? $roomRequest['action'] : 'join';
+		$actorId = $roomRequest['actorid'] ?? null;
+		$actorType = $roomRequest['actortype'] ?? null;
 
-		try {
-			$room = $this->manager->getRoomByToken($roomId, $userId);
-		} catch (RoomNotFoundException $e) {
-			return new DataResponse([
-				'type' => 'error',
-				'error' => [
-					'code' => 'no_such_room',
-					'message' => 'The user is not invited to this room.',
-				],
-			]);
-		}
-
-		$participant = null;
-		if ($sessionId) {
+		if ($actorId && $actorType) {
 			try {
-				$participant = $room->getParticipantBySession($sessionId);
-			} catch (ParticipantNotFoundException $e) {
+				$room = $this->manager->getRoomByActor($roomId, $actorId, $actorType);
+			} catch (RoomNotFoundException $e) {
+				return new DataResponse([
+					'type' => 'error',
+					'error' => [
+						'code' => 'no_such_room',
+						'message' => 'The user is not invited to this room.',
+					],
+				]);
 			}
-		}
 
-		if (!empty($userId)) {
-			// User trying to join room.
+			$participant = null;
 			try {
-				$participant = $room->getParticipant($userId);
+				$participant = $room->getParticipant($actorId);
 			} catch (ParticipantNotFoundException $e) {
 			}
+		} else {
+			try {
+				$room = $this->manager->getRoomByToken($roomId, $userId);
+			} catch (RoomNotFoundException $e) {
+				return new DataResponse([
+					'type' => 'error',
+					'error' => [
+						'code' => 'no_such_room',
+						'message' => 'The user is not invited to this room.',
+					],
+				]);
+			}
+
+			$participant = null;
+			if ($sessionId) {
+				try {
+					$participant = $room->getParticipantBySession($sessionId);
+				} catch (ParticipantNotFoundException $e) {
+				}
+			}
+
+			if (!empty($userId)) {
+				// User trying to join room.
+				try {
+					$participant = $room->getParticipant($userId);
+				} catch (ParticipantNotFoundException $e) {
+				}
+			}
 		}
 
 		if (!$participant instanceof Participant) {

From 10d865f1c75ce1765fe7f5ce56a4bdc410de62d5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 15:08:43 +0100
Subject: [PATCH 083/129] Get the participant by actor

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 13 +++++------
 lib/Manager.php                        | 10 ++++----
 lib/Room.php                           | 32 ++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 08fd8572c8f..f40570f5f22 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -520,16 +520,17 @@ private function backendAuth(array $auth): DataResponse {
 	}
 
 	private function backendRoom(array $roomRequest): DataResponse {
-		$roomId = $roomRequest['roomid'];
+		$token = $roomRequest['roomid']; // It's actually the room token
 		$userId = $roomRequest['userid'];
 		$sessionId = $roomRequest['sessionid'];
 		$action = !empty($roomRequest['action']) ? $roomRequest['action'] : 'join';
 		$actorId = $roomRequest['actorid'] ?? null;
 		$actorType = $roomRequest['actortype'] ?? null;
 
-		if ($actorId && $actorType) {
+		$participant = null;
+		if ($actorId !== null && $actorType !== null) {
 			try {
-				$room = $this->manager->getRoomByActor($roomId, $actorId, $actorType);
+				$room = $this->manager->getRoomByActor($token, $actorType, $actorId);
 			} catch (RoomNotFoundException $e) {
 				return new DataResponse([
 					'type' => 'error',
@@ -540,14 +541,13 @@ private function backendRoom(array $roomRequest): DataResponse {
 				]);
 			}
 
-			$participant = null;
 			try {
-				$participant = $room->getParticipant($actorId);
+				$participant = $room->getParticipantByActor($actorType, $actorId);
 			} catch (ParticipantNotFoundException $e) {
 			}
 		} else {
 			try {
-				$room = $this->manager->getRoomByToken($roomId, $userId);
+				$room = $this->manager->getRoomByToken($token, $userId);
 			} catch (RoomNotFoundException $e) {
 				return new DataResponse([
 					'type' => 'error',
@@ -558,7 +558,6 @@ private function backendRoom(array $roomRequest): DataResponse {
 				]);
 			}
 
-			$participant = null;
 			if ($sessionId) {
 				try {
 					$participant = $room->getParticipantBySession($sessionId);
diff --git a/lib/Manager.php b/lib/Manager.php
index 3ca8e940eaf..f646e6124a5 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -466,12 +466,12 @@ public function getRoomById(int $roomId): Room {
 
 	/**
 	 * @param string $token
-	 * @param string $actorId
 	 * @param string $actorType
+	 * @param string $actorId
 	 * @return Room
 	 * @throws RoomNotFoundException
 	 */
-	public function getRoomByActor(string $token, string $actorId, string $actorType): Room {
+	public function getRoomByActor(string $token, string $actorType, string $actorId): Room {
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->addSelect('a.*')
@@ -479,8 +479,8 @@ public function getRoomByActor(string $token, string $actorId, string $actorType
 			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
-				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
 				$query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)),
+				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
@@ -499,7 +499,7 @@ public function getRoomByActor(string $token, string $actorId, string $actorType
 		}
 
 		$room = $this->createRoomObject($row);
-		if (isset($row['actor_id'])) {
+		if ($actorType === Attendee::ACTOR_USERS && isset($row['actor_id'])) {
 			$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 		}
 
@@ -515,7 +515,7 @@ public function getRoomByActor(string $token, string $actorId, string $actorType
 	public function getRoomByToken(string $token, ?string $preloadUserId = null): Room {
 		$preloadUserId = $preloadUserId === '' ? null : $preloadUserId;
 		if ($preloadUserId !== null) {
-			return $this->getRoomByActor($token, $preloadUserId, Attendee::ACTOR_USERS);
+			return $this->getRoomByActor($token, Attendee::ACTOR_USERS, $preloadUserId);
 		}
 
 		$query = $this->db->getQueryBuilder();
diff --git a/lib/Room.php b/lib/Room.php
index 2061284f79c..cadf60d77e5 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -455,6 +455,38 @@ public function getParticipantByAttendeeId(int $attendeeId): Participant {
 		return $this->manager->createParticipantObject($this, $row);
 	}
 
+	/**
+	 * @param string $actorType
+	 * @param string $actorId
+	 * @return Participant
+	 * @throws ParticipantNotFoundException When the pin is not valid (has no participant assigned)
+	 */
+	public function getParticipantByActor(string $actorType, string $actorId): Participant {
+		if ($actorType === Attendee::ACTOR_USERS) {
+			return $this->getParticipant($actorId);
+		}
+
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
+			->from('talk_attendees', 'a')
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'))
+			->andWhere($query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)))
+			->andWhere($query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)))
+			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
+			->setMaxResults(1);
+		$result = $query->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
+		if ($row === false) {
+			throw new ParticipantNotFoundException('User is not a participant');
+		}
+
+		return $this->manager->createParticipantObject($this, $row);
+	}
+
 	public function deleteRoom(): void {
 		$event = new RoomEvent($this);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_ROOM_DELETE, $event);

From a862facb899ae18d248c8644936065c258175308 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 15:19:03 +0100
Subject: [PATCH 084/129] Store the session given by the HPB for the actor

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 16 +++++++++++++++
 lib/Participant.php                    |  4 ++++
 lib/Service/SessionService.php         | 28 ++++++++++++++++++++------
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index f40570f5f22..8a7ec39ec09 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -25,6 +25,7 @@
 
 namespace OCA\Talk\Controller;
 
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCA\Talk\Config;
 use OCA\Talk\Events\SignalingEvent;
 use OCA\Talk\Exceptions\RoomNotFoundException;
@@ -586,6 +587,21 @@ private function backendRoom(array $roomRequest): DataResponse {
 		}
 
 		if ($action === 'join') {
+			if ($sessionId && !$participant->getSession() instanceof Session) {
+				try {
+					$session = $this->sessionService->createSessionForAttendee($participant->getAttendee(), $sessionId);
+				} catch (UniqueConstraintViolationException $e) {
+					return new DataResponse([
+						'type' => 'error',
+						'error' => [
+							'code' => 'duplicate_session',
+							'message' => 'The given session is already in use.',
+						],
+					]);
+				}
+				$participant->setSession($session);
+			}
+
 			if ($participant->getSession() instanceof Session) {
 				$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
 			}
diff --git a/lib/Participant.php b/lib/Participant.php
index 9044c8736e7..b0a6bfaa6fc 100644
--- a/lib/Participant.php
+++ b/lib/Participant.php
@@ -71,6 +71,10 @@ public function getSession(): ?Session {
 		return $this->session;
 	}
 
+	public function setSession(Session $session): void {
+		$this->session = $session;
+	}
+
 	public function isGuest(): bool {
 		$participantType = $this->attendee->getParticipantType();
 		return \in_array($participantType, [self::GUEST, self::GUEST_MODERATOR], true);
diff --git a/lib/Service/SessionService.php b/lib/Service/SessionService.php
index 37b8d6af46a..7d66b8d9813 100644
--- a/lib/Service/SessionService.php
+++ b/lib/Service/SessionService.php
@@ -78,21 +78,37 @@ public function deleteSessionsById(array $ids): void {
 		$this->sessionMapper->deleteByIds($ids);
 	}
 
-	public function createSessionForAttendee(Attendee $attendee): Session {
+	/**
+	 * @param Attendee $attendee
+	 * @param string $forceSessionId
+	 * @return Session
+	 * @throws UniqueConstraintViolationException
+	 */
+	public function createSessionForAttendee(Attendee $attendee, string $forceSessionId = ''): Session {
 		// Currently a participant can only join once
 		$this->sessionMapper->deleteByAttendeeId($attendee->getId());
 
 		$session = new Session();
 		$session->setAttendeeId($attendee->getId());
 
-		while (true) {
-			$sessionId = $this->secureRandom->generate(255);
-			$session->setSessionId($sessionId);
+		if ($forceSessionId !== '') {
+			$session->setSessionId($forceSessionId);
 			try {
 				$this->sessionMapper->insert($session);
-				break;
 			} catch (UniqueConstraintViolationException $e) {
-				// 255 chars are not unique? Try again...
+				// The HPB told us to use a session which exists already…
+				throw $e;
+			}
+		} else {
+			while (true) {
+				$sessionId = $this->secureRandom->generate(255);
+				$session->setSessionId($sessionId);
+				try {
+					$this->sessionMapper->insert($session);
+					break;
+				} catch (UniqueConstraintViolationException $e) {
+					// 255 chars are not unique? Try again...
+				}
 			}
 		}
 

From 5664949240da2a7a5ce75b90b2f601533e667a29 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 30 Oct 2020 15:32:10 +0100
Subject: [PATCH 085/129] Increase the length of the session id column

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml                              |  2 +-
 .../Version10000Date20201015134000.php        |  2 +-
 .../Version10000Date20201015150000.php        | 62 +++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 lib/Migration/Version10000Date20201015150000.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0e2de97ca6c..b2276c1e805 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>10.0.3.4</version>
+	<version>10.0.3.7</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/lib/Migration/Version10000Date20201015134000.php b/lib/Migration/Version10000Date20201015134000.php
index a56e76a7694..aa7e5bb5e00 100644
--- a/lib/Migration/Version10000Date20201015134000.php
+++ b/lib/Migration/Version10000Date20201015134000.php
@@ -150,7 +150,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			// Unique key to avoid duplication issues
 			$table->addColumn('session_id', Type::STRING, [
 				'notnull' => true,
-				'length' => 255,
+				'length' => 512,
 			]);
 
 			$table->addColumn('in_call', Type::INTEGER, [
diff --git a/lib/Migration/Version10000Date20201015150000.php b/lib/Migration/Version10000Date20201015150000.php
new file mode 100644
index 00000000000..1180257d519
--- /dev/null
+++ b/lib/Migration/Version10000Date20201015150000.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Talk\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * The HPB is generating sessions longer than 255 chars. So we update the length
+ * But the install migration was fixed, so this only does something on update.
+ */
+class Version10000Date20201015150000 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if ($schema->hasTable('talk_sessions')) {
+			$table = $schema->getTable('talk_sessions');
+
+			$column = $table->getColumn('session_id');
+
+			if ($column->getLength() !== 512) {
+				$column->setLength(512);
+				return $schema;
+			}
+		}
+
+		return null;
+	}
+}

From fb03d02ecda00059039dc403396e89fc155a4c98 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 2 Nov 2020 14:29:03 +0100
Subject: [PATCH 086/129] Fix CS and psalm

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Model/Attendee.php | 1 -
 psalm.xml              | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php
index 8725c365d02..3189ede37f5 100644
--- a/lib/Model/Attendee.php
+++ b/lib/Model/Attendee.php
@@ -50,7 +50,6 @@
  * @method int getLastMentionMessage()
  */
 class Attendee extends Entity {
-
 	public const ACTOR_USERS = 'users';
 	public const ACTOR_GUESTS = 'guests';
 	public const ACTOR_EMAILS = 'emails';
diff --git a/psalm.xml b/psalm.xml
index d7f19a41c52..f0401c97321 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -20,13 +20,14 @@
 	<issueHandlers>
 		<UndefinedClass>
 			<errorLevel type="suppress">
-				<referencedClass name="OC" />
-				<referencedClass name="Doctrine\DBAL\Types\Type" />
 				<referencedClass name="Doctrine\DBAL\Exception\UniqueConstraintViolationException" />
+				<referencedClass name="Doctrine\DBAL\Types\Type" />
+				<referencedClass name="OC" />
 			</errorLevel>
 		</UndefinedClass>
 		<UndefinedDocblockClass>
 			<errorLevel type="suppress">
+				<referencedClass name="Doctrine\DBAL\Exception\UniqueConstraintViolationException" />
 				<referencedClass name="Doctrine\DBAL\Schema\Schema" />
 				<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
 				<referencedClass name="Doctrine\DBAL\Driver\Statement" />

From 5d76572d6c966d68f809a2837ecf72acd388add4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 2 Nov 2020 15:31:04 +0100
Subject: [PATCH 087/129] Only generate a PIN and send it when configured

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 img/phone.png                      | Bin 0 -> 233 bytes
 lib/GuestManager.php               |  32 ++++++++++++++++++++++++-----
 lib/Service/ParticipantService.php |  14 ++++++++++---
 3 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 img/phone.png

diff --git a/img/phone.png b/img/phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..c385083f17f853ff02f3233db46b1b462c389617
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<S+1aaSXBO
zJ$q>*CsUvR%Z2s@7g@y;)iRjP7Vf;3!pL5>fb~YhjO;ZU8d+&t83q48Sn&Lt%fY9k
z!)<K+|NJL^i${`KQr=l2zseTAzgD<G*TUj@;Re04(V?<EhrUVw3O#w@h+L*@Q6HzA
zM2+&M1Dta&+5GYsTGQn5Zb^H$&fKLP)}98_ZPkxnwSKf`k-@Qd%$89NI&&4%ZanC7
e7Hz!$i1p7z)$4UOccg%BW$<+Mb6Mw<&;$T|Fjr~-

literal 0
HcmV?d00001

diff --git a/lib/GuestManager.php b/lib/GuestManager.php
index 6689145c5b7..bcc60592631 100644
--- a/lib/GuestManager.php
+++ b/lib/GuestManager.php
@@ -45,6 +45,9 @@ class GuestManager {
 	/** @var IDBConnection */
 	protected $connection;
 
+	/** @var Config */
+	protected $talkConfig;
+
 	/** @var IMailer */
 	protected $mailer;
 
@@ -64,6 +67,7 @@ class GuestManager {
 	protected $dispatcher;
 
 	public function __construct(IDBConnection $connection,
+								Config $talkConfig,
 								IMailer $mailer,
 								Defaults $defaults,
 								IUserSession $userSession,
@@ -71,6 +75,7 @@ public function __construct(IDBConnection $connection,
 								IL10N $l,
 								IEventDispatcher $dispatcher) {
 		$this->connection = $connection;
+		$this->talkConfig = $talkConfig;
 		$this->mailer = $mailer;
 		$this->defaults = $defaults;
 		$this->userSession = $userSession;
@@ -201,16 +206,33 @@ public function sendEmailInvitation(Room $room, Participant $participant): void
 			$subject
 		);
 
-		if ($pin) {
-			// FIXME wrap in text
-			$template->addBodyText($pin);
-		}
-
 		$template->addBodyButton(
 			$this->l->t('Join »%s«', [$room->getDisplayName('')]),
 			$link
 		);
 
+		if ($pin) {
+			$template->addBodyText($this->l->t('You can also dial-in via phone with the following details'));
+
+			$template->addBodyListItem(
+				$this->talkConfig->getDialInInfo(),
+				$this->l->t('Dial-in information'),
+				$this->url->getAbsoluteURL($this->url->imagePath('spreed', 'phone.png'))
+			);
+
+			$template->addBodyListItem(
+				$room->getToken(),
+				$this->l->t('Meeting ID'),
+				$this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))
+			);
+
+			$template->addBodyListItem(
+				$pin,
+				$this->l->t('PIN'),
+				$this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.png'))
+			);
+		}
+
 		$template->addFooter();
 
 		$message->setTo([$email]);
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 0649dfa185a..ca95e23ff15 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\Service;
 
+use OCA\Talk\Config;
 use OCA\Talk\Events\AddParticipantsEvent;
 use OCA\Talk\Events\JoinRoomGuestEvent;
 use OCA\Talk\Events\JoinRoomUserEvent;
@@ -40,6 +41,7 @@
 use OCA\Talk\Model\SessionMapper;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCA\Talk\Webinary;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
@@ -51,6 +53,8 @@
 use OCP\Security\ISecureRandom;
 
 class ParticipantService {
+	/** @var Config */
+	protected $talkConfig;
 	/** @var AttendeeMapper */
 	protected $attendeeMapper;
 	/** @var SessionMapper */
@@ -68,7 +72,8 @@ class ParticipantService {
 	/** @var ITimeFactory */
 	private $timeFactory;
 
-	public function __construct(AttendeeMapper $attendeeMapper,
+	public function __construct(Config $talkConfig,
+								AttendeeMapper $attendeeMapper,
 								SessionMapper $sessionMapper,
 								SessionService $sessionService,
 								ISecureRandom $secureRandom,
@@ -76,6 +81,7 @@ public function __construct(AttendeeMapper $attendeeMapper,
 								IEventDispatcher $dispatcher,
 								IUserManager $userManager,
 								ITimeFactory $timeFactory) {
+		$this->talkConfig = $talkConfig;
 		$this->attendeeMapper = $attendeeMapper;
 		$this->sessionMapper = $sessionMapper;
 		$this->sessionService = $sessionService;
@@ -260,8 +266,10 @@ public function inviteEmailAddress(Room $room, string $email): Participant {
 		$attendee->setActorType(Attendee::ACTOR_EMAILS);
 		$attendee->setActorId($email);
 
-		// FIXME Only do this when SIP is enabled?
-		$attendee->setPin($this->generatePin());
+		if ($room->getSIPEnabled() === Webinary::SIP_ENABLED
+			&& $this->talkConfig->isSIPConfigured()) {
+			$attendee->setPin($this->generatePin());
+		}
 
 		$attendee->setParticipantType(Participant::GUEST);
 		$attendee->setLastReadMessage($lastMessage);

From 4ea81a7fb57c49261c92b7ccdba8d39cd6fd1a88 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 2 Nov 2020 15:34:48 +0100
Subject: [PATCH 088/129] Only delete guests without a PIN

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 8a7ec39ec09..98547fb5bc1 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -606,12 +606,14 @@ private function backendRoom(array $roomRequest): DataResponse {
 				$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
 			}
 		} elseif ($action === 'leave') {
-			if ($participant instanceof Participant) {
-				if (!empty($userId)) {
-					$this->participantService->leaveRoomAsSession($room, $participant);
-				} else {
-					$this->participantService->removeAttendee($room, $participant, Room::PARTICIPANT_LEFT);
-				}
+			// Guests are removed completely as they don't reuse attendees,
+			// but this is only true for guests that joined directly.
+			// Emails are retained as their PIN needs to remain and stay
+			// valid.
+			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_GUESTS) {
+				$this->participantService->removeAttendee($room, $participant, Room::PARTICIPANT_LEFT);
+			} else {
+				$this->participantService->leaveRoomAsSession($room, $participant);
 			}
 		}
 

From ec380939600627cc41ad8daba8b53bab5f800601 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 2 Nov 2020 16:38:23 +0100
Subject: [PATCH 089/129] Only allow enabling SIP when the user can enable it

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Config.php                       | 21 +++++++++++++++++++++
 lib/Controller/RoomController.php    |  8 ++++++++
 lib/Controller/WebinarController.php | 22 ++++++++++++++++++++--
 src/components/TopBar/TopBar.vue     |  5 +++++
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/lib/Config.php b/lib/Config.php
index 6347700bb3f..16255dbfb17 100644
--- a/lib/Config.php
+++ b/lib/Config.php
@@ -43,6 +43,9 @@ class Config {
 	/** @var ISecureRandom */
 	private $secureRandom;
 
+	/** @var array */
+	protected $canEnableSIP = [];
+
 	public function __construct(IConfig $config,
 								ISecureRandom $secureRandom,
 								IGroupManager $groupManager,
@@ -84,6 +87,24 @@ public function getSIPSharedSecret(): string {
 		return $this->config->getAppValue('spreed', 'sip_bridge_shared_secret');
 	}
 
+	public function canUserEnableSIP(IUser $user): bool {
+		if (isset($this->canEnableSIP[$user->getUID()])) {
+			return $this->canEnableSIP[$user->getUID()];
+		}
+
+		$this->canEnableSIP[$user->getUID()] = false;
+
+		$allowedGroups = $this->getSIPGroups();
+		if (empty($allowedGroups)) {
+			$this->canEnableSIP[$user->getUID()] = true;
+		} else {
+			$userGroups = $this->groupManager->getUserGroupIds($user);
+			$this->canEnableSIP[$user->getUID()] = !empty(array_intersect($allowedGroups, $userGroups));
+		}
+
+		return $this->canEnableSIP[$user->getUID()];
+	}
+
 	public function isDisabledForUser(IUser $user): bool {
 		$allowedGroups = $this->getAllowedTalkGroupIds();
 		if (empty($allowedGroups)) {
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 7634f8645e5..3b81127e2b1 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -192,6 +192,7 @@ public function getRooms(int $noStatusUpdate = 0): DataResponse {
 			}
 		}
 
+
 		$rooms = $this->manager->getRoomsForUser($this->userId, true);
 
 		$return = [];
@@ -542,6 +543,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 				'actorType' => '',
 				'actorId' => '',
 				'attendeeId' => 0,
+				'canEnableSIP' => false,
 			]);
 		}
 
@@ -664,6 +666,12 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 				$roomData['canDeleteConversation'] = $room->getType() !== Room::ONE_TO_ONE_CALL
 					&& $currentParticipant->hasModeratorPermissions(false);
 				$roomData['canLeaveConversation'] = true;
+				if ($this->getAPIVersion() >= 3) {
+					$roomData['canEnableSIP'] =
+						($room->getType() === Room::GROUP_CALL || $room->getType() === Room::PUBLIC_CALL)
+						&& $currentParticipant->hasModeratorPermissions(false)
+						&& $this->talkConfig->canUserEnableSIP($currentUser);
+				}
 			}
 		}
 
diff --git a/lib/Controller/WebinarController.php b/lib/Controller/WebinarController.php
index c6fa35ec5c2..b04b4d48761 100644
--- a/lib/Controller/WebinarController.php
+++ b/lib/Controller/WebinarController.php
@@ -33,6 +33,8 @@
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IRequest;
+use OCP\IUser;
+use OCP\IUserManager;
 
 class WebinarController extends AEnvironmentAwareController {
 
@@ -42,16 +44,24 @@ class WebinarController extends AEnvironmentAwareController {
 	protected $participantService;
 	/** @var Config */
 	protected $talkConfig;
+	/** @var IUserManager */
+	protected $userManager;
+	/** @var string|null */
+	protected $userId;
 
 	public function __construct(string $appName,
 								IRequest $request,
 								ITimeFactory $timeFactory,
 								ParticipantService $participantService,
-								Config $talkConfig) {
+								Config $talkConfig,
+								IUserManager $userManager,
+								?string $userId) {
 		parent::__construct($appName, $request);
 		$this->timeFactory = $timeFactory;
 		$this->participantService = $participantService;
 		$this->talkConfig = $talkConfig;
+		$this->userManager = $userManager;
+		$this->userId = $userId;
 	}
 
 	/**
@@ -99,11 +109,19 @@ public function setLobby(int $state, ?int $timer = null): DataResponse {
 	 * @return DataResponse
 	 */
 	public function setSIPEnabled(int $state): DataResponse {
+		$user = $this->userManager->get($this->userId);
+		if (!$user instanceof IUser) {
+			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+		}
+
+		if (!$this->talkConfig->canUserEnableSIP($user)) {
+			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+		}
+
 		if (!$this->talkConfig->isSIPConfigured()) {
 			return new DataResponse([], Http::STATUS_PRECONDITION_FAILED);
 		}
 
-		// TODO Check if user is in "SIP groups"
 		if (!$this->room->setSIPEnabled($state)) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 450370af25c..cf9f6fdb211 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -134,6 +134,7 @@
 					{{ t('spreed', 'Start time (optional)') }}
 				</ActionInput>
 				<ActionCheckbox
+					v-if="canUserEnableSIP"
 					:checked="hasSIPEnabled"
 					@change="toggleSIPEnabled">
 					{{ t('spreed', 'Enable SIP dial-in') }}
@@ -288,6 +289,9 @@ export default {
 		showModerationOptions() {
 			return !this.isOneToOneConversation && this.canModerate
 		},
+		canUserEnableSIP() {
+			return this.conversation.canEnableSIP
+		},
 		token() {
 			return this.$store.getters.getToken()
 		},
@@ -303,6 +307,7 @@ export default {
 				displayName: '',
 				isFavorite: false,
 				hasPassword: false,
+				canEnableSIP: false,
 				type: CONVERSATION.TYPE.PUBLIC,
 				lobbyState: WEBINAR.LOBBY.NONE,
 				lobbyTimer: 0,

From 310419277d8e61b099c5b8baa2fde42cecfacc7e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 09:07:43 +0100
Subject: [PATCH 090/129] Only delete users that are guests as actor type not
 participant type

So PINs are retained when a user hangs up the phone

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Service/ParticipantService.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index ca95e23ff15..bdf1fe5b363 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -300,7 +300,7 @@ public function ensureOneToOneRoomIsFilled(Room $room): void {
 	}
 
 	public function leaveRoomAsSession(Room $room, Participant $participant): void {
-		if (!$participant->isGuest()) {
+		if ($participant->getAttendee()->getActorType() !== Attendee::ACTOR_GUESTS) {
 			$event = new ParticipantEvent($room, $participant);
 			$this->dispatcher->dispatch(Room::EVENT_BEFORE_ROOM_DISCONNECT, $event);
 		} else {
@@ -315,12 +315,12 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 			$this->sessionMapper->deleteByAttendeeId($participant->getAttendee()->getId());
 		}
 
-		if ($participant->isGuest()
+		if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_GUESTS
 			|| $participant->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED) {
 			$this->attendeeMapper->delete($participant->getAttendee());
 		}
 
-		if (!$participant->isGuest()) {
+		if ($participant->getAttendee()->getActorType() !== Attendee::ACTOR_GUESTS) {
 			$this->dispatcher->dispatch(Room::EVENT_AFTER_ROOM_DISCONNECT, $event);
 		} else {
 			$this->dispatcher->dispatch(Room::EVENT_AFTER_PARTICIPANT_REMOVE, $event);

From cdb77f848165c5e5a4dcaaeb86a55f5873440472 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 09:49:15 +0100
Subject: [PATCH 091/129] Generate a PIN for users when they join a room with
 SIP enabled

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  |  1 +
 lib/Service/ParticipantService.php | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 3b81127e2b1..fd37addb62a 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1476,6 +1476,7 @@ public function joinRoom(string $token, string $password = '', bool $force = tru
 			$result = $room->verifyPassword((string) $this->session->getPasswordForRoom($token));
 			if ($user instanceof IUser) {
 				$participant = $this->participantService->joinRoom($room, $user, $password, $result['result']);
+				$this->participantService->generatePinForParticipant($room, $participant);
 			} else {
 				$participant = $this->participantService->joinRoomAsNewGuest($room, $password, $result['result']);
 			}
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index bdf1fe5b363..89923443b55 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -279,6 +279,16 @@ public function inviteEmailAddress(Room $room, string $email): Participant {
 		return new Participant($room, $attendee, null);
 	}
 
+	public function generatePinForParticipant(Room $room, Participant $participant): void {
+		$attendee = $participant->getAttendee();
+		if ($room->getSIPEnabled() === Webinary::SIP_ENABLED
+			&& $this->talkConfig->isSIPConfigured()
+			&& !$attendee->getPin()) {
+			$attendee->setPin($this->generatePin());
+			$this->attendeeMapper->update($attendee);
+		}
+	}
+
 	public function ensureOneToOneRoomIsFilled(Room $room): void {
 		if ($room->getType() !== Room::ONE_TO_ONE_CALL) {
 			return;

From b5fee31f88d27ec354e582e8641336a1a71b92e8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 16:14:46 +0100
Subject: [PATCH 092/129] Show pins to moderators

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php                     |  6 ++++++
 .../ParticipantsList/Participant/Participant.vue      | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index fd37addb62a..cc07ce1749b 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -544,6 +544,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 				'actorId' => '',
 				'attendeeId' => 0,
 				'canEnableSIP' => false,
+				'attendeePin' => '',
 			]);
 		}
 
@@ -603,6 +604,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 				'actorType' => $attendee->getActorType(),
 				'actorId' => $attendee->getActorId(),
 				'attendeeId' => $attendee->getId(),
+				'attendeePin' => $attendee->getPin(),
 			]);
 		}
 
@@ -1055,6 +1057,10 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				$result['attendeeId'] = $participant->getAttendee()->getId();
 				$result['actorId'] = $participant->getAttendee()->getActorId();
 				$result['actorType'] = $participant->getAttendee()->getActorType();
+				if ($this->participant->hasModeratorPermissions(false)
+					|| $this->participant->getAttendee()->getId() === $participant->getAttendee()->getId()) {
+					$result['attendeePin'] = (string) $participant->getAttendee()->getPin();
+				}
 			}
 			if ($participant->getSession() instanceof Session) {
 				$result['inCall'] = $participant->getSession()->getInCall();
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index 2255817a172..cf19d95037e 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -81,6 +81,12 @@
 			v-if="canModerate && !isSearched"
 			:aria-label="t('spreed', 'Participant settings')"
 			class="participant-row__actions">
+			<ActionText
+				v-if="attendeePin"
+				:title="t('spreed', 'Dial-in PIN')"
+				icon="icon-password">
+				{{ attendeePin }}
+			</ActionText>
 			<ActionButton v-if="canBeDemoted"
 				icon="icon-rename"
 				@click="demoteFromModerator">
@@ -104,6 +110,7 @@
 <script>
 
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ActionText from '@nextcloud/vue/dist/Components/ActionText'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import Microphone from 'vue-material-design-icons/Microphone'
@@ -120,6 +127,7 @@ export default {
 	components: {
 		Actions,
 		ActionButton,
+		ActionText,
 		AvatarWrapper,
 		Microphone,
 		Phone,
@@ -261,6 +269,9 @@ export default {
 		lastPing() {
 			return this.participant.lastPing
 		},
+		attendeePin() {
+			return this.participant.attendeePin
+		},
 		token() {
 			return this.$store.getters.getToken()
 		},

From 626e6d8a77202e02791308ba633f2247f43e8ff9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 16:18:26 +0100
Subject: [PATCH 093/129] Use the call flag when it was given by the HPB server

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 98547fb5bc1..3b87a420123 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -527,6 +527,7 @@ private function backendRoom(array $roomRequest): DataResponse {
 		$action = !empty($roomRequest['action']) ? $roomRequest['action'] : 'join';
 		$actorId = $roomRequest['actorid'] ?? null;
 		$actorType = $roomRequest['actortype'] ?? null;
+		$inCall = $roomRequest['inCall'] ?? null;
 
 		$participant = null;
 		if ($actorId !== null && $actorType !== null) {
@@ -603,6 +604,9 @@ private function backendRoom(array $roomRequest): DataResponse {
 			}
 
 			if ($participant->getSession() instanceof Session) {
+				if ($inCall !== null) {
+					$this->participantService->changeInCall($room, $participant, $inCall);
+				}
 				$this->sessionService->updateLastPing($participant->getSession(), $this->timeFactory->getTime());
 			}
 		} elseif ($action === 'leave') {

From 9cf24fe151198d66bcec6ee36edb8a0f684bc914 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 19:11:59 +0100
Subject: [PATCH 094/129] Show the dial-in info in the sidebar

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php            |  3 +
 lib/GuestManager.php                         |  2 +-
 lib/TInitialState.php                        |  5 ++
 src/components/RightSidebar/RightSidebar.vue | 12 ++++
 src/components/RightSidebar/SipSettings.vue  | 68 ++++++++++++++++++++
 5 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 src/components/RightSidebar/SipSettings.vue

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index cc07ce1749b..17debc2a214 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -159,6 +159,9 @@ protected function getTalkHashHeader(): array {
 				$this->config->getAppValue('spreed', 'allowed_groups', '') . '#' .
 				$this->config->getAppValue('spreed', 'start_conversations', '') . '#' .
 				$this->config->getAppValue('spreed', 'has_reference_id', '') . '#' .
+				$this->config->getAppValue('spreed', 'sip_bridge_groups', '[]') . '#' .
+				$this->config->getAppValue('spreed', 'sip_bridge_dialin_info') . '#' .
+				$this->config->getAppValue('spreed', 'sip_bridge_shared_secret') . '#' .
 				$this->config->getAppValue('theming', 'cachebuster', '1')
 		)];
 	}
diff --git a/lib/GuestManager.php b/lib/GuestManager.php
index bcc60592631..1cc48ad7c20 100644
--- a/lib/GuestManager.php
+++ b/lib/GuestManager.php
@@ -228,7 +228,7 @@ public function sendEmailInvitation(Room $room, Participant $participant): void
 
 			$template->addBodyListItem(
 				$pin,
-				$this->l->t('PIN'),
+				$this->l->t('Your PIN'),
 				$this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.png'))
 			);
 		}
diff --git a/lib/TInitialState.php b/lib/TInitialState.php
index c918befe3fa..5b771d50f65 100644
--- a/lib/TInitialState.php
+++ b/lib/TInitialState.php
@@ -67,6 +67,11 @@ protected function publishInitialStateShared(): void {
 			'talk', 'signaling_mode',
 			$this->talkConfig->getSignalingMode()
 		);
+
+		$this->initialStateService->provideInitialState(
+			'talk', 'sip_dialin_info',
+			$this->talkConfig->getDialInInfo()
+		);
 	}
 
 	protected function publishInitialStateForUser(IUser $user, IRootFolder $rootFolder, IAppManager $appManager): void {
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 0b36d5ae293..63ed15490e1 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -55,6 +55,10 @@
 			icon="icon-settings">
 			<SetGuestUsername
 				v-if="!getUserId" />
+			<SipSettings
+				v-if="showSIPSettings"
+				:meeting-id="conversation.token"
+				:attendee-pin="conversation.attendeePin" />
 			<CollectionList
 				v-if="getUserId && conversation.token"
 				:id="conversation.token"
@@ -87,6 +91,7 @@ import MatterbridgeSettings from './Matterbridge/MatterbridgeSettings'
 import isInLobby from '../../mixins/isInLobby'
 import SetGuestUsername from '../SetGuestUsername'
 import { EventBus } from '../../services/EventBus'
+import SipSettings from './SipSettings'
 
 export default {
 	name: 'RightSidebar',
@@ -97,6 +102,7 @@ export default {
 		CollectionList,
 		ParticipantsTab,
 		SetGuestUsername,
+		SipSettings,
 		MatterbridgeSettings,
 	},
 
@@ -145,6 +151,7 @@ export default {
 				type: CONVERSATION.TYPE.PUBLIC,
 				lobbyState: WEBINAR.LOBBY.NONE,
 				lobbyTimer: 0,
+				attendeePin: '',
 			}
 		},
 
@@ -194,6 +201,11 @@ export default {
 		isRenamingConversation() {
 			return this.$store.getters.isRenamingConversation
 		},
+
+		showSIPSettings() {
+			return this.conversation.sipEnabled === WEBINAR.SIP.ENABLED
+				&& this.conversation.attendeePin !== ''
+		},
 	},
 
 	watch: {
diff --git a/src/components/RightSidebar/SipSettings.vue b/src/components/RightSidebar/SipSettings.vue
new file mode 100644
index 00000000000..8ae4817b7d2
--- /dev/null
+++ b/src/components/RightSidebar/SipSettings.vue
@@ -0,0 +1,68 @@
+<!--
+  - @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+  -
+  - @author Joas Schilling <coding@schilljs.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<template>
+	<div>
+		<h3>{{ t('spreed', 'Dial-in information') }}</h3>
+
+		<p>{{ dialInInfo }}</p>
+		<p>{{ meetingIdLabel }}</p>
+		<p>{{ attendeePinLabel }}</p>
+	</div>
+</template>
+
+<script>
+import { loadState } from '@nextcloud/initial-state'
+
+export default {
+	name: 'SipSettings',
+
+	props: {
+		attendeePin: {
+			type: String,
+			required: true,
+		},
+		meetingId: {
+			type: String,
+			required: true,
+		},
+	},
+
+	data() {
+		return {
+			dialInInfo: loadState('talk', 'sip_dialin_info'),
+		}
+	},
+
+	computed: {
+		meetingIdLabel() {
+			return t('spreed', 'Meeting ID: {meetingId}', {
+				meetingId: this.meetingId,
+			})
+		},
+		attendeePinLabel() {
+			return t('spreed', 'Your PIN: {attendeePin}', {
+				attendeePin: this.attendeePin,
+			})
+		},
+	},
+}
+</script>

From f194b214a511376a5464c0822d575441df445446 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 19:16:37 +0100
Subject: [PATCH 095/129] Don't expose SIP data when SIP is not configured
 anymore

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 17debc2a214..64e1d238712 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -535,7 +535,6 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 			'notificationLevel' => Participant::NOTIFY_NEVER,
 			'lobbyState' => Webinary::LOBBY_NONE,
 			'lobbyTimer' => 0,
-			'sipEnabled' => Webinary::SIP_DISABLED,
 			'lastPing' => 0,
 			'sessionId' => '0',
 			'guestList' => '',
@@ -543,6 +542,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 		];
 		if ($this->getAPIVersion() >= 3) {
 			$roomData = array_merge($roomData, [
+				'sipEnabled' => Webinary::SIP_DISABLED,
 				'actorType' => '',
 				'actorId' => '',
 				'attendeeId' => 0,
@@ -600,14 +600,17 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 			'notificationLevel' => $attendee->getNotificationLevel(),
 			'lobbyState' => $room->getLobbyState(),
 			'lobbyTimer' => $lobbyTimer,
-			'sipEnabled' => $room->getSIPEnabled(),
 		]);
 		if ($this->getAPIVersion() >= 3) {
+			if ($this->talkConfig->isSIPConfigured()) {
+				$roomData['sipEnabled'] = $room->getSIPEnabled();
+				$roomData['attendeePin'] = $attendee->getPin();
+			}
+
 			$roomData = array_merge($roomData, [
 				'actorType' => $attendee->getActorType(),
 				'actorId' => $attendee->getActorId(),
 				'attendeeId' => $attendee->getId(),
-				'attendeePin' => $attendee->getPin(),
 			]);
 		}
 
@@ -673,7 +676,8 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 				$roomData['canLeaveConversation'] = true;
 				if ($this->getAPIVersion() >= 3) {
 					$roomData['canEnableSIP'] =
-						($room->getType() === Room::GROUP_CALL || $room->getType() === Room::PUBLIC_CALL)
+						$this->talkConfig->isSIPConfigured()
+						&& ($room->getType() === Room::GROUP_CALL || $room->getType() === Room::PUBLIC_CALL)
 						&& $currentParticipant->hasModeratorPermissions(false)
 						&& $this->talkConfig->canUserEnableSIP($currentUser);
 				}
@@ -1060,8 +1064,9 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				$result['attendeeId'] = $participant->getAttendee()->getId();
 				$result['actorId'] = $participant->getAttendee()->getActorId();
 				$result['actorType'] = $participant->getAttendee()->getActorType();
-				if ($this->participant->hasModeratorPermissions(false)
-					|| $this->participant->getAttendee()->getId() === $participant->getAttendee()->getId()) {
+				if ($this->talkConfig->isSIPConfigured()
+					&& ($this->participant->hasModeratorPermissions(false)
+						|| $this->participant->getAttendee()->getId() === $participant->getAttendee()->getId())) {
 					$result['attendeePin'] = (string) $participant->getAttendee()->getPin();
 				}
 			}

From bf90db0f7c0041fd41bc5a68806efcdf35be3541 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 3 Nov 2020 19:20:16 +0100
Subject: [PATCH 096/129] Ignore the exception that is unknown

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 psalm.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/psalm.xml b/psalm.xml
index f0401c97321..8aab1628e97 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -34,5 +34,10 @@
 				<referencedClass name="Doctrine\DBAL\Schema\Table" />
 			</errorLevel>
 		</UndefinedDocblockClass>
+		<InvalidThrow>
+			<errorLevel type="suppress">
+				<referencedClass name="Doctrine\DBAL\Exception\UniqueConstraintViolationException" />
+			</errorLevel>
+		</InvalidThrow>
 	</issueHandlers>
 </psalm>

From 9f84f5ae77be1e3cb2bd53e06e502ba24d3e17ab Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 11:00:08 +0100
Subject: [PATCH 097/129] Add the participant to the join/start call message
 generation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/SystemMessage/Listener.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index b69e50a063a..62c158c37ca 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -81,9 +81,9 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$participantService = \OC::$server->query(ParticipantService::class);
 
 			if ($participantService->hasActiveSessionsInCall($room)) {
-				$listener->sendSystemMessage($room, 'call_joined');
+				$listener->sendSystemMessage($room, 'call_joined', [], $event->getParticipant());
 			} else {
-				$listener->sendSystemMessage($room, 'call_started');
+				$listener->sendSystemMessage($room, 'call_started', [], $event->getParticipant());
 			}
 		});
 		$dispatcher->addListener(Room::EVENT_AFTER_SESSION_LEAVE_CALL, static function (ModifyParticipantEvent $event) {

From e9a9c5e5af6cedbf43bf698039862106313656a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 11:10:02 +0100
Subject: [PATCH 098/129] Add missing alias when deleting a room in the
 background job

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Manager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Manager.php b/lib/Manager.php
index f646e6124a5..d36d8c4e7be 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -111,6 +111,7 @@ public function __construct(IDBConnection $db,
 	public function forAllRooms(callable $callback): void {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
+			->selectAlias('id', 'r_id')
 			->from('talk_rooms');
 
 		$result = $query->execute();

From 4fad28fb489a97518b119971ebed40a576675a3b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 11:33:03 +0100
Subject: [PATCH 099/129] The session object is modified nowadays so it's
 always disconnected in the "after" event

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Chat/SystemMessage/Listener.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index 62c158c37ca..83de21cd201 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -90,7 +90,7 @@ public static function register(IEventDispatcher $dispatcher): void {
 			$room = $event->getRoom();
 
 			$session = $event->getParticipant()->getSession();
-			if (!$session instanceof Session || $session->getInCall() === Participant::FLAG_DISCONNECTED) {
+			if (!$session instanceof Session) {
 				// This happens in case the user was kicked/lobbied
 				return;
 			}

From 05bc6d134a84eaf7b0749056f6b04e31fb31d995 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 12:03:50 +0100
Subject: [PATCH 100/129] Dispatch leave call events when the user was in call
 while leaving the conversation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Service/ParticipantService.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 89923443b55..8707cf3ca9e 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -320,7 +320,17 @@ public function leaveRoomAsSession(Room $room, Participant $participant): void {
 
 		$session = $participant->getSession();
 		if ($session instanceof Session) {
+			$dispatchLeaveCallEvents = $session->getInCall() !== Participant::FLAG_DISCONNECTED;
+			if ($dispatchLeaveCallEvents) {
+				$event = new ModifyParticipantEvent($room, $participant, 'inCall', Participant::FLAG_DISCONNECTED, $session->getInCall());
+				$this->dispatcher->dispatch(Room::EVENT_BEFORE_SESSION_LEAVE_CALL, $event);
+			}
+
 			$this->sessionMapper->delete($session);
+
+			if ($dispatchLeaveCallEvents) {
+				$this->dispatcher->dispatch(Room::EVENT_AFTER_SESSION_LEAVE_CALL, $event);
+			}
 		} else {
 			$this->sessionMapper->deleteByAttendeeId($participant->getAttendee()->getId());
 		}

From 33d36f615e5edc864d1e6bfd23167a932bef16e2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 14:04:23 +0100
Subject: [PATCH 101/129] All parameters are lowercase

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 3b87a420123..917809a9b9d 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -527,7 +527,7 @@ private function backendRoom(array $roomRequest): DataResponse {
 		$action = !empty($roomRequest['action']) ? $roomRequest['action'] : 'join';
 		$actorId = $roomRequest['actorid'] ?? null;
 		$actorType = $roomRequest['actortype'] ?? null;
-		$inCall = $roomRequest['inCall'] ?? null;
+		$inCall = $roomRequest['incall'] ?? null;
 
 		$participant = null;
 		if ($actorId !== null && $actorType !== null) {

From b2ebf3b31e040b620ed5bb9fc91d9a4e1b9f9c61 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 14:36:24 +0100
Subject: [PATCH 102/129] Don't preload the user so we load it with the session
 later on

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 917809a9b9d..02b8adf288c 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -549,7 +549,8 @@ private function backendRoom(array $roomRequest): DataResponse {
 			}
 		} else {
 			try {
-				$room = $this->manager->getRoomByToken($token, $userId);
+				// FIXME Don't preload with the user as that misses the session, kinda meh.
+				$room = $this->manager->getRoomByToken($token);
 			} catch (RoomNotFoundException $e) {
 				return new DataResponse([
 					'type' => 'error',

From ddf7d1913072233b51a1adb0bd10afe6b3035ca9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 4 Nov 2020 14:58:47 +0100
Subject: [PATCH 103/129] Load the participant by session as loading by actor
 is prefetched only as attendee

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 02b8adf288c..7d5331fedf3 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -544,7 +544,15 @@ private function backendRoom(array $roomRequest): DataResponse {
 			}
 
 			try {
-				$participant = $room->getParticipantByActor($actorType, $actorId);
+				if ($sessionId) {
+					try {
+						$participant = $room->getParticipantBySession($sessionId);
+					} catch (ParticipantNotFoundException $e) {
+						$participant = $room->getParticipantByActor($actorType, $actorId);
+					}
+				} else {
+					$participant = $room->getParticipantByActor($actorType, $actorId);
+				}
 			} catch (ParticipantNotFoundException $e) {
 			}
 		} else {

From 3241c67c881e7030ab8991d7bfb7e19cb5f6223b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 11 Nov 2020 11:51:01 +0100
Subject: [PATCH 104/129] Add constants for SIP flags and pass on the event

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/constants.js           |  6 ++++++
 src/utils/signaling.js     |  3 +++
 src/utils/webrtc/webrtc.js | 14 ++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/src/constants.js b/src/constants.js
index e5a5cfb09c5..a3d3c0a9855 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -49,6 +49,12 @@ export const PARTICIPANT = {
 		WITH_VIDEO: 4,
 		WITH_PHONE: 8,
 	},
+	SIP_FLAG: {
+		MUTE_MICROPHONE: 1,
+		MUTE_SPEAKER: 2,
+		SPEAKING: 4,
+		RAISE_HAND: 8,
+	},
 	NOTIFY: {
 		DEFAULT: 0,
 		ALWAYS: 1,
diff --git a/src/utils/signaling.js b/src/utils/signaling.js
index 94a97266d32..237d3d36482 100644
--- a/src/utils/signaling.js
+++ b/src/utils/signaling.js
@@ -1148,6 +1148,9 @@ Signaling.Standalone.prototype.processRoomParticipantsEvent = function(data) {
 		this._trigger('usersChanged', [data.event.update.users || []])
 		this._trigger('participantListChanged')
 		break
+	case 'flags':
+		this._trigger('participantFlagsChanged', [data.event.flags || []])
+		break
 	default:
 		console.error('Unknown room participant event', data)
 		break
diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js
index c3cb185929e..b636dc3c838 100644
--- a/src/utils/webrtc/webrtc.js
+++ b/src/utils/webrtc/webrtc.js
@@ -384,6 +384,20 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
 		})
 		usersInCallChanged(signaling, usersInCallMapping)
 	})
+	signaling.on('participantFlagsChanged', function(event) {
+		/**
+		 * event {
+		 *   roomid: "1609407087",
+		 *   sessionid: "…",
+		 *   flags: 1
+		 * }
+		 */
+		const callParticipantModel = callParticipantCollection.get(event.sessionid)
+		if (callParticipantModel) {
+			callParticipantModel.set('speaking', (event.flags & PARTICIPANT.SIP_FLAG.SPEAKING) > 0)
+			callParticipantModel.set('audioAvailable', (event.flags & PARTICIPANT.SIP_FLAG.MUTE_MICROPHONE) === 0)
+		}
+	})
 	signaling.on('usersInRoom', function(users) {
 		usersInCallMapping = {}
 		users.forEach(function(user) {

From d6a2a07c2020cbd4a9a3f2a1aed10386f0b2b3b4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 11 Nov 2020 12:01:14 +0100
Subject: [PATCH 105/129] Don't show the SIP connection as guest

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/CallView/CallView.vue            | 2 +-
 src/utils/webrtc/models/CallParticipantModel.js | 1 +
 src/utils/webrtc/webrtc.js                      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index e656d794789..d02feb86072 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -171,7 +171,7 @@ export default {
 	},
 	computed: {
 		callParticipantModels() {
-			return callParticipantCollection.callParticipantModels
+			return callParticipantCollection.callParticipantModels.filter(callParticipantModel => !callParticipantModel.attributes.internal)
 		},
 
 		reversedCallParticipantModels() {
diff --git a/src/utils/webrtc/models/CallParticipantModel.js b/src/utils/webrtc/models/CallParticipantModel.js
index c4c079d452e..87d65ed72ba 100644
--- a/src/utils/webrtc/models/CallParticipantModel.js
+++ b/src/utils/webrtc/models/CallParticipantModel.js
@@ -43,6 +43,7 @@ export default function CallParticipantModel(options) {
 		// are used for known but negative/empty values.
 		userId: undefined,
 		name: undefined,
+		internal: undefined,
 		connectionState: ConnectionState.NEW,
 		stream: null,
 		// The audio element is part of the model to ensure that it can be
diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js
index b636dc3c838..7d810289e6f 100644
--- a/src/utils/webrtc/webrtc.js
+++ b/src/utils/webrtc/webrtc.js
@@ -229,6 +229,9 @@ function usersChanged(signaling, newUsers, disconnectedSessionIds) {
 			})
 		}
 		callParticipantModel.setUserId(userId)
+		if (user.internal) {
+			callParticipantModel.set('internal', true)
+		}
 
 		// When the MCU is used and the other participant has no streams or
 		// when no MCU is used and neither the local participant nor the

From 95cb01952b8f1103d81baa1934600c2d6047ae39 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 11 Nov 2020 13:20:21 +0100
Subject: [PATCH 106/129] Also load the session information when we load an
 attendee

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Manager.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/Manager.php b/lib/Manager.php
index d36d8c4e7be..c4488261d7b 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -290,14 +290,19 @@ public function getRoomsForUser(string $userId, bool $includeLastMessage = false
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->addSelect('a.*')
+			->addSelect('s.*')
 			->selectAlias('r.id', 'r_id')
 			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 				$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+				$query->expr()->eq('a.id', 's.attendee_id')
+			))
 			->where($query->expr()->isNotNull('a.id'));
 
 		if ($includeLastMessage) {
@@ -341,12 +346,17 @@ public function getRoomForUser(int $roomId, ?string $userId): Room {
 		if ($userId !== null) {
 			// Non guest user
 			$query->addSelect('a.*')
+				->addSelect('s.*')
 				->selectAlias('a.id', 'a_id')
+				->selectAlias('s.id', 's_id')
 				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
 				))
+				->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+					$query->expr()->eq('a.id', 's.attendee_id')
+				))
 				->andWhere($query->expr()->isNotNull('a.id'));
 		}
 
@@ -396,11 +406,16 @@ public function getRoomForUserByToken(string $token, ?string $userId, bool $incl
 		if ($userId !== null) {
 			// Non guest user
 			$query->addSelect('a.*')
-				->selectAlias('a.id', 'a_id');
-			$query->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
+				->addSelect('s.*')
+				->selectAlias('a.id', 'a_id')
+				->selectAlias('s.id', 's_id')
+				->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
 					$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
 					$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
 					$query->expr()->eq('a.room_id', 'r.id')
+				))
+				->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+					$query->expr()->eq('a.id', 's.attendee_id')
 				));
 		}
 
@@ -476,7 +491,9 @@ public function getRoomByActor(string $token, string $actorType, string $actorId
 		$query = $this->db->getQueryBuilder();
 		$query->select('r.*')
 			->addSelect('a.*')
+			->addSelect('s.*')
 			->selectAlias('a.id', 'a_id')
+			->selectAlias('s.id', 's_id')
 			->selectAlias('r.id', 'r_id')
 			->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
@@ -484,6 +501,9 @@ public function getRoomByActor(string $token, string $actorType, string $actorId
 				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
+			->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
+				$query->expr()->eq('a.id', 's.attendee_id')
+			))
 			->where($query->expr()->eq('r.token', $query->createNamedParameter($token)));
 
 		$result = $query->execute();

From 77beca42380d8bdc7f7e71f53d3a8e56702bff92 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 13 Nov 2020 11:36:01 +0100
Subject: [PATCH 107/129] When the HPB provided a session id only join/leave
 with that session

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 7d5331fedf3..adf4375d46d 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -574,9 +574,7 @@ private function backendRoom(array $roomRequest): DataResponse {
 					$participant = $room->getParticipantBySession($sessionId);
 				} catch (ParticipantNotFoundException $e) {
 				}
-			}
-
-			if (!empty($userId)) {
+			} elseif (!empty($userId)) {
 				// User trying to join room.
 				try {
 					$participant = $room->getParticipant($userId);

From c3ecbe5c433abc771a043fa71a24d4565e34a0bc Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 16 Nov 2020 16:49:42 +0100
Subject: [PATCH 108/129] Update baseline

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/psalm-baseline.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 0df7fc7c7b0..33bc69dc2ba 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -582,12 +582,6 @@
       <code>Cache</code>
     </UndefinedClass>
   </file>
-  <file src="lib/Signaling/BackendNotifier.php">
-    <InvalidClass occurrences="2">
-      <code>IURLGenerator</code>
-      <code>IUrlGenerator</code>
-    </InvalidClass>
-  </file>
   <file src="lib/TInitialState.php">
     <MissingDependency occurrences="1">
       <code>IRootFolder</code>

From f9ce2656f97954c81abdf441ec3197ddee73e694 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 16 Nov 2020 20:46:33 +0100
Subject: [PATCH 109/129] Refresh the peer list and take the display name from
 there

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                       |  6 ++--
 lib/Controller/CallController.php        | 32 +++++++++++------
 src/components/CallView/CallView.vue     | 28 ++++++++++++++-
 src/components/CallView/shared/Video.vue | 45 ++++++++++++++++++++----
 src/services/callsService.js             | 14 ++------
 src/store/participantsStore.js           | 32 +++++++++++++++++
 6 files changed, 126 insertions(+), 31 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index a97fc9fb1e6..130359c62c5 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -109,7 +109,7 @@
 			'url' => '/api/{apiVersion}/call/{token}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -118,7 +118,7 @@
 			'url' => '/api/{apiVersion}/call/{token}',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -127,7 +127,7 @@
 			'url' => '/api/{apiVersion}/call/{token}',
 			'verb' => 'DELETE',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2|3)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 6a43b49ff18..85c85e834f6 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -72,17 +72,29 @@ public function getPeersForCall(): DataResponse {
 				continue;
 			}
 
-			$userId = '';
-			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
-				$userId = $participant->getAttendee()->getActorId();
+			if ($this->getAPIVersion() >= 3) {
+				$result[] = [
+					'actorType' => $participant->getAttendee()->getActorType(),
+					'actorId' => $participant->getAttendee()->getActorId(),
+					// FIXME 'displayName' => $participant->getAttendee()->getDisplayName(),
+					'displayName' => $participant->getAttendee()->getActorId(),
+					'token' => $this->room->getToken(),
+					'lastPing' => $session->getLastPing(),
+					'sessionId' => $session->getSessionId(),
+				];
+			} else {
+				$userId = '';
+				if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
+					$userId = $participant->getAttendee()->getActorId();
+				}
+
+				$result[] = [
+					'userId' => $userId,
+					'token' => $this->room->getToken(),
+					'lastPing' => $session->getLastPing(),
+					'sessionId' => $session->getSessionId(),
+				];
 			}
-
-			$result[] = [
-				'userId' => $userId,
-				'token' => $this->room->getToken(),
-				'lastPing' => $session->getLastPing(),
-				'sessionId' => $session->getSessionId(),
-			];
 		}
 
 		return new DataResponse($result);
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index d02feb86072..608179e0332 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -124,10 +124,13 @@
 <script>
 import Grid from './Grid/Grid'
 import { localMediaModel, localCallParticipantModel, callParticipantCollection } from '../../utils/webrtc/index'
+import { fetchPeers } from '../../services/callsService'
 import EmptyCallView from './shared/EmptyCallView'
 import Video from './shared/Video'
 import LocalVideo from './shared/LocalVideo'
 import Screen from './shared/Screen'
+import debounce from 'debounce'
+import { EventBus } from '../../services/EventBus'
 
 export default {
 	name: 'CallView',
@@ -355,6 +358,12 @@ export default {
 		// subviews.
 		this.updateDataFromCallParticipantModels(this.callParticipantModels)
 	},
+	mounted() {
+		EventBus.$on('refreshPeerList', this.debounceFetchPeers)
+	},
+	unmounted() {
+		EventBus.$on('refreshPeerList', this.debounceFetchPeers)
+	},
 	methods: {
 		/**
 		 * Updates data properties that depend on the CallParticipantModels.
@@ -520,6 +529,23 @@ export default {
 			this.$store.dispatch('selectedVideoPeerId', 'local')
 			this.$store.dispatch('isGrid', false)
 		},
+
+		debounceFetchPeers: debounce(async function() {
+			const token = this.token
+			try {
+				const response = await fetchPeers(token)
+				this.$store.dispatch('purgePeersStore')
+
+				response.data.ocs.data.forEach((peer) => {
+					this.$store.dispatch('addPeer', {
+						token,
+						peer,
+					})
+				})
+			} catch (exception) {
+				// Just means guests have no name, so don't error …
+			}
+		}, 3000),
 	},
 }
 </script>
@@ -531,7 +557,7 @@ export default {
 	width: 100%;
 	height: 100%;
 	overflow: hidden;
-	background-color: black,
+	background-color: black;
 }
 
 #call-container {
diff --git a/src/components/CallView/shared/Video.vue b/src/components/CallView/shared/Video.vue
index 6c17f358841..caf9a748d1f 100644
--- a/src/components/CallView/shared/Video.vue
+++ b/src/components/CallView/shared/Video.vue
@@ -47,18 +47,18 @@
 				:key="'backgroundAvatar'"
 				class="avatar-container">
 				<VideoBackground
-					:display-name="model.attributes.name"
-					:user="model.attributes.userId"
+					:display-name="participantName"
+					:user="participantUserId"
 					:grid-blur="videoBackgroundBlur" />
-				<Avatar v-if="model.attributes.userId"
+				<Avatar v-if="participantUserId"
 					:size="avatarSize"
 					:disable-menu="true"
 					:disable-tooltip="true"
-					:user="model.attributes.userId"
-					:display-name="model.attributes.name"
+					:user="participantUserId"
+					:display-name="participantName"
 					:show-user-status="false"
 					:class="avatarClass" />
-				<div v-if="!model.attributes.userId"
+				<div v-if="!participantUserId"
 					:class="guestAvatarClass"
 					class="avatar guest">
 					{{ firstLetterOfGuestName }}
@@ -92,6 +92,7 @@ import VideoBackground from './VideoBackground'
 import AccountCircle from 'vue-material-design-icons/AccountCircle'
 import VideoBottomBar from './VideoBottomBar'
 import Screen from './Screen'
+import { EventBus } from '../../../services/EventBus'
 
 export default {
 
@@ -202,6 +203,34 @@ export default {
 			return Hex.stringify(SHA1(this.peerId))
 		},
 
+		peerData() {
+			let peerData = this.$store.getters.getPeer(this.$store.getters.getToken(), this.peerId)
+			if (!peerData.actorId) {
+				EventBus.$emit('refreshPeerList')
+				peerData = {
+					actorType: '',
+					actorId: '',
+					displayName: '',
+				}
+			}
+			return peerData
+		},
+
+		participantUserId() {
+			let participantUserId = this.model.attributes.userId
+
+			// The name is undefined and not shown until a connection is made
+			// for registered users, so do not fall back to the guest name in
+			// the store either until the connection was made.
+			if (!participantUserId) {
+				if (this.peerData.actorType === 'users') {
+					participantUserId = this.peerData.actorId
+				}
+			}
+
+			return participantUserId
+		},
+
 		participantName() {
 			let participantName = this.model.attributes.name
 
@@ -215,6 +244,10 @@ export default {
 				)
 			}
 
+			if (!participantName) {
+				participantName = this.peerData.displayName
+			}
+
 			return participantName
 		},
 
diff --git a/src/services/callsService.js b/src/services/callsService.js
index 3298522c0ea..86b39cb2498 100644
--- a/src/services/callsService.js
+++ b/src/services/callsService.js
@@ -53,17 +53,9 @@ const leaveCall = async function(token) {
 	}
 }
 
-/**
- * Fetches all peers for a call
- * @param {string} token The token of the call to be fetched.
- */
-const fetchPeers = async function(token) {
-	try {
-		const response = await axios.get(generateOcsUrl('apps/spreed/api/v1', 2) + `call/${token}`)
-		return response
-	} catch (error) {
-		console.debug('Error while fetching the peers: ', error)
-	}
+const fetchPeers = async function(token, options) {
+	const response = await axios.get(generateOcsUrl('apps/spreed/api/v3', 2) + `call/${token}`, options)
+	return response
 }
 
 export {
diff --git a/src/store/participantsStore.js b/src/store/participantsStore.js
index 1da71d610ec..b191a8a45a8 100644
--- a/src/store/participantsStore.js
+++ b/src/store/participantsStore.js
@@ -34,6 +34,8 @@ import { PARTICIPANT } from '../constants'
 const state = {
 	participants: {
 	},
+	peers: {
+	},
 }
 
 const getters = {
@@ -71,6 +73,17 @@ const getters = {
 
 		return index
 	},
+	getPeer: (state) => (token, sessionId) => {
+		if (!state.peers[token]) {
+			return {}
+		}
+
+		if (state.peers[token].hasOwnProperty(sessionId)) {
+			return state.peers[token][sessionId]
+		}
+
+		return {}
+	},
 }
 
 const mutations = {
@@ -110,6 +123,18 @@ const mutations = {
 			Vue.delete(state.participants, token)
 		}
 	},
+
+	addPeer(state, { token, peer }) {
+		if (!state.peers[token]) {
+			Vue.set(state.peers, token, [])
+		}
+		Vue.set(state.peers[token], peer.sessionId, peer)
+	},
+	purgePeersStore(state, token) {
+		if (state.peers[token]) {
+			Vue.delete(state.peers, token)
+		}
+	},
 }
 
 const actions = {
@@ -189,6 +214,13 @@ const actions = {
 		commit('purgeParticipantsStore', token)
 	},
 
+	addPeer({ commit }, { token, peer }) {
+		commit('addPeer', { token, peer })
+	},
+	purgePeersStore({ commit }, token) {
+		commit('purgePeersStore', token)
+	},
+
 	updateSessionId({ commit, getters }, { token, participantIdentifier, sessionId }) {
 		const index = getters.getParticipantIndex(token, participantIdentifier)
 		if (index === -1) {

From a12d505b51c0fcc10696eae680329d45d2c99775 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 16 Nov 2020 21:49:18 +0100
Subject: [PATCH 110/129] Use a new VideoBackground component when we get a
 userId

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/CallView/shared/Video.vue | 41 ++++++++++++++----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/components/CallView/shared/Video.vue b/src/components/CallView/shared/Video.vue
index caf9a748d1f..aa2d73a5dfb 100644
--- a/src/components/CallView/shared/Video.vue
+++ b/src/components/CallView/shared/Video.vue
@@ -46,23 +46,30 @@
 				v-if="showBackgroundAndAvatar"
 				:key="'backgroundAvatar'"
 				class="avatar-container">
-				<VideoBackground
-					:display-name="participantName"
-					:user="participantUserId"
-					:grid-blur="videoBackgroundBlur" />
-				<Avatar v-if="participantUserId"
-					:size="avatarSize"
-					:disable-menu="true"
-					:disable-tooltip="true"
-					:user="participantUserId"
-					:display-name="participantName"
-					:show-user-status="false"
-					:class="avatarClass" />
-				<div v-if="!participantUserId"
-					:class="guestAvatarClass"
-					class="avatar guest">
-					{{ firstLetterOfGuestName }}
-				</div>
+				<template v-if="participantUserId">
+					<VideoBackground
+						:display-name="participantName"
+						:user="participantUserId"
+						:grid-blur="videoBackgroundBlur" />
+					<Avatar
+						:size="avatarSize"
+						:disable-menu="true"
+						:disable-tooltip="true"
+						:user="participantUserId"
+						:display-name="participantName"
+						:show-user-status="false"
+						:class="avatarClass" />
+				</template>
+				<template v-else>
+					<VideoBackground
+						:display-name="participantName"
+						:grid-blur="videoBackgroundBlur" />
+					<div
+						:class="guestAvatarClass"
+						class="avatar guest">
+						{{ firstLetterOfGuestName }}
+					</div>
+				</template>
 			</div>
 			<div v-if="showPlaceholderForPromoted"
 				:key="'placeholderForPromoted'"

From 35b9741689e4b5099c700e90ce3dfe774f6ac203 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 17 Nov 2020 10:12:18 +0100
Subject: [PATCH 111/129] Fix baseline

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/psalm-baseline.xml | 171 ++-------------------------------------
 1 file changed, 6 insertions(+), 165 deletions(-)

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 33bc69dc2ba..8ddba65a2d1 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.16@d03e5ef057d6adc656c0ff7e166c50b73b4f48f3">
+<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977">
   <file src="lib/AppInfo/Application.php">
     <UndefinedClass occurrences="2">
       <code>BeforeTemplateRenderedEvent</code>
@@ -292,7 +292,7 @@
     </UndefinedDocblockClass>
   </file>
   <file src="lib/Manager.php">
-    <InvalidArgument occurrences="4"/>
+    <InvalidArgument occurrences="8"/>
     <MissingDependency occurrences="4">
       <code>$this-&gt;commentsManager</code>
       <code>$this-&gt;commentsManager</code>
@@ -301,11 +301,10 @@
     </MissingDependency>
   </file>
   <file src="lib/MatterbridgeManager.php">
-    <UndefinedClass occurrences="4">
+    <UndefinedClass occurrences="3">
       <code>IAuthTokenProvider</code>
       <code>IToken</code>
       <code>IToken</code>
-      <code>UniqueConstraintViolationException</code>
     </UndefinedClass>
     <UndefinedDocblockClass occurrences="4">
       <code>$this-&gt;tokenProvider</code>
@@ -314,202 +313,44 @@
       <code>IAuthTokenProvider</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="lib/Migration/Version10000Date20200819121721.php">
-    <UndefinedClass occurrences="3">
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version11000Date20200922161218.php">
-    <UndefinedClass occurrences="2">
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version2000Date20170707093535.php">
-    <UndefinedClass occurrences="14">
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Migration/Version2001Date20170707115443.php">
     <InvalidArrayAccess occurrences="1">
       <code>$return['num_rooms']</code>
     </InvalidArrayAccess>
-    <UndefinedClass occurrences="3">
+    <UndefinedClass occurrences="2">
       <code>PostgreSqlPlatform</code>
       <code>PostgreSqlPlatform</code>
-      <code>Type</code>
     </UndefinedClass>
     <UndefinedDocblockClass occurrences="2">
       <code>$this-&gt;db-&gt;getDatabasePlatform()</code>
       <code>$this-&gt;db-&gt;getDatabasePlatform()</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="lib/Migration/Version2001Date20170913104501.php">
-    <UndefinedClass occurrences="4">
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version2001Date20170921145301.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version2001Date20171009132424.php">
-    <UndefinedClass occurrences="2">
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Migration/Version2001Date20171026134605.php">
-    <UndefinedClass occurrences="20">
+    <UndefinedClass occurrences="4">
       <code>PostgreSqlPlatform</code>
       <code>TableNotFoundException</code>
       <code>TableNotFoundException</code>
       <code>TableNotFoundException</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
     </UndefinedClass>
     <UndefinedDocblockClass occurrences="1">
       <code>$this-&gt;connection-&gt;getDatabasePlatform()</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="lib/Migration/Version2001Date20171031102049.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Migration/Version2001Date20180103144447.php">
-    <UndefinedClass occurrences="9">
+    <UndefinedClass occurrences="1">
       <code>PostgreSqlPlatform</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
     </UndefinedClass>
     <UndefinedDocblockClass occurrences="1">
       <code>$this-&gt;connection-&gt;getDatabasePlatform()</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="lib/Migration/Version3002Date20180319104030.php">
-    <UndefinedClass occurrences="2">
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version3003Date20180707222130.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version3003Date20180718112436.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version3003Date20180718133519.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version3003Date20180720162342.php">
-    <UndefinedClass occurrences="2">
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version3003Date20180722152849.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version3003Date20180730080327.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version4099Date20181001123058.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version5099Date20190121102337.php">
-    <UndefinedClass occurrences="7">
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version5099Date20190319134820.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version6099Date20190627172429.php">
-    <UndefinedClass occurrences="2">
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Migration/Version7000Date20190717141457.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Migration/Version7000Date20190724121136.php">
     <InvalidArgument occurrences="1"/>
-    <UndefinedClass occurrences="2">
-      <code>Type</code>
-      <code>Type</code>
-    </UndefinedClass>
   </file>
   <file src="lib/Migration/Version7000Date20190724121137.php">
     <InvalidArgument occurrences="1"/>
   </file>
-  <file src="lib/Migration/Version8000Date20200407115318.php">
-    <UndefinedClass occurrences="1">
-      <code>Type</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/Notification/Notifier.php">
     <InvalidPropertyAssignmentValue occurrences="3">
       <code>$this-&gt;participants</code>

From c4ebfd6a66854eb043646fba00290e18d8baec0a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 17 Nov 2020 16:21:48 +0100
Subject: [PATCH 112/129] Also check the room token when suggesting if SIP can
 be enabled

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php |  1 +
 lib/Room.php                      | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 64e1d238712..7afc446ec34 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -677,6 +677,7 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 				if ($this->getAPIVersion() >= 3) {
 					$roomData['canEnableSIP'] =
 						$this->talkConfig->isSIPConfigured()
+						&& !preg_match(Room::SIP_INCOMPATIBLE_REGEX, $room->getToken())
 						&& ($room->getType() === Room::GROUP_CALL || $room->getType() === Room::PUBLIC_CALL)
 						&& $currentParticipant->hasModeratorPermissions(false)
 						&& $this->talkConfig->canUserEnableSIP($currentUser);
diff --git a/lib/Room.php b/lib/Room.php
index cadf60d77e5..ee655156f0e 100644
--- a/lib/Room.php
+++ b/lib/Room.php
@@ -44,6 +44,15 @@
 use OCP\Security\ISecureRandom;
 
 class Room {
+
+	/**
+	 * Regex that matches SIP incompatible rooms:
+	 * 1. duplicate digit: …11…
+	 * 2. leading zero: 0…
+	 * 3. non-digit: …a…
+	 */
+	public const SIP_INCOMPATIBLE_REGEX = '/((\d)(?=\2+)|^0|\D)/';
+
 	public const UNKNOWN_CALL = -1;
 	public const ONE_TO_ONE_CALL = 1;
 	public const GROUP_CALL = 2;
@@ -776,12 +785,10 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 			return false;
 		}
 
-		if (!preg_match('/^\d+$/', $this->token)) {
+		if (preg_match(self::SIP_INCOMPATIBLE_REGEX, $this->token)) {
 			return false;
 		}
 
-		// FIXME check if SIP is enabled/configured
-
 		$event = new ModifyRoomEvent($this, 'sipEnabled', $newSipEnabled, $oldSipEnabled);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_SIP_ENABLED_SET, $event);
 

From 23dbda8eb454072bedbc3f68367c317aacd590d8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 17 Nov 2020 20:59:03 +0100
Subject: [PATCH 113/129] Simplify getting the participant

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php          | 17 ++++++++---------
 .../php/Controller/SignalingControllerTest.php  |  4 ----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index adf4375d46d..9902e27deec 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -543,17 +543,16 @@ private function backendRoom(array $roomRequest): DataResponse {
 				]);
 			}
 
-			try {
-				if ($sessionId) {
-					try {
-						$participant = $room->getParticipantBySession($sessionId);
-					} catch (ParticipantNotFoundException $e) {
-						$participant = $room->getParticipantByActor($actorType, $actorId);
-					}
-				} else {
+			if ($sessionId) {
+				try {
+					$participant = $room->getParticipantBySession($sessionId);
+				} catch (ParticipantNotFoundException $e) {
+				}
+			} else {
+				try {
 					$participant = $room->getParticipantByActor($actorType, $actorId);
+				} catch (ParticipantNotFoundException $e) {
 				}
-			} catch (ParticipantNotFoundException $e) {
 			}
 		} else {
 			try {
diff --git a/tests/php/Controller/SignalingControllerTest.php b/tests/php/Controller/SignalingControllerTest.php
index e9da6f7f2f7..b99e10ef191 100644
--- a/tests/php/Controller/SignalingControllerTest.php
+++ b/tests/php/Controller/SignalingControllerTest.php
@@ -591,10 +591,6 @@ public function testBackendRoomInvitedPublic() {
 			->willReturn($room);
 
 		$participant = $this->createMock(Participant::class);
-		$room->expects($this->once())
-			->method('getParticipantBySession')
-			->with($sessionId)
-			->willThrowException(new ParticipantNotFoundException());
 		$room->expects($this->once())
 			->method('getParticipantBySession')
 			->with($sessionId)

From 29949706cdb86ab2cf93fe110838a8f0954a5004 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 17 Nov 2020 21:52:48 +0100
Subject: [PATCH 114/129] Update baseline

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/psalm-baseline.xml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 8ddba65a2d1..f86c29ebcd4 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -75,6 +75,12 @@
       <code>getById</code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="lib/Chat/SystemMessage/Listener.php">
+    <InvalidArgument occurrences="2">
+      <code>$listener</code>
+      <code>$listener</code>
+    </InvalidArgument>
+  </file>
   <file src="lib/Command/ActiveCalls.php">
     <UndefinedClass occurrences="1">
       <code>Base</code>
@@ -209,16 +215,6 @@
       <code>DBALException</code>
     </UndefinedClass>
   </file>
-  <file src="lib/Controller/MatterbridgeController.php">
-    <InvalidArgument occurrences="1">
-      <code>$success</code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/Controller/MatterbridgeSettingsController.php">
-    <InvalidArgument occurrences="1">
-      <code>$success</code>
-    </InvalidArgument>
-  </file>
   <file src="lib/Controller/PageController.php">
     <MissingDependency occurrences="2">
       <code>IRootFolder</code>
@@ -254,10 +250,6 @@
     </UndefinedClass>
   </file>
   <file src="lib/Controller/SignalingController.php">
-    <InvalidArgument occurrences="2">
-      <code>'Internal signaling disabled.'</code>
-      <code>'Internal signaling disabled.'</code>
-    </InvalidArgument>
     <UndefinedClass occurrences="1">
       <code>\GuzzleHttp\Exception\ConnectException</code>
     </UndefinedClass>
@@ -286,6 +278,9 @@
       <code>GroupFolderStorage</code>
     </UndefinedClass>
   </file>
+  <file src="lib/Flow/Operation.php">
+    <InvalidArgument occurrences="1"/>
+  </file>
   <file src="lib/GuestManager.php">
     <UndefinedDocblockClass occurrences="1">
       <code>\Doctrine\DBAL\DBALException</code>
@@ -387,6 +382,9 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Share/Listener.php">
+    <InvalidArgument occurrences="1">
+      <code>[self::class, 'listenPreShare']</code>
+    </InvalidArgument>
     <UndefinedClass occurrences="7">
       <code>$event-&gt;getView()</code>
       <code>$event-&gt;getView()</code>

From e7c5f8b91105e8a47df3a8bee5a838cb4046d8b0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 27 Nov 2020 10:53:53 +0100
Subject: [PATCH 115/129] Load new participants by actor when the session does
 not exist yet

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/SignalingController.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index 9902e27deec..c6b26c7cfc8 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -547,6 +547,14 @@ private function backendRoom(array $roomRequest): DataResponse {
 				try {
 					$participant = $room->getParticipantBySession($sessionId);
 				} catch (ParticipantNotFoundException $e) {
+					if ($action === 'join') {
+						// If the user joins the session might not be known to the server yet.
+						// In this case we load by actor information and use the session id as new session.
+						try {
+							$participant = $room->getParticipantByActor($actorType, $actorId);
+						} catch (ParticipantNotFoundException $e) {
+						}
+					}
 				}
 			} else {
 				try {

From a47e6b0750952f0445f2988f50f5c39f1b587a21 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Fri, 27 Nov 2020 12:23:11 +0100
Subject: [PATCH 116/129] Unregister refreshPeerList on unmount

Fix copy-paste issue, replacing "$on" with "$off" when unmounting the
call view.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 src/components/CallView/CallView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index 608179e0332..2c17fd2a86a 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -362,7 +362,7 @@ export default {
 		EventBus.$on('refreshPeerList', this.debounceFetchPeers)
 	},
 	unmounted() {
-		EventBus.$on('refreshPeerList', this.debounceFetchPeers)
+		EventBus.$off('refreshPeerList', this.debounceFetchPeers)
 	},
 	methods: {
 		/**

From bfdd59cabf4cf13fce200365ca51d2d346e5afe8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 27 Nov 2020 16:52:56 +0100
Subject: [PATCH 117/129] Make sure the key calculation is always unique

before it was s#0 for all email invites

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../ParticipantsList/ParticipantsList.vue            | 12 +++++++-----
 src/store/conversationsStore.js                      |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
index f56da84dc5c..00332b34a71 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
@@ -91,11 +91,13 @@ export default {
 		},
 
 		generateKey(participant) {
-			let key = 'i#' + participant.id
-			if (participant.actorType === 'users') {
-				key = 'u#' + participant.actorId
-			} else if (participant.sessionId) {
-				key = 's#' + participant.sessionId
+			let key = ''
+			if (participant.attendeeId) {
+				// Attendee from participant list
+				key = 'attendee#' + participant.attendeeId
+			} else if (participant.source) {
+				// Search result candidate
+				key = 'search#' + participant.source + '#' + participant.id
 			}
 			return key
 		},
diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index 67951e45108..b7d494968b4 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -110,6 +110,7 @@ const actions = {
 				lastPing: conversation.lastPing,
 				sessionId: conversation.sessionId,
 				participantType: conversation.participantType,
+				attendeeId: conversation.attendeeId,
 				actorType: conversation.actorType,
 				actorId: conversation.actorId, // FIXME check public share page handling
 				userId: currentUser ? currentUser.uid : '',

From e660315e9d7fe8d2f34e57e9ea98828af7af0f81 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 27 Nov 2020 17:01:17 +0100
Subject: [PATCH 118/129] Guests should not see the settings panel

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/RightSidebar/RightSidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 63ed15490e1..cdc4325ffb2 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -204,7 +204,7 @@ export default {
 
 		showSIPSettings() {
 			return this.conversation.sipEnabled === WEBINAR.SIP.ENABLED
-				&& this.conversation.attendeePin !== ''
+				&& this.conversation.attendeePin
 		},
 	},
 

From eafe2959428e7e9bb541f6a722986d112e87e741 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 27 Nov 2020 17:10:22 +0100
Subject: [PATCH 119/129] Return SIP and attendee information when interacting
 with rooms API

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/services/conversationsService.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/services/conversationsService.js b/src/services/conversationsService.js
index ea454412172..7189800ecf8 100644
--- a/src/services/conversationsService.js
+++ b/src/services/conversationsService.js
@@ -129,7 +129,7 @@ const searchPossibleConversations = async function(searchText, token, onlyUsers)
  */
 const createOneToOneConversation = async function(userId) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room`, { roomType: CONVERSATION.TYPE.ONE_TO_ONE, invite: userId })
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room`, { roomType: CONVERSATION.TYPE.ONE_TO_ONE, invite: userId })
 		return response
 	} catch (error) {
 		console.debug('Error creating new one to one conversation: ', error)
@@ -143,7 +143,7 @@ const createOneToOneConversation = async function(userId) {
  */
 const createGroupConversation = async function(invite, source) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room`, { roomType: CONVERSATION.TYPE.GROUP, invite, source: source || 'groups' })
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room`, { roomType: CONVERSATION.TYPE.GROUP, invite, source: source || 'groups' })
 		return response
 	} catch (error) {
 		console.debug('Error creating new group conversation: ', error)
@@ -156,7 +156,7 @@ const createGroupConversation = async function(invite, source) {
  */
 const createPrivateConversation = async function(conversationName) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room`, { roomType: CONVERSATION.TYPE.GROUP, roomName: conversationName })
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room`, { roomType: CONVERSATION.TYPE.GROUP, roomName: conversationName })
 		return response
 	} catch (error) {
 		console.debug('Error creating new private conversation: ', error)
@@ -169,7 +169,7 @@ const createPrivateConversation = async function(conversationName) {
  */
 const createPublicConversation = async function(conversationName) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room`, { roomType: CONVERSATION.TYPE.PUBLIC, roomName: conversationName })
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room`, { roomType: CONVERSATION.TYPE.PUBLIC, roomName: conversationName })
 		return response
 	} catch (error) {
 		console.debug('Error creating new public conversation: ', error)
@@ -182,7 +182,7 @@ const createPublicConversation = async function(conversationName) {
  * @param {string} password the password to be set
  */
 const setConversationPassword = async function(token, password) {
-	const response = await axios.put(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/password`, {
+	const response = await axios.put(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/password`, {
 		password,
 	})
 	return response
@@ -194,7 +194,7 @@ const setConversationPassword = async function(token, password) {
  * @param {string} name the name to be set
  */
 const setConversationName = async function(token, name) {
-	const response = await axios.put(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}`, {
+	const response = await axios.put(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}`, {
 		roomName: name,
 	})
 	return response
@@ -206,7 +206,7 @@ const setConversationName = async function(token, name) {
  */
 const deleteConversation = async function(token) {
 	try {
-		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}`)
+		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}`)
 		return response
 	} catch (error) {
 		console.debug('Error while deleting the conversation: ', error)
@@ -219,7 +219,7 @@ const deleteConversation = async function(token) {
  */
 const addToFavorites = async function(token) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/favorite`)
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/favorite`)
 		return response
 	} catch (error) {
 		console.debug('Error while adding the conversation to favorites: ', error)
@@ -232,7 +232,7 @@ const addToFavorites = async function(token) {
  */
 const removeFromFavorites = async function(token) {
 	try {
-		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/favorite`)
+		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/favorite`)
 		return response
 	} catch (error) {
 		console.debug('Error while removing the conversation from favorites: ', error)
@@ -246,7 +246,7 @@ const removeFromFavorites = async function(token) {
  */
 const setNotificationLevel = async function(token, level) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/notify`, { level })
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/notify`, { level })
 		return response
 	} catch (error) {
 		console.debug('Error while setting the notification level: ', error)
@@ -259,7 +259,7 @@ const setNotificationLevel = async function(token, level) {
  */
 const makePublic = async function(token) {
 	try {
-		const response = await axios.post(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/public`)
+		const response = await axios.post(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/public`)
 		return response
 	} catch (error) {
 		console.debug('Error while making the conversation public: ', error)
@@ -272,7 +272,7 @@ const makePublic = async function(token) {
  */
 const makePrivate = async function(token) {
 	try {
-		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/public`)
+		const response = await axios.delete(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/public`)
 		return response
 	} catch (error) {
 		console.debug('Error while making the conversation private: ', error)
@@ -285,7 +285,7 @@ const makePrivate = async function(token) {
  * @param {int} newState The new SIP state to set
  */
 const setSIPEnabled = async function(token, newState) {
-	return axios.put(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/webinar/sip`, {
+	return axios.put(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/webinar/sip`, {
 		state: newState,
 	})
 }
@@ -298,7 +298,7 @@ const setSIPEnabled = async function(token, newState) {
  */
 const changeLobbyState = async function(token, newState, timestamp) {
 	try {
-		const response = await axios.put(generateOcsUrl('apps/spreed/api/v2', 2) + `room/${token}/webinar/lobby`, {
+		const response = await axios.put(generateOcsUrl('apps/spreed/api/v3', 2) + `room/${token}/webinar/lobby`, {
 			state: newState,
 			timer: timestamp,
 		})

From ef45b2c3c19c4cfca5c4dc096912b3a9414968c1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 27 Nov 2020 17:29:09 +0100
Subject: [PATCH 120/129] Generate a attendee pin for the moderator when
 enabling SIP and return it

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                   |  46 +++++-----
 lib/Controller/RoomController.php    |  69 ++++++++++++++
 lib/Controller/WebinarController.php | 131 ---------------------------
 3 files changed, 90 insertions(+), 156 deletions(-)
 delete mode 100644 lib/Controller/WebinarController.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 130359c62c5..db43f825730 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -367,7 +367,7 @@
 			'url' => '/api/{apiVersion}/room/{token}/pin/{pin}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v(2|3)', // FIXME v3 only?
+				'apiVersion' => 'v3',
 				'token' => '^[a-z0-9]{4,30}$',
 				'pin' => '^\d{7,32}$',
 			],
@@ -381,6 +381,26 @@
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
+		[
+			'name' => 'Room#setLobby',
+			'url' => '/api/{apiVersion}/room/{token}/{webinar}/lobby',
+			'verb' => 'PUT',
+			'requirements' => [
+				'apiVersion' => 'v(1|2|3)',
+				'webinar' => 'webinary?',
+				'token' => '^[a-z0-9]{4,30}$',
+			],
+		],
+		[
+			'name' => 'Room#setSIPEnabled',
+			'url' => '/api/{apiVersion}/room/{token}/{webinar}/sip',
+			'verb' => 'PUT',
+			'requirements' => [
+				'apiVersion' => 'v3',
+				'webinar' => 'webinary?',
+				'token' => '^[a-z0-9]{4,30}$',
+			],
+		],
 
 		/**
 		 * Bridge settings
@@ -499,30 +519,6 @@
 			],
 		],
 
-		/**
-		 * Webinar
-		 */
-		[
-			'name' => 'Webinar#setLobby',
-			'url' => '/api/{apiVersion}/room/{token}/{webinar}/lobby',
-			'verb' => 'PUT',
-			'requirements' => [
-				'apiVersion' => 'v(1|2)',
-				'webinar' => 'webinary?',
-				'token' => '^[a-z0-9]{4,30}$',
-			],
-		],
-		[
-			'name' => 'Webinar#setSIPEnabled',
-			'url' => '/api/{apiVersion}/room/{token}/{webinar}/sip',
-			'verb' => 'PUT',
-			'requirements' => [
-				'apiVersion' => 'v(1|2)',// FIXME v2 only?
-				'webinar' => 'webinary?',
-				'token' => '^[a-z0-9]{4,30}$',
-			],
-		],
-
 		/**
 		 * Settings
 		 */
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 7afc446ec34..20c1cef430a 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1644,4 +1644,73 @@ protected function changeParticipantType(?int $attendeeId, ?string $userId, ?str
 
 		return new DataResponse();
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @RequireModeratorParticipant
+	 *
+	 * @param int $state
+	 * @param int|null $timer
+	 * @return DataResponse
+	 */
+	public function setLobby(int $state, ?int $timer = null): DataResponse {
+		$timerDateTime = null;
+		if ($timer !== null && $timer > 0) {
+			try {
+				$timerDateTime = $this->timeFactory->getDateTime('@' . $timer);
+				$timerDateTime->setTimezone(new \DateTimeZone('UTC'));
+			} catch (\Exception $e) {
+				return new DataResponse([], Http::STATUS_BAD_REQUEST);
+			}
+		}
+
+		if (!$this->room->setLobby($state, $timerDateTime)) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		if ($state === Webinary::LOBBY_NON_MODERATORS) {
+			$participants = $this->participantService->getParticipantsInCall($this->room);
+			foreach ($participants as $participant) {
+				if ($participant->hasModeratorPermissions()) {
+					continue;
+				}
+
+				$this->participantService->changeInCall($this->room, $participant, Participant::FLAG_DISCONNECTED);
+			}
+		}
+
+		return new DataResponse($this->formatRoomV2andV3($this->room, $this->participant));
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @RequireModeratorParticipant
+	 *
+	 * @param int $state
+	 * @return DataResponse
+	 */
+	public function setSIPEnabled(int $state): DataResponse {
+		$user = $this->userManager->get($this->userId);
+		if (!$user instanceof IUser) {
+			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+		}
+
+		if (!$this->talkConfig->canUserEnableSIP($user)) {
+			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+		}
+
+		if (!$this->talkConfig->isSIPConfigured()) {
+			return new DataResponse([], Http::STATUS_PRECONDITION_FAILED);
+		}
+
+		if (!$this->room->setSIPEnabled($state)) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		if ($state === Webinary::SIP_ENABLED) {
+			$this->participantService->generatePinForParticipant($this->room, $this->participant);
+		}
+
+		return new DataResponse($this->formatRoomV2andV3($this->room, $this->participant));
+	}
 }
diff --git a/lib/Controller/WebinarController.php b/lib/Controller/WebinarController.php
deleted file mode 100644
index b04b4d48761..00000000000
--- a/lib/Controller/WebinarController.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
- *
- * @author Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Talk\Controller;
-
-use OCA\Talk\Config;
-use OCA\Talk\Participant;
-use OCA\Talk\Service\ParticipantService;
-use OCA\Talk\Webinary;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\IRequest;
-use OCP\IUser;
-use OCP\IUserManager;
-
-class WebinarController extends AEnvironmentAwareController {
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var ParticipantService */
-	protected $participantService;
-	/** @var Config */
-	protected $talkConfig;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var string|null */
-	protected $userId;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								ITimeFactory $timeFactory,
-								ParticipantService $participantService,
-								Config $talkConfig,
-								IUserManager $userManager,
-								?string $userId) {
-		parent::__construct($appName, $request);
-		$this->timeFactory = $timeFactory;
-		$this->participantService = $participantService;
-		$this->talkConfig = $talkConfig;
-		$this->userManager = $userManager;
-		$this->userId = $userId;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @RequireModeratorParticipant
-	 *
-	 * @param int $state
-	 * @param int|null $timer
-	 * @return DataResponse
-	 */
-	public function setLobby(int $state, ?int $timer = null): DataResponse {
-		$timerDateTime = null;
-		if ($timer !== null && $timer > 0) {
-			try {
-				$timerDateTime = $this->timeFactory->getDateTime('@' . $timer);
-				$timerDateTime->setTimezone(new \DateTimeZone('UTC'));
-			} catch (\Exception $e) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-			}
-		}
-
-		if (!$this->room->setLobby($state, $timerDateTime)) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($state === Webinary::LOBBY_NON_MODERATORS) {
-			$participants = $this->participantService->getParticipantsInCall($this->room);
-			foreach ($participants as $participant) {
-				if ($participant->hasModeratorPermissions()) {
-					continue;
-				}
-
-				$this->participantService->changeInCall($this->room, $participant, Participant::FLAG_DISCONNECTED);
-			}
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @RequireModeratorParticipant
-	 *
-	 * @param int $state
-	 * @return DataResponse
-	 */
-	public function setSIPEnabled(int $state): DataResponse {
-		$user = $this->userManager->get($this->userId);
-		if (!$user instanceof IUser) {
-			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
-		}
-
-		if (!$this->talkConfig->canUserEnableSIP($user)) {
-			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
-		}
-
-		if (!$this->talkConfig->isSIPConfigured()) {
-			return new DataResponse([], Http::STATUS_PRECONDITION_FAILED);
-		}
-
-		if (!$this->room->setSIPEnabled($state)) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		return new DataResponse();
-	}
-}

From 1136041df40f79416a688bc45ce6d86d457a8620 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 30 Nov 2020 12:09:57 +0100
Subject: [PATCH 121/129] Add docs and capability

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 docs/capabilities.md           |  3 +++
 docs/conversation.md           |  3 +++
 docs/webinar.md                | 22 +++++++++++++++++++++-
 lib/Capabilities.php           |  1 +
 tests/php/CapabilitiesTest.php |  2 ++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/docs/capabilities.md b/docs/capabilities.md
index 03c878d7d75..9cc183581ed 100644
--- a/docs/capabilities.md
+++ b/docs/capabilities.md
@@ -51,3 +51,6 @@ title: Capabilities
 * `force-mute` - "forceMute" signaling messages can be sent to mute other participants.
 * `conversation-v2` - The conversations API v2 is less load heavy and should be used by clients when available. Check the difference in the [Conversation API documentation](conversation.md).
 * `chat-reference-id` - an optional referenceId can be sent with a chat message to be able to identify it in parallel get requests to earlier fade out a temporary message
+
+## 10.0
+* `sip-support` - Whether conversations API v3 exists and SIP can be configured and enabled by moderators. The conversations API will come with some new values `sipEnabled` which signals whether this conversation has SIP configured as well as `canEnableSIP` to see if a user can enable it. When it is enabled `attendeePin` will contain the unique dial-in code for this user.
diff --git a/docs/conversation.md b/docs/conversation.md
index 6eadff048b4..a87107e76df 100644
--- a/docs/conversation.md
+++ b/docs/conversation.md
@@ -31,6 +31,7 @@
         `displayName` | string | * | `name` if non empty, otherwise it falls back to a list of participants
         `participantType` | int | * | Permissions level of the current user
         `attendeeId` | int | v3 | Unique attendee id
+        `attendeePin` | string | v3 | Unique dial-in authentication code for this user, when the conversation has SIP enabled (see `sipEnabled` attribute)
         `actorType` | string | v3 | Currently known `users|guests|emails|groups`
         `actorId` | string | v3 | The unique identifier for the given actor type
         `participantInCall` | bool | 🏴 v1 | Flag if the current user is in the call (deprecated, use `participantFlags` instead)
@@ -50,6 +51,8 @@
         `notificationLevel` | int | * | The notification level for the user (one of `Participant::NOTIFY_*` (1-3))
         `lobbyState` | int | * | Webinary lobby restriction (0-1), if the participant is a moderator they can always join the conversation (only available with `webinary-lobby` capability)
         `lobbyTimer` | int | * | Timestamp when the lobby will be automatically disabled (only available with `webinary-lobby` capability)
+        `sipEnabled` | int | v3 | SIP enable status (0-1)
+        `canEnableSIP` | int | v3 | Whether the given user can enable SIP for this conversation. Note that when the token is not-numeric only, SIP can not be enabled even if the user is permitted and a moderator of the conversation
         `unreadMessages` | int | * | Number of unread chat messages in the conversation (only available with `chat-v2` capability)
         `unreadMention` | bool | * | Flag if the user was mentioned since their last visit
         `lastReadMessage` | int | * | ID of the last read message in a room (only available with `chat-read-marker` capability)
diff --git a/docs/webinar.md b/docs/webinar.md
index a3331359b4c..ea3f37bf3de 100644
--- a/docs/webinar.md
+++ b/docs/webinar.md
@@ -1,6 +1,6 @@
 # Webinar management
 
-Group and public conversations can be used to host webinaries. Those online meetings can have a lobby, which come with the following restrictions:
+Group and public conversations can be used to host webinars. Those online meetings can have a lobby, which come with the following restrictions:
 
 * Only moderators can start/join a call
 * Only moderators can read and write chat messages
@@ -28,3 +28,23 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
         + `400 Bad Request` When the given timestamp is invalid
         + `403 Forbidden` When the current user is not a moderator/owner
         + `404 Not Found` When the conversation could not be found for the participant
+
+## Enabled or disable SIP dial-in
+
+* Required capability: `sip-support`
+* Method: `PUT`
+* Endpoint: `/room/{token}/webinar/sip`
+* Data:
+
+    field | type | Description
+    ------|------|------------
+    `state` | int | New SIP state for the conversation (0 = disabled, 1 = enabled)
+
+* Response:
+    - Status code:
+        + `200 OK`
+        + `400 Bad Request` When the state was invalid or the same
+        + `401 Unauthorized` When the user can not enabled SIP
+        + `403 Forbidden` When the current user is not a moderator/owner
+        + `404 Not Found` When the conversation could not be found for the participant
+        + `412 Precondition Failed` When SIP is not configured on the server
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
index 3a31ad55636..4af5b4ff23a 100644
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -80,6 +80,7 @@ public function getCapabilities(): array {
 				'chat-replies',
 				'circles-support',
 				'force-mute',
+				'sip-support',
 			],
 			'config' => [
 				'attachments' => [
diff --git a/tests/php/CapabilitiesTest.php b/tests/php/CapabilitiesTest.php
index b2a7f94456e..ab6eac4f8f5 100644
--- a/tests/php/CapabilitiesTest.php
+++ b/tests/php/CapabilitiesTest.php
@@ -97,6 +97,7 @@ public function testGetCapabilitiesGuest(): void {
 					'chat-replies',
 					'circles-support',
 					'force-mute',
+					'sip-support',
 				],
 				'config' => [
 					'attachments' => [
@@ -189,6 +190,7 @@ public function testGetCapabilitiesUserAllowed(bool $isNotAllowed, bool $canCrea
 					'circles-support',
 					'force-mute',
 					'chat-reference-id',
+					'sip-support',
 				],
 				'config' => [
 					'attachments' => [

From 252338dc449d3ebb8ed16b552c5f83d44cb49cf9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 30 Nov 2020 13:10:14 +0100
Subject: [PATCH 122/129] Make sure we always generate a PIN for users when SIP
 is enabled

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php  | 16 +++++++++++-----
 lib/Service/ParticipantService.php |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 20c1cef430a..21b648b0065 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -604,7 +604,12 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
 		if ($this->getAPIVersion() >= 3) {
 			if ($this->talkConfig->isSIPConfigured()) {
 				$roomData['sipEnabled'] = $room->getSIPEnabled();
-				$roomData['attendeePin'] = $attendee->getPin();
+				if ($room->getSIPEnabled() === Webinary::SIP_ENABLED) {
+					// Generate a PIN if the attendee is a user and doesn't have one.
+					$this->participantService->generatePinForParticipant($room, $currentParticipant);
+
+					$roomData['attendeePin'] = $attendee->getPin();
+				}
 			}
 
 			$roomData = array_merge($roomData, [
@@ -1065,9 +1070,14 @@ public function getParticipants(bool $includeStatus = false): DataResponse {
 				$result['attendeeId'] = $participant->getAttendee()->getId();
 				$result['actorId'] = $participant->getAttendee()->getActorId();
 				$result['actorType'] = $participant->getAttendee()->getActorType();
+				$result['attendeePin'] = '';
 				if ($this->talkConfig->isSIPConfigured()
+					&& $this->room->getSIPEnabled() === Webinary::SIP_ENABLED
 					&& ($this->participant->hasModeratorPermissions(false)
 						|| $this->participant->getAttendee()->getId() === $participant->getAttendee()->getId())) {
+					// Generate a PIN if the attendee is a user and doesn't have one.
+					$this->participantService->generatePinForParticipant($this->room, $participant);
+
 					$result['attendeePin'] = (string) $participant->getAttendee()->getPin();
 				}
 			}
@@ -1707,10 +1717,6 @@ public function setSIPEnabled(int $state): DataResponse {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		if ($state === Webinary::SIP_ENABLED) {
-			$this->participantService->generatePinForParticipant($this->room, $this->participant);
-		}
-
 		return new DataResponse($this->formatRoomV2andV3($this->room, $this->participant));
 	}
 }
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 8707cf3ca9e..67ff97ced81 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -283,6 +283,7 @@ public function generatePinForParticipant(Room $room, Participant $participant):
 		$attendee = $participant->getAttendee();
 		if ($room->getSIPEnabled() === Webinary::SIP_ENABLED
 			&& $this->talkConfig->isSIPConfigured()
+			&& $attendee->getActorType() === Attendee::ACTOR_USERS
 			&& !$attendee->getPin()) {
 			$attendee->setPin($this->generatePin());
 			$this->attendeeMapper->update($attendee);

From 0d189405a6f1f237a8d805246ba15753f0455f73 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 30 Nov 2020 13:23:13 +0100
Subject: [PATCH 123/129] Expose the dial-in information to clients

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/routes.php                     | 10 +++++-----
 docs/internal-signaling.md             | 19 ++++++++++---------
 lib/Controller/SignalingController.php | 15 ++++++++++++---
 src/services/signalingService.js       |  6 +++---
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index db43f825730..1e1f2259173 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -62,7 +62,7 @@
 			'url' => '/api/{apiVersion}/signaling/settings',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2)',
 			],
 		],
 		[
@@ -70,7 +70,7 @@
 			'url' => '/api/{apiVersion}/signaling/welcome/{serverId}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2)',
 				'serverId' => '^\d+$',
 			],
 		],
@@ -79,7 +79,7 @@
 			'url' => '/api/{apiVersion}/signaling/backend',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2)',
 			],
 		],
 		[
@@ -87,7 +87,7 @@
 			'url' => '/api/{apiVersion}/signaling/{token}',
 			'verb' => 'POST',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
@@ -96,7 +96,7 @@
 			'url' => '/api/{apiVersion}/signaling/{token}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v1',
+				'apiVersion' => 'v(1|2)',
 				'token' => '^[a-z0-9]{4,30}$',
 			],
 		],
diff --git a/docs/internal-signaling.md b/docs/internal-signaling.md
index 3524791b791..1a4db437ae7 100644
--- a/docs/internal-signaling.md
+++ b/docs/internal-signaling.md
@@ -14,15 +14,16 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 
 * Response:
 
-    field | type | Description
-    ------|------|------------
-    `signalingMode` | string | See [Signaling modes](constants.md#Signaling_modes)
-    `userId` | string | Current user id
-    `hideWarning` | string | Don't show a performance warning although internal signaling is used
-    `server` | string | URL of the external signaling server
-    `ticket` | string | Ticket for the external signaling server
-    `stunservers` | array | STUN servers
-    `turnservers` | array | TURN servers
+    field | type | API | Description
+    ------|------|-----|------------
+    `signalingMode` | string | * | See [Signaling modes](constants.md#Signaling_modes)
+    `userId` | string | * | Current user id
+    `hideWarning` | string | * | Don't show a performance warning although internal signaling is used
+    `server` | string | * | URL of the external signaling server
+    `ticket` | string | * | Ticket for the external signaling server
+    `stunservers` | array | * | STUN servers
+    `turnservers` | array | * | TURN servers
+    `sipDialinInfo` | string | v2 | Generic SIP dial-in information for this conversation (admin free text containing the phone number etc)
 
     - STUN server
     
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
index c6b26c7cfc8..fc315158fba 100644
--- a/lib/Controller/SignalingController.php
+++ b/lib/Controller/SignalingController.php
@@ -118,10 +118,13 @@ public function __construct(string $appName,
 	/**
 	 * @PublicPage
 	 *
+	 * @param string $apiVersion
 	 * @param string $token
 	 * @return DataResponse
 	 */
-	public function getSettings(string $token = ''): DataResponse {
+	public function getSettings(string $apiVersion, string $token = ''): DataResponse {
+		$apiV = (int) substr($apiVersion, 1);
+
 		try {
 			if ($token !== '') {
 				$room = $this->manager->getRoomForUserByToken($token, $this->userId);
@@ -158,7 +161,7 @@ public function getSettings(string $token = ''): DataResponse {
 		$signalingMode = $this->talkConfig->getSignalingMode();
 		$signaling = $this->signalingManager->getSignalingServerLinkForConversation($room);
 
-		return new DataResponse([
+		$data = [
 			'signalingMode' => $signalingMode,
 			'userId' => $this->userId,
 			'hideWarning' => $signaling !== '' || $this->talkConfig->getHideSignalingWarning(),
@@ -166,7 +169,13 @@ public function getSettings(string $token = ''): DataResponse {
 			'ticket' => $this->talkConfig->getSignalingTicket($this->userId),
 			'stunservers' => $stun,
 			'turnservers' => $turn,
-		]);
+		];
+
+		if ($apiV >= 2) {
+			$data['sipDialinInfo'] = $this->talkConfig->isSIPConfigured() ? $this->talkConfig->getDialInInfo() : '';
+		}
+
+		return new DataResponse($data);
 	}
 
 	/**
diff --git a/src/services/signalingService.js b/src/services/signalingService.js
index 420de10a03a..a2806e8204b 100644
--- a/src/services/signalingService.js
+++ b/src/services/signalingService.js
@@ -27,7 +27,7 @@ import { generateOcsUrl } from '@nextcloud/router'
  * @param {object} options options
  */
 const fetchSignalingSettings = async({ token }, options) => {
-	return axios.get(generateOcsUrl('apps/spreed/api/v1/signaling', 2) + 'settings', Object.assign(options, {
+	return axios.get(generateOcsUrl('apps/spreed/api/v2/signaling', 2) + 'settings', Object.assign(options, {
 		params: {
 			token,
 		},
@@ -35,11 +35,11 @@ const fetchSignalingSettings = async({ token }, options) => {
 }
 
 const pullSignalingMessages = async(token, options) => {
-	return axios.get(generateOcsUrl('apps/spreed/api/v1/signaling', 2) + token, options)
+	return axios.get(generateOcsUrl('apps/spreed/api/v2/signaling', 2) + token, options)
 }
 
 const getWelcomeMessage = async(serverId) => {
-	return axios.get(generateOcsUrl('apps/spreed/api/v1/signaling', 2) + 'welcome/' + serverId)
+	return axios.get(generateOcsUrl('apps/spreed/api/v2/signaling', 2) + 'welcome/' + serverId)
 }
 
 export {

From 55aa2ef96930a5fb9ace50264ea4a44b0fad718f Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 30 Nov 2020 16:24:17 +0100
Subject: [PATCH 124/129] Correctly toggle the ActionCheckbox

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/TopBar/TopBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index cf9f6fdb211..4765a79ae9f 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -136,7 +136,7 @@
 				<ActionCheckbox
 					v-if="canUserEnableSIP"
 					:checked="hasSIPEnabled"
-					@change="toggleSIPEnabled">
+					@update:checked="toggleSIPEnabled">
 					{{ t('spreed', 'Enable SIP dial-in') }}
 				</ActionCheckbox>
 			</template>

From 896cd6b60a42c3d316a84d07aba943601b52ceb0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 30 Nov 2020 16:43:34 +0100
Subject: [PATCH 125/129] Fix return code when user can not enable SIP

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Controller/RoomController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 21b648b0065..6819d8b6b5d 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -1706,7 +1706,7 @@ public function setSIPEnabled(int $state): DataResponse {
 		}
 
 		if (!$this->talkConfig->canUserEnableSIP($user)) {
-			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
+			return new DataResponse([], Http::STATUS_FORBIDDEN);
 		}
 
 		if (!$this->talkConfig->isSIPConfigured()) {

From d6f8ae1794d8f4e058724b963e7f6617ac2d3880 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 1 Dec 2020 08:33:43 +0100
Subject: [PATCH 126/129] Fix unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/php/CapabilitiesTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/php/CapabilitiesTest.php b/tests/php/CapabilitiesTest.php
index ab6eac4f8f5..58c1a1e7691 100644
--- a/tests/php/CapabilitiesTest.php
+++ b/tests/php/CapabilitiesTest.php
@@ -189,8 +189,8 @@ public function testGetCapabilitiesUserAllowed(bool $isNotAllowed, bool $canCrea
 					'chat-replies',
 					'circles-support',
 					'force-mute',
-					'chat-reference-id',
 					'sip-support',
+					'chat-reference-id',
 				],
 				'config' => [
 					'attachments' => [

From c23c8284e60476e8810b2915b644335d0c14ecdc Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Dec 2020 11:47:48 +0100
Subject: [PATCH 127/129] Update baseline

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/psalm-baseline.xml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index f86c29ebcd4..41b7cd0b6b6 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977">
+<files psalm-version="3.16@d03e5ef057d6adc656c0ff7e166c50b73b4f48f3">
   <file src="lib/AppInfo/Application.php">
     <UndefinedClass occurrences="2">
       <code>BeforeTemplateRenderedEvent</code>
@@ -75,12 +75,6 @@
       <code>getById</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="lib/Chat/SystemMessage/Listener.php">
-    <InvalidArgument occurrences="2">
-      <code>$listener</code>
-      <code>$listener</code>
-    </InvalidArgument>
-  </file>
   <file src="lib/Command/ActiveCalls.php">
     <UndefinedClass occurrences="1">
       <code>Base</code>
@@ -215,6 +209,16 @@
       <code>DBALException</code>
     </UndefinedClass>
   </file>
+  <file src="lib/Controller/MatterbridgeController.php">
+    <InvalidArgument occurrences="1">
+      <code>$success</code>
+    </InvalidArgument>
+  </file>
+  <file src="lib/Controller/MatterbridgeSettingsController.php">
+    <InvalidArgument occurrences="1">
+      <code>$success</code>
+    </InvalidArgument>
+  </file>
   <file src="lib/Controller/PageController.php">
     <MissingDependency occurrences="2">
       <code>IRootFolder</code>
@@ -250,6 +254,10 @@
     </UndefinedClass>
   </file>
   <file src="lib/Controller/SignalingController.php">
+    <InvalidArgument occurrences="2">
+      <code>'Internal signaling disabled.'</code>
+      <code>'Internal signaling disabled.'</code>
+    </InvalidArgument>
     <UndefinedClass occurrences="1">
       <code>\GuzzleHttp\Exception\ConnectException</code>
     </UndefinedClass>
@@ -278,9 +286,6 @@
       <code>GroupFolderStorage</code>
     </UndefinedClass>
   </file>
-  <file src="lib/Flow/Operation.php">
-    <InvalidArgument occurrences="1"/>
-  </file>
   <file src="lib/GuestManager.php">
     <UndefinedDocblockClass occurrences="1">
       <code>\Doctrine\DBAL\DBALException</code>
@@ -382,9 +387,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Share/Listener.php">
-    <InvalidArgument occurrences="1">
-      <code>[self::class, 'listenPreShare']</code>
-    </InvalidArgument>
     <UndefinedClass occurrences="7">
       <code>$event-&gt;getView()</code>
       <code>$event-&gt;getView()</code>

From c33fad3a681ad24522b847ef4e52de8ce5a142de Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Dec 2020 11:51:58 +0100
Subject: [PATCH 128/129] Bump version

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b2276c1e805..3f6d5959404 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>10.0.3.7</version>
+	<version>10.1.0-dev.1</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>

From 97153c6fbbdec7b289db2a63df1033ce2d2dc72a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Dec 2020 11:59:23 +0100
Subject: [PATCH 129/129] Fix server target testing branch

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .drone.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f6628e34f41..12bc343f6fa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -462,7 +462,7 @@ steps:
     image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: stable20
       DATABASEHOST: sqlite
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -657,7 +657,7 @@ steps:
     image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: stable20
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -880,7 +880,7 @@ steps:
     image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: stable20
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0