fix im heartbeat and friend display name

server/im_http_test.go

@@ -1250,7 +1250,18 @@ func (s *testRelationsStore) DeleteFriend(tenantID types.TenantID, userID, peerI
 }
 
 func (s *testRelationsStore) UpdateFriendRemark(tenantID types.TenantID, userID, peerID types.Uid, remark string, now time.Time) (*types.Friendship, error) {
-	return &types.Friendship{TenantID: tenantID, UserID: userID, PeerID: peerID, Status: types.RelationshipFriend, Remark: remark, Topic: userID.P2PName(peerID), CreatedAt: now, UpdatedAt: now}, nil
+	friendship := &types.Friendship{TenantID: tenantID, UserID: userID, PeerID: peerID, Status: types.RelationshipFriend, Remark: remark, Topic: userID.P2PName(peerID), CreatedAt: now, UpdatedAt: now}
+	s.context = &types.RelationshipContext{
+		TenantID:     tenantID,
+		UserID:       userID,
+		PeerID:       peerID,
+		Topic:        friendship.Topic,
+		Relationship: types.RelationshipFriend,
+		CanSend:      true,
+		Remark:       remark,
+		Peer:         &types.User{ObjHeader: types.ObjHeader{Id: peerID.String()}, TenantID: tenantID, Public: map[string]any{"display_name": "Ming"}},
+	}
+	return friendship, nil
 }
 
 func (s *testRelationsStore) SearchUsers(_ types.TenantID, _ types.Uid, _, _, _ string, _ int) ([]types.UserSearchItem, string, error) {
@@ -7203,6 +7214,13 @@ func TestServeIMFriendRemark(t *testing.T) {
 	if data["relationship"] != types.RelationshipFriend || data["topic"] == "" {
 		t.Fatalf("unexpected friend remark response: %#v", data)
 	}
+	if data["display_name"] != "小明" || data["remark"] != "小明" {
+		t.Fatalf("friend remark should drive display name: %#v", data)
+	}
+	peerData := data["peer"].(map[string]any)
+	if peerData["display_name"] != "小明" {
+		t.Fatalf("peer display name should use remark: %#v", data)
+	}
 }
 
 func TestServeIMFriendDeleteReturnsCannotSendContext(t *testing.T) {