diff options
| -rw-r--r-- | bridge/matrix/helpers.go | 2 | ||||
| -rw-r--r-- | bridge/matrix/matrix.go | 2 | ||||
| -rw-r--r-- | go.mod | 4 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/.gitignore (renamed from vendor/github.com/matrix-org/gomatrix/.gitignore) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/.golangci.yml (renamed from vendor/github.com/matrix-org/gomatrix/.golangci.yml) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/.travis.yml (renamed from vendor/github.com/matrix-org/gomatrix/.travis.yml) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/CHANGELOG.md (renamed from vendor/github.com/matrix-org/gomatrix/CHANGELOG.md) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/LICENSE (renamed from vendor/github.com/matrix-org/gomatrix/LICENSE) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/README.md (renamed from vendor/github.com/matrix-org/gomatrix/README.md) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/client.go (renamed from vendor/github.com/matrix-org/gomatrix/client.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/events.go (renamed from vendor/github.com/matrix-org/gomatrix/events.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/filter.go (renamed from vendor/github.com/matrix-org/gomatrix/filter.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/identifier.go (renamed from vendor/github.com/matrix-org/gomatrix/identifier.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/requests.go (renamed from vendor/github.com/matrix-org/gomatrix/requests.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/responses.go (renamed from vendor/github.com/matrix-org/gomatrix/responses.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/room.go (renamed from vendor/github.com/matrix-org/gomatrix/room.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/store.go (renamed from vendor/github.com/matrix-org/gomatrix/store.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/sync.go (renamed from vendor/github.com/matrix-org/gomatrix/sync.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/tags.go (renamed from vendor/github.com/matrix-org/gomatrix/tags.go) | 0 | ||||
| -rw-r--r-- | vendor/github.com/matterbridge/gomatrix/userids.go (renamed from vendor/github.com/matrix-org/gomatrix/userids.go) | 0 | ||||
| -rw-r--r-- | vendor/modules.txt | 7 |
21 files changed, 7 insertions, 8 deletions
diff --git a/bridge/matrix/helpers.go b/bridge/matrix/helpers.go index 03e448da..b8e848a2 100644 --- a/bridge/matrix/helpers.go +++ b/bridge/matrix/helpers.go @@ -8,7 +8,7 @@ import ( "strings" "time" - matrix "github.com/matrix-org/gomatrix" + matrix "github.com/matterbridge/gomatrix" ) func newMatrixUsername(username string) *matrixUsername { diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index 706ae302..a2525358 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -12,7 +12,7 @@ import ( "github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/helper" - matrix "github.com/matrix-org/gomatrix" + matrix "github.com/matterbridge/gomatrix" ) var ( @@ -23,9 +23,9 @@ require ( github.com/kyokomi/emoji/v2 v2.2.9 github.com/labstack/echo/v4 v4.7.0 github.com/lrstanley/girc v0.0.0-20211023233735-147f0ff77566 - github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696 github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be + github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75 github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba github.com/matterbridge/matterclient v0.0.0-20211107234719-faca3cd42315 @@ -135,6 +135,6 @@ require ( gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) -replace github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 +//replace github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 go 1.17 diff --git a/vendor/github.com/matrix-org/gomatrix/.gitignore b/vendor/github.com/matterbridge/gomatrix/.gitignore index 0dd56286..0dd56286 100644 --- a/vendor/github.com/matrix-org/gomatrix/.gitignore +++ b/vendor/github.com/matterbridge/gomatrix/.gitignore diff --git a/vendor/github.com/matrix-org/gomatrix/.golangci.yml b/vendor/github.com/matterbridge/gomatrix/.golangci.yml index 15eb6ef7..15eb6ef7 100644 --- a/vendor/github.com/matrix-org/gomatrix/.golangci.yml +++ b/vendor/github.com/matterbridge/gomatrix/.golangci.yml diff --git a/vendor/github.com/matrix-org/gomatrix/.travis.yml b/vendor/github.com/matterbridge/gomatrix/.travis.yml index 46997ab6..46997ab6 100644 --- a/vendor/github.com/matrix-org/gomatrix/.travis.yml +++ b/vendor/github.com/matterbridge/gomatrix/.travis.yml diff --git a/vendor/github.com/matrix-org/gomatrix/CHANGELOG.md b/vendor/github.com/matterbridge/gomatrix/CHANGELOG.md index b6a9a167..b6a9a167 100644 --- a/vendor/github.com/matrix-org/gomatrix/CHANGELOG.md +++ b/vendor/github.com/matterbridge/gomatrix/CHANGELOG.md diff --git a/vendor/github.com/matrix-org/gomatrix/LICENSE b/vendor/github.com/matterbridge/gomatrix/LICENSE index 8dada3ed..8dada3ed 100644 --- a/vendor/github.com/matrix-org/gomatrix/LICENSE +++ b/vendor/github.com/matterbridge/gomatrix/LICENSE diff --git a/vendor/github.com/matrix-org/gomatrix/README.md b/vendor/github.com/matterbridge/gomatrix/README.md index a083b46c..a083b46c 100644 --- a/vendor/github.com/matrix-org/gomatrix/README.md +++ b/vendor/github.com/matterbridge/gomatrix/README.md diff --git a/vendor/github.com/matrix-org/gomatrix/client.go b/vendor/github.com/matterbridge/gomatrix/client.go index d0bb0c5e..d0bb0c5e 100644 --- a/vendor/github.com/matrix-org/gomatrix/client.go +++ b/vendor/github.com/matterbridge/gomatrix/client.go diff --git a/vendor/github.com/matrix-org/gomatrix/events.go b/vendor/github.com/matterbridge/gomatrix/events.go index d555dc3f..d555dc3f 100644 --- a/vendor/github.com/matrix-org/gomatrix/events.go +++ b/vendor/github.com/matterbridge/gomatrix/events.go diff --git a/vendor/github.com/matrix-org/gomatrix/filter.go b/vendor/github.com/matterbridge/gomatrix/filter.go index 2a0c37fa..2a0c37fa 100644 --- a/vendor/github.com/matrix-org/gomatrix/filter.go +++ b/vendor/github.com/matterbridge/gomatrix/filter.go diff --git a/vendor/github.com/matrix-org/gomatrix/identifier.go b/vendor/github.com/matterbridge/gomatrix/identifier.go index 4a61d080..4a61d080 100644 --- a/vendor/github.com/matrix-org/gomatrix/identifier.go +++ b/vendor/github.com/matterbridge/gomatrix/identifier.go diff --git a/vendor/github.com/matrix-org/gomatrix/requests.go b/vendor/github.com/matterbridge/gomatrix/requests.go index 31c426d4..31c426d4 100644 --- a/vendor/github.com/matrix-org/gomatrix/requests.go +++ b/vendor/github.com/matterbridge/gomatrix/requests.go diff --git a/vendor/github.com/matrix-org/gomatrix/responses.go b/vendor/github.com/matterbridge/gomatrix/responses.go index f488e69e..f488e69e 100644 --- a/vendor/github.com/matrix-org/gomatrix/responses.go +++ b/vendor/github.com/matterbridge/gomatrix/responses.go diff --git a/vendor/github.com/matrix-org/gomatrix/room.go b/vendor/github.com/matterbridge/gomatrix/room.go index 364deab2..364deab2 100644 --- a/vendor/github.com/matrix-org/gomatrix/room.go +++ b/vendor/github.com/matterbridge/gomatrix/room.go diff --git a/vendor/github.com/matrix-org/gomatrix/store.go b/vendor/github.com/matterbridge/gomatrix/store.go index 6dc687e5..6dc687e5 100644 --- a/vendor/github.com/matrix-org/gomatrix/store.go +++ b/vendor/github.com/matterbridge/gomatrix/store.go diff --git a/vendor/github.com/matrix-org/gomatrix/sync.go b/vendor/github.com/matterbridge/gomatrix/sync.go index ac326c3a..ac326c3a 100644 --- a/vendor/github.com/matrix-org/gomatrix/sync.go +++ b/vendor/github.com/matterbridge/gomatrix/sync.go diff --git a/vendor/github.com/matrix-org/gomatrix/tags.go b/vendor/github.com/matterbridge/gomatrix/tags.go index 956fb11e..956fb11e 100644 --- a/vendor/github.com/matrix-org/gomatrix/tags.go +++ b/vendor/github.com/matterbridge/gomatrix/tags.go diff --git a/vendor/github.com/matrix-org/gomatrix/userids.go b/vendor/github.com/matterbridge/gomatrix/userids.go index 70002c5b..70002c5b 100644 --- a/vendor/github.com/matrix-org/gomatrix/userids.go +++ b/vendor/github.com/matterbridge/gomatrix/userids.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 6c4d9bcd..6a01071f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -189,9 +189,6 @@ github.com/lrstanley/girc # github.com/magiconair/properties v1.8.5 ## explicit; go 1.13 github.com/magiconair/properties -# github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 -## explicit; go 1.17 -github.com/matrix-org/gomatrix # github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696 ## explicit github.com/matterbridge/Rocket.Chat.Go.SDK/models @@ -200,6 +197,9 @@ github.com/matterbridge/Rocket.Chat.Go.SDK/rest # github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be ## explicit github.com/matterbridge/go-xmpp +# github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 +## explicit; go 1.17 +github.com/matterbridge/gomatrix # github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75 ## explicit github.com/matterbridge/gozulipbot @@ -603,4 +603,3 @@ layeh.com/gumble/gumble layeh.com/gumble/gumble/MumbleProto layeh.com/gumble/gumble/varint layeh.com/gumble/gumbleutil -# github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 |