From 3e3e1d628c817a2d9b07c117afce247e93243ac1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 25 Dec 2019 18:20:02 +0300 Subject: [PATCH] Highlight timestamps in video captions. --- Telegram/SourceFiles/core/application.cpp | 21 ++-- Telegram/SourceFiles/core/application.h | 7 ++ .../SourceFiles/core/click_handler_types.cpp | 7 +- .../SourceFiles/core/local_url_handlers.cpp | 45 +++++++- .../SourceFiles/core/local_url_handlers.h | 1 + Telegram/SourceFiles/core/ui_integration.cpp | 3 + .../history/view/media/history_view_gif.cpp | 29 ++++- .../history/view/media/history_view_gif.h | 4 + .../history/view/media/history_view_media.cpp | 100 +++++++++++++++++- .../history/view/media/history_view_media.h | 11 +- 10 files changed, 210 insertions(+), 18 deletions(-) diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp index c13abe1d2..bde661b70 100644 --- a/Telegram/SourceFiles/core/application.cpp +++ b/Telegram/SourceFiles/core/application.cpp @@ -583,27 +583,36 @@ void Application::checkStartUrl() { } bool Application::openLocalUrl(const QString &url, QVariant context) { - auto urlTrimmed = url.trimmed(); - if (urlTrimmed.size() > 8192) urlTrimmed = urlTrimmed.mid(0, 8192); + return openCustomUrl("tg://", LocalUrlHandlers(), url, context); +} - const auto protocol = qstr("tg://"); +bool Application::openInternalUrl(const QString &url, QVariant context) { + return openCustomUrl("internal:", InternalUrlHandlers(), url, context); +} + +bool Application::openCustomUrl( + const QString &protocol, + const std::vector &handlers, + const QString &url, + const QVariant &context) { + const auto urlTrimmed = url.trimmed(); if (!urlTrimmed.startsWith(protocol, Qt::CaseInsensitive) || locked()) { return false; } - auto command = urlTrimmed.midRef(protocol.size()); - + const auto command = urlTrimmed.midRef(protocol.size(), 8192); const auto session = activeAccount().sessionExists() ? &activeAccount().session() : nullptr; using namespace qthelp; const auto options = RegExOption::CaseInsensitive; - for (const auto &[expression, handler] : LocalUrlHandlers()) { + for (const auto &[expression, handler] : handlers) { const auto match = regex_match(expression, command, options); if (match) { return handler(session, match, context); } } return false; + } void Application::lockByPasscode() { diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h index 6854aaa32..dd0b1a805 100644 --- a/Telegram/SourceFiles/core/application.h +++ b/Telegram/SourceFiles/core/application.h @@ -178,6 +178,7 @@ public: QString createInternalLinkFull(const QString &query) const; void checkStartUrl(); bool openLocalUrl(const QString &url, QVariant context); + bool openInternalUrl(const QString &url, QVariant context); void forceLogOut(const TextWithEntities &explanation); void checkLocalTime(); @@ -241,6 +242,12 @@ private: void clearPasscodeLock(); + bool openCustomUrl( + const QString &protocol, + const std::vector &handlers, + const QString &url, + const QVariant &context); + static Application *Instance; struct InstanceSetter { InstanceSetter(not_null instance) { diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index e98d6a5e6..6434b56f7 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -43,7 +43,8 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) { const auto open = [=] { UrlClickHandler::Open(url, context); }; - if (url.startsWith(qstr("tg://"), Qt::CaseInsensitive)) { + if (url.startsWith(qstr("tg://"), Qt::CaseInsensitive) + || url.startsWith(qstr("internal:"), Qt::CaseInsensitive)) { open(); } else { const auto parsedUrl = QUrl::fromUserInput(url); @@ -55,7 +56,9 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) { : url; Ui::show( Box( - tr::lng_open_this_link(tr::now) + qsl("\n\n") + displayUrl, + (tr::lng_open_this_link(tr::now) + + qsl("\n\n") + + displayUrl), tr::lng_open_link(tr::now), [=] { Ui::hideLayer(); open(); }), Ui::LayerOption::KeepOther); diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp index b72822231..732297b4a 100644 --- a/Telegram/SourceFiles/core/local_url_handlers.cpp +++ b/Telegram/SourceFiles/core/local_url_handlers.cpp @@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "passport/passport_form_controller.h" #include "window/window_session_controller.h" #include "data/data_session.h" +#include "data/data_document.h" #include "data/data_cloud_themes.h" #include "data/data_channel.h" #include "mainwindow.h" @@ -362,6 +363,38 @@ bool HandleUnknown( return true; } +bool OpenMediaTimestamp( + Main::Session *session, + const Match &match, + const QVariant &context) { + if (!session) { + return false; + } + const auto time = match->captured(2).toInt(); + if (time < 0) { + return false; + } + const auto base = match->captured(1); + if (base.startsWith(qstr("doc"))) { + const auto parts = base.mid(3).split('_'); + const auto documentId = parts.value(0).toULongLong(); + const auto itemId = FullMsgId( + parts.value(1).toInt(), + parts.value(2).toInt()); + const auto document = session->data().document(documentId); + session->settings().setMediaLastPlaybackPosition( + documentId, + time * crl::time(1000)); + if (!document->isNull()) { + Core::App().showDocument( + document, + session->data().message(itemId)); + } + return true; + } + return false; +} + } // namespace const std::vector &LocalUrlHandlers() { @@ -421,7 +454,17 @@ const std::vector &LocalUrlHandlers() { { qsl("^([^\\?]+)(\\?|#|$)"), HandleUnknown - } + }, + }; + return Result; +} + +const std::vector &InternalUrlHandlers() { + static auto Result = std::vector{ + { + qsl("^media_timestamp/?\\?base=([a-zA-Z0-9\\.\\_\\-]+)&t=(\\d+)(&|$)"), + OpenMediaTimestamp + }, }; return Result; } diff --git a/Telegram/SourceFiles/core/local_url_handlers.h b/Telegram/SourceFiles/core/local_url_handlers.h index 38c437e64..98e1893c9 100644 --- a/Telegram/SourceFiles/core/local_url_handlers.h +++ b/Telegram/SourceFiles/core/local_url_handlers.h @@ -26,6 +26,7 @@ struct LocalUrlHandler { }; [[nodiscard]] const std::vector &LocalUrlHandlers(); +[[nodiscard]] const std::vector &InternalUrlHandlers(); [[nodiscard]] QString TryConvertUrlToLocal(QString url); diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp index a878b9075..ccc76aa66 100644 --- a/Telegram/SourceFiles/core/ui_integration.cpp +++ b/Telegram/SourceFiles/core/ui_integration.cpp @@ -126,6 +126,9 @@ bool UiIntegration::handleUrlClick( } else if (local.startsWith(qstr("tg://"), Qt::CaseInsensitive)) { Core::App().openLocalUrl(local, context); return true; + } else if (local.startsWith(qstr("internal:"), Qt::CaseInsensitive)) { + Core::App().openInternalUrl(local, context); + return true; } return false; diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp index 783bf3baf..376034e56 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp @@ -76,7 +76,7 @@ Gif::Gif( setStatusSize(FileStatusSizeReady); - _caption = createCaption(realParent); + refreshCaption(); _data->loadThumbnail(realParent->fullId()); } @@ -1208,10 +1208,29 @@ bool Gif::isReadyForOpen() const { } void Gif::parentTextUpdated() { - _caption = (_parent->media() == this) - ? createCaption(_parent->data()) - : Ui::Text::String(); - history()->owner().requestViewResize(_parent); + if (_parent->media() == this) { + refreshCaption(); + history()->owner().requestViewResize(_parent); + } +} + +void Gif::refreshParentId(not_null realParent) { + if (_parent->media() == this) { + refreshCaption(); + } +} + +void Gif::refreshCaption() { + const auto timestampLinksDuration = _data->isVideoFile() + ? _data->getDuration() + : 0; + const auto timestampLinkBase = timestampLinksDuration + ? DocumentTimestampLinkBase(_data, _realParent->fullId()) + : QString(); + _caption = createCaption( + _parent->data(), + timestampLinksDuration, + timestampLinkBase); } int Gif::additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply, const HistoryMessageForwarded *forwarded) const { diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h index 0a8eb7615..efa35b4e1 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_gif.h +++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h @@ -104,6 +104,8 @@ public: stopAnimation(); } + void refreshParentId(not_null realParent) override; + private: struct Streamed; @@ -111,6 +113,8 @@ private: bool dataFinished() const override; bool dataLoaded() const override; + void refreshCaption(); + [[nodiscard]] bool autoplayEnabled() const; void playAnimation(bool autoplay) override; diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp index 8339b1637..f3e78e69c 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp @@ -11,10 +11,96 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_element.h" #include "history/view/history_view_cursor_state.h" #include "storage/storage_shared_media.h" +#include "data/data_document.h" #include "ui/text_options.h" #include "styles/style_history.h" namespace HistoryView { +namespace { + +[[nodiscard]] TimeId TimeFromMatch( + const QStringRef &hours, + const QStringRef &minutes1, + const QStringRef &minutes2, + const QStringRef &seconds) { + auto ok1 = true; + auto ok2 = true; + auto ok3 = true; + const auto result = (hours.isEmpty() ? 0 : hours.toInt(&ok1)) * 3600 + + (minutes1 + minutes2).toInt(&ok2) * 60 + + seconds.toInt(&ok3); + return (ok1 && ok2 && ok3) ? result : -1; +} + +[[nodiscard]] TextWithEntities AddTimestampLinks( + TextWithEntities text, + TimeId duration, + const QString &base) { + static const auto expression = QRegularExpression( + "(? duration) { + continue; + } + + auto &entities = text.entities; + const auto i = ranges::lower_bound( + entities, + from, + std::less<>(), + &EntityInText::offset); + if (i != entities.end() && i->offset() < till) { + continue; + } + + const auto intersects = [&](const EntityInText &entity) { + return entity.offset() + entity.length() > from; + }; + auto j = std::make_reverse_iterator(i); + const auto e = std::make_reverse_iterator(entities.begin()); + if (std::find_if(j, e, intersects) != e) { + continue; + } + + entities.insert( + i, + EntityInText( + EntityType::CustomUrl, + from, + till - from, + ("internal:media_timestamp?base=" + + base + + "&t=" + + QString::number(time)))); + } + return text; +} + +} // namespace + +QString DocumentTimestampLinkBase( + not_null document, + FullMsgId context) { + return QString( + "doc%1_%2_%3" + ).arg(document->id).arg(context.channel).arg(context.msg); +} Storage::SharedMediaTypesMask Media::sharedMediaTypes() const { return {}; @@ -32,7 +118,12 @@ QSize Media::countCurrentSize(int newWidth) { return QSize(qMin(newWidth, maxWidth()), minHeight()); } -Ui::Text::String Media::createCaption(not_null item) const { +Ui::Text::String Media::createCaption( + not_null item, + TimeId timestampLinksDuration, + const QString ×tampLinkBase) const { + Expects(timestampLinksDuration >= 0); + if (item->emptyText()) { return {}; } @@ -42,7 +133,12 @@ Ui::Text::String Media::createCaption(not_null item) const { auto result = Ui::Text::String(minResizeWidth); result.setMarkedText( st::messageTextStyle, - item->originalText(), + (timestampLinksDuration + ? AddTimestampLinks( + item->originalText(), + timestampLinksDuration, + timestampLinkBase) + : item->originalText()), Ui::ItemTextOptions(item)); if (const auto width = _parent->skipBlockWidth()) { result.updateSkipBlock(width, _parent->skipBlockHeight()); diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h index e6782c48b..2ba8f45c7 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media.h +++ b/Telegram/SourceFiles/history/view/media/history_view_media.h @@ -40,6 +40,10 @@ enum class MediaInBubbleState { Bottom, }; +[[nodiscard]] QString DocumentTimestampLinkBase( + not_null document, + FullMsgId context); + class Media : public Object { public: Media(not_null parent) : _parent(parent) { @@ -237,8 +241,11 @@ public: virtual ~Media() = default; protected: - QSize countCurrentSize(int newWidth) override; - Ui::Text::String createCaption(not_null item) const; + [[nodiscard]] QSize countCurrentSize(int newWidth) override; + [[nodiscard]] Ui::Text::String createCaption( + not_null item, + TimeId timestampLinksDuration = 0, + const QString ×tampLinkBase = QString()) const; virtual void playAnimation(bool autoplay) { }