refactor

Author: 1Conan

go.sum

@@ -81,8 +81,6 @@ go.mau.fi/util v0.9.2-0.20251005111801-c13b66219cee h1:wk1XGP/E1UH3YBqXbb9dajWdO
 go.mau.fi/util v0.9.2-0.20251005111801-c13b66219cee/go.mod h1:M0bM9SyaOWJniaHs9hxEzz91r5ql6gYq6o1q5O1SsjQ=
 go.mau.fi/webp v0.2.0 h1:QVMenHw7JDb4vall5sV75JNBQj9Hw4u8AKbi1QetHvg=
 go.mau.fi/webp v0.2.0/go.mod h1:VSg9MyODn12Mb5pyG0NIyNFhujrmoFSsZBs8syOZD1Q=
-go.mau.fi/whatsmeow v0.0.0-20251010113933-5806d60827b0 h1:Q4gIHMOPglOvX8JQ7ewWhoHMhveew2pwnBzmepgJi1w=
-go.mau.fi/whatsmeow v0.0.0-20251010113933-5806d60827b0/go.mod h1:CSdGU471Ss7bWunGomSe9RObY0MRxQDvxFH8i5Ndfk4=
 go.mau.fi/whatsmeow v0.0.0-20251014132254-6048f61ae25b h1:T0+Fhr2eaIOPW2M3xJW4qGzYLLa63aCsAnBFd/2GLhU=
 go.mau.fi/whatsmeow v0.0.0-20251014132254-6048f61ae25b/go.mod h1:CSdGU471Ss7bWunGomSe9RObY0MRxQDvxFH8i5Ndfk4=
 go.mau.fi/zeroconfig v0.2.0 h1:e/OGEERqVRRKlgaro7E6bh8xXiKFSXB3eNNIud7FUjU=

pkg/connector/handlematrix.go

@@ -596,14 +596,10 @@ func (wa *WhatsAppClient) HandleRoomTag(ctx context.Context, msg *bridgev2.Matri
 	return wa.Client.SendAppState(ctx, appstate.BuildPin(chatJID, isFavorite))
 }
 
-func (wa *WhatsAppClient) HandleMarkedUnread(ctx context.Context, msg *bridgev2.MatrixMarkedUnread) error {
-	chatJID, err := waid.ParsePortalID(msg.Portal.ID)
-	if err != nil {
-		return err
-	}
-	msgs, err := wa.Main.Bridge.DB.Message.GetLastNInPortal(ctx, msg.Portal.PortalKey, 1)
+func (wa *WhatsAppClient) getLastMessageInfo(ctx context.Context, chatJID types.JID, portalKey networkid.PortalKey) (time.Time, *waCommon.MessageKey, error) {
+	msgs, err := wa.Main.Bridge.DB.Message.GetLastNInPortal(ctx, portalKey, 1)
 	if err != nil {
-		return fmt.Errorf("failed to get last message in portal: %w", err)
+		return time.Time{}, nil, fmt.Errorf("failed to get last message in portal: %w", err)
 	}
 	var lastTS time.Time
 	var lastKey *waCommon.MessageKey
@@ -624,37 +620,32 @@ func (wa *WhatsAppClient) HandleMarkedUnread(ctx context.Context, msg *bridgev2.
 			}
 		}
 	}
-	return wa.Client.SendAppState(ctx, appstate.BuildMarkChatAsRead(chatJID, msg.Content.Unread, lastTS, lastKey))
+	return lastTS, lastKey, nil
 }
 
-func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridgev2.MatrixDeleteChat) error {
+func (wa *WhatsAppClient) HandleMarkedUnread(ctx context.Context, msg *bridgev2.MatrixMarkedUnread) error {
 	chatJID, err := waid.ParsePortalID(msg.Portal.ID)
 	if err != nil {
 		return err
 	}
-	messages, err := wa.Main.Bridge.DB.Message.GetLastNInPortal(ctx, msg.Portal.PortalKey, 1)
+	lastTS, lastKey, err := wa.getLastMessageInfo(ctx, chatJID, msg.Portal.PortalKey)
 	if err != nil {
-		return fmt.Errorf("failed to get last message in portal: %w", err)
-	}
-	if len(messages) < 1 {
-		return fmt.Errorf("failed to delete chat: no messages found")
+		return err
 	}
-	message := messages[0]
-	lastTS := messages[0].Timestamp
-	parsed, err := waid.ParseMessageID(message.ID)
+	return wa.Client.SendAppState(ctx, appstate.BuildMarkChatAsRead(chatJID, msg.Content.Unread, lastTS, lastKey))
+}
+
+func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridgev2.MatrixDeleteChat) error {
+	chatJID, err := waid.ParsePortalID(msg.Portal.ID)
 	if err != nil {
-		return fmt.Errorf("failed to parse last message ID: %w", err)
+		return err
 	}
-	fromMe := parsed.Sender.ToNonAD() == wa.JID.ToNonAD() || parsed.Sender.ToNonAD() == wa.GetStore().GetLID().ToNonAD()
-	var participant *string
-	if chatJID.Server == types.GroupServer {
-		participant = ptr.Ptr(parsed.Sender.String())
+	lastTS, lastKey, err := wa.getLastMessageInfo(ctx, chatJID, msg.Portal.PortalKey)
+	if err != nil {
+		return err
 	}
-	lastKey := &waCommon.MessageKey{
-		RemoteJID:   ptr.Ptr(chatJID.String()),
-		FromMe:      &fromMe,
-		ID:          &parsed.ID,
-		Participant: participant,
+	if lastKey == nil {
+		return fmt.Errorf("failed to delete chat: no messages found")
 	}
 	return wa.Client.SendAppState(ctx, appstate.BuildDeleteChat(chatJID, lastTS, lastKey))
 }