fix deleted check (keybase#23774)

Author: joshblum

go/chat/sender.go

@@ -276,14 +276,15 @@ func (s *BlockingSender) getAllDeletedEdits(ctx context.Context, uid gregor1.UID
 	}
 
 	// Get the one message to be deleted by ID.
-	deleteTarget, isValidFull, err := s.getMessage(ctx, uid, convID, deleteTargetID, false /* resolveSupersedes */)
+	deleteTarget, err := s.getMessage(ctx, uid, convID, deleteTargetID, false /* resolveSupersedes */)
 	if err != nil {
 		return msg, nil, nil, err
-	} else if !isValidFull {
-		// If the message is already deleted just get out of here.
-		return msg, nil, nil, nil
 	}
-	switch deleteTarget.ClientHeader.MessageType {
+	bodyTyp, err := deleteTarget.MessageBody.MessageType()
+	if err != nil {
+		return msg, nil, nil, err
+	}
+	switch bodyTyp {
 	case chat1.MessageType_REACTION:
 		// Don't do anything here for reactions/unfurls, they can't be edited
 		return msg, nil, nil, nil
@@ -379,22 +380,22 @@ func (s *BlockingSender) getAllDeletedEdits(ctx context.Context, uid gregor1.UID
 }
 
 func (s *BlockingSender) getMessage(ctx context.Context, uid gregor1.UID,
-	convID chat1.ConversationID, msgID chat1.MessageID, resolveSupersedes bool) (mvalid chat1.MessageUnboxedValid, isValidFull bool, err error) {
+	convID chat1.ConversationID, msgID chat1.MessageID, resolveSupersedes bool) (mvalid chat1.MessageUnboxedValid, err error) {
 	reason := chat1.GetThreadReason_PREPARE
 	messages, err := s.G().ConvSource.GetMessages(ctx, convID, uid, []chat1.MessageID{msgID},
 		&reason, nil, resolveSupersedes)
 	if err != nil {
-		return mvalid, false, err
+		return mvalid, err
 	}
 	if len(messages) == 0 {
-		return mvalid, false, fmt.Errorf("getMessage: message not found")
+		return mvalid, fmt.Errorf("getMessage: message not found")
 	}
 	if !messages[0].IsValid() {
 		st, err := messages[0].State()
-		return mvalid, false, fmt.Errorf("getMessage returned invalid message: msgID: %v st: %v: err %v",
+		return mvalid, fmt.Errorf("getMessage returned invalid message: msgID: %v st: %v: err %v",
 			msgID, st, err)
 	}
-	return messages[0].Valid(), messages[0].IsValidFull(), nil
+	return messages[0].Valid(), nil
 }
 
 // If we are superseding an ephemeral message, we have to set the
@@ -410,7 +411,7 @@ func (s *BlockingSender) getSupersederEphemeralMetadata(ctx context.Context, uid
 		return nil, nil
 	}
 
-	supersededMsg, _, err := s.getMessage(ctx, uid, convID, msg.ClientHeader.Supersedes, false /* resolveSupersedes */)
+	supersededMsg, err := s.getMessage(ctx, uid, convID, msg.ClientHeader.Supersedes, false /* resolveSupersedes */)
 	if err != nil {
 		return nil, err
 	}
@@ -432,7 +433,7 @@ func (s *BlockingSender) processReactionMessage(ctx context.Context, uid gregor1
 	}
 
 	// We could either be posting a reaction or removing one that we already posted.
-	supersededMsg, _, err := s.getMessage(ctx, uid, convID, msg.ClientHeader.Supersedes,
+	supersededMsg, err := s.getMessage(ctx, uid, convID, msg.ClientHeader.Supersedes,
 		true /* resolveSupersedes */)
 	if err != nil {
 		return clientHeader, body, err
@@ -1029,7 +1030,7 @@ func (s *BlockingSender) applyTeamBotSettings(ctx context.Context, uid gregor1.U
 	// Check if we are superseding a bot message. If so, just take what the
 	// superseded has. Don't automatically key for replies, run the normal checks.
 	if msg.ClientHeader.Supersedes > 0 && opts.ReplyTo == nil && convID != nil {
-		target, _, err := s.getMessage(ctx, uid, *convID, msg.ClientHeader.Supersedes, false /*resolveSupersedes */)
+		target, err := s.getMessage(ctx, uid, *convID, msg.ClientHeader.Supersedes, false /*resolveSupersedes */)
 		if err != nil {
 			return nil, err
 		}

go/chat/utils/utils.go

@@ -1927,13 +1927,9 @@ func PresentMessageUnboxed(ctx context.Context, g *globals.Context, rawMsg chat1
 	case chat1.MessageUnboxedState_VALID:
 		valid := rawMsg.Valid()
 		if !rawMsg.IsValidFull() {
-			showErr := true
 			// If we have an expired ephemeral message, don't show an error
 			// message.
-			if valid.IsEphemeral() && valid.IsEphemeralExpired(time.Now()) {
-				showErr = false
-			}
-			if showErr {
+			if !(valid.IsEphemeral() && valid.IsEphemeralExpired(time.Now())) {
 				return miscErr(fmt.Errorf("unexpected deleted %v message",
 					strings.ToLower(rawMsg.GetMessageType().String())))
 			}

go/protocol/chat1/extras.go

@@ -1046,6 +1046,13 @@ func (m UIMessage) IsValid() bool {
 	return false
 }
 
+func (m UIMessage) IsError() bool {
+	if state, err := m.State(); err == nil {
+		return state == MessageUnboxedState_ERROR
+	}
+	return false
+}
+
 func (m UIMessage) IsOutbox() bool {
 	if state, err := m.State(); err == nil {
 		return state == MessageUnboxedState_OUTBOX