commit 235bf021fa5b2b0ca34e0722ffb31ebe3351427f
Author: Joseph Crowell <joseph.w.crowell@gmail.com>
Date: Wed Dec 17 18:30:49 2025 +0000
whitespace and newline fixes
diff --git a/bridge/zulip/zulip.go b/bridge/zulip/zulip.go
index 3569ae8..3c21a89 100644
--- a/bridge/zulip/zulip.go
+++ b/bridge/zulip/zulip.go
@@ -136 +137 @@ import (
"github.com/matterbridge-org/matterbridge/bridge/config"
"github.com/matterbridge-org/matterbridge/bridge/helper"
"github.com/matterbridge-org/matterbridge/version"
+
// Seems not significantly different from upstream https://github.com/ifo/gozulipbot replace?
gzb "github.com/matterbridge/gozulipbot"
)
diff --git a/docs/protocols/matrix/settings.md b/docs/protocols/matrix/settings.md
index 6c726e9..ed47111 100644
--- a/docs/protocols/matrix/settings.md
+++ b/docs/protocols/matrix/settings.md
@@ -237 +237 @@ Messages sent from this user will not be relayed to avoid loops.
- Setting: **REQUIRED**
- Format: *string*
-- Example:
+- Example:
```toml
Login="yourlogin"
```
@@ -467 +467 @@ password of your bot.
- Setting: **REQUIRED**
- Format: *string*
-- Example:
+- Example:
```toml
Password="yourpass"
```
@@ -577 +577 @@ Server is your homeserver (eg https://matrix.org)
- Setting: **REQUIRED**
- Format: *string*
-- Example:
+- Example:
```toml
Server="https://matrix.org"
```
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index 0f5a6c3..0793978 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -2615 +2615 @@ server=""
[[gateway]]
name = "bridge1"
enable=true
-
+
[[gateway.inout]]
account = "irc.freenode"
channel = "#wimtesting"
-
+
[[gateway.inout]]
account = "discord.test"
channel = "general"
-
+
[[gateway.inout]]
account="slack.test"
channel="testing"
@@ -5326 +5326 @@ server=""
[[gateway]]
name = "bridge1"
enable=true
-
+
[[gateway.in]]
account = "irc.freenode"
channel = "#wimtesting"
-
+
[[gateway.inout]]
account = "discord.test"
channel = "general"
-
+
[[gateway.out]]
account="slack.test"
channel="testing"
[[gateway]]
name = "bridge2"
enable=true
-
+
[[gateway.in]]
account = "irc.freenode"
channel = "#wimtesting2"
-
+
[[gateway.out]]
account = "discord.test"
channel = "general2"
@@ -917 +917 @@ enable=true
[[gateway.inout]]
account="irc.zzz"
- channel="#main"
+ channel="#main"
[[gateway.inout]]
account="telegram.zzz"
@@ -9952 +9952 @@ enable=true
[[gateway.inout]]
account="slack.zzz"
- channel="irc"
-
+ channel="irc"
+
[[gateway]]
name="announcements"
enable=true
-
+
[[gateway.in]]
account="telegram.zzz"
- channel="-2222222222222"
-
+ channel="-2222222222222"
+
[[gateway.out]]
account="irc.zzz"
- channel="#main"
-
+ channel="#main"
+
[[gateway.out]]
account="irc.zzz"
- channel="#main-help"
+ channel="#main-help"
[[gateway.out]]
account="telegram.zzz"
- channel="--333333333333"
+ channel="--333333333333"
[[gateway.out]]
account="slack.zzz"
- channel="general"
-
+ channel="general"
+
[[gateway]]
name="bridge2"
enable=true
[[gateway.inout]]
account="irc.zzz"
- channel="#main-help"
+ channel="#main-help"
[[gateway.inout]]
account="telegram.zzz"
- channel="--444444444444"
+ channel="--444444444444"
+
-
[[gateway]]
name="bridge3"
enable=true
[[gateway.inout]]
account="irc.zzz"
- channel="#main-telegram"
+ channel="#main-telegram"
[[gateway.inout]]
account="telegram.zzz"
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 6efe8d4..1030436 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -12829 +12829 @@ UseUserName=false
# Matrix quotes replies and as of matterbridge 1.24.0 we strip those as this causes
# issues with bridges support threading and have PreserveThreading enabled.
-# But if you for example use mattermost or discord with webhooks you'll need to enable
+# But if you for example use mattermost or discord with webhooks you'll need to enable
# this (and keep PreserveThreading disabled) if you want something that looks like a reply from matrix.
-# See issues:
+# See issues:
# - https://github.com/42wim/matterbridge/issues/1819
# - https://github.com/42wim/matterbridge/issues/1780
KeepQuotedReply=false
