From ac20f1ed255fb244c3cb9205e53932f26501e9b7 Mon Sep 17 00:00:00 2001
From: richjohnrambo <richjohnrambo@gmail.com>
Date: Wed, 23 Sep 2026 10:47:31 +0800
Subject: [PATCH] fix message mutation responses

---
 server/db/mysql/tenant_adapter.go | 32 +++++++++++++++++++++++++++----
 server/im_http.go                 | 21 +++++++++++++++++++-
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/server/db/mysql/tenant_adapter.go b/server/db/mysql/tenant_adapter.go
index 317551d..ce41721 100644
--- a/server/db/mysql/tenant_adapter.go
+++ b/server/db/mysql/tenant_adapter.go
@@ -2463,7 +2463,13 @@ func (a *adapter) TenantMessageRecall(id t.TenantID, topic string, seq int64, ac
 	if err = tx.Commit(); err != nil {
 		return nil, err
 	}
-	return a.TenantMessageGetOne(id, topic, seq)
+	msg.UpdatedAt = recalledAt
+	msg.Version++
+	msg.RecalledAt = &recalledAt
+	msg.RecalledBy = actor.String()
+	msg.Head = nil
+	msg.Content = nil
+	return msg, nil
 }
 
 func (a *adapter) TenantGroupMessageRecall(id t.TenantID, topic string, seq int64, actor t.Uid, expectedVersion int, recalledAt time.Time) (*t.Message, error) {
@@ -2512,7 +2518,13 @@ func (a *adapter) TenantGroupMessageRecall(id t.TenantID, topic string, seq int6
 	if err = tx.Commit(); err != nil {
 		return nil, err
 	}
-	return a.TenantGroupMessageGetOne(id, topic, seq)
+	msg.UpdatedAt = recalledAt
+	msg.Version++
+	msg.RecalledAt = &recalledAt
+	msg.RecalledBy = actor.String()
+	msg.Head = nil
+	msg.Content = nil
+	return msg, nil
 }
 
 func (a *adapter) TenantMessageEdit(id t.TenantID, topic string, seq int64, actor t.Uid, expectedVersion int, head t.KVMap, content any, reason string, editedAt time.Time) (*t.Message, error) {
@@ -2569,7 +2581,13 @@ func (a *adapter) TenantMessageEdit(id t.TenantID, topic string, seq int64, acto
 	if err = tx.Commit(); err != nil {
 		return nil, err
 	}
-	return a.TenantMessageGetOne(id, topic, seq)
+	msg.UpdatedAt = editedAt
+	msg.Version++
+	msg.Head = head
+	msg.Content = storedContent
+	msg.ContentNonce = nonce
+	msg.KeyVersion = keyVersion
+	return msg, nil
 }
 
 func (a *adapter) TenantGroupMessageEdit(id t.TenantID, topic string, seq int64, actor t.Uid, expectedVersion int, head t.KVMap, content any, reason string, editedAt time.Time) (*t.Message, error) {
@@ -2625,7 +2643,13 @@ func (a *adapter) TenantGroupMessageEdit(id t.TenantID, topic string, seq int64,
 	if err = tx.Commit(); err != nil {
 		return nil, err
 	}
-	return a.TenantGroupMessageGetOne(id, topic, seq)
+	msg.UpdatedAt = editedAt
+	msg.Version++
+	msg.Head = head
+	msg.Content = storedContent
+	msg.ContentNonce = nonce
+	msg.KeyVersion = keyVersion
+	return msg, nil
 }
 
 func (a *adapter) TenantMessageGetAll(id t.TenantID, topic string, uid t.Uid, opts *t.QueryOpt) ([]t.Message, error) {
diff --git a/server/im_http.go b/server/im_http.go
index 10f2d76..0d1b10a 100644
--- a/server/im_http.go
+++ b/server/im_http.go
@@ -4360,10 +4360,29 @@ func serveIMGroupMember(wrt http.ResponseWriter, req *http.Request, topic string
 }
 
 func serveIMGroupDetail(wrt http.ResponseWriter, req *http.Request, topic string) {
-	principal, selfSub, ok := requireIMGroupMember(wrt, req, topic, true)
+	principal, ok := authenticateIMHTTPBearer(wrt, req)
 	if !ok {
 		return
 	}
+	if types.GetTopicCat(topic) != types.TopicCatGrp {
+		writeIMError(wrt, req, http.StatusBadRequest, 30000, imReasonMalformedRequest, "malformed request", map[string]any{"field": "topic"})
+		return
+	}
+	if req.Method == http.MethodGet {
+		if settings, err := store.GroupBusiness.GetSettings(principal.TenantID, topic); err == nil && settings != nil && settings.GroupStatus == types.GroupStatusDissolved {
+			writeIMError(wrt, req, http.StatusGone, 30004, imReasonGroupDissolved, "group dissolved", map[string]any{"topic": topic})
+			return
+		}
+	}
+	selfSub, err := store.Subs.Get(principal.TenantID, topic, principal.Uid, false)
+	if err != nil {
+		writeIMError(wrt, req, http.StatusInternalServerError, 90000, imReasonInternal, "internal error", nil)
+		return
+	}
+	if selfSub == nil || !(selfSub.ModeGiven & selfSub.ModeWant).IsJoiner() || !(selfSub.ModeGiven & selfSub.ModeWant).IsReader() {
+		writeIMError(wrt, req, http.StatusForbidden, 30005, imReasonPermissionDenied, "topic permission required", nil)
+		return
+	}
 	switch req.Method {
 	case http.MethodGet:
 		group, err := store.Topics.Get(principal.TenantID, topic)