RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Show invite link owner in service message." 

This reverts commit 27103889a4.
This commit is contained in:
John Preston 2018-11-08 17:17:00 +04:00
parent 346cb4e203
commit 784b0a2248
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View File

@ -846,7 +846,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_action_kick_user" = "{from} removed {user}";
"lng_action_user_left" = "{from} left the group";
"lng_action_user_joined" = "{from} joined the group";
"lng_action_user_joined_by_link_from" = "{from} joined the group via invite link from {user}";
"lng_action_user_joined_by_link" = "{from} joined the group via invite link";
"lng_action_user_registered" = "{from} just joined Telegram";
"lng_action_removed_photo" = "{from} removed group photo";
"lng_action_removed_photo_channel" = "Channel photo removed";

12
Telegram/SourceFiles/history/history_service.cpp
View File

@ -36,14 +36,14 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
auto result = PreparedText {};
auto &users = action.vusers.v;
if (users.size() == 1) {
auto user = App::user(peerFromUser(users[0]));
if (user == _from) {
auto u = App::user(peerFromUser(users[0]));
if (u == _from) {
result.links.push_back(fromLink());
result.text = lng_action_user_joined(lt_from, fromLinkText());
} else {
result.links.push_back(fromLink());
result.links.push_back(user->createOpenLink());
result.text = lng_action_add_user(lt_from, fromLinkText(), lt_user, textcmdLink(2, user->name));
result.links.push_back(u->createOpenLink());
result.text = lng_action_add_user(lt_from, fromLinkText(), lt_user, textcmdLink(2, u->name));
}
} else if (users.isEmpty()) {
result.links.push_back(fromLink());
@ -69,11 +69,9 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
};
auto prepareChatJoinedByLink = [this](const MTPDmessageActionChatJoinedByLink &action) {
const auto user = App::user(peerFromUser(action.vinviter_id.v));
auto result = PreparedText {};
result.links.push_back(fromLink());
result.links.push_back(user->createOpenLink());
result.text = lng_action_user_joined_by_link_from(lt_from, fromLinkText(), lt_user, textcmdLink(2, user->name));
result.text = lng_action_user_joined_by_link(lt_from, fromLinkText());
return result;
};