From d26a8cbdcc0c940b3dd2bed78dc37e50cf756d4a Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 10 May 2016 14:42:03 +0300 Subject: [PATCH] Mentioning a user without username by first name only. Beta 9048001. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/SourceFiles/historywidget.cpp | 5 ++++- Telegram/build/version | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 6df5730f8..ee19b5322 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,48,0 - PRODUCTVERSION 0,9,48,0 + FILEVERSION 0,9,48,1 + PRODUCTVERSION 0,9,48,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.48.0" + VALUE "FileVersion", "0.9.48.1" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.48.0" + VALUE "ProductVersion", "0.9.48.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 5a58c3a01..6f897a376 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,48,0 - PRODUCTVERSION 0,9,48,0 + FILEVERSION 0,9,48,1 + PRODUCTVERSION 0,9,48,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.9.48.0" + VALUE "FileVersion", "0.9.48.1" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.48.0" + VALUE "ProductVersion", "0.9.48.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index f220a893c..31c790162 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" -#define BETA_VERSION_MACRO (0ULL) +#define BETA_VERSION_MACRO (9048001ULL) constexpr int AppVersion = 9048; constexpr str_const AppVersionStr = "0.9.48"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 2e0b015f8..e2ce96b1b 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -3007,7 +3007,10 @@ void HistoryWidget::onStickersUpdated() { void HistoryWidget::onMentionInsert(UserData *user) { QString replacement, entityTag; if (user->username.isEmpty()) { - replacement = App::peerName(user); + replacement = user->firstName; + if (replacement.isEmpty()) { + replacement = App::peerName(user); + } entityTag = qsl("mention://user.") + QString::number(user->bareId()) + '.' + QString::number(user->access); } else { replacement = '@' + user->username; diff --git a/Telegram/build/version b/Telegram/build/version index 0c657fd1c..ecb2c68fb 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 0.9 AppVersionStrSmall 0.9.48 AppVersionStr 0.9.48 AlphaChannel 0 -BetaVersion 0 +BetaVersion 9048001