Prechádzať zdrojové kódy

Revert "Fix hidden category/channel bug" (#371)

Ayyan 2 rokov pred
rodič
commit
518eea9855
1 zmenil súbory, kde vykonal 3 pridanie a 25 odobranie
  1. 3 25
      cmd/guilds_tree.go

+ 3 - 25
cmd/guilds_tree.go

@@ -108,8 +108,7 @@ func (gt *GuildsTree) channelToString(c discord.Channel) string {
 }
 
 func (gt *GuildsTree) createChannelNode(n *tview.TreeNode, c discord.Channel) {
-	// If c is a regular channel, abort if user does not have view permission
-	if c.Type != discord.DirectMessage && c.Type != discord.GroupDM && c.Type != discord.GuildCategory {
+	if c.Type != discord.DirectMessage && c.Type != discord.GroupDM {
 		ps, err := discordState.Permissions(c.ID, discordState.Ready().User.ID)
 		if err != nil {
 			log.Println(err)
@@ -127,47 +126,26 @@ func (gt *GuildsTree) createChannelNode(n *tview.TreeNode, c discord.Channel) {
 }
 
 func (gt *GuildsTree) createChannelNodes(n *tview.TreeNode, cs []discord.Channel) {
-	// Create all top-level, non-category channels
 	for _, c := range cs {
 		if c.Type != discord.GuildCategory && !c.ParentID.IsValid() {
 			gt.createChannelNode(n, c)
 		}
 	}
 
-	// Create categories that have child channels, if at least one child channel is visible to the user
 PARENT_CHANNELS:
 	for _, c := range cs {
 		if c.Type == discord.GuildCategory {
 			for _, nested := range cs {
 				if nested.ParentID == c.ID {
-					ps, err := discordState.Permissions(nested.ID, discordState.Ready().User.ID)
-					if err != nil {
-						log.Println(err)
-						continue
-					}
-					if ps.Has(discord.PermissionViewChannel) {
-						gt.createChannelNode(n, c)
-						continue PARENT_CHANNELS
-					}
+					gt.createChannelNode(n, c)
+					continue PARENT_CHANNELS
 				}
 			}
 		}
 	}
 
-	// Create category-channels if user has view channel permission
 	for _, c := range cs {
 		if c.ParentID.IsValid() {
-			// Check if user has view permission for this channel (if not, we don't need to look for the parent)
-			ps, err := discordState.Permissions(c.ID, discordState.Ready().User.ID)
-			if err != nil {
-				log.Println(err)
-				continue
-			}
-			if !ps.Has(discord.PermissionViewChannel) {
-				continue
-			}
-
-			// Get parent reference if it exists
 			var parent *tview.TreeNode
 			n.Walk(func(node, _ *tview.TreeNode) bool {
 				if node.GetReference() == c.ParentID {