Explorar el Código

refactor(ui/chat): discard error from (store.MeStore).Me (#732)

Ayyan hace 3 meses
padre
commit
6f5a1c36cb

+ 6 - 16
internal/ui/chat/message_input.go

@@ -282,10 +282,8 @@ func expandMentions(state *ningen.State, c *discord.Channel, src []byte) []byte
 				}
 			}
 			// self ping
-			me, err := state.Cabinet.Me()
-			if err != nil {
-				slog.Error("failed to get client user (me)", "err", err)
-			} else if strings.EqualFold(me.Username, name) {
+			me, _ := state.Cabinet.Me()
+			if strings.EqualFold(me.Username, name) {
 				return []byte(me.ID.Mention())
 			}
 			return output
@@ -373,12 +371,8 @@ func (mi *messageInput) tabSuggestion() {
 	if name == "" {
 		shown = make(map[string]struct{})
 		// Don't show @me in the list of recent authors
-		me, err := mi.chatView.state.Cabinet.Me()
-		if err != nil {
-			slog.Error("failed to get client user (me)", "err", err)
-		} else {
-			shown[me.Username] = userDone
-		}
+		me, _ := mi.chatView.state.Cabinet.Me()
+		shown[me.Username] = userDone
 	}
 
 	// DMs have recipients, not members
@@ -397,12 +391,8 @@ func (mi *messageInput) tabSuggestion() {
 			}
 		} else {
 			users := selected.DMRecipients
-			me, err := mi.chatView.state.Cabinet.Me()
-			if err != nil {
-				slog.Error("failed to get client user (me)", "err", err)
-			} else {
-				users = append(users, *me)
-			}
+			me, _ := mi.chatView.state.Cabinet.Me()
+			users = append(users, *me)
 			res := fuzzy.FindFrom(name, userList(users))
 			for _, r := range res {
 				mi.addMentionUser(&users[r.Index])

+ 2 - 7
internal/ui/chat/messages_list.go

@@ -630,12 +630,7 @@ func (ml *messagesList) edit() {
 		return
 	}
 
-	me, err := ml.chatView.state.Cabinet.Me()
-	if err != nil {
-		slog.Error("failed to get client user (me)", "err", err)
-		return
-	}
-
+	me, _ := ml.chatView.state.Cabinet.Me()
 	if message.Author.ID != me.ID {
 		slog.Error("failed to edit message; not the author", "channel_id", message.ChannelID, "message_id", message.ID)
 		return
@@ -669,7 +664,7 @@ func (ml *messagesList) delete() {
 	}
 
 	if msg.GuildID.IsValid() {
-		me, err := ml.chatView.state.Cabinet.Me()
+		me, _ := ml.chatView.state.Cabinet.Me()
 		if err != nil {
 			slog.Error("failed to get client user (me)", "err", err)
 			return

+ 1 - 6
internal/ui/chat/state.go

@@ -198,12 +198,7 @@ func (v *View) onTypingStart(event *gateway.TypingStartEvent) {
 		return
 	}
 
-	me, err := v.state.Cabinet.Me()
-	if err != nil {
-		slog.Error("failed to get me from state", "err", err)
-		return
-	}
-
+	me, _ := v.state.Cabinet.Me()
 	if event.UserID == me.ID {
 		return
 	}