From ccbc63cd6e4b3f73c33aab358a522d666e111351 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 15 May 2020 15:47:10 +0300 Subject: [PATCH] Added ability to paste data in section of scheduled messages. Fixed #6702. Fixed #6539. --- .../SourceFiles/boxes/edit_caption_box.cpp | 5 +- .../SourceFiles/history/history_widget.cpp | 5 +- .../view/history_view_compose_controls.cpp | 4 ++ .../view/history_view_compose_controls.h | 7 +- .../view/history_view_scheduled_section.cpp | 64 +++++++++++++++++++ .../view/history_view_scheduled_section.h | 4 ++ 6 files changed, 80 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 948a1150a..811cb455d 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -551,10 +551,7 @@ void EditCaptionBox::prepare() { } else if (data->hasImage()) { return true; } else if (const auto urls = data->urls(); !urls.empty()) { - if (ranges::find_if( - urls, - [](const QUrl &url) { return !url.isLocalFile(); } - ) == urls.end()) { + if (ranges::all_of(urls, &QUrl::isLocalFile)) { return true; } } diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index fb63f0672..56f369d1a 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -4475,10 +4475,7 @@ bool HistoryWidget::canSendFiles(not_null data) const { } else if (data->hasImage()) { return true; } else if (const auto urls = data->urls(); !urls.empty()) { - if (ranges::find_if( - urls, - [](const QUrl &url) { return !url.isLocalFile(); } - ) == urls.end()) { + if (ranges::all_of(urls, &QUrl::isLocalFile)) { return true; } } diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp index af14fb3a8..04daa403f 100644 --- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp @@ -110,6 +110,10 @@ rpl::producer<> ComposeControls::attachRequests() const { }); } +void ComposeControls::setMimeDataHook(MimeDataHook hook) { + _field->setMimeDataHook(std::move(hook)); +} + rpl::producer> ComposeControls::fileChosen() const { return _fileChosen.events(); } diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/history_view_compose_controls.h index ecda04061..239b7b1f3 100644 --- a/Telegram/SourceFiles/history/view/history_view_compose_controls.h +++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.h @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/unique_qptr.h" #include "ui/rp_widget.h" #include "ui/effects/animations.h" +#include "ui/widgets/input_fields.h" #include "chat_helpers/tabbed_selector.h" class History; @@ -31,7 +32,6 @@ namespace Ui { class SendButton; class IconButton; class EmojiButton; -class InputField; } // namespace Ui namespace Main { @@ -76,6 +76,11 @@ public: [[nodiscard]] auto inlineResultChosen() const -> rpl::producer; + using MimeDataHook = Fn data, + Ui::InputField::MimeAction action)>; + void setMimeDataHook(MimeDataHook hook); + bool pushTabbedSelectorToThirdSection( not_null peer, const Window::SectionShow ¶ms); diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp index 5e519f23f..42fc8056d 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp @@ -44,6 +44,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_info.h" #include "styles/style_boxes.h" +#include + namespace HistoryView { namespace { @@ -55,6 +57,17 @@ void ShowErrorToast(const QString &text) { }); } +bool CanSendFiles(not_null data) { + if (data->hasImage()) { + return true; + } else if (const auto urls = data->urls(); !urls.empty()) { + if (ranges::all_of(urls, &QUrl::isLocalFile)) { + return true; + } + } + return false; +} + } // namespace object_ptr ScheduledMemento::createWidget( @@ -165,6 +178,20 @@ void ScheduledWidget::setupComposeControls() { ChatHelpers::TabbedSelector::InlineChosen chosen) { sendInlineResult(chosen.result, chosen.bot); }, lifetime()); + + _composeControls->setMimeDataHook([=]( + not_null data, + Ui::InputField::MimeAction action) { + if (action == Ui::InputField::MimeAction::Check) { + return CanSendFiles(data); + } else if (action == Ui::InputField::MimeAction::Insert) { + return confirmSendingFiles( + data, + CompressConfirm::Auto, + data->text()); + } + Unexpected("action in MimeData hook."); + }); } void ScheduledWidget::chooseAttach() { @@ -214,6 +241,43 @@ void ScheduledWidget::chooseAttach() { }), nullptr); } +bool ScheduledWidget::confirmSendingFiles( + not_null data, + CompressConfirm compressed, + const QString &insertTextOnCancel) { + const auto hasImage = data->hasImage(); + + if (const auto urls = data->urls(); !urls.empty()) { + auto list = Storage::PrepareMediaList( + urls, + st::sendMediaPreviewSize); + if (list.error != Storage::PreparedList::Error::NonLocalUrl) { + if (list.error == Storage::PreparedList::Error::None + || !hasImage) { + const auto emptyTextOnCancel = QString(); + confirmSendingFiles( + std::move(list), + compressed, + emptyTextOnCancel); + return true; + } + } + } + + if (hasImage) { + auto image = qvariant_cast(data->imageData()); + if (!image.isNull()) { + confirmSendingFiles( + std::move(image), + QByteArray(), + compressed, + insertTextOnCancel); + return true; + } + } + return false; +} + bool ScheduledWidget::confirmSendingFiles( Storage::PreparedList &&list, CompressConfirm compressed, diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h index a7c92df1a..146059209 100644 --- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h +++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h @@ -159,6 +159,10 @@ private: Storage::PreparedList &&list, CompressConfirm compressed, const QString &insertTextOnCancel = QString()); + bool confirmSendingFiles( + not_null data, + CompressConfirm compressed, + const QString &insertTextOnCancel = QString()); bool showSendingFilesError(const Storage::PreparedList &list) const; void uploadFilesAfterConfirmation( Storage::PreparedList &&list,