Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update code references to old repo
  • Loading branch information
lil5 committed Nov 19, 2025
commit f833bf90c1127ee82f993e671a44ebb07bd72a67
12 changes: 6 additions & 6 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Development
on:
push:
paths-ignore:
- 'docs/**'
- 'README.md'
- "docs/**"
- "README.md"
pull_request:
paths-ignore:
- 'docs/**'
- 'README.md'
- "docs/**"
- "README.md"
permissions:
contents: read
pull-requests: read
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
run: go test ./...
build-upload:
# Uploading artifacts only if lint/test succeeded
needs: [ "lint", "test" ]
needs: ["lint", "test"]
strategy:
matrix:
arch: [amd64]
Expand All @@ -67,7 +67,7 @@ jobs:
uses: actions/checkout@v5
- name: Build/upload matterbridge for ${{ matrix.platform.goos }}-${{ matrix.arch }}
run: |
CGO_ENABLED=0 GOOS=${{ matrix.platform.goos }} GOARCH=${{ matrix.arch }} go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o matterbridge
CGO_ENABLED=0 GOOS=${{ matrix.platform.goos }} GOARCH=${{ matrix.arch }} go build -ldflags "-s -X github.com/matterbridge-org/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o matterbridge
- name: Upload matterbridge-${{ matrix.name }}-${{ matrix.arch }}
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builds:
- 6
- 7
ldflags:
- -s -w -X github.com/42wim/matterbridge/version.GitHash={{.ShortCommit}}
- -s -w -X github.com/matterbridge-org/matterbridge/version.GitHash={{.ShortCommit}}

archives:
-
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_whatsappmulti
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions bridge/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/olahol/melody"

"github.com/42wim/matterbridge/bridge"
"github.com/42wim/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"
)
Expand Down
2 changes: 1 addition & 1 deletion bridge/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"github.com/42wim/matterbridge/bridge/config"
"github.com/matterbridge-org/matterbridge/bridge/config"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions bridge/discord/discord.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ 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/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"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion bridge/discord/handlers.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package bdiscord

import (
"github.com/42wim/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
Expand Down
4 changes: 2 additions & 2 deletions bridge/discord/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"bytes"
"strings"

"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
"github.com/bwmarrin/discordgo"
"github.com/matterbridge-org/matterbridge/bridge/config"
"github.com/matterbridge-org/matterbridge/bridge/helper"
)

// shouldMessageUseWebhooks checks if have a channel specific webhook, if we're not using auto webhooks
Expand Down
2 changes: 1 addition & 1 deletion bridge/helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (

"golang.org/x/image/webp"

"github.com/42wim/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"
)

Expand Down
4 changes: 2 additions & 2 deletions bridge/irc/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"time"

"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
"github.com/lrstanley/girc"
"github.com/matterbridge-org/matterbridge/bridge/config"
"github.com/matterbridge-org/matterbridge/bridge/helper"
"github.com/paulrosania/go-charset/charset"
"github.com/saintfish/chardet"

Expand Down
6 changes: 3 additions & 3 deletions bridge/irc/irc.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"strings"
"time"

"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
"github.com/lrstanley/girc"
"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.
Expand Down
4 changes: 2 additions & 2 deletions bridge/mastodon/mastodon.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"regexp"
"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"

mastodon "github.com/mattn/go-mastodon"
)
Expand Down
6 changes: 3 additions & 3 deletions bridge/matrix/matrix.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ 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"
matrix "github.com/matterbridge/gomatrix"
)

Expand Down
4 changes: 2 additions & 2 deletions bridge/mattermost/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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"
)
Expand Down
6 changes: 3 additions & 3 deletions bridge/mattermost/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ 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"
)
Expand Down
8 changes: 4 additions & 4 deletions bridge/mattermost/mattermost.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ 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"
)
Expand Down
4 changes: 2 additions & 2 deletions bridge/msteams/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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"
)
Expand Down
4 changes: 2 additions & 2 deletions bridge/msteams/msteams.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"time"

"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
"github.com/davecgh/go-spew/spew"
"github.com/matterbridge-org/matterbridge/bridge"
"github.com/matterbridge-org/matterbridge/bridge/config"

"github.com/mattn/godown"
msgraph "github.com/yaegashi/msgraph.go/beta"
Expand Down
2 changes: 1 addition & 1 deletion bridge/mumble/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// to implement Opus, but does not actually do anything. This serves
// as a workaround until https://github.com/layeh/gumble/pull/61 is
// merged.
// See https://github.com/42wim/matterbridge/issues/1750 for details.
// See https://github.com/matterbridge-org/matterbridge/issues/1750 for details.

const (
audioCodecIDOpus = 4
Expand Down
4 changes: 2 additions & 2 deletions bridge/mumble/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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) {
Expand Down
2 changes: 1 addition & 1 deletion bridge/mumble/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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"
)
Expand Down
6 changes: 3 additions & 3 deletions bridge/mumble/mumble.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ 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.
Expand Down
4 changes: 2 additions & 2 deletions bridge/nctalk/nctalk.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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"
Expand Down
4 changes: 2 additions & 2 deletions bridge/rocketchat/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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"
"github.com/matterbridge/Rocket.Chat.Go.SDK/models"
)

Expand Down
8 changes: 4 additions & 4 deletions bridge/rocketchat/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ 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/matterbridge/Rocket.Chat.Go.SDK/models"
"github.com/matterbridge/Rocket.Chat.Go.SDK/realtime"
"github.com/matterbridge/Rocket.Chat.Go.SDK/rest"
Expand Down
10 changes: 5 additions & 5 deletions bridge/rocketchat/rocketchat.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ 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"
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"
"github.com/matterbridge/Rocket.Chat.Go.SDK/models"
"github.com/matterbridge/Rocket.Chat.Go.SDK/realtime"
"github.com/matterbridge/Rocket.Chat.Go.SDK/rest"
Expand Down
4 changes: 2 additions & 2 deletions bridge/slack/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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"
)

Expand Down
2 changes: 1 addition & 1 deletion bridge/slack/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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"
)
Expand Down
2 changes: 1 addition & 1 deletion bridge/slack/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"testing"

"github.com/42wim/matterbridge/bridge"
"github.com/matterbridge-org/matterbridge/bridge"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions bridge/slack/legacy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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"
)

Expand Down
Loading