Ver código fonte

refactor: use ningen helpers

ayn2op 1 ano atrás
pai
commit
ce69326513
2 arquivos alterados com 2 adições e 14 exclusões
  1. 1 5
      cmd/guilds_tree.go
  2. 1 9
      cmd/messages_text.go

+ 1 - 5
cmd/guilds_tree.go

@@ -207,16 +207,12 @@ func (gt *GuildsTree) onSelected(n *tview.TreeNode) {
 		gt.selectedChannelID = ref
 		app.SetFocus(mainFlex.messageInput)
 	case nil: // Direct messages
-		cs, err := discordState.Cabinet.PrivateChannels()
+		cs, err := discordState.PrivateChannels()
 		if err != nil {
 			log.Println(err)
 			return
 		}
 
-		sort.Slice(cs, func(i, j int) bool {
-			return cs[i].LastMessageID > cs[j].LastMessageID
-		})
-
 		for _, c := range cs {
 			gt.createChannelNode(n, c)
 		}

+ 1 - 9
cmd/messages_text.go

@@ -75,15 +75,7 @@ func (mt *MessagesText) reset() {
 
 func (mt *MessagesText) createMessage(m discord.Message) {
 	if cfg.HideBlockedUsers {
-		ready := discordState.Ready()
-		var isBlocked bool
-		for _, relationship := range ready.Relationships {
-			if relationship.Type == discord.BlockedRelationship && relationship.UserID == m.Author.ID {
-				isBlocked = true
-				break
-			}
-		}
-
+		isBlocked := discordState.UserIsBlocked(m.Author.ID)
 		if isBlocked {
 			fmt.Fprintln(mt, "[:red:b]Blocked message[:-:-]")
 			return