rani/matterbridge.git

commit da40c1087c30f6d5e904c90660b2023d1a9494f4 Author: poVoq <jkmakowka@yahoo.de> Date: Thu Dec 04 17:30:36 2025 +0000 update self-referential urls diff --git a/Dockerfile b/Dockerfile index de3d05e..366a5a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37 +37 @@ FROM alpine AS builder COPY . /go/src/matterbridge RUN apk --no-cache add go git \ && cd /go/src/matterbridge \ - && CGO_ENABLED=0 go build -ldflags "-X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge + && CGO_ENABLED=0 go build -ldflags "-X github.com/matterbridge-org/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge FROM alpine RUN apk --no-cache add ca-certificates mailcap diff --git a/Dockerfile_whatsappmulti b/Dockerfile_whatsappmulti index 6db65fe..f2f30b1 100644 --- a/Dockerfile_whatsappmulti +++ b/Dockerfile_whatsappmulti @@ -37 +37 @@ FROM alpine AS builder COPY . /go/src/matterbridge RUN apk --no-cache add go git \ && cd /go/src/matterbridge \ - && CGO_ENABLED=0 go build -tags whatsappmulti -mod vendor -ldflags "-X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge + && CGO_ENABLED=0 go build -tags whatsappmulti -mod vendor -ldflags "-X github.com/matterbridge-org/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge FROM alpine RUN apk --no-cache add ca-certificates mailcap diff --git a/bridge/api/api.go b/bridge/api/api.go index cb348f1..ff26956 100644 --- a/bridge/api/api.go +++ b/bridge/api/api.go @@ -108 +108 @@ import ( "github.com/olahol/melody" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" + "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/mitchellh/mapstructure" diff --git a/bridge/bridge.go b/bridge/bridge.go index ef71f97..62e55f9 100644 --- a/bridge/bridge.go +++ b/bridge/bridge.go @@ -67 +67 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/sirupsen/logrus" ) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 1c26e40..124c2dc 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -610 +610 @@ import ( "strings" "sync" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/discord/transmitter" - "github.com/42wim/matterbridge/bridge/helper" + "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" ) diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go index 34cef55..c9c10a7 100644 --- a/bridge/discord/handlers.go +++ b/bridge/discord/handlers.go @@ -17 +17 @@ package bdiscord import ( - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/bwmarrin/discordgo" "github.com/davecgh/go-spew/spew" ) diff --git a/bridge/discord/webhook.go b/bridge/discord/webhook.go index ef129d4..fb3a93d 100644 --- a/bridge/discord/webhook.go +++ b/bridge/discord/webhook.go @@ -48 +48 @@ import ( "bytes" "strings" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/bwmarrin/discordgo" ) diff --git a/bridge/helper/helper.go b/bridge/helper/helper.go index b361e46..e9b868f 100644 --- a/bridge/helper/helper.go +++ b/bridge/helper/helper.go @@ -147 +147 @@ import ( "golang.org/x/image/webp" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/gomarkdown/markdown" "github.com/gomarkdown/markdown/html" "github.com/gomarkdown/markdown/parser" diff --git a/bridge/irc/handlers.go b/bridge/irc/handlers.go index cb2cc85..4e6cbeb 100644 --- a/bridge/irc/handlers.go +++ b/bridge/irc/handlers.go @@ -88 +88 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "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 7202df5..b6f32b5 100644 --- a/bridge/irc/irc.go +++ b/bridge/irc/irc.go @@ -129 +129 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "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" diff --git a/bridge/mastodon/mastodon.go b/bridge/mastodon/mastodon.go index 5f2b85c..484f969 100644 --- a/bridge/mastodon/mastodon.go +++ b/bridge/mastodon/mastodon.go @@ -89 +89 @@ import ( "regexp" "strings" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" mastodon "github.com/mattn/go-mastodon" ) diff --git a/bridge/matrix/helpers.go b/bridge/matrix/helpers.go index 6ad1fbe..eeaa5ab 100644 --- a/bridge/matrix/helpers.go +++ b/bridge/matrix/helpers.go @@ -86 +87 @@ import ( "strings" "time" + // Custom fork of unmaintained library, needs replacement: matrix "github.com/matterbridge/gomatrix" ) diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index 0615fc8..3fb2d61 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -99 +910 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" + // Custom fork of unmaintained library, needs replacement: matrix "github.com/matterbridge/gomatrix" ) diff --git a/bridge/mattermost/handlers.go b/bridge/mattermost/handlers.go index b7b5338..a4743b3 100644 --- a/bridge/mattermost/handlers.go +++ b/bridge/mattermost/handlers.go @@ -38 +38 @@ package bmattermost import ( "context" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/matterbridge/matterclient" "github.com/mattermost/mattermost/server/public/model" ) diff --git a/bridge/mattermost/helpers.go b/bridge/mattermost/helpers.go index e0a30d7..63e143d 100644 --- a/bridge/mattermost/helpers.go +++ b/bridge/mattermost/helpers.go @@ -49 +49 @@ import ( "net/http" "strings" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/42wim/matterbridge/matterhook" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/matterhook" "github.com/matterbridge/matterclient" "github.com/mattermost/mattermost/server/public/model" ) diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index 349a708..2a9cbf7 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -710 +710 @@ import ( "strings" "sync" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/42wim/matterbridge/matterhook" + "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" "github.com/matterbridge/matterclient" "github.com/rs/xid" ) diff --git a/bridge/msteams/handler.go b/bridge/msteams/handler.go index c8f0c46..6083eab 100644 --- a/bridge/msteams/handler.go +++ b/bridge/msteams/handler.go @@ -68 +68 @@ import ( "io/ioutil" "strings" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" msgraph "github.com/yaegashi/msgraph.go/beta" ) diff --git a/bridge/msteams/msteams.go b/bridge/msteams/msteams.go index 27d7bee..48f69ce 100644 --- a/bridge/msteams/msteams.go +++ b/bridge/msteams/msteams.go @@ -88 +88 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/davecgh/go-spew/spew" "github.com/mattn/godown" diff --git a/bridge/mumble/handlers.go b/bridge/mumble/handlers.go index 830aa5c..98dfda1 100644 --- a/bridge/mumble/handlers.go +++ b/bridge/mumble/handlers.go @@ -68 +68 @@ import ( "layeh.com/gumble/gumble" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" ) func (b *Bmumble) handleServerConfig(event *gumble.ServerConfigEvent) { diff --git a/bridge/mumble/helpers.go b/bridge/mumble/helpers.go index c828df2..9e0a6c0 100644 --- a/bridge/mumble/helpers.go +++ b/bridge/mumble/helpers.go @@ -77 +77 @@ import ( "regexp" "strings" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/mattn/godown" "github.com/vincent-petithory/dataurl" ) diff --git a/bridge/mumble/mumble.go b/bridge/mumble/mumble.go index 859ca4a..54bbdcd 100644 --- a/bridge/mumble/mumble.go +++ b/bridge/mumble/mumble.go @@ -149 +149 @@ import ( "layeh.com/gumble/gumble" "layeh.com/gumble/gumbleutil" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" stripmd "github.com/writeas/go-strip-markdown" // We need to import the 'data' package as an implicit dependency. diff --git a/bridge/nctalk/nctalk.go b/bridge/nctalk/nctalk.go index 82acba4..f673169 100644 --- a/bridge/nctalk/nctalk.go +++ b/bridge/nctalk/nctalk.go @@ -68 +68 @@ import ( "strconv" "strings" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" "gomod.garykim.dev/nc-talk/ocs" "gomod.garykim.dev/nc-talk/room" diff --git a/bridge/rocketchat/handlers.go b/bridge/rocketchat/handlers.go index 03b66ea..2707d0b 100644 --- a/bridge/rocketchat/handlers.go +++ b/bridge/rocketchat/handlers.go @@ -38 +39 @@ package brocketchat import ( "fmt" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" + // Library even upstream no longer actively maintained, should be replaced: "github.com/matterbridge/Rocket.Chat.Go.SDK/models" ) diff --git a/bridge/rocketchat/helpers.go b/bridge/rocketchat/helpers.go index fa1b470..a9a4657 100644 --- a/bridge/rocketchat/helpers.go +++ b/bridge/rocketchat/helpers.go @@ -914 +915 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/42wim/matterbridge/hook/rockethook" - "github.com/42wim/matterbridge/matterhook" + "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" + "github.com/nelsonken/gomf" + // 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" "github.com/matterbridge/Rocket.Chat.Go.SDK/rest" - "github.com/nelsonken/gomf" ) func (b *Brocketchat) doConnectWebhookBind() error { diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go index 405bead..361ef59 100644 --- a/bridge/rocketchat/rocketchat.go +++ b/bridge/rocketchat/rocketchat.go @@ -512 +513 @@ import ( "strings" "sync" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/42wim/matterbridge/hook/rockethook" - "github.com/42wim/matterbridge/matterhook" + "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" "github.com/matterbridge/Rocket.Chat.Go.SDK/rest" diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go index 3ddacfd..e6649a9 100644 --- a/bridge/slack/handlers.go +++ b/bridge/slack/handlers.go @@ -68 +68 @@ import ( "html" "time" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/slack-go/slack" ) diff --git a/bridge/slack/helpers.go b/bridge/slack/helpers.go index 309b3af..c7c651c 100644 --- a/bridge/slack/helpers.go +++ b/bridge/slack/helpers.go @@ -67 +67 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/sirupsen/logrus" "github.com/slack-go/slack" ) diff --git a/bridge/slack/helpers_test.go b/bridge/slack/helpers_test.go index fe3ba41..5e314d3 100644 --- a/bridge/slack/helpers_test.go +++ b/bridge/slack/helpers_test.go @@ -47 +47 @@ import ( "io/ioutil" "testing" - "github.com/42wim/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/bridge/slack/legacy.go b/bridge/slack/legacy.go index d89d286..8e94685 100644 --- a/bridge/slack/legacy.go +++ b/bridge/slack/legacy.go @@ -38 +38 @@ package bslack import ( "errors" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/matterhook" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/matterhook" "github.com/slack-go/slack" ) diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index c39c608..735c610 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -810 +810 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/42wim/matterbridge/matterhook" + "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/slack/users_channels.go b/bridge/slack/users_channels.go index 85b944b..f98e9f0 100644 --- a/bridge/slack/users_channels.go +++ b/bridge/slack/users_channels.go @@ -77 +77 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/sirupsen/logrus" "github.com/slack-go/slack" ) diff --git a/bridge/sshchat/sshchat.go b/bridge/sshchat/sshchat.go index 6b78c22..92dd34a 100644 --- a/bridge/sshchat/sshchat.go +++ b/bridge/sshchat/sshchat.go @@ -59 +59 @@ import ( "io" "strings" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/shazow/ssh-chat/sshd" ) diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go index a601254..b7fd3f4 100644 --- a/bridge/telegram/handlers.go +++ b/bridge/telegram/handlers.go @@ -89 +810 @@ import ( "strings" "unicode/utf16" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "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/telegram/telegram.go b/bridge/telegram/telegram.go index e7885ca..8c15486 100644 --- a/bridge/telegram/telegram.go +++ b/bridge/telegram/telegram.go @@ -79 +710 @@ import ( "strconv" "strings" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" + // 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/vk/vk.go b/bridge/vk/vk.go index 7faa5b4..be9f2a6 100644 --- a/bridge/vk/vk.go +++ b/bridge/vk/vk.go @@ -89 +89 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/SevereCloud/vksdk/v2/api" "github.com/SevereCloud/vksdk/v2/events" diff --git a/bridge/whatsapp/handlers.go b/bridge/whatsapp/handlers.go index 8f9fef1..9318579 100644 --- a/bridge/whatsapp/handlers.go +++ b/bridge/whatsapp/handlers.go @@ -78 +78 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/Rhymen/go-whatsapp" "github.com/jpillora/backoff" ) diff --git a/bridge/whatsapp/whatsapp.go b/bridge/whatsapp/whatsapp.go index bb0dfe5..a4d9ed9 100644 --- a/bridge/whatsapp/whatsapp.go +++ b/bridge/whatsapp/whatsapp.go @@ -128 +128 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/Rhymen/go-whatsapp" ) diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go index bc92c0f..51e89d3 100644 --- a/bridge/whatsappmulti/handlers.go +++ b/bridge/whatsappmulti/handlers.go @@ -98 +98 @@ import ( "mime" "strings" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "go.mau.fi/whatsmeow/binary/proto" "go.mau.fi/whatsmeow/types" diff --git a/bridge/whatsappmulti/whatsapp.go b/bridge/whatsappmulti/whatsapp.go index 3460047..4e8c7ca 100644 --- a/bridge/whatsappmulti/whatsapp.go +++ b/bridge/whatsappmulti/whatsapp.go @@ -128 +128 @@ import ( "path/filepath" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/mdp/qrterminal" "go.mau.fi/whatsmeow" diff --git a/bridge/xmpp/handler.go b/bridge/xmpp/handler.go index 5f56ccc..dd7f578 100644 --- a/bridge/xmpp/handler.go +++ b/bridge/xmpp/handler.go @@ -18 +18 @@ package bxmpp import ( - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/helper" "github.com/xmppo/go-xmpp" ) diff --git a/bridge/xmpp/helpers.go b/bridge/xmpp/helpers.go index eb6a536..562d705 100644 --- a/bridge/xmpp/helpers.go +++ b/bridge/xmpp/helpers.go @@ -37 +37 @@ package bxmpp import ( "regexp" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" ) var pathRegex = regexp.MustCompile("[^a-zA-Z0-9]+") diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go index 3bd9f3e..94bfbd8 100644 --- a/bridge/xmpp/xmpp.go +++ b/bridge/xmpp/xmpp.go @@ -119 +119 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" + "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/bridge/zulip/zulip.go b/bridge/zulip/zulip.go index 9b8b73c..a31cbf7 100644 --- a/bridge/zulip/zulip.go +++ b/bridge/zulip/zulip.go @@ -910 +911 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/bridge/helper" - "github.com/42wim/matterbridge/version" + "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/version" + // Seems not significantly different from upstream https://github.com/ifo/gozulipbot replace? gzb "github.com/matterbridge/gozulipbot" ) diff --git a/docker/arm/Dockerfile b/docker/arm/Dockerfile index 8c7f94b..82f0568 100644 --- a/docker/arm/Dockerfile +++ b/docker/arm/Dockerfile @@ -17 +17 @@ FROM alpine:edge as certs RUN apk --update add ca-certificates ARG VERSION=1.22.3 -ADD https://github.com/42wim/matterbridge/releases/download/v${VERSION}/matterbridge-${VERSION}-linux-arm64 /bin/matterbridge +ADD https://github.com/matterbridge-org/matterbridge/releases/download/v${VERSION}/matterbridge-${VERSION}-linux-arm64 /bin/matterbridge RUN chmod +x /bin/matterbridge FROM scratch diff --git a/gateway/bridgemap/api.go b/gateway/bridgemap/api.go index b602811..1ed09de 100644 --- a/gateway/bridgemap/api.go +++ b/gateway/bridgemap/api.go @@ -47 +47 @@ package bridgemap import ( - "github.com/42wim/matterbridge/bridge/api" + "github.com/matterbridge-org/matterbridge/bridge/api" ) func init() { diff --git a/gateway/bridgemap/bdiscord.go b/gateway/bridgemap/bdiscord.go index 81c4ff7..6a6f1a3 100644 --- a/gateway/bridgemap/bdiscord.go +++ b/gateway/bridgemap/bdiscord.go @@ -47 +47 @@ package bridgemap import ( - bdiscord "github.com/42wim/matterbridge/bridge/discord" + bdiscord "github.com/matterbridge-org/matterbridge/bridge/discord" ) func init() { diff --git a/gateway/bridgemap/birc.go b/gateway/bridgemap/birc.go index 9ce2eba..e2fa805 100644 --- a/gateway/bridgemap/birc.go +++ b/gateway/bridgemap/birc.go @@ -47 +47 @@ package bridgemap import ( - birc "github.com/42wim/matterbridge/bridge/irc" + birc "github.com/matterbridge-org/matterbridge/bridge/irc" ) func init() { diff --git a/gateway/bridgemap/bmastodon.go b/gateway/bridgemap/bmastodon.go index 64b7f9e..70ec377 100644 --- a/gateway/bridgemap/bmastodon.go +++ b/gateway/bridgemap/bmastodon.go @@ -37 +37 @@ package bridgemap import ( - bmastodon "github.com/42wim/matterbridge/bridge/mastodon" + bmastodon "github.com/matterbridge-org/matterbridge/bridge/mastodon" ) //nolint:gochecknoinits diff --git a/gateway/bridgemap/bmatrix.go b/gateway/bridgemap/bmatrix.go index 9b299f7..eacc27d 100644 --- a/gateway/bridgemap/bmatrix.go +++ b/gateway/bridgemap/bmatrix.go @@ -47 +47 @@ package bridgemap import ( - bmatrix "github.com/42wim/matterbridge/bridge/matrix" + bmatrix "github.com/matterbridge-org/matterbridge/bridge/matrix" ) func init() { diff --git a/gateway/bridgemap/bmattermost.go b/gateway/bridgemap/bmattermost.go index 8a80e32..307e346 100644 --- a/gateway/bridgemap/bmattermost.go +++ b/gateway/bridgemap/bmattermost.go @@ -47 +47 @@ package bridgemap import ( - bmattermost "github.com/42wim/matterbridge/bridge/mattermost" + bmattermost "github.com/matterbridge-org/matterbridge/bridge/mattermost" ) func init() { diff --git a/gateway/bridgemap/bmsteams.go b/gateway/bridgemap/bmsteams.go index e43c1d9..6cfd8aa 100644 --- a/gateway/bridgemap/bmsteams.go +++ b/gateway/bridgemap/bmsteams.go @@ -47 +47 @@ package bridgemap import ( - bmsteams "github.com/42wim/matterbridge/bridge/msteams" + bmsteams "github.com/matterbridge-org/matterbridge/bridge/msteams" ) func init() { diff --git a/gateway/bridgemap/bmumble.go b/gateway/bridgemap/bmumble.go index 2b9c93b..4bb8a5a 100644 --- a/gateway/bridgemap/bmumble.go +++ b/gateway/bridgemap/bmumble.go @@ -47 +47 @@ package bridgemap import ( - bmumble "github.com/42wim/matterbridge/bridge/mumble" + bmumble "github.com/matterbridge-org/matterbridge/bridge/mumble" ) func init() { diff --git a/gateway/bridgemap/bnctalk.go b/gateway/bridgemap/bnctalk.go index b675725..03d31de 100644 --- a/gateway/bridgemap/bnctalk.go +++ b/gateway/bridgemap/bnctalk.go @@ -47 +47 @@ package bridgemap import ( - btalk "github.com/42wim/matterbridge/bridge/nctalk" + btalk "github.com/matterbridge-org/matterbridge/bridge/nctalk" ) func init() { diff --git a/gateway/bridgemap/bridgemap.go b/gateway/bridgemap/bridgemap.go index 8851469..f3ecc6a 100644 --- a/gateway/bridgemap/bridgemap.go +++ b/gateway/bridgemap/bridgemap.go @@ -17 +17 @@ package bridgemap import ( - "github.com/42wim/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge" ) var ( diff --git a/gateway/bridgemap/brocketchat.go b/gateway/bridgemap/brocketchat.go index ad173a4..c709648 100644 --- a/gateway/bridgemap/brocketchat.go +++ b/gateway/bridgemap/brocketchat.go @@ -47 +47 @@ package bridgemap import ( - brocketchat "github.com/42wim/matterbridge/bridge/rocketchat" + brocketchat "github.com/matterbridge-org/matterbridge/bridge/rocketchat" ) func init() { diff --git a/gateway/bridgemap/bslack.go b/gateway/bridgemap/bslack.go index a4dd6a5..2efbb26 100644 --- a/gateway/bridgemap/bslack.go +++ b/gateway/bridgemap/bslack.go @@ -47 +47 @@ package bridgemap import ( - bslack "github.com/42wim/matterbridge/bridge/slack" + bslack "github.com/matterbridge-org/matterbridge/bridge/slack" ) func init() { diff --git a/gateway/bridgemap/bsshchat.go b/gateway/bridgemap/bsshchat.go index 650c2a6..5423d52 100644 --- a/gateway/bridgemap/bsshchat.go +++ b/gateway/bridgemap/bsshchat.go @@ -47 +47 @@ package bridgemap import ( - bsshchat "github.com/42wim/matterbridge/bridge/sshchat" + bsshchat "github.com/matterbridge-org/matterbridge/bridge/sshchat" ) func init() { diff --git a/gateway/bridgemap/btelegram.go b/gateway/bridgemap/btelegram.go index dbff2bc..81e7382 100644 --- a/gateway/bridgemap/btelegram.go +++ b/gateway/bridgemap/btelegram.go @@ -47 +47 @@ package bridgemap import ( - btelegram "github.com/42wim/matterbridge/bridge/telegram" + btelegram "github.com/matterbridge-org/matterbridge/bridge/telegram" ) func init() { diff --git a/gateway/bridgemap/bvk.go b/gateway/bridgemap/bvk.go index f049622..fe83ed3 100644 --- a/gateway/bridgemap/bvk.go +++ b/gateway/bridgemap/bvk.go @@ -47 +47 @@ package bridgemap import ( - bvk "github.com/42wim/matterbridge/bridge/vk" + bvk "github.com/matterbridge-org/matterbridge/bridge/vk" ) func init() { diff --git a/gateway/bridgemap/bwhatsapp.go b/gateway/bridgemap/bwhatsapp.go index d808c81..42dfb2d 100644 --- a/gateway/bridgemap/bwhatsapp.go +++ b/gateway/bridgemap/bwhatsapp.go @@ -47 +47 @@ package bridgemap import ( - bwhatsapp "github.com/42wim/matterbridge/bridge/whatsapp" + bwhatsapp "github.com/matterbridge-org/matterbridge/bridge/whatsapp" ) func init() { diff --git a/gateway/bridgemap/bwhatsappmulti.go b/gateway/bridgemap/bwhatsappmulti.go index 2e098e2..646499d 100644 --- a/gateway/bridgemap/bwhatsappmulti.go +++ b/gateway/bridgemap/bwhatsappmulti.go @@ -47 +47 @@ package bridgemap import ( - bwhatsapp "github.com/42wim/matterbridge/bridge/whatsappmulti" + bwhatsapp "github.com/matterbridge-org/matterbridge/bridge/whatsappmulti" ) func init() { diff --git a/gateway/bridgemap/bxmpp.go b/gateway/bridgemap/bxmpp.go index aa60938..89d6489 100644 --- a/gateway/bridgemap/bxmpp.go +++ b/gateway/bridgemap/bxmpp.go @@ -47 +47 @@ package bridgemap import ( - bxmpp "github.com/42wim/matterbridge/bridge/xmpp" + bxmpp "github.com/matterbridge-org/matterbridge/bridge/xmpp" ) func init() { diff --git a/gateway/bridgemap/bzulip.go b/gateway/bridgemap/bzulip.go index f3105c6..f24e593 100644 --- a/gateway/bridgemap/bzulip.go +++ b/gateway/bridgemap/bzulip.go @@ -47 +47 @@ package bridgemap import ( - bzulip "github.com/42wim/matterbridge/bridge/zulip" + bzulip "github.com/matterbridge-org/matterbridge/bridge/zulip" ) func init() { diff --git a/gateway/gateway.go b/gateway/gateway.go index 51d151a..12bb1eb 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -89 +89 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/internal" + "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" diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go index c1e4ab9..c0a2980 100644 --- a/gateway/gateway_test.go +++ b/gateway/gateway_test.go @@ -68 +68 @@ import ( "strconv" "testing" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/gateway/bridgemap" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/gateway/bridgemap" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/gateway/handlers.go b/gateway/handlers.go index 44cefe4..2f26103 100644 --- a/gateway/handlers.go +++ b/gateway/handlers.go @@ -129 +129 @@ import ( "strings" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/gateway/bridgemap" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/gateway/bridgemap" ) // handleEventFailure handles failures and reconnects bridges. diff --git a/gateway/handlers_test.go b/gateway/handlers_test.go index 20a7cfc..1ca1093 100644 --- a/gateway/handlers_test.go +++ b/gateway/handlers_test.go @@ -18 +18 @@ package gateway import ( - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/stretchr/testify/assert" "testing" diff --git a/gateway/router.go b/gateway/router.go index a0d5f40..f129c1b 100644 --- a/gateway/router.go +++ b/gateway/router.go @@ -59 +59 @@ import ( "sync" "time" - "github.com/42wim/matterbridge/bridge" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/gateway/samechannel" + "github.com/matterbridge-org/matterbridge/bridge" + "github.com/matterbridge-org/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/gateway/samechannel" "github.com/sirupsen/logrus" ) diff --git a/gateway/samechannel/samechannel.go b/gateway/samechannel/samechannel.go index 4b6016c..c52ed51 100644 --- a/gateway/samechannel/samechannel.go +++ b/gateway/samechannel/samechannel.go @@ -17 +17 @@ package samechannel import ( - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" ) type SameChannelGateway struct { diff --git a/gateway/samechannel/samechannel_test.go b/gateway/samechannel/samechannel_test.go index 17d816a..1bed9cf 100644 --- a/gateway/samechannel/samechannel_test.go +++ b/gateway/samechannel/samechannel_test.go @@ -47 +47 @@ import ( "io/ioutil" "testing" - "github.com/42wim/matterbridge/bridge/config" + "github.com/matterbridge-org/matterbridge/bridge/config" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/go.mod b/go.mod index d7114d6..20212a6 100644 --- a/go.mod +++ b/go.mod @@ -14 +14 @@ -module github.com/42wim/matterbridge +module github.com/matterbridge-org/matterbridge require ( github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f diff --git a/matterbridge.go b/matterbridge.go index 17bfca7..043dddf 100644 --- a/matterbridge.go +++ b/matterbridge.go @@ -710 +710 @@ import ( "runtime" "strings" - "github.com/42wim/matterbridge/bridge/config" - "github.com/42wim/matterbridge/gateway" - "github.com/42wim/matterbridge/gateway/bridgemap" - "github.com/42wim/matterbridge/version" + "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" diff --git a/tgs.Dockerfile b/tgs.Dockerfile index e093531..b43b147 100644 --- a/tgs.Dockerfile +++ b/tgs.Dockerfile @@ -57 +57 @@ RUN apk add \ go \ git \ && cd /go/src/matterbridge \ - && CGO_ENABLED=0 go build -mod vendor -ldflags "-X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge + && CGO_ENABLED=0 go build -mod vendor -ldflags "-X github.com/matterbridge-org/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge FROM alpine RUN apk --no-cache add \