diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index a3310c7f11..b55a1289c1 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.13.1" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 9b5d5dfc46..3e1e8f0a83 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,13,0 - PRODUCTVERSION 2,1,13,0 + FILEVERSION 2,1,13,1 + PRODUCTVERSION 2,1,13,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.1.13.0" + VALUE "FileVersion", "2.1.13.1" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.13.0" + VALUE "ProductVersion", "2.1.13.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index b8ed825121..fce071db71 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,13,0 - PRODUCTVERSION 2,1,13,0 + FILEVERSION 2,1,13,1 + PRODUCTVERSION 2,1,13,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.1.13.0" + VALUE "FileVersion", "2.1.13.1" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.13.0" + VALUE "ProductVersion", "2.1.13.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 6b6d127afb..6b5991274a 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (2001013001ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION diff --git a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm index f29efaa95d..35fb4971ca 100644 --- a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm +++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm @@ -198,7 +198,7 @@ QImage ArchiveUserpic(not_null folder) { return result; } -QImage UnreadBadge(PeerData *peer) { +QImage UnreadBadge(not_null peer) { const auto history = peer->owner().history(peer->id); const auto count = history->unreadCountForBadge(); if (!count) { @@ -261,10 +261,6 @@ TimeId CalculateOnlineTill(not_null peer) { return 0; }; -inline auto RplToEmpty() { - return rpl::map([=] { return rpl::empty_value(); }); -} - int WidthFromString(NSString *s) { return (int)ceil( [[NSTextField labelWithString:s] frame].size.width) * 1.2; @@ -933,11 +929,11 @@ void AppendEmojiPacks( _session->changes().historyUpdates( _session->data().history(peer), Data::HistoryUpdate::Flag::UnreadView - ) | RplToEmpty(), + ) | rpl::to_empty, _session->changes().peerFlagsValue( peer, UpdateFlag::Notifications - ) | RplToEmpty() + ) | rpl::to_empty ) | rpl::start_with_next([=] { updateBadge(pin); }, *peerChangedLifetime); diff --git a/Telegram/build/version b/Telegram/build/version index 4d1e03a16d..9865bcd09d 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,5 +3,5 @@ AppVersionStrMajor 2.1 AppVersionStrSmall 2.1.13 AppVersionStr 2.1.13 BetaChannel 0 -AlphaVersion 0 -AppVersionOriginal 2.1.13 +AlphaVersion 2001013001 +AppVersionOriginal 2.1.13.1