Skip to content
This repository has been archived by the owner on Aug 12, 2024. It is now read-only.

Commit

Permalink
Shamrock: error fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@whitechi73
whitechi73 committed Dec 2, 2023
1 parent b2adc5c commit 6201d12
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ internal object GlobalEventTransmitter: BaseSvc() {
sender = Sender(
userId = record.senderUin,
nickname = record.sendNickName
.ifBlank { record.peerName }
.ifBlank { record.sendRemarkName }
.ifBlank { record.sendMemberName },
.ifBlank { record.sendMemberName }
.ifBlank { record.peerName },
card = record.sendMemberName.ifBlank { record.sendNickName },
role = when (record.senderUin) {
GroupSvc.getOwner(record.peerUin.toString()) -> MemberRole.Owner
Expand Down

3 comments on commit 6201d12

@Miuzarte
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在变成了没名片的时候card和nickname都是昵称，有群名片的时候两者都是群名片（

    "sender": {
        "user_id": user_id,
        "nickname": "謬紗特 ゚゚゚゚゚゚゚゚",
        "card": "謬紗特 ゚゚゚゚゚゚゚゚",
        "role": "owner",
        "title": "",
        "level": ""
    }

    "sender": {
        "user_id": user_id,
        "nickname": "123456",
        "card": "123456",
        "role": "owner",
        "title": "",
        "level": ""
    }

@whitechi73
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在变成了没名片的时候card和nickname都是昵称，有群名片的时候两者都是群名片（

    "sender": {
        "user_id": user_id,
        "nickname": "謬紗特 ゚゚゚゚゚゚゚゚",
        "card": "謬紗特 ゚゚゚゚゚゚゚゚",
        "role": "owner",
        "title": "",
        "level": ""
    }

    "sender": {
        "user_id": user_id,
        "nickname": "123456",
        "card": "123456",
        "role": "owner",
        "title": "",
        "level": ""
    }

QQ是这么设计的，没办法

@Miuzarte
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在变成了没名片的时候card和nickname都是昵称，有群名片的时候两者都是群名片（

    "sender": {
        "user_id": user_id,
        "nickname": "謬紗特 ゚゚゚゚゚゚゚゚",
        "card": "謬紗特 ゚゚゚゚゚゚゚゚",
        "role": "owner",
        "title": "",
        "level": ""
    }

    "sender": {
        "user_id": user_id,
        "nickname": "123456",
        "card": "123456",
        "role": "owner",
        "title": "",
        "level": ""
    }

QQ是这么设计的，没办法

对 之前那个pr合并之后看了下确实没办法，有群名片的情况下拿不到昵称

Please sign in to comment.