Update matterbridge to 1.25.2, and switch to upstream discordgo 0.25.0

bridge/bridge.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/gobwas/glob"
-	"github.com/matterbridge/discordgo"
+	"github.com/bwmarrin/discordgo"
 	"github.com/pkg/errors"
 	"github.com/qaisjp/go-discord-irc/irc/varys"
 	irc "github.com/qaisjp/go-ircevent"

bridge/discord.go

@@ -10,7 +10,7 @@ import (
 	"github.com/qaisjp/go-discord-irc/dstate"
 	ircnick "github.com/qaisjp/go-discord-irc/irc/nick"
 
-	"github.com/matterbridge/discordgo"
+	"github.com/bwmarrin/discordgo"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"

bridge/discord_events.go

@@ -3,7 +3,7 @@ package bridge
 import (
 	"strings"
 
-	"github.com/matterbridge/discordgo"
+	"github.com/bwmarrin/discordgo"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
@@ -65,7 +65,7 @@ func (d *discordBot) OnTypingStart(s *discordgo.Session, m *discordgo.TypingStar
 
 func (d *discordBot) OnReady(s *discordgo.Session, m *discordgo.Ready) {
 	// Fires a GuildMembersChunk event
-	err := d.Session.RequestGuildMembers(d.guildID, "", 0, true)
+	err := d.Session.RequestGuildMembers(d.guildID, "", 0, "", true)
 	if err != nil {
 		log.Warningln(errors.Wrap(err, "could not request guild members").Error())
 		return

bridge/structs.go

@@ -1,7 +1,7 @@
 package bridge
 
 import (
-	"github.com/matterbridge/discordgo"
+	"github.com/bwmarrin/discordgo"
 )
 
 // DiscordMessage is a chat message sent to IRC (from Discord)

dstate/dstate.go

@@ -1,7 +1,7 @@
 // Package dstate provides helpers for discordgo that first tries the State, and then falls back on an endpoint request.
 package dstate
 
-import "github.com/matterbridge/discordgo"
+import "github.com/bwmarrin/discordgo"
 
 func ChannelMessage(s *discordgo.Session, channelID string, messageID string) (*discordgo.Message, error) {
 	if msg, err := s.State.Message(channelID, messageID); err == nil {

go.mod

@@ -3,16 +3,14 @@ module github.com/qaisjp/go-discord-irc
 go 1.15
 
 require (
-	github.com/42wim/matterbridge v1.22.0
-	github.com/fsnotify/fsnotify v1.4.9
+	github.com/42wim/matterbridge v1.25.2
+	github.com/bwmarrin/discordgo v0.25.0
+	github.com/fsnotify/fsnotify v1.5.4
 	github.com/gobwas/glob v0.2.3
-	github.com/matterbridge/discordgo v0.23.2-0.20210201201054-fb39a175b4f7
 	github.com/mozillazg/go-unidecode v0.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/qaisjp/go-ircevent v0.0.0-20210224154625-07452bfb05b5
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect
-	golang.org/x/text v0.3.5 // indirect
+	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/viper v1.12.0
+	github.com/stretchr/testify v1.7.2
 )