chore: Objectify managed guilds

autoCreate.go

@@ -20,27 +20,37 @@ import (
 	"github.com/bwmarrin/discordgo"
 )
 
-var newChannelEndpoint = make(map[string]*discordgo.Channel)
-var createdChannels = make(map[string]map[string][]string)
+type AutoGuild struct {
+	id                 string
+	newChannelEndpoint *discordgo.Channel
+	createdChannels    map[string][]string
+}
 
-var categoryName = "Gaming🎮"
+var managedGuilds = make(map[string]*AutoGuild)
+
+const CATEGORY_NAME = "Gaming🎮"
+const DEFAULT_CHANNEL_NAME = "Stanza"
 
 func initChannels(s *discordgo.Session, guildID string) {
+	var guild AutoGuild
+	guild.id = guildID
+	guild.createdChannels = make(map[string][]string)
+
 	log.Debugf("Preparing guild %s for automatic channel management", guildID)
 
-	category := searchChannel(s, guildID, categoryName, "")
+	category := searchChannel(s, guildID, CATEGORY_NAME, "")
 	if category == nil {
-		log.Errorf("Cannot find category %s in guild %s", categoryName, guildID)
+		log.Errorf("Cannot find category %s in guild %s", CATEGORY_NAME, guildID)
 		return
 	}
 
 	deleteAllChannelsUnderCategory(s, guildID, category.ID)
-	createNewChannelEndpoint(s, guildID, category.ID)
+	guild.createNewChannelEndpoint(s, category.ID)
 
-	createdChannels[guildID] = make(map[string][]string)
+	managedGuilds[guildID] = &guild
 }
 
-func createNewChannelEndpoint(s *discordgo.Session, guildID string, channelParent string) {
+func (guild *AutoGuild) createNewChannelEndpoint(s *discordgo.Session, channelParent string) {
 
 	newChannelData := discordgo.GuildChannelCreateData{
 		Name:     "Crea nuovo canale",
@@ -48,68 +58,76 @@ func createNewChannelEndpoint(s *discordgo.Session, guildID string, channelParen
 		ParentID: channelParent}
 
 	var err error
-	newChannelEndpoint[guildID], err = s.GuildChannelCreateComplex(guildID, newChannelData)
+	guild.newChannelEndpoint, err = s.GuildChannelCreateComplex(guild.id, newChannelData)
 
 	if err != nil {
-		log.Errorf("Cannot create channel with name %s in guild %s. This guild is in a corrupted state", newChannelData.Name, guildID)
+		log.Errorf("Cannot create channel with name %s in guild %s. This guild is in a corrupted state", newChannelData.Name, guild.id)
 		return
 	}
 
-	log.Debugf("Created channel with name %s in guild %s", newChannelData.Name, guildID)
+	log.Debugf("Created channel with name %s in guild %s", newChannelData.Name, guild.id)
 }
 
-func createNewChannel(s *discordgo.Session, vs *discordgo.VoiceStateUpdate) {
-	category := searchChannel(s, vs.GuildID, categoryName, "")
+func (guild *AutoGuild) createNewChannel(s *discordgo.Session, channelID string, userID string) {
+	category := searchChannel(s, guild.id, CATEGORY_NAME, "")
 	if category == nil {
-		log.Errorf("Cannot find category %s in guild %s", categoryName, vs.GuildID)
+		log.Errorf("Cannot find category %s in guild %s", CATEGORY_NAME, guild.id)
 		return
 	}
 
-	channelName := getActivity(s.State, vs.GuildID, vs.UserID)
+	channelName := guild.getActivity(s.State, userID)
 	editChannelData := discordgo.ChannelEdit{Name: channelName}
-	_, err := s.ChannelEdit(vs.ChannelID, &editChannelData)
+	_, err := s.ChannelEdit(channelID, &editChannelData)
 	if err != nil {
-		log.Errorf("Cannot rename channel %s with new name %s in guild %s", vs.ChannelID, channelName, vs.GuildID)
+		log.Errorf("Cannot rename channel %s with new name %s in guild %s", channelID, channelName, guild.id)
 		return
 	}
-	createdChannels[vs.GuildID][vs.ChannelID] = []string{vs.UserID}
-	log.Debugf("Renamed channel %s to %s in guild %s", vs.ChannelID, channelName, vs.GuildID)
+	guild.createdChannels[channelID] = []string{userID}
+	log.Debugf("Renamed channel %s to %s in guild %s", channelID, channelName, guild.id)
 
-	createNewChannelEndpoint(s, vs.GuildID, category.ID)
+	guild.createNewChannelEndpoint(s, category.ID)
 }
 
-func removeUserFromChannels(s *discordgo.Session, vs *discordgo.VoiceStateUpdate) {
-	for channelID, channel := range createdChannels[vs.GuildID] {
-		index := contains(channel, vs.UserID)
+func (guild *AutoGuild) removeUserFromChannels(s *discordgo.Session, userID string) {
+	for channelID, channel := range guild.createdChannels {
+		index := contains(channel, userID)
 
 		if index != -1 {
 			if len(channel) == 1 {
+				// If this user was the only one left in the channel, delete the channel
 				_, err := s.ChannelDelete(channelID)
 				if err != nil {
-					log.Errorf("Cannot delete channel %s in guild %s", channelID, vs.GuildID)
+					log.Errorf("Cannot delete channel %s in guild %s", channelID, guild.id)
 				} else {
-					log.Debugf("Channel %s deleted in guild %s", channelID, vs.GuildID)
-					delete(createdChannels[vs.GuildID], channelID)
+					log.Debugf("Channel %s deleted in guild %s", channelID, guild.id)
+					delete(guild.createdChannels, channelID)
 				}
 			} else {
-				createdChannels[vs.GuildID][channelID] = remove(channel, index)
+				// Otherwise update the channel name and remove user from the list
+				guild.createdChannels[channelID] = remove(channel, index)
+				guild.updateChannelName(s, channelID)
 			}
 		}
 	}
 }
 
-func updateChannelName(s *discordgo.Session, guildID string, channelID string) {
+func (guild *AutoGuild) trackUserJoinManagedChannel(s *discordgo.Session, channelID string, userID string) {
+	guild.createdChannels[channelID] = append(guild.createdChannels[channelID], userID)
+	guild.updateChannelName(s, channelID)
+}
+
+func (guild *AutoGuild) updateChannelName(s *discordgo.Session, channelID string) {
 	programs := make(map[string]int)
 
-	for _, userID := range createdChannels[guildID][channelID] {
-		programs[getActivity(s.State, guildID, userID)] += 1
+	for _, userID := range guild.createdChannels[channelID] {
+		programs[guild.getActivity(s.State, userID)] += 1
 	}
 
 	max := -1
-	name := "Stanza"
+	name := DEFAULT_CHANNEL_NAME
 
 	for program, count := range programs {
-		if count > max {
+		if program != DEFAULT_CHANNEL_NAME && count > max {
 			max = count
 			name = program
 		}
@@ -117,7 +135,7 @@ func updateChannelName(s *discordgo.Session, guildID string, channelID string) {
 
 	channel, err := s.Channel(channelID)
 	if err != nil {
-		log.Errorf("Channel %s not found in guild %s", channelID, guildID)
+		log.Errorf("Channel %s not found in guild %s", channelID, guild.id)
 		return
 	}
 
@@ -130,17 +148,23 @@ func updateChannelName(s *discordgo.Session, guildID string, channelID string) {
 	editChannelData := discordgo.ChannelEdit{Name: name}
 	_, err = s.ChannelEdit(channelID, &editChannelData)
 	if err != nil {
-		log.Errorf("Cannot rename channel %s with new name %s in guild %s", channelID, name, guildID)
+		log.Errorf("Cannot rename channel %s with new name %s in guild %s", channelID, name, guild.id)
 	}
-	log.Debugf("Renamed channel %s from %s to %s in guild %s", channelID, oldName, name, guildID)
+	log.Debugf("Renamed channel %s from %s to %s in guild %s", channelID, oldName, name, guild.id)
 }
 
-func getActivity(st *discordgo.State, guildID string, userID string) string {
-	presence, err := st.Presence(guildID, userID)
+func (guild *AutoGuild) getActivity(st *discordgo.State, userID string) string {
+	presence, err := st.Presence(guild.id, userID)
 
 	if err != nil || len(presence.Activities) == 0 {
-		return "Stanza"
+		return DEFAULT_CHANNEL_NAME
 	}
 
-	return presence.Activities[len(presence.Activities)-1].Name
+	for _, activity := range presence.Activities {
+		if activity.Name != "Hang Status" {
+			return activity.Name
+		}
+	}
+
+	return DEFAULT_CHANNEL_NAME
 }

go.mod

@@ -4,13 +4,13 @@ go 1.20
 
 require (
 	github.com/bwmarrin/discordgo v0.27.1
-	go.uber.org/zap v1.24.0
+	go.uber.org/zap v1.27.0
 )
 
 require (
-	github.com/gorilla/websocket v1.5.0 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 )

go.sum

@@ -1,76 +1,34 @@
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/bwmarrin/discordgo v0.23.2 h1:BzrtTktixGHIu9Tt7dEE6diysEF9HWnXeHuoJEt2fH4=
-github.com/bwmarrin/discordgo v0.23.2/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M=
 github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY=
 github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
-go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc=
-go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA=
-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

main.go

@@ -70,19 +70,23 @@ func main() {
 }
 
 func handleVoiceActivity(s *discordgo.Session, vs *discordgo.VoiceStateUpdate) {
-	if val, ok := newChannelEndpoint[vs.GuildID]; ok {
+	if autoGuild, ok := managedGuilds[vs.GuildID]; ok {
 		if vs.ChannelID == "" {
-			removeUserFromChannels(s, vs)
+			// The user left a channel
+			autoGuild.removeUserFromChannels(s, vs.UserID)
 			return
 		}
 
-		if vs.ChannelID == val.ID {
-			removeUserFromChannels(s, vs)
-			createNewChannel(s, vs)
-		} else if _, ok := createdChannels[vs.GuildID][vs.ChannelID]; ok {
-			createdChannels[vs.GuildID][vs.ChannelID] = append(createdChannels[vs.GuildID][vs.ChannelID], vs.UserID)
+		if vs.ChannelID == autoGuild.newChannelEndpoint.ID {
+			// User joined the new channel endpoint
+			autoGuild.removeUserFromChannels(s, vs.UserID)
+			autoGuild.createNewChannel(s, vs.ChannelID, vs.UserID)
+		} else if _, ok := autoGuild.createdChannels[vs.ChannelID]; ok {
+			// User joined a managed channel
+			autoGuild.trackUserJoinManagedChannel(s, vs.ChannelID, vs.UserID)
 		} else {
-			removeUserFromChannels(s, vs)
+			// User joined a non managed channel
+			autoGuild.removeUserFromChannels(s, vs.UserID)
 		}
 	} else {
 		initChannels(s, vs.GuildID)
@@ -90,11 +94,11 @@ func handleVoiceActivity(s *discordgo.Session, vs *discordgo.VoiceStateUpdate) {
 }
 
 func handlePresenceUpdate(s *discordgo.Session, pu *discordgo.PresenceUpdate) {
-	if _, ok := newChannelEndpoint[pu.GuildID]; ok {
-		for channelID, channel := range createdChannels[pu.GuildID] {
+	if autoGuild, ok := managedGuilds[pu.GuildID]; ok {
+		for channelID, channel := range autoGuild.createdChannels {
 			for _, user := range channel {
 				if user == pu.User.ID {
-					updateChannelName(s, pu.GuildID, channelID)
+					autoGuild.updateChannelName(s, channelID)
 				}
 			}
 		}