mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-08-02 02:07:54 +00:00
Merge tag 'v4.15.2' into dev
# Conflicts: # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/info/info_wrap_widget.cpp # Telegram/SourceFiles/settings/settings_common_session.cpp # Telegram/lib_ui # docs/building-mac.md # snap/snapcraft.yaml
This commit is contained in:
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "mtproto/mtp_instance.h"
|
||||
#include "mtproto/mtproto_config.h"
|
||||
#include "mtproto/mtproto_dc_options.h"
|
||||
#include "data/business/data_shortcut_messages.h"
|
||||
#include "data/notify/data_notify_settings.h"
|
||||
#include "data/stickers/data_stickers.h"
|
||||
#include "data/data_saved_messages.h"
|
||||
@@ -1141,7 +1142,8 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
|
||||
MTPlong(),
|
||||
MTPMessageReactions(),
|
||||
MTPVector<MTPRestrictionReason>(),
|
||||
MTP_int(d.vttl_period().value_or_empty())),
|
||||
MTP_int(d.vttl_period().value_or_empty()),
|
||||
MTPint()), // quick_reply_shortcut_id
|
||||
MessageFlags(),
|
||||
NewMessageType::Unread);
|
||||
} break;
|
||||
@@ -1174,7 +1176,8 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
|
||||
MTPlong(),
|
||||
MTPMessageReactions(),
|
||||
MTPVector<MTPRestrictionReason>(),
|
||||
MTP_int(d.vttl_period().value_or_empty())),
|
||||
MTP_int(d.vttl_period().value_or_empty()),
|
||||
MTPint()), // quick_reply_shortcut_id
|
||||
MessageFlags(),
|
||||
NewMessageType::Unread);
|
||||
} break;
|
||||
@@ -1565,6 +1568,8 @@ void Updates::feedUpdate(const MTPUpdate &update) {
|
||||
if (const auto local = owner.message(id)) {
|
||||
if (local->isScheduled()) {
|
||||
session().data().scheduledMessages().apply(d, local);
|
||||
} else if (local->isBusinessShortcut()) {
|
||||
session().data().shortcutMessages().apply(d, local);
|
||||
} else {
|
||||
const auto existing = session().data().message(
|
||||
id.peer,
|
||||
@@ -1780,6 +1785,31 @@ void Updates::feedUpdate(const MTPUpdate &update) {
|
||||
session().data().scheduledMessages().apply(d);
|
||||
} break;
|
||||
|
||||
case mtpc_updateQuickReplies: {
|
||||
const auto &d = update.c_updateQuickReplies();
|
||||
session().data().shortcutMessages().apply(d);
|
||||
} break;
|
||||
|
||||
case mtpc_updateNewQuickReply: {
|
||||
const auto &d = update.c_updateNewQuickReply();
|
||||
session().data().shortcutMessages().apply(d);
|
||||
} break;
|
||||
|
||||
case mtpc_updateDeleteQuickReply: {
|
||||
const auto &d = update.c_updateDeleteQuickReply();
|
||||
session().data().shortcutMessages().apply(d);
|
||||
} break;
|
||||
|
||||
case mtpc_updateQuickReplyMessage: {
|
||||
const auto &d = update.c_updateQuickReplyMessage();
|
||||
session().data().shortcutMessages().apply(d);
|
||||
} break;
|
||||
|
||||
case mtpc_updateDeleteQuickReplyMessages: {
|
||||
const auto &d = update.c_updateDeleteQuickReplyMessages();
|
||||
session().data().shortcutMessages().apply(d);
|
||||
} break;
|
||||
|
||||
case mtpc_updateWebPage: {
|
||||
auto &d = update.c_updateWebPage();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user