MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mentioning a user without username by first name only. Beta 9048001.

Browse Source
This commit is contained in:
John Preston 2016-05-10 14:42:03 +03:00
parent 1167860f3e
commit d26a8cbdcc
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -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"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -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"

2
Telegram/SourceFiles/core/version.h
View File

@ -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";

5
Telegram/SourceFiles/historywidget.cpp
View File

@ -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;

2
Telegram/build/version
View File

@ -3,4 +3,4 @@ AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.48
AppVersionStr 0.9.48
AlphaChannel 0
BetaVersion 0
BetaVersion 9048001