mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse Source
This commit is contained in:
RadRussianRus
2020-01-18 18:26:29 +03:00
parent 182d315609 f1b0e81b60
commit 2b77ec69f0
435 changed files with 19946 additions and 7255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/data/data_channel.h
View File

@@ -369,8 +369,8 @@ public:
return _ptsWaiter.waitingForShortPoll();
}
[[nodiscard]] QString unavailableReason() const override;
void setUnavailableReason(const QString &reason);
void setUnavailableReasons(
std::vector<Data::UnavailableReason> &&reason);
[[nodiscard]] MsgId availableMinId() const {
return _availableMinId;
@@ -413,6 +413,8 @@ public:
TimeId inviteDate = 0;
private:
auto unavailableReasons() const
-> const std::vector<Data::UnavailableReason> & override;
bool canEditLastAdmin(not_null<UserData*> user) const;
Flags _flags = Flags(MTPDchannel_ClientFlag::f_forbidden | 0);
@@ -432,7 +434,7 @@ private:
RestrictionFlags _restrictions;
TimeId _restrictedUntil;
QString _unavailableReason;
std::vector<Data::UnavailableReason> _unavailableReasons;
QString _inviteLink;
ChannelData *_linkedChat = nullptr;