diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-12-18 13:29:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 13:29:57 +0300 |
| commit | 8416de542898aa5c4143c0d54702d4977cc83532 (patch) | |
| tree | ea3590b715ddc00893aa2b29d66af91d36dd6821 | |
| parent | 4e877e50583e2f06a7fc3ad30ce6766ddda10305 (diff) | |
| parent | 1105b287b8b55ba0177654020b1113db1e49223f (diff) | |
Merge pull request #4799 from nextcloud/backport/4745/stable20.1
[stable20.1] Fix MsTeams and Steam Matterbridge config
| -rw-r--r-- | lib/MatterbridgeManager.php | 16 | ||||
| -rw-r--r-- | src/components/RightSidebar/Matterbridge/MatterbridgeSettings.vue | 4 |
2 files changed, 6 insertions, 14 deletions
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php index ad6837fb8..f9df4d102 100644 --- a/lib/MatterbridgeManager.php +++ b/lib/MatterbridgeManager.php @@ -488,19 +488,11 @@ class MatterbridgeManager { $content .= '[[gateway.inout]]' . "\n"; $content .= sprintf(' account = "%s.%s"', $type, $k) . "\n"; - if (in_array($type, ['zulip', 'discord', 'xmpp', 'irc', 'slack', 'rocketchat', 'mattermost', 'matrix', 'nctalk'])) { - $content .= sprintf(' channel = "%s"', $part['channel']) . "\n"; - if ($type === 'irc' && $part['password']) { - $content .= sprintf(' options = { key = "%s" }', $part['password']) . "\n"; - } - $content .= "\n"; - } elseif ($type === 'msteams') { - $content .= sprintf(' threadId = "%s"', $part['threadid']) . "\n\n"; - } elseif ($type === 'telegram') { - $content .= sprintf(' channel = "%s"', $part['channel']) . "\n\n"; - } elseif ($type === 'steam') { - $content .= sprintf(' chatid = "%s"', $part['chatid']) . "\n\n"; + $content .= sprintf(' channel = "%s"', $part['channel']) . "\n"; + if ($type === 'irc' && $part['password']) { + $content .= sprintf(' options = { key = "%s" }', $part['password']) . "\n"; } + $content .= "\n"; } return $content; diff --git a/src/components/RightSidebar/Matterbridge/MatterbridgeSettings.vue b/src/components/RightSidebar/Matterbridge/MatterbridgeSettings.vue index adb74b56b..fb6ba91d2 100644 --- a/src/components/RightSidebar/Matterbridge/MatterbridgeSettings.vue +++ b/src/components/RightSidebar/Matterbridge/MatterbridgeSettings.vue @@ -320,7 +320,7 @@ export default { placeholder: t('spreed', 'Password'), icon: 'icon-category-auth', }, - chatid: { + channel: { type: 'text', placeholder: t('spreed', 'Chat ID'), icon: 'icon-group', @@ -394,7 +394,7 @@ export default { placeholder: t('spreed', 'Team ID'), icon: 'icon-category-auth', }, - threadid: { + channel: { type: 'text', placeholder: t('spreed', 'Thread ID'), icon: 'icon-group', |