mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 16:15:13 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev_private

Browse Source
This commit is contained in:
John Preston
2016-07-31 11:01:37 +01:00
parent a4dbe6f096 c34181ef3e
commit d155967149
11 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/history.cpp
View File

@@ -2833,7 +2833,9 @@ void HistoryItem::setId(MsgId newId) {
}
bool HistoryItem::canEdit(const QDateTime &cur) const {
if (id < 0 || date.secsTo(cur) >= Global::EditTimeLimit()) return false;
auto messageToMyself = (peerToUser(_history->peer->id) == MTP::authedId());
auto messageTooOld = messageToMyself ? false : (date.secsTo(cur) >= Global::EditTimeLimit());
if (id < 0 || messageTooOld) return false;
if (auto msg = toHistoryMessage()) {
if (msg->Has<HistoryMessageVia>() || msg->Has<HistoryMessageForwarded>()) return false;
@@ -2854,7 +2856,7 @@ bool HistoryItem::canEdit(const QDateTime &cur) const {
auto channel = _history->peer->asChannel();
return (channel->amCreator() || (channel->amEditor() && out()));
}
return out() || (peerToUser(_history->peer->id) == MTP::authedId());
return out() || messageToMyself;
}
return false;
}