diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-12-18 13:29:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 13:29:34 +0300 |
| commit | 8cd8d2d98a6ac443826bc85ee3743eb03eae1ec5 (patch) | |
| tree | f314a3060769b38c5f0b64e24e9ced7952c944bf | |
| parent | 3b0ba09368efa97e6031aee4a21f72839637f27e (diff) | |
| parent | c836088bbf0383e944486baa20f06e2090e7cad7 (diff) | |
Merge pull request #4800 from nextcloud/backport/4745/stable20
[stable20] 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 9c188c783..623341610 100644 --- a/lib/MatterbridgeManager.php +++ b/lib/MatterbridgeManager.php @@ -481,19 +481,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', |