fix im profile display name remark priority
This commit is contained in:
+4
-1
@@ -9343,7 +9343,7 @@ func blockListItemPayload(item types.BlockListItem) map[string]any {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func userProfilePayload(user *types.User, ctx *types.RelationshipContext) map[string]any {
|
func userProfilePayload(user *types.User, ctx *types.RelationshipContext) map[string]any {
|
||||||
data := userSummaryPayload(user, "")
|
data := userSummaryPayload(user, ctx.Remark)
|
||||||
data["relationship"] = ctx.Relationship
|
data["relationship"] = ctx.Relationship
|
||||||
data["topic"] = ctx.Topic
|
data["topic"] = ctx.Topic
|
||||||
data["capabilities"] = map[string]any{
|
data["capabilities"] = map[string]any{
|
||||||
@@ -9351,6 +9351,9 @@ func userProfilePayload(user *types.User, ctx *types.RelationshipContext) map[st
|
|||||||
"can_call": imCanCall(ctx.CanSend),
|
"can_call": imCanCall(ctx.CanSend),
|
||||||
"can_add_friend": ctx.Relationship == types.RelationshipNone,
|
"can_add_friend": ctx.Relationship == types.RelationshipNone,
|
||||||
}
|
}
|
||||||
|
if ctx.Remark != "" {
|
||||||
|
data["remark"] = ctx.Remark
|
||||||
|
}
|
||||||
if ctx.RequestID != "" {
|
if ctx.RequestID != "" {
|
||||||
data["request_id"] = ctx.RequestID
|
data["request_id"] = ctx.RequestID
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7311,6 +7311,7 @@ func TestServeIMUserProfile(t *testing.T) {
|
|||||||
Topic: types.Uid(1).P2PName(peer),
|
Topic: types.Uid(1).P2PName(peer),
|
||||||
Relationship: types.RelationshipFriend,
|
Relationship: types.RelationshipFriend,
|
||||||
CanSend: true,
|
CanSend: true,
|
||||||
|
Remark: "老同事",
|
||||||
}}
|
}}
|
||||||
store.Profiles = &testProfilesStore{}
|
store.Profiles = &testProfilesStore{}
|
||||||
defer func() {
|
defer func() {
|
||||||
@@ -7332,6 +7333,9 @@ func TestServeIMUserProfile(t *testing.T) {
|
|||||||
if data["relationship"] != types.RelationshipFriend || data["signature"] != "hello" || data["topic"] == "" {
|
if data["relationship"] != types.RelationshipFriend || data["signature"] != "hello" || data["topic"] == "" {
|
||||||
t.Fatalf("unexpected profile response: %#v", data)
|
t.Fatalf("unexpected profile response: %#v", data)
|
||||||
}
|
}
|
||||||
|
if data["display_name"] != "老同事" || data["remark"] != "老同事" {
|
||||||
|
t.Fatalf("profile display name should use friend remark: %#v", data)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServeIMUserQRCodes(t *testing.T) {
|
func TestServeIMUserQRCodes(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user