mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-10-15 14:08:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into profile

Browse Source 
Conflicts:
	Telegram/Telegram.vcxproj.filters
This commit is contained in:
John Preston
2016-05-16 18:45:50 +03:00
parent bf8a98a13b ecff1d15af
commit 6e2dea7030
66 changed files with 4666 additions and 2354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/profilewidget.cpp
View File

@@ -1029,15 +1029,6 @@ void ProfileInner::paintEvent(QPaintEvent *e) {
if (!data) {
data = _participantsData[cnt] = new ParticipantData();
data->name.setText(st::profileListNameFont, user->name, _textNameOptions);
if (user->botInfo) {
if (user->botInfo->readsAllHistory) {
data->online = lang(lng_status_bot_reads_all);
} else {
data->online = lang(lng_status_bot_not_reads_all);
}
} else {
data->online = App::onlineText(user, l_time);
}
if (_peerChat) {
data->admin = (peerFromUser(_peerChat->creator) == user->id) || (_peerChat->adminsEnabled() && (_peerChat->admins.constFind(user) != _peerChat->admins.cend()));
} else if (_peerChannel) {
@@ -1045,6 +1036,15 @@ void ProfileInner::paintEvent(QPaintEvent *e) {
} else {
data->admin = false;
}
if (user->botInfo) {
if (user->botInfo->readsAllHistory || data->admin) {
data->online = lang(lng_status_bot_reads_all);
} else {
data->online = lang(lng_status_bot_not_reads_all);
}
} else {
data->online = App::onlineText(user, l_time);
}
if (_amCreator) {
data->cankick = (user != App::self());
} else if (_peerChat && _peerChat->amAdmin()) {