From e994898f36a8f2d025e6ce9e4298c6108bf66640 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 14 Nov 2024 10:18:48 +0100
Subject: [PATCH 1/5] fix(matterbridge): fix selecting an option, cleanup

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../Matterbridge/MatterbridgeSettings.vue     | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index ac2a56f655e..b3d650bb49f 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -20,8 +20,7 @@
 				<div v-show="!enabled"
 					class="add-part-wrapper">
 					<Plus class="icon" :size="20" />
-					<NcSelect v-model="selectedType"
-						label="displayName"
+					<NcSelect label="displayName"
 						:aria-label-combobox="t('spreed', 'Messaging systems')"
 						:placeholder="newPartPlaceholder"
 						:options="formatedTypes"
@@ -102,7 +101,6 @@ import {
 	getBridge,
 	getBridgeProcessState,
 } from '../../../services/matterbridgeService.js'
-import { useSidebarStore } from '../../../stores/sidebar.js'
 
 export default {
 	name: 'MatterbridgeSettings',
@@ -120,7 +118,6 @@ export default {
 
 	setup() {
 		return {
-			sidebarStore: useSidebarStore(),
 		}
 	},
 
@@ -492,17 +489,10 @@ export default {
 				},
 			},
 			newPartPlaceholder: t('spreed', 'Add new bridged channel to current conversation'),
-			selectedType: null,
 		}
 	},
 
 	computed: {
-		show() {
-			return this.sidebarStore.show
-		},
-		opened() {
-			return !!this.token && this.show
-		},
 		token() {
 			const token = this.$store.getters.getToken()
 			this.getBridge(token)
@@ -530,12 +520,6 @@ export default {
 		},
 	},
 
-	beforeMount() {
-	},
-
-	beforeDestroy() {
-	},
-
 	methods: {
 		t,
 		relaunchStateLoop(token) {
@@ -543,8 +527,8 @@ export default {
 			clearInterval(this.stateLoop)
 			this.stateLoop = setInterval(() => this.getBridgeProcessState(token), 60000)
 		},
-		clickAddPart() {
-			const typeKey = this.selectedType.type
+		clickAddPart(event) {
+			const typeKey = event.type
 			const type = this.types[typeKey]
 			const newPart = {
 				type: typeKey,
@@ -554,7 +538,6 @@ export default {
 				newPart[fieldKey] = ''
 			}
 			this.parts.unshift(newPart)
-			this.selectedType = null
 		},
 		onDelete(i) {
 			this.parts.splice(i, 1)

From 718182e89d9231b890f00d9de9ca6b88a0727675 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 14 Nov 2024 10:25:07 +0100
Subject: [PATCH 2/5] fix(matterbridge): extract types constant

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../Matterbridge/MatterbridgeSettings.vue     | 378 +----------------
 .../Matterbridge/matterbridgeTypes.ts         | 382 ++++++++++++++++++
 2 files changed, 391 insertions(+), 369 deletions(-)
 create mode 100644 src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts

diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index b3d650bb49f..ebe8fb02245 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -68,7 +68,7 @@
 				<li v-for="(part, i) in parts" :key="part.type + i">
 					<BridgePart :num="i+1"
 						:part="part"
-						:type="types[part.type]"
+						:type="matterbridgeTypes[part.type]"
 						:editing="part.editing"
 						:editable="!enabled"
 						container=".matterbridge-settings"
@@ -86,7 +86,6 @@ import Plus from 'vue-material-design-icons/Plus.vue'
 
 import { showSuccess } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
-import { imagePath } from '@nextcloud/router'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
@@ -96,6 +95,7 @@ import NcTextArea from '@nextcloud/vue/dist/Components/NcTextArea.js'
 
 import BridgePart from './BridgePart.vue'
 
+import { matterbridgeTypes } from './matterbridgeTypes.ts'
 import {
 	editBridge,
 	getBridge,
@@ -118,6 +118,7 @@ export default {
 
 	setup() {
 		return {
+			matterbridgeTypes,
 		}
 	},
 
@@ -130,364 +131,6 @@ export default {
 			processLog: '',
 			logModal: false,
 			stateLoop: null,
-			types: {
-				nctalk: {
-					name: 'Nextcloud Talk',
-					iconUrl: imagePath('spreed', 'app-dark.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Section-Nextcloud-Talk-%28basic%29',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'Nextcloud URL'),
-							icon: 'icon-link',
-						},
-						login: {
-							type: 'text',
-							placeholder: t('spreed', 'Nextcloud user'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'User password'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Talk conversation'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'server',
-				},
-				matrix: {
-					name: 'Matrix',
-					iconUrl: imagePath('spreed', 'bridge-services/matrix.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#matrix',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'Matrix server URL'),
-							icon: 'icon-link',
-						},
-						login: {
-							type: 'text',
-							placeholder: t('spreed', 'User'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'User password'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Matrix channel'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'server',
-				},
-				mattermost: {
-					name: 'Mattermost',
-					iconUrl: imagePath('spreed', 'bridge-services/mattermost.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#mattermost',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'Mattermost server URL'),
-							icon: 'icon-link',
-						},
-						login: {
-							type: 'text',
-							placeholder: t('spreed', 'Mattermost user'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'User password'),
-							icon: 'icon-category-auth',
-						},
-						team: {
-							type: 'text',
-							placeholder: t('spreed', 'Team name'),
-							icon: 'icon-group',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Channel name'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'server',
-				},
-				rocketchat: {
-					name: 'Rocket.Chat',
-					iconUrl: imagePath('spreed', 'bridge-services/rocketchat.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#rocketchat',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'Rocket.Chat server URL'),
-							icon: 'icon-link',
-						},
-						login: {
-							type: 'text',
-							placeholder: t('spreed', 'User name or email address'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'Password'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Rocket.Chat channel'),
-							icon: 'icon-group',
-						},
-						skiptls: {
-							type: 'checkbox',
-							labelText: t('spreed', 'Skip TLS verification'),
-						},
-					},
-					mainField: 'server',
-				},
-				zulip: {
-					name: 'Zulip',
-					iconUrl: imagePath('spreed', 'bridge-services/zulip.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#zulip',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'Zulip server URL'),
-							icon: 'icon-link',
-						},
-						login: {
-							type: 'text',
-							placeholder: t('spreed', 'Bot user name'),
-							icon: 'icon-user',
-						},
-						token: {
-							type: 'password',
-							placeholder: t('spreed', 'Bot API key'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Zulip channel'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'server',
-				},
-				slack: {
-					name: 'Slack',
-					iconUrl: imagePath('spreed', 'bridge-services/slack.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Slack-bot-setup',
-					fields: {
-						token: {
-							type: 'password',
-							placeholder: t('spreed', 'API token'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Slack channel'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'channel',
-				},
-				discord: {
-					name: 'Discord',
-					iconUrl: imagePath('spreed', 'bridge-services/discord.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Discord-bot-setup',
-					fields: {
-						token: {
-							type: 'password',
-							placeholder: t('spreed', 'API token'),
-							icon: 'icon-category-auth',
-						},
-						server: {
-							type: 'text',
-							placeholder: t('spreed', 'Server ID or name'),
-							icon: 'icon-group',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Channel ID or name'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'server',
-				},
-				telegram: {
-					name: 'Telegram',
-					iconUrl: imagePath('spreed', 'bridge-services/telegram.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#telegram',
-					fields: {
-						token: {
-							type: 'password',
-							placeholder: t('spreed', 'API token'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Channel'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'chatid',
-				},
-				steam: {
-					name: 'Steam',
-					iconUrl: imagePath('spreed', 'bridge-services/steam.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#steam',
-					fields: {
-						login: {
-							type: 'text',
-							placeholder: t('spreed', 'Login'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'Password'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Chat ID'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'chatid',
-				},
-				irc: {
-					name: 'IRC',
-					iconUrl: imagePath('spreed', 'bridge-services/irc.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#irc',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'IRC server URL (e.g. chat.freenode.net:6667)'),
-							icon: 'icon-link',
-						},
-						nick: {
-							type: 'text',
-							placeholder: t('spreed', 'Nickname'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'Connection password'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'IRC channel'),
-							icon: 'icon-group',
-						},
-						channelpassword: {
-							type: 'password',
-							placeholder: t('spreed', 'Channel password'),
-							icon: 'icon-category-auth',
-						},
-						nickservnick: {
-							type: 'text',
-							placeholder: t('spreed', 'NickServ nickname'),
-							icon: 'icon-user',
-						},
-						nickservpassword: {
-							type: 'password',
-							placeholder: t('spreed', 'NickServ password'),
-							icon: 'icon-category-auth',
-						},
-						usetls: {
-							type: 'checkbox',
-							labelText: t('spreed', 'Use TLS'),
-						},
-						usesasl: {
-							type: 'checkbox',
-							labelText: t('spreed', 'Use SASL'),
-						},
-						skiptls: {
-							type: 'checkbox',
-							labelText: t('spreed', 'Skip TLS verification'),
-						},
-					},
-					mainField: 'channel',
-				},
-				msteams: {
-					name: 'Microsoft Teams',
-					iconUrl: imagePath('spreed', 'bridge-services/msteams.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/MS-Teams-setup',
-					fields: {
-						tenantid: {
-							type: 'text',
-							placeholder: t('spreed', 'Tenant ID'),
-							icon: 'icon-user',
-						},
-						clientid: {
-							type: 'password',
-							placeholder: t('spreed', 'Client ID'),
-							icon: 'icon-user',
-						},
-						teamid: {
-							type: 'text',
-							placeholder: t('spreed', 'Team ID'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Thread ID'),
-							icon: 'icon-group',
-						},
-					},
-					mainField: 'threadid',
-				},
-				xmpp: {
-					name: 'XMPP/Jabber',
-					iconUrl: imagePath('spreed', 'bridge-services/xmpp.svg'),
-					infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#xmpp',
-					fields: {
-						server: {
-							type: 'url',
-							placeholder: t('spreed', 'XMPP/Jabber server URL'),
-							icon: 'icon-link',
-						},
-						muc: {
-							type: 'url',
-							placeholder: t('spreed', 'MUC server URL'),
-							icon: 'icon-link',
-						},
-						jid: {
-							type: 'text',
-							placeholder: t('spreed', 'Jabber ID'),
-							icon: 'icon-user',
-						},
-						nick: {
-							type: 'text',
-							placeholder: t('spreed', 'Nickname'),
-							icon: 'icon-user',
-						},
-						password: {
-							type: 'password',
-							placeholder: t('spreed', 'Password'),
-							icon: 'icon-category-auth',
-						},
-						channel: {
-							type: 'text',
-							placeholder: t('spreed', 'Channel'),
-							icon: 'icon-group',
-						},
-						skiptls: {
-							type: 'checkbox',
-							labelText: t('spreed', 'Skip TLS verification'),
-						},
-					},
-					mainField: 'channel',
-				},
-			},
 			newPartPlaceholder: t('spreed', 'Add new bridged channel to current conversation'),
 		}
 	},
@@ -500,14 +143,11 @@ export default {
 			return token
 		},
 		formatedTypes() {
-			return Object.keys(this.types).map((k) => {
-				const t = this.types[k]
-				return {
-					displayName: t.name,
-					type: k,
-					iconUrl: t.iconUrl,
-				}
-			})
+			return Object.entries(this.matterbridgeTypes).map(([type, value]) => ({
+				type,
+				displayName: value.name,
+				iconUrl: value.iconUrl,
+			}))
 		},
 		processStateText() {
 			return this.processRunning === null
@@ -529,7 +169,7 @@ export default {
 		},
 		clickAddPart(event) {
 			const typeKey = event.type
-			const type = this.types[typeKey]
+			const type = this.matterbridgeTypes[typeKey]
 			const newPart = {
 				type: typeKey,
 				editing: true,
diff --git a/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts b/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts
new file mode 100644
index 00000000000..9872c1e2a95
--- /dev/null
+++ b/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts
@@ -0,0 +1,382 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { t } from '@nextcloud/l10n'
+import { imagePath } from '@nextcloud/router'
+
+type InputField = {
+	type: 'url' | 'text' | 'password',
+	placeholder: string,
+	icon: string,
+} | {
+	type: 'checkbox',
+	labelText: string,
+}
+type MatterbridgeType = {
+	name: string,
+	iconUrl: string,
+	infoTarget: string,
+	fields: Record<string, InputField>
+	mainField: string,
+}
+
+export const matterbridgeTypes: Record<string, MatterbridgeType> = {
+	nctalk: {
+		name: 'Nextcloud Talk',
+		iconUrl: imagePath('spreed', 'app-dark.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Section-Nextcloud-Talk-%28basic%29',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'Nextcloud URL'),
+				icon: 'icon-link',
+			},
+			login: {
+				type: 'text',
+				placeholder: t('spreed', 'Nextcloud user'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'User password'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Talk conversation'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'server',
+	},
+	matrix: {
+		name: 'Matrix',
+		iconUrl: imagePath('spreed', 'bridge-services/matrix.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#matrix',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'Matrix server URL'),
+				icon: 'icon-link',
+			},
+			login: {
+				type: 'text',
+				placeholder: t('spreed', 'User'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'User password'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Matrix channel'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'server',
+	},
+	mattermost: {
+		name: 'Mattermost',
+		iconUrl: imagePath('spreed', 'bridge-services/mattermost.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#mattermost',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'Mattermost server URL'),
+				icon: 'icon-link',
+			},
+			login: {
+				type: 'text',
+				placeholder: t('spreed', 'Mattermost user'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'User password'),
+				icon: 'icon-category-auth',
+			},
+			team: {
+				type: 'text',
+				placeholder: t('spreed', 'Team name'),
+				icon: 'icon-group',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Channel name'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'server',
+	},
+	rocketchat: {
+		name: 'Rocket.Chat',
+		iconUrl: imagePath('spreed', 'bridge-services/rocketchat.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#rocketchat',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'Rocket.Chat server URL'),
+				icon: 'icon-link',
+			},
+			login: {
+				type: 'text',
+				placeholder: t('spreed', 'User name or email address'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'Password'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Rocket.Chat channel'),
+				icon: 'icon-group',
+			},
+			skiptls: {
+				type: 'checkbox',
+				labelText: t('spreed', 'Skip TLS verification'),
+			},
+		},
+		mainField: 'server',
+	},
+	zulip: {
+		name: 'Zulip',
+		iconUrl: imagePath('spreed', 'bridge-services/zulip.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#zulip',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'Zulip server URL'),
+				icon: 'icon-link',
+			},
+			login: {
+				type: 'text',
+				placeholder: t('spreed', 'Bot user name'),
+				icon: 'icon-user',
+			},
+			token: {
+				type: 'password',
+				placeholder: t('spreed', 'Bot API key'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Zulip channel'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'server',
+	},
+	slack: {
+		name: 'Slack',
+		iconUrl: imagePath('spreed', 'bridge-services/slack.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Slack-bot-setup',
+		fields: {
+			token: {
+				type: 'password',
+				placeholder: t('spreed', 'API token'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Slack channel'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'channel',
+	},
+	discord: {
+		name: 'Discord',
+		iconUrl: imagePath('spreed', 'bridge-services/discord.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Discord-bot-setup',
+		fields: {
+			token: {
+				type: 'password',
+				placeholder: t('spreed', 'API token'),
+				icon: 'icon-category-auth',
+			},
+			server: {
+				type: 'text',
+				placeholder: t('spreed', 'Server ID or name'),
+				icon: 'icon-group',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Channel ID or name'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'server',
+	},
+	telegram: {
+		name: 'Telegram',
+		iconUrl: imagePath('spreed', 'bridge-services/telegram.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#telegram',
+		fields: {
+			token: {
+				type: 'password',
+				placeholder: t('spreed', 'API token'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Channel'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'chatid',
+	},
+	steam: {
+		name: 'Steam',
+		iconUrl: imagePath('spreed', 'bridge-services/steam.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#steam',
+		fields: {
+			login: {
+				type: 'text',
+				placeholder: t('spreed', 'Login'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'Password'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Chat ID'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'chatid',
+	},
+	irc: {
+		name: 'IRC',
+		iconUrl: imagePath('spreed', 'bridge-services/irc.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#irc',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'IRC server URL (e.g. chat.freenode.net:6667)'),
+				icon: 'icon-link',
+			},
+			nick: {
+				type: 'text',
+				placeholder: t('spreed', 'Nickname'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'Connection password'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'IRC channel'),
+				icon: 'icon-group',
+			},
+			channelpassword: {
+				type: 'password',
+				placeholder: t('spreed', 'Channel password'),
+				icon: 'icon-category-auth',
+			},
+			nickservnick: {
+				type: 'text',
+				placeholder: t('spreed', 'NickServ nickname'),
+				icon: 'icon-user',
+			},
+			nickservpassword: {
+				type: 'password',
+				placeholder: t('spreed', 'NickServ password'),
+				icon: 'icon-category-auth',
+			},
+			usetls: {
+				type: 'checkbox',
+				labelText: t('spreed', 'Use TLS'),
+			},
+			usesasl: {
+				type: 'checkbox',
+				labelText: t('spreed', 'Use SASL'),
+			},
+			skiptls: {
+				type: 'checkbox',
+				labelText: t('spreed', 'Skip TLS verification'),
+			},
+		},
+		mainField: 'channel',
+	},
+	msteams: {
+		name: 'Microsoft Teams',
+		iconUrl: imagePath('spreed', 'bridge-services/msteams.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/MS-Teams-setup',
+		fields: {
+			tenantid: {
+				type: 'text',
+				placeholder: t('spreed', 'Tenant ID'),
+				icon: 'icon-user',
+			},
+			clientid: {
+				type: 'password',
+				placeholder: t('spreed', 'Client ID'),
+				icon: 'icon-user',
+			},
+			teamid: {
+				type: 'text',
+				placeholder: t('spreed', 'Team ID'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Thread ID'),
+				icon: 'icon-group',
+			},
+		},
+		mainField: 'threadid',
+	},
+	xmpp: {
+		name: 'XMPP/Jabber',
+		iconUrl: imagePath('spreed', 'bridge-services/xmpp.svg'),
+		infoTarget: 'https://github.com/42wim/matterbridge/wiki/Settings#xmpp',
+		fields: {
+			server: {
+				type: 'url',
+				placeholder: t('spreed', 'XMPP/Jabber server URL'),
+				icon: 'icon-link',
+			},
+			muc: {
+				type: 'url',
+				placeholder: t('spreed', 'MUC server URL'),
+				icon: 'icon-link',
+			},
+			jid: {
+				type: 'text',
+				placeholder: t('spreed', 'Jabber ID'),
+				icon: 'icon-user',
+			},
+			nick: {
+				type: 'text',
+				placeholder: t('spreed', 'Nickname'),
+				icon: 'icon-user',
+			},
+			password: {
+				type: 'password',
+				placeholder: t('spreed', 'Password'),
+				icon: 'icon-category-auth',
+			},
+			channel: {
+				type: 'text',
+				placeholder: t('spreed', 'Channel'),
+				icon: 'icon-group',
+			},
+			skiptls: {
+				type: 'checkbox',
+				labelText: t('spreed', 'Skip TLS verification'),
+			},
+		},
+		mainField: 'channel',
+	},
+}

From f8dfc790407286822e0de851a91135d114878103 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 14 Nov 2024 10:33:03 +0100
Subject: [PATCH 3/5] fix(matterbridge): refactor computed properties

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../Matterbridge/MatterbridgeSettings.vue     | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index ebe8fb02245..76d5416b872 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -23,7 +23,7 @@
 					<NcSelect label="displayName"
 						:aria-label-combobox="t('spreed', 'Messaging systems')"
 						:placeholder="newPartPlaceholder"
-						:options="formatedTypes"
+						:options="options"
 						@input="clickAddPart">
 						<template #option="option">
 							<img class="icon-multiselect-service"
@@ -137,26 +137,39 @@ export default {
 
 	computed: {
 		token() {
-			const token = this.$store.getters.getToken()
-			this.getBridge(token)
-			this.relaunchStateLoop(token)
-			return token
+			return this.$store.getters.getToken()
 		},
-		formatedTypes() {
+
+		options() {
 			return Object.entries(this.matterbridgeTypes).map(([type, value]) => ({
 				type,
 				displayName: value.name,
 				iconUrl: value.iconUrl,
 			}))
 		},
+
 		processStateText() {
-			return this.processRunning === null
-				? t('spreed', 'unknown state')
-				: this.processRunning
-					? t('spreed', 'running')
-					: this.enabled
-						? t('spreed', 'not running, check Matterbridge log')
-						: t('spreed', 'not running')
+			if (this.processRunning === null) {
+				return t('spreed', 'unknown state')
+			}
+
+			if (this.processRunning) {
+				return t('spreed', 'running')
+			} else {
+				return this.enabled
+					? t('spreed', 'not running, check Matterbridge log')
+					: t('spreed', 'not running')
+			}
+		},
+	},
+
+	watch: {
+		token: {
+			immediate: true,
+			handler(token) {
+				this.getBridge(token)
+				this.relaunchStateLoop(token)
+			},
 		},
 	},
 

From 076fdcefc975c37efc3b3eb2e66ded49e5701a0a Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 14 Nov 2024 10:53:12 +0100
Subject: [PATCH 4/5] fix(matterbridge): skip TLS for NC Talk

- Matterbridge has two gateways:
  - local - always NC Talk - we 'trust' it and skip verifying
  - target - could be NC Talk (same or another) - checkbox is added to skip verifying

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 lib/MatterbridgeManager.php                                   | 4 ++++
 .../ConversationSettings/Matterbridge/matterbridgeTypes.ts    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php
index 6deab9d225b..26e73283310 100644
--- a/lib/MatterbridgeManager.php
+++ b/lib/MatterbridgeManager.php
@@ -229,6 +229,7 @@ private function addLocalPart(Room $room, array $bridge): array {
 			'login' => $botInfo['id'],
 			'password' => $botInfo['password'],
 			'channel' => $room->getToken(),
+			'skiptls' => true,
 		];
 		$bridge['parts'][] = $localPart;
 		return $bridge;
@@ -346,6 +347,9 @@ private function generateConfig(array $bridge): string {
 					// TODO remove that
 					//$serverUrl = preg_replace('/https:/', 'http:', $serverUrl);
 				}
+				if ($part['skiptls']) {
+					$content .= '	SkipTLSVerify = true' . "\n";
+				}
 				$content .= sprintf('	Server = "%s"', $serverUrl) . "\n";
 				$content .= sprintf('	Login = "%s"', $part['login']) . "\n";
 				$content .= sprintf('	Password = "%s"', $part['password']) . "\n";
diff --git a/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts b/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts
index 9872c1e2a95..82269e438fa 100644
--- a/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts
+++ b/src/components/ConversationSettings/Matterbridge/matterbridgeTypes.ts
@@ -48,6 +48,10 @@ export const matterbridgeTypes: Record<string, MatterbridgeType> = {
 				placeholder: t('spreed', 'Talk conversation'),
 				icon: 'icon-group',
 			},
+			skiptls: {
+				type: 'checkbox',
+				labelText: t('spreed', 'Skip TLS verification'),
+			},
 		},
 		mainField: 'server',
 	},

From 6b4848f9e541b77b7703273ed1a65500a346dd07 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Fri, 15 Nov 2024 15:37:54 +0100
Subject: [PATCH 5/5] fix: BridgePart.vue header restyle

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../Matterbridge/BridgePart.vue               | 92 +++++++++----------
 .../Matterbridge/MatterbridgeSettings.vue     | 26 +++---
 2 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/components/ConversationSettings/Matterbridge/BridgePart.vue b/src/components/ConversationSettings/Matterbridge/BridgePart.vue
index a29dfa264d1..f1d2247aa23 100644
--- a/src/components/ConversationSettings/Matterbridge/BridgePart.vue
+++ b/src/components/ConversationSettings/Matterbridge/BridgePart.vue
@@ -4,40 +4,37 @@
 -->
 
 <template>
-	<div class="part"
-		:class="{ readonly: !editing }">
-		<h3>
-			<img class="icon-service"
-				:src="type.iconUrl">
-			<span>
+	<li class="part" :class="{ readonly: !editing }">
+		<div class="part__header">
+			<img class="part__icon" :src="type.iconUrl" :alt="type.name">
+			<h4 class="part__heading">
 				{{ type.name }}
-			</span>
-			<NcActions :container="container"
-				:force-menu="false">
-				<NcActionButton v-if="editable"
-					:icon="editing ? 'icon-checkmark' : 'icon-rename'"
-					@click="onEditClick">
-					{{ editing ? t('spreed', 'Save'): t('spreed', 'Edit') }}
-				</NcActionButton>
-			</NcActions>
+			</h4>
 			<NcActions class="actions"
 				:container="container"
-				:force-menu="true"
+				:inline="editable ? 1 : 0"
 				placement="bottom">
-				<NcActionLink icon="icon-info"
-					target="_blank"
-					:href="type.infoTarget"
-					close-after-click>
+				<NcActionButton v-if="editable" close-after-click @click="$emit('edit-clicked')">
+					<template #icon>
+						<IconCheck v-if="editing" :size="20" />
+						<IconPencil v-else :size="20" />
+					</template>
+					{{ editing ? t('spreed', 'Save'): t('spreed', 'Edit') }}
+				</NcActionButton>
+				<NcActionLink :href="type.infoTarget" target="_blank" close-after-click>
+					<template #icon>
+						<IconInformation :size="20" />
+					</template>
 					{{ t('spreed', 'More information') }}
 				</NcActionLink>
-				<NcActionButton v-if="editable"
-					icon="icon-delete"
-					:close-after-click="true"
-					@click="$emit('delete-part')">
+				<NcActionButton v-if="editable" close-after-click @click="$emit('delete-part')">
+					<template #icon>
+						<IconDelete :size="20" />
+					</template>
 					{{ t('spreed', 'Delete') }}
 				</NcActionButton>
 			</NcActions>
-		</h3>
+		</div>
 		<div v-for="(field, key) in displayedFields"
 			:key="key"
 			class="field">
@@ -71,10 +68,15 @@
 			</div>
 			<!-- eslint-enable -->
 		</div>
-	</div>
+	</li>
 </template>
 
 <script>
+import IconCheck from 'vue-material-design-icons/Check.vue'
+import IconDelete from 'vue-material-design-icons/Delete.vue'
+import IconInformation from 'vue-material-design-icons/Information.vue'
+import IconPencil from 'vue-material-design-icons/Pencil.vue'
+
 import { t } from '@nextcloud/l10n'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
@@ -84,14 +86,15 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 export default {
 	name: 'BridgePart',
 	components: {
-		NcActions,
+		IconCheck,
+		IconDelete,
+		IconInformation,
+		IconPencil,
 		NcActionButton,
 		NcActionLink,
+		NcActions,
 	},
 
-	mixins: [
-	],
-
 	props: {
 		num: {
 			type: Number,
@@ -160,9 +163,7 @@ export default {
 			classes[this.type.fields[name].icon] = true
 			return classes
 		},
-		onEditClick() {
-			this.$emit('edit-clicked')
-		},
+
 		// focus on main field when entering edition mode and when created
 		focusMainField() {
 			if (this.editing && this.$refs[this.type.mainField] && this.$refs[this.type.mainField].length > 0) {
@@ -176,25 +177,22 @@ export default {
 
 <style lang="scss" scoped>
 .part {
-	padding-top: 10px;
-}
-
-h3 {
-	display: flex;
-	align-items: flex-end;
-	margin-bottom: 0;
+	&__header {
+		display: flex;
+		align-items: center;
+		gap: calc(2 * var(--default-grid-baseline));
+		//width: 100%;
+	}
 
-	> span {
+	&__heading {
 		flex-grow: 1;
-		padding-top: 12px;
+		margin: 0;
 	}
 
-	.icon-service {
+	&__icon {
 		flex-grow: 0;
-		padding: 0 !important;
-		margin: 14px 10px 0 14px;
-		width: 16px;
-		height: 16px;
+		width: var(--clickable-area-small);
+		height: var(--clickable-area-small);
 		filter: var(--background-invert-if-dark);
 	}
 }
diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index 76d5416b872..11378e191c5 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -65,16 +65,16 @@
 				</div>
 			</div>
 			<ul>
-				<li v-for="(part, i) in parts" :key="part.type + i">
-					<BridgePart :num="i+1"
-						:part="part"
-						:type="matterbridgeTypes[part.type]"
-						:editing="part.editing"
-						:editable="!enabled"
-						container=".matterbridge-settings"
-						@edit-clicked="onEditClicked(i)"
-						@delete-part="onDelete(i)" />
-				</li>
+				<BridgePart v-for="(part, i) in parts"
+					:key="part.type + i"
+					:num="i+1"
+					:part="part"
+					:type="matterbridgeTypes[part.type]"
+					:editing="part.editing"
+					:editable="!enabled"
+					container=".matterbridge-settings"
+					@edit-clicked="onEditClicked(i)"
+					@delete-part="onDelete(i)" />
 			</ul>
 		</div>
 	</div>
@@ -314,6 +314,8 @@ export default {
 	}
 
 	.basic-settings {
+		margin-bottom: calc(4 * var(--default-grid-baseline));
+
 		.action {
 			list-style: none;
 		}
@@ -354,7 +356,9 @@ export default {
 	}
 
 	ul {
-		margin-bottom: 64px;
+		display: flex;
+		flex-direction: column;
+		gap: calc(4 * var(--default-grid-baseline));
 	}
 }