Merge 4653efcf94 into c4157a4d5b

bridge/discord/discord.go

@@ -206,21 +206,28 @@ func (b *Bdiscord) Connect() error {
 	// Obtaining guild members and initializing nickname mapping.
 	b.membersMutex.Lock()
 	defer b.membersMutex.Unlock()
-	members, err := b.c.GuildMembers(b.guildID, "", 1000)
+	after := ""
-	if err != nil {
+	for {
-		b.Log.Error("Error obtaining server members: ", err)
+		members, err := b.c.GuildMembers(b.guildID, after, 1000)
-		return err
+		if err != nil {
-	}
+			b.Log.Error("Error obtaining server members: ", err)
-	for _, member := range members {
+			return err
-		if member == nil {
-			b.Log.Warnf("Skipping missing information for a user.")
-			continue
 		}
-		b.userMemberMap[member.User.ID] = member
+		if len(members) == 0 {
-		b.nickMemberMap[member.User.Username] = member
+			break
-		if member.Nick != "" {
-			b.nickMemberMap[member.Nick] = member
 		}
+		for _, member := range members {
+			if member == nil {
+				b.Log.Warnf("Skipping missing information for a user.")
+				continue
+			}
+			b.userMemberMap[member.User.ID] = member
+			b.nickMemberMap[member.User.Username] = member
+			if member.Nick != "" {
+				b.nickMemberMap[member.Nick] = member
+			}
+		}
+		after = members[len(members) - 1].User.ID
 	}
 
 	b.c.AddHandler(b.messageCreate)