rani/matterbridge.git

commit bbc85c6ed0dbead6dce8722b3e8c0612fe8f7930 Author: poVoq <jkmakowka@yahoo.de> Date: Thu Dec 04 19:24:24 2025 +0000 tidy and automatic formatting diff --git a/bridge/api/api.go b/bridge/api/api.go index ff26956..30ceac9 100644 --- a/bridge/api/api.go +++ b/bridge/api/api.go @@ -1010 +1010 @@ import (     "github.com/olahol/melody"   - "github.com/matterbridge-org/matterbridge/bridge" - "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/labstack/echo/v4"   "github.com/labstack/echo/v4/middleware" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/mitchellh/mapstructure"   ring "github.com/zfjagann/golang-ring"  ) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 124c2dc..5b6b7e4 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -612 +612 @@ import (   "strings"   "sync"   + "github.com/bwmarrin/discordgo" + lru "github.com/hashicorp/golang-lru"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/discord/transmitter"   "github.com/matterbridge-org/matterbridge/bridge/helper" - "github.com/bwmarrin/discordgo" - lru "github.com/hashicorp/golang-lru"  )    const ( diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go index c9c10a7..b969122 100644 --- a/bridge/discord/handlers.go +++ b/bridge/discord/handlers.go @@ -19 +19 @@  package bdiscord    import ( - "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/bwmarrin/discordgo"   "github.com/davecgh/go-spew/spew" + "github.com/matterbridge-org/matterbridge/bridge/config"  )    func (b *Bdiscord) messageDelete(s *discordgo.Session, m *discordgo.MessageDelete) { //nolint:unparam diff --git a/bridge/discord/webhook.go b/bridge/discord/webhook.go index fb3a93d..8dadf5f 100644 --- a/bridge/discord/webhook.go +++ b/bridge/discord/webhook.go @@ -49 +49 @@ import (   "bytes"   "strings"   + "github.com/bwmarrin/discordgo"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper" - "github.com/bwmarrin/discordgo"  )    // shouldMessageUseWebhooks checks if have a channel specific webhook, if we're not using auto webhooks diff --git a/bridge/helper/helper.go b/bridge/helper/helper.go index e9b868f..dd9a6d4 100644 --- a/bridge/helper/helper.go +++ b/bridge/helper/helper.go @@ -1410 +1410 @@ import (     "golang.org/x/image/webp"   - "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/gomarkdown/markdown"   "github.com/gomarkdown/markdown/html"   "github.com/gomarkdown/markdown/parser" + "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/sirupsen/logrus"  )   diff --git a/bridge/irc/handlers.go b/bridge/irc/handlers.go index 4e6cbeb..e9d79aa 100644 --- a/bridge/irc/handlers.go +++ b/bridge/irc/handlers.go @@ -89 +89 @@ import (   "strings"   "time"   + "github.com/lrstanley/girc"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper" - "github.com/lrstanley/girc"   "github.com/paulrosania/go-charset/charset"   "github.com/saintfish/chardet"   diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go index b6f32b5..cf978c4 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -1210 +1210 @@ import (   "strings"   "time"   + "github.com/lrstanley/girc"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper" - "github.com/lrstanley/girc"   stripmd "github.com/writeas/go-strip-markdown"     // We need to import the 'data' package as an implicit dependency. diff --git a/bridge/msteams/msteams.go b/bridge/msteams/msteams.go index 48f69ce..f79e718 100644 --- a/bridge/msteams/msteams.go +++ b/bridge/msteams/msteams.go @@ -89 +89 @@ import (   "strings"   "time"   + "github.com/davecgh/go-spew/spew"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config" - "github.com/davecgh/go-spew/spew"     "github.com/mattn/godown"   msgraph "github.com/yaegashi/msgraph.go/beta" diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go index 361ef59..247f2b4 100644 --- a/bridge/rocketchat/rocketchat.go +++ b/bridge/rocketchat/rocketchat.go @@ -512 +512 @@ import (   "strings"   "sync"   + lru "github.com/hashicorp/golang-lru"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper"   "github.com/matterbridge-org/matterbridge/hook/rockethook"   "github.com/matterbridge-org/matterbridge/matterhook" - lru "github.com/hashicorp/golang-lru"   // Library even upstream no longer actively maintained, should be replaced:   "github.com/matterbridge/Rocket.Chat.Go.SDK/models"   "github.com/matterbridge/Rocket.Chat.Go.SDK/realtime" diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 735c610..497246e 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -811 +811 @@ import (   "sync"   "time"   + lru "github.com/hashicorp/golang-lru"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper"   "github.com/matterbridge-org/matterbridge/matterhook" - lru "github.com/hashicorp/golang-lru"   "github.com/rs/xid"   "github.com/slack-go/slack"  ) diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go index b7fd3f4..85a2ba9 100644 --- a/bridge/telegram/handlers.go +++ b/bridge/telegram/handlers.go @@ -89 +89 @@ import (   "strings"   "unicode/utf16"   + "github.com/davecgh/go-spew/spew"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper" - "github.com/davecgh/go-spew/spew"   // Seems not much different from upstream https://github.com/go-telegram-bot-api/telegram-bot-api replace?   tgbotapi "github.com/matterbridge/telegram-bot-api/v6"  ) diff --git a/bridge/whatsapp/handlers.go b/bridge/whatsapp/handlers.go index 9318579..e0c6faa 100644 --- a/bridge/whatsapp/handlers.go +++ b/bridge/whatsapp/handlers.go @@ -710 +710 @@ import (   "strings"   "time"   - "github.com/matterbridge-org/matterbridge/bridge/config" - "github.com/matterbridge-org/matterbridge/bridge/helper"   "github.com/Rhymen/go-whatsapp"   "github.com/jpillora/backoff" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper"  )    /* diff --git a/bridge/whatsapp/whatsapp.go b/bridge/whatsapp/whatsapp.go index a4d9ed9..447fad0 100644 --- a/bridge/whatsapp/whatsapp.go +++ b/bridge/whatsapp/whatsapp.go @@ -129 +129 @@ import (   "strings"   "time"   + "github.com/Rhymen/go-whatsapp"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config" - "github.com/Rhymen/go-whatsapp"  )    const ( diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index 94bfbd8..d1ebf60 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -1110 +1110 @@ import (   "sync"   "time"   + "github.com/jpillora/backoff"   "github.com/matterbridge-org/matterbridge/bridge"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/bridge/helper" - "github.com/jpillora/backoff"   "github.com/rs/xid"   "github.com/xmppo/go-xmpp"  ) diff --git a/gateway/gateway.go b/gateway/gateway.go index 12bb1eb..a4b8759 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -813 +813 @@ import (   "strings"   "time"   - "github.com/matterbridge-org/matterbridge/bridge" - "github.com/matterbridge-org/matterbridge/bridge/config" - "github.com/matterbridge-org/matterbridge/internal"   "github.com/d5/tengo/v2"   "github.com/d5/tengo/v2/stdlib"   lru "github.com/hashicorp/golang-lru"   "github.com/kyokomi/emoji/v2" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/internal"   "github.com/sirupsen/logrus"  )   diff --git a/go.mod b/go.mod index 20212a6..6513394 100644 --- a/go.mod +++ b/go.mod @@ -246 +247 @@ require (   github.com/matterbridge/matterclient v0.0.0-20240817214420-3d4c3aef3dc1   github.com/matterbridge/telegram-bot-api/v6 v6.5.0   github.com/mattermost/mattermost/server/public v0.1.6 + github.com/mattn/go-mastodon v0.0.10   github.com/mattn/godown v0.0.1   github.com/mdp/qrterminal v1.0.1   github.com/mitchellh/mapstructure v1.5.0 @@ -5111 +529 @@ require (   google.golang.org/protobuf v1.36.10   layeh.com/gumble v0.0.0-20221205141517-d1df60a3cc14   modernc.org/sqlite v1.32.0 - github.com/mattn/go-mastodon v0.0.10  )    require ( - github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect   filippo.io/edwards25519 v1.1.0 // indirect   github.com/Benau/go_rlottie v0.0.0-20210807002906-98c1b2421989 // indirect   github.com/Jeffail/gabs v1.4.0 // indirect @@ -1216 +1207 @@ require (   github.com/spf13/pflag v1.0.5 // indirect   github.com/subosito/gotenv v1.6.0 // indirect   github.com/tinylib/msgp v1.2.0 // indirect + github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect   github.com/valyala/bytebufferpool v1.0.0 // indirect   github.com/valyala/fasttemplate v1.2.2 // indirect   github.com/vektah/gqlparser/v2 v2.5.31 // indirect diff --git a/matterbridge.go b/matterbridge.go index 043dddf..f5a18b6 100644 --- a/matterbridge.go +++ b/matterbridge.go @@ -711 +711 @@ import (   "runtime"   "strings"   + "github.com/google/gops/agent"   "github.com/matterbridge-org/matterbridge/bridge/config"   "github.com/matterbridge-org/matterbridge/gateway"   "github.com/matterbridge-org/matterbridge/gateway/bridgemap"   "github.com/matterbridge-org/matterbridge/version" - "github.com/google/gops/agent"   prefixed "github.com/matterbridge/logrus-prefixed-formatter"   "github.com/sirupsen/logrus"  )