From 9785edd26366be8eb11c2435f50f90a5c8eea7fc Mon Sep 17 00:00:00 2001 From: Wim Date: Sun, 8 Mar 2020 17:08:18 +0100 Subject: Remove replace directives and use own fork to make go get work again (#1028) See https://github.com/golang/go/issues/30354 go get doesn't honor the go.mod replace options. --- bridge/discord/discord.go | 2 +- bridge/discord/handlers.go | 2 +- bridge/discord/helpers.go | 2 +- bridge/msteams/handler.go | 2 +- bridge/msteams/msteams.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bridge') diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index e37208b7..c0817911 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -10,7 +10,7 @@ import ( "github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/helper" - "github.com/bwmarrin/discordgo" + "github.com/matterbridge/discordgo" ) const MessageLength = 1950 diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go index ab320975..2527c0db 100644 --- a/bridge/discord/handlers.go +++ b/bridge/discord/handlers.go @@ -2,7 +2,7 @@ package bdiscord import ( "github.com/42wim/matterbridge/bridge/config" - "github.com/bwmarrin/discordgo" + "github.com/matterbridge/discordgo" ) func (b *Bdiscord) messageDelete(s *discordgo.Session, m *discordgo.MessageDelete) { //nolint:unparam diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go index 7ea0a365..8bc4f336 100644 --- a/bridge/discord/helpers.go +++ b/bridge/discord/helpers.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - "github.com/bwmarrin/discordgo" + "github.com/matterbridge/discordgo" ) func (b *Bdiscord) getNick(user *discordgo.User, guildID string) string { diff --git a/bridge/msteams/handler.go b/bridge/msteams/handler.go index c8f0c468..394a9ac0 100644 --- a/bridge/msteams/handler.go +++ b/bridge/msteams/handler.go @@ -9,7 +9,7 @@ import ( "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/helper" - msgraph "github.com/yaegashi/msgraph.go/beta" + msgraph "github.com/matterbridge/msgraph.go/beta" ) func (b *Bmsteams) findFile(weburl string) (string, error) { diff --git a/bridge/msteams/msteams.go b/bridge/msteams/msteams.go index 3633924a..b096cb04 100644 --- a/bridge/msteams/msteams.go +++ b/bridge/msteams/msteams.go @@ -12,9 +12,9 @@ import ( "github.com/42wim/matterbridge/bridge/config" // "github.com/davecgh/go-spew/spew" + msgraph "github.com/matterbridge/msgraph.go/beta" + "github.com/matterbridge/msgraph.go/msauth" "github.com/mattn/godown" - msgraph "github.com/yaegashi/msgraph.go/beta" - "github.com/yaegashi/msgraph.go/msauth" "golang.org/x/oauth2" ) -- cgit v1.2.3