2
0
mirror of https://github.com/ars3niy/tdlib-purple synced 2025-08-31 05:55:08 +00:00

Set correct "who" for file transfers, and verify in tests

This commit is contained in:
Arseniy Lartsev
2020-10-04 18:57:14 +02:00
parent b3baa548f6
commit 089913eb26
11 changed files with 55 additions and 35 deletions

View File

@@ -443,7 +443,7 @@ static void showMessageTextChat(TdAccountData &account, const td::td_api::chat &
} else {
if (purpleId != 0)
serv_got_chat_in(purple_account_get_connection(account.purpleAccount), purpleId,
message.sender.empty() ? "someone" : message.sender.c_str(),
message.incomingGroupchatSender.empty() ? "someone" : message.incomingGroupchatSender.c_str(),
flags, text, message.timestamp);
}
}
@@ -608,8 +608,8 @@ std::string makeBasicDisplayName(const td::td_api::user &user)
return result;
}
std::string getSenderPurpleName(const td::td_api::chat &chat, const td::td_api::message &message,
TdAccountData &account)
std::string getIncomingGroupchatSenderPurpleName(const td::td_api::chat &chat, const td::td_api::message &message,
TdAccountData &account)
{
if (!message.is_outgoing_ && (getBasicGroupId(chat).valid() || getSupergroupId(chat).valid())) {
UserId senderId = getSenderUserId(message);
@@ -959,7 +959,7 @@ std::string getSenderDisplayName(const td::td_api::chat &chat, const TgMessageIn
else if (isPrivateChat(chat))
return chat.title_;
else
return message.sender;
return message.incomingGroupchatSender;
}
std::string makeNoticeWithSender(const td::td_api::chat &chat, const TgMessageInfo &message,