Quit IRC when their user leaves the Discord server

Fix #45
qaisjp · Jul 11, 2020 · 6dc5f88 · 6dc5f88
1 parent 056a4f9
commit 6dc5f88
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/bridge/bridge.go b/bridge/bridge.go
@@ -65,6 +65,7 @@ type Bridge struct {
 	discordMessagesChan      chan IRCMessage
 	discordMessageEventsChan chan *DiscordMessage
 	updateUserChan           chan DiscordUser
+	removeUserChan           chan string // user id
 }
 
 // Close the Bridge
@@ -203,6 +204,7 @@ func New(conf *Config) (*Bridge, error) {
 		discordMessagesChan:      make(chan IRCMessage),
 		discordMessageEventsChan: make(chan *DiscordMessage),
 		updateUserChan:           make(chan DiscordUser),
+		removeUserChan:           make(chan string),
 	}
 
 	if err := dib.load(conf); err != nil {
@@ -414,6 +416,9 @@ func (b *Bridge) loop() {
 		case user := <-b.updateUserChan:
 			b.ircManager.HandleUser(user)
 
+		case userID := <-b.removeUserChan:
+			b.ircManager.DisconnectUser(userID)
+
 		// Done!
 		case <-b.done:
 			b.discord.Close()

diff --git a/bridge/discord.go b/bridge/discord.go
@@ -47,6 +47,7 @@ func newDiscord(bridge *Bridge, botToken, guildID string) (*discordBot, error) {
 	if !bridge.Config.SimpleMode {
 		discord.AddHandler(discord.onMemberListChunk)
 		discord.AddHandler(discord.onMemberUpdate)
+		discord.AddHandler(discord.onMemberLeave)
 		discord.AddHandler(discord.OnPresencesReplace)
 		discord.AddHandler(discord.OnPresenceUpdate)
 		discord.AddHandler(discord.OnTypingStart)
@@ -348,6 +349,11 @@ func (d *discordBot) onMemberUpdate(s *discordgo.Session, m *discordgo.GuildMemb
 	d.handleMemberUpdate(m.Member, false)
 }
 
+// onMemberLeave is triggered when a user is removed from a guild (leave/kick/ban).
+func (d *discordBot) onMemberLeave(s *discordgo.Session, m *discordgo.GuildMemberRemove) {
+	d.bridge.removeUserChan <- m.User.ID
+}
+
 // What does this do? Probably what it sounds like.
 func (d *discordBot) OnPresencesReplace(s *discordgo.Session, m *discordgo.PresencesReplace) {
 	for _, p := range *m {

diff --git a/bridge/irc_manager.go b/bridge/irc_manager.go
@@ -75,6 +75,15 @@ func (m *IRCManager) SetConnectionCooldown(con *ircConnection) {
 	log.WithField("nick", con.nick).Println("IRC connection cooldownTimer created...")
 }
 
+// DisconnectUser immediately disconnects a Discord user if it exists
+func (m *IRCManager) DisconnectUser(userID string) {
+	con, ok := m.ircConnections[userID]
+	if !ok {
+		return
+	}
+	m.CloseConnection(con)
+}
+
 // HandleUser deals with messages sent from a DiscordUser
 func (m *IRCManager) HandleUser(user DiscordUser) {
 	if user.Username == "" || user.Discriminator == "" {