mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Show correct phrase in local join messages.

Browse Source
This commit is contained in:
John Preston
2021-10-14 15:42:51 +04:00
parent 721aac57a5
commit 2ade6be146
6 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/history/history.cpp
View File

@@ -2879,16 +2879,17 @@ MsgRange History::rangeForDifferenceRequest() const {
}
HistoryService *History::insertJoinedMessage() {
if (!isChannel()
const auto channel = peer->asChannel();
if (!channel
|| _joinedMessage
|| !peer->asChannel()->amIn()
|| !channel->amIn()
|| (peer->isMegagroup()
&& peer->asChannel()->mgInfo->joinedMessageFound)) {
&& channel->mgInfo->joinedMessageFound)) {
return _joinedMessage;
}
const auto inviter = peer->asChannel()->inviter
? owner().userLoaded(peer->asChannel()->inviter)
const auto inviter = (channel->inviter.bare > 0)
? owner().userLoaded(channel->inviter)
: nullptr;
if (!inviter) {
return nullptr;
@@ -2898,12 +2899,15 @@ HistoryService *History::insertJoinedMessage() {
&& peer->migrateFrom()
&& !blocks.empty()
&& blocks.front()->messages.front()->data()->id == 1) {
peer->asChannel()->mgInfo->joinedMessageFound = true;
channel->mgInfo->joinedMessageFound = true;
return nullptr;
}
const auto inviteDate = peer->asChannel()->inviteDate;
_joinedMessage = GenerateJoinedMessage(this, inviteDate, inviter);
_joinedMessage = GenerateJoinedMessage(
this,
channel->inviteDate,
inviter,
channel->inviteViaRequest);
insertLocalMessage(_joinedMessage);
return _joinedMessage;
}