Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
075ab20e5b | ||
|
|
deeea0aaed | ||
|
|
8113117cc4 | ||
|
|
7bfe096f3b |
@@ -10,7 +10,7 @@
|
||||
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
|
||||
ProcessorArchitecture="ARCHITECTURE"
|
||||
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
|
||||
Version="3.7.2.0" />
|
||||
Version="3.7.3.0" />
|
||||
<Properties>
|
||||
<DisplayName>Telegram Desktop</DisplayName>
|
||||
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
|
||||
|
||||
@@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,7,2,0
|
||||
PRODUCTVERSION 3,7,2,0
|
||||
FILEVERSION 3,7,3,0
|
||||
PRODUCTVERSION 3,7,3,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -62,10 +62,10 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Telegram FZ-LLC"
|
||||
VALUE "FileDescription", "Telegram Desktop"
|
||||
VALUE "FileVersion", "3.7.2.0"
|
||||
VALUE "FileVersion", "3.7.3.0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2014-2022"
|
||||
VALUE "ProductName", "Telegram Desktop"
|
||||
VALUE "ProductVersion", "3.7.2.0"
|
||||
VALUE "ProductVersion", "3.7.3.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,7,2,0
|
||||
PRODUCTVERSION 3,7,2,0
|
||||
FILEVERSION 3,7,3,0
|
||||
PRODUCTVERSION 3,7,3,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -53,10 +53,10 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Telegram FZ-LLC"
|
||||
VALUE "FileDescription", "Telegram Desktop Updater"
|
||||
VALUE "FileVersion", "3.7.2.0"
|
||||
VALUE "FileVersion", "3.7.3.0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2014-2022"
|
||||
VALUE "ProductName", "Telegram Desktop"
|
||||
VALUE "ProductVersion", "3.7.2.0"
|
||||
VALUE "ProductVersion", "3.7.3.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
|
||||
constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
|
||||
constexpr auto AppName = "Telegram Desktop"_cs;
|
||||
constexpr auto AppFile = "Telegram"_cs;
|
||||
constexpr auto AppVersion = 3007002;
|
||||
constexpr auto AppVersionStr = "3.7.2";
|
||||
constexpr auto AppVersion = 3007003;
|
||||
constexpr auto AppVersionStr = "3.7.3";
|
||||
constexpr auto AppBetaVersion = false;
|
||||
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
|
||||
|
||||
@@ -1243,6 +1243,11 @@ bool ListWidget::hasCopyRestrictionForSelected() const {
|
||||
if (hasCopyRestriction()) {
|
||||
return true;
|
||||
}
|
||||
if (_selected.empty()) {
|
||||
if (_selectedTextItem && _selectedTextItem->forbidsForward()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for (const auto &[itemId, selection] : _selected) {
|
||||
if (const auto item = session().data().message(itemId)) {
|
||||
if (item->forbidsForward()) {
|
||||
@@ -1254,6 +1259,11 @@ bool ListWidget::hasCopyRestrictionForSelected() const {
|
||||
}
|
||||
|
||||
bool ListWidget::showCopyRestrictionForSelected() {
|
||||
if (_selected.empty()) {
|
||||
if (_selectedTextItem && showCopyRestriction(_selectedTextItem)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for (const auto &[itemId, selection] : _selected) {
|
||||
if (showCopyRestriction(session().data().message(itemId))) {
|
||||
return true;
|
||||
|
||||
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "history/view/history_view_pinned_tracker.h"
|
||||
#include "history/history_item.h"
|
||||
#include "history/history.h"
|
||||
#include "base/weak_ptr.h"
|
||||
#include "apiwrap.h"
|
||||
#include "styles/style_chat.h"
|
||||
|
||||
@@ -163,27 +164,32 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
|
||||
consumer.put_next(nullptr);
|
||||
|
||||
struct State {
|
||||
HistoryMessageReplyMarkup *previousReplyMarkup = nullptr;
|
||||
bool hasReplyMarkup = false;
|
||||
base::has_weak_ptr guard;
|
||||
rpl::lifetime lifetime;
|
||||
FullMsgId resolvedId;
|
||||
};
|
||||
const auto state = lifetime.make_state<State>();
|
||||
|
||||
const auto pushUnique = [=](not_null<HistoryItem*> item) {
|
||||
const auto replyMarkup = item->inlineReplyMarkup();
|
||||
if (state->previousReplyMarkup == replyMarkup) {
|
||||
if (!state->hasReplyMarkup && !replyMarkup) {
|
||||
return;
|
||||
}
|
||||
state->hasReplyMarkup = (replyMarkup != nullptr);
|
||||
consumer.put_next(item.get());
|
||||
state->previousReplyMarkup = replyMarkup;
|
||||
};
|
||||
|
||||
rpl::duplicate(
|
||||
id
|
||||
) | rpl::start_with_next([=](PinnedId current) {
|
||||
) | rpl::filter([=](PinnedId current) {
|
||||
return current.message && (current.message != state->resolvedId);
|
||||
}) | rpl::start_with_next([=](PinnedId current) {
|
||||
const auto fullId = current.message;
|
||||
if (!fullId) {
|
||||
return;
|
||||
}
|
||||
state->lifetime.destroy();
|
||||
state->resolvedId = fullId;
|
||||
invalidate_weak_ptrs(&state->guard);
|
||||
|
||||
const auto messageFlag = [=](not_null<HistoryItem*> item) {
|
||||
using Update = Data::MessageUpdate;
|
||||
session->changes().messageFlagsValue(
|
||||
@@ -195,12 +201,17 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
|
||||
};
|
||||
if (const auto item = session->data().message(fullId)) {
|
||||
messageFlag(item);
|
||||
} else {
|
||||
session->api().requestMessageData(
|
||||
session->data().peer(fullId.peer),
|
||||
fullId.msg,
|
||||
[=] { messageFlag(session->data().message(fullId)); });
|
||||
return;
|
||||
}
|
||||
const auto resolved = crl::guard(&state->guard, [=] {
|
||||
if (const auto item = session->data().message(fullId)) {
|
||||
messageFlag(item);
|
||||
}
|
||||
});
|
||||
session->api().requestMessageData(
|
||||
session->data().peer(fullId.peer),
|
||||
fullId.msg,
|
||||
resolved);
|
||||
}, lifetime);
|
||||
return lifetime;
|
||||
});
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
AppVersion 3007002
|
||||
AppVersion 3007003
|
||||
AppVersionStrMajor 3.7
|
||||
AppVersionStrSmall 3.7.2
|
||||
AppVersionStr 3.7.2
|
||||
AppVersionStrSmall 3.7.3
|
||||
AppVersionStr 3.7.3
|
||||
BetaChannel 0
|
||||
AlphaVersion 0
|
||||
AppVersionOriginal 3.7.2
|
||||
AppVersionOriginal 3.7.3
|
||||
|
||||
Submodule Telegram/lib_webview updated: 0e9c8d86cf...77b1712a8f
@@ -1,3 +1,7 @@
|
||||
3.7.3 (26.04.22)
|
||||
|
||||
- Fix a crash in the pinned bar bot button refresh.
|
||||
|
||||
3.7.2 (25.04.22)
|
||||
|
||||
- Fix mute period selector values.
|
||||
|
||||
Reference in New Issue
Block a user