Browse Source

refactor: remove createGuildNodeFromID func

ayn2op 3 năm trước cách đây
mục cha
commit
794081d816
2 tập tin đã thay đổi với 8 bổ sung9 xóa
  1. 5 8
      guilds_tree.go
  2. 3 1
      state.go

+ 5 - 8
guilds_tree.go

@@ -57,23 +57,20 @@ func (gt *GuildsTree) createGuildFolderNode(parent *tview.TreeNode, gf gateway.G
 	parent.AddChild(n)
 
 	for _, gid := range gf.GuildIDs {
-		if err := guildsTree.createGuildNodeFromID(n, gid); err != nil {
+		g, err := discordState.Cabinet.Guild(gid)
+		if err != nil {
 			log.Println(err)
 			continue
 		}
-	}
-}
 
-func (gt *GuildsTree) createGuildNodeFromID(n *tview.TreeNode, gid discord.GuildID) error {
-	g, err := discordState.Cabinet.Guild(gid)
-	if err != nil {
-		return err
+		gt.createGuildNode(n, *g)
 	}
+}
 
+func (gt *GuildsTree) createGuildNode(n *tview.TreeNode, g discord.Guild) {
 	gn := tview.NewTreeNode(g.Name)
 	gn.SetReference(g.ID)
 	n.AddChild(gn)
-	return nil
 }
 
 func (gt *GuildsTree) createChannelNode(n *tview.TreeNode, c discord.Channel) {

+ 3 - 1
state.go

@@ -65,11 +65,13 @@ func (s *State) onReady(r *gateway.ReadyEvent) {
 	for _, gf := range r.UserSettings.GuildFolders {
 		/// If the ID of the guild folder is zero, the guild folder only contains single guild.
 		if gf.ID == 0 {
-			err := guildsTree.createGuildNodeFromID(guildsTree.root, gf.GuildIDs[0])
+			g, err := discordState.Cabinet.Guild(gf.GuildIDs[0])
 			if err != nil {
 				log.Println(err)
 				continue
 			}
+
+			guildsTree.createGuildNode(guildsTree.root, *g)
 		} else {
 			guildsTree.createGuildFolderNode(guildsTree.root, gf)
 		}