uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Remove go replace by fork (matrix) (#1771)

Browse Source
This commit is contained in:
Wim 2022-03-20 01:43:26 +01:00 committed by GitHub
parent c5e49eec96
commit 17da95b094
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/matrix/helpers.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"time" "time"
matrix "github.com/matrix-org/gomatrix" matrix "github.com/matterbridge/gomatrix"
) )
func newMatrixUsername(username string) *matrixUsername { func newMatrixUsername(username string) *matrixUsername {

2
bridge/matrix/matrix.go
View File

@ -12,7 +12,7 @@ import (
"github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper" "github.com/42wim/matterbridge/bridge/helper"
matrix "github.com/matrix-org/gomatrix" matrix "github.com/matterbridge/gomatrix"
) )
var ( var (

4
go.mod
View File

@ -23,9 +23,9 @@ require (
github.com/kyokomi/emoji/v2 v2.2.9 github.com/kyokomi/emoji/v2 v2.2.9
github.com/labstack/echo/v4 v4.7.0 github.com/labstack/echo/v4 v4.7.0
github.com/lrstanley/girc v0.0.0-20211023233735-147f0ff77566 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/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be 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/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
github.com/matterbridge/matterclient v0.0.0-20211107234719-faca3cd42315 github.com/matterbridge/matterclient v0.0.0-20211107234719-faca3cd42315
@ -135,6 +135,6 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect 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 go 1.17

0
vendor/github.com/matrix-org/gomatrix/.gitignore → vendor/github.com/matterbridge/gomatrix/.gitignore generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/.golangci.yml → vendor/github.com/matterbridge/gomatrix/.golangci.yml generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/.travis.yml → vendor/github.com/matterbridge/gomatrix/.travis.yml generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/CHANGELOG.md → vendor/github.com/matterbridge/gomatrix/CHANGELOG.md generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/LICENSE → vendor/github.com/matterbridge/gomatrix/LICENSE generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/README.md → vendor/github.com/matterbridge/gomatrix/README.md generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/client.go → vendor/github.com/matterbridge/gomatrix/client.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/events.go → vendor/github.com/matterbridge/gomatrix/events.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/filter.go → vendor/github.com/matterbridge/gomatrix/filter.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/identifier.go → vendor/github.com/matterbridge/gomatrix/identifier.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/requests.go → vendor/github.com/matterbridge/gomatrix/requests.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/responses.go → vendor/github.com/matterbridge/gomatrix/responses.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/room.go → vendor/github.com/matterbridge/gomatrix/room.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/store.go → vendor/github.com/matterbridge/gomatrix/store.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/sync.go → vendor/github.com/matterbridge/gomatrix/sync.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/tags.go → vendor/github.com/matterbridge/gomatrix/tags.go generated vendored
View File

0
vendor/github.com/matrix-org/gomatrix/userids.go → vendor/github.com/matterbridge/gomatrix/userids.go generated vendored
View File

7
vendor/modules.txt vendored
View File

@ -189,9 +189,6 @@ github.com/lrstanley/girc
# github.com/magiconair/properties v1.8.5 # github.com/magiconair/properties v1.8.5
## explicit; go 1.13 ## explicit; go 1.13
github.com/magiconair/properties 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 # github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
## explicit ## explicit
github.com/matterbridge/Rocket.Chat.Go.SDK/models 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 # github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be
## explicit ## explicit
github.com/matterbridge/go-xmpp 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 # github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
## explicit ## explicit
github.com/matterbridge/gozulipbot github.com/matterbridge/gozulipbot
@ -603,4 +603,3 @@ layeh.com/gumble/gumble
layeh.com/gumble/gumble/MumbleProto layeh.com/gumble/gumble/MumbleProto
layeh.com/gumble/gumble/varint layeh.com/gumble/gumble/varint
layeh.com/gumble/gumbleutil layeh.com/gumble/gumbleutil
# github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419