Version 4.2.4.

- Fix crash in emoji statuses clearing.

.github/workflows/mac.yml

@@ -40,7 +40,7 @@ jobs:
 
   macos:
     name: MacOS
-    runs-on: macos-latest
+    runs-on: macos-12
 
     strategy:
       matrix:

.github/workflows/win.yml

@@ -80,7 +80,7 @@ jobs:
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
 
       - name: Python installs.
-        run: py -m pip install pywin32 six
+        run: pip3 install --upgrade pywin32 six
 
       - name: Set up environment paths.
         shell: bash

.gitmodules

@@ -94,3 +94,6 @@
 [submodule "Telegram/ThirdParty/kimageformats"]
 	path = Telegram/ThirdParty/kimageformats
 	url = https://github.com/KDE/kimageformats.git
+[submodule "Telegram/ThirdParty/kcoreaddons"]
+	path = Telegram/ThirdParty/kcoreaddons
+	url = https://github.com/KDE/kcoreaddons.git

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.2.1.0" />
+    Version="4.2.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,2,1,0
- PRODUCTVERSION 4,2,1,0
+ FILEVERSION 4,2,4,0
+ PRODUCTVERSION 4,2,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.2.1.0"
+            VALUE "FileVersion", "4.2.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2022"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.2.1.0"
+            VALUE "ProductVersion", "4.2.4.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,2,1,0
- PRODUCTVERSION 4,2,1,0
+ FILEVERSION 4,2,4,0
+ PRODUCTVERSION 4,2,4,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", "4.2.1.0"
+            VALUE "FileVersion", "4.2.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2022"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.2.1.0"
+            VALUE "ProductVersion", "4.2.4.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -805,13 +805,13 @@ void SendFilesBox::captionResized() {
 }
 
 bool SendFilesBox::canAddFiles(not_null<const QMimeData*> data) const {
-	return (data->hasUrls() && CanAddUrls(base::GetMimeUrls(data))) || data->hasImage();
+	return CanAddUrls(base::GetMimeUrls(data)) || data->hasImage();
 }
 
 bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 	const auto premium = _controller->session().premium();
 	auto list = [&] {
-		const auto urls = data->hasUrls() ? base::GetMimeUrls(data) : QList<QUrl>();
+		const auto urls = base::GetMimeUrls(data);
 		auto result = CanAddUrls(urls)
 			? Storage::PrepareMediaList(
 				urls,

Telegram/SourceFiles/core/application.cpp

@@ -1205,11 +1205,9 @@ void Application::closeWindow(not_null<Window::Controller*> window) {
 
 void Application::closeChatFromWindows(not_null<PeerData*> peer) {
 	for (const auto &[history, window] : _secondaryWindows) {
-		if (!window) {
-			continue;
-		}
 		if (history->peer == peer) {
 			closeWindow(window.get());
+			break;
 		} else if (const auto session = window->sessionController()) {
 			if (session->activeChatCurrent().peer() == peer) {
 				session->showPeerHistory(

Telegram/SourceFiles/core/base_integration.cpp

@@ -33,6 +33,12 @@ void BaseIntegration::logMessage(const QString &message) {
 	Logs::writeMain(message);
 }
 
+void BaseIntegration::setCrashAnnotation(
+		const std::string &key,
+		const QString &value) {
+	CrashReports::SetAnnotation(key, value);
+}
+
 void BaseIntegration::logAssertionViolation(const QString &info) {
 	Logs::writeMain("Assertion Failed! " + info);
 	CrashReports::SetAnnotation("Assertion", info);

Telegram/SourceFiles/core/base_integration.h

@@ -20,6 +20,9 @@ public:
 	void logMessageDebug(const QString &message) override;
 	void logMessage(const QString &message) override;
 	void logAssertionViolation(const QString &info) override;
+	void setCrashAnnotation(
+		const std::string &key,
+		const QString &value) override;
 
 };
 

Telegram/SourceFiles/core/changelogs.cpp

@@ -68,6 +68,14 @@ std::map<int, const char*> BetaLogs() {
 		"- Improve touch support in channel comments.\n"
 
 		"- Nice animation for spoilers.\n"
+	},
+	{
+		4002002,
+		"- Fix crash in spoiler revealing in media captions.\n"
+
+		"- Fix spoiler revealing in media viewer captions.\n"
+		
+		"- Fix crash in folder editing on Linux.\n"
 	}
 	};
 };

Telegram/SourceFiles/core/update_checker.cpp

@@ -31,7 +31,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <KSandbox>
+
+#include <ksandbox.h>
 
 extern "C" {
 #include <openssl/rsa.h>

Telegram/SourceFiles/core/utils.h

@@ -22,12 +22,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <cmath>
 #include <set>
 
-#if __has_include(<KUrlMimeData>)
-#include <KUrlMimeData>
+#if __has_include(<kurlmimedata.h>)
+#include <kurlmimedata.h>
 #endif
 
-#if __has_include(<KSandbox>)
-#include <KSandbox>
+#if __has_include(<ksandbox.h>)
+#include <ksandbox.h>
 #endif
 
 #define qsl(s) QStringLiteral(s)
@@ -39,17 +39,19 @@ inline bool in_range(Value &&value, From &&from, Till &&till) {
 	return (value >= from) && (value < till);
 }
 
-inline auto GetMimeUrls(const QMimeData *data) {
-#if __has_include(<KUrlMimeData>)
+#if __has_include(<kurlmimedata.h>)
+inline QList<QUrl> GetMimeUrls(const QMimeData *data) {
+	if (!data->hasUrls()) {
+		return {};
+	}
+
 	return KUrlMimeData::urlsFromMimeData(
 		data,
 		KUrlMimeData::PreferLocalUrls);
-#else
-	return data->urls();
-#endif
 }
+#endif
 
-#if __has_include(<KSandbox>) && defined DeclareReadSetting
+#if __has_include(<ksandbox.h>) && defined DeclareReadSetting
 inline QString FlatpakID() {
 	static const auto Result = [] {
 		if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {

Telegram/SourceFiles/core/version.h

@@ -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 = 4002001;
-constexpr auto AppVersionStr = "4.2.1";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 4002004;
+constexpr auto AppVersionStr = "4.2.4";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

Telegram/SourceFiles/data/data_emoji_statuses.cpp

@@ -44,7 +44,8 @@ constexpr auto kMaxTimeout = 6 * 60 * 60 * crl::time(1000);
 
 EmojiStatuses::EmojiStatuses(not_null<Session*> owner)
 : _owner(owner)
-, _defaultRefreshTimer([=] { refreshDefault(); }) {
+, _defaultRefreshTimer([=] { refreshDefault(); })
+, _clearingTimer([=] { processClearing(); }) {
 	refreshDefault();
 	refreshColored();
 
@@ -118,8 +119,7 @@ void EmojiStatuses::registerAutomaticClear(
 		if (i->first == user) {
 			const auto now = base::unixtime::now();
 			if (now < until) {
-				const auto waitms = (until - now) * crl::time(1000);
-				_clearingTimer.callOnce(std::min(waitms, kMaxTimeout));
+				processClearingIn(until - now);
 			} else {
 				processClearing();
 			}
@@ -152,12 +152,17 @@ void EmojiStatuses::processClearing() {
 		}
 	}
 	if (minWait) {
-		_clearingTimer.callOnce(minWait * crl::time(1000));
+		processClearingIn(minWait);
 	} else {
 		_clearingTimer.cancel();
 	}
 }
 
+void EmojiStatuses::processClearingIn(TimeId wait) {
+	const auto waitms = wait * crl::time(1000);
+	_clearingTimer.callOnce(std::min(waitms, kMaxTimeout));
+}
+
 void EmojiStatuses::requestRecent() {
 	if (_recentRequestId) {
 		return;

Telegram/SourceFiles/data/data_emoji_statuses.h

@@ -62,6 +62,7 @@ private:
 	void updateDefault(const MTPDaccount_emojiStatuses &data);
 	void updateColored(const MTPDmessages_stickerSet &data);
 
+	void processClearingIn(TimeId wait);
 	void processClearing();
 
 	const not_null<Session*> _owner;
@@ -85,7 +86,7 @@ private:
 
 	mtpRequestId _sentRequestId = 0;
 
-	base::flat_map<not_null<UserData*>, crl::time> _clearing;
+	base::flat_map<not_null<UserData*>, TimeId> _clearing;
 	base::Timer _clearingTimer;
 
 	rpl::lifetime _lifetime;

Telegram/SourceFiles/data/data_session.cpp

@@ -1572,7 +1572,6 @@ rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved(
 }
 
 void Session::notifyViewRemoved(not_null<const ViewElement*> view) {
-	_shownSpoilers.remove(view);
 	_viewRemoved.fire_copy(view);
 }
 
@@ -3707,6 +3706,8 @@ void Session::registerItemView(not_null<ViewElement*> view) {
 void Session::unregisterItemView(not_null<ViewElement*> view) {
 	Expects(!_heavyViewParts.contains(view));
 
+	_shownSpoilers.remove(view);
+
 	const auto i = _views.find(view->data());
 	if (i != end(_views)) {
 		auto &list = i->second;

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -2364,7 +2364,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}
 			}
 		}
-		if (!actionText.isEmpty()) {
+		if (!actionText.isEmpty() && !hasCopyRestriction(item)) {
 			_menu->addAction(
 				actionText,
 				[text = link->copyToClipboardText()] {

Telegram/SourceFiles/history/history_widget.cpp

@@ -3770,6 +3770,10 @@ void HistoryWidget::send(Api::SendOptions options) {
 		return;
 	}
 
+	if (!options.scheduled) {
+		clearReplyReturns();
+	}
+
 	const auto webPageId = (_previewState != Data::PreviewState::Allowed)
 		? CancelledWebPageId
 		: ((_previewData && _previewData->pendingTill >= 0)

Telegram/SourceFiles/history/view/history_view_context_menu.cpp

@@ -1001,7 +1001,9 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 		}
 	}
 
-	AddCopyLinkAction(result, link);
+	if (!list->hasCopyRestriction(view->data())) {
+		AddCopyLinkAction(result, link);
+	}
 	AddMessageActions(result, request, list);
 
 	if (item) {

Telegram/SourceFiles/history/view/history_view_message.cpp

@@ -1606,7 +1606,8 @@ TextState Message::textState(
 				result = entry->textState(
 					point - QPoint(entryLeft, entryTop),
 					request);
-				result.symbol += text().length() + (mediaDisplayed ? media->fullSelectionLength() : 0);
+				result.symbol += visibleTextLength()
+					+ visibleMediaTextLength();
 			}
 		}
 
@@ -1624,7 +1625,7 @@ TextState Message::textState(
 				result = bottomInfoResult;
 			}
 		};
-		if (inBubble) {
+		if (!result.symbol && inBubble) {
 			if (mediaDisplayed) {
 				auto mediaHeight = media->height();
 				auto mediaLeft = trect.x() - st::msgPadding.left();
@@ -1632,18 +1633,18 @@ TextState Message::textState(
 
 				if (point.y() >= mediaTop && point.y() < mediaTop + mediaHeight) {
 					result = media->textState(point - QPoint(mediaLeft, mediaTop), request);
-					result.symbol += text().length();
+					result.symbol += visibleTextLength();
 				} else if (getStateText(point, trect, &result, request)) {
 					checkBottomInfoState();
 					return result;
 				} else if (point.y() >= trect.y() + trect.height()) {
-					result.symbol = text().length();
+					result.symbol = visibleTextLength();
 				}
 			} else if (getStateText(point, trect, &result, request)) {
 				checkBottomInfoState();
 				return result;
 			} else if (point.y() >= trect.y() + trect.height()) {
-				result.symbol = text().length();
+				result.symbol = visibleTextLength();
 			}
 		}
 		checkBottomInfoState();
@@ -1665,7 +1666,7 @@ TextState Message::textState(
 		}
 	} else if (media && media->isDisplayed()) {
 		result = media->textState(point - g.topLeft(), request);
-		result.symbol += text().length();
+		result.symbol += visibleTextLength();
 	}
 
 	if (keyboard && item->isHistoryEntry()) {
@@ -2002,7 +2003,9 @@ void Message::updatePressed(QPoint point) {
 TextForMimeData Message::selectedText(TextSelection selection) const {
 	const auto media = this->media();
 	auto logEntryOriginalResult = TextForMimeData();
-	auto textResult = text().toTextForMimeData(selection);
+	auto textResult = hasVisibleText()
+		? text().toTextForMimeData(selection)
+		: TextForMimeData();
 	auto skipped = skipTextSelection(selection);
 	auto mediaDisplayed = (media && media->isDisplayed());
 	auto mediaResult = (mediaDisplayed || isHiddenByGroup())
@@ -2033,8 +2036,10 @@ TextSelection Message::adjustSelection(
 		TextSelectType type) const {
 	const auto media = this->media();
 
-	auto result = text().adjustSelection(selection, type);
-	auto beforeMediaLength = text().length();
+	auto result = hasVisibleText()
+		? text().adjustSelection(selection, type)
+		: selection;
+	auto beforeMediaLength = visibleTextLength();
 	if (selection.to <= beforeMediaLength) {
 		return result;
 	}
@@ -2048,8 +2053,7 @@ TextSelection Message::adjustSelection(
 			result.to = mediaSelection.to;
 		}
 	}
-	auto beforeEntryLength = beforeMediaLength
-		+ (mediaDisplayed ? media->fullSelectionLength() : 0);
+	auto beforeEntryLength = beforeMediaLength + visibleMediaTextLength();
 	if (selection.to <= beforeEntryLength) {
 		return result;
 	}
@@ -2887,13 +2891,16 @@ void Message::fromNameUpdated(int width) const {
 }
 
 TextSelection Message::skipTextSelection(TextSelection selection) const {
-	if (selection.from == 0xFFFF) {
+	if (selection.from == 0xFFFF || !hasVisibleText()) {
 		return selection;
 	}
 	return HistoryView::UnshiftItemSelection(selection, text());
 }
 
 TextSelection Message::unskipTextSelection(TextSelection selection) const {
+	if (!hasVisibleText()) {
+		return selection;
+	}
 	return HistoryView::ShiftItemSelection(selection, text());
 }
 
@@ -3160,6 +3167,17 @@ bool Message::hasVisibleText() const {
 	return !media || !media->hideMessageText();
 }
 
+int Message::visibleTextLength() const {
+	return hasVisibleText() ? text().length() : 0;
+}
+
+int Message::visibleMediaTextLength() const {
+	const auto media = this->media();
+	return (media && media->isDisplayed())
+		? media->fullSelectionLength()
+		: 0;
+}
+
 QSize Message::performCountCurrentSize(int newWidth) {
 	const auto newHeight = resizeContentGetHeight(newWidth);
 

Telegram/SourceFiles/history/view/history_view_message.h

@@ -226,6 +226,8 @@ private:
 	QSize performCountOptimalSize() override;
 	QSize performCountCurrentSize(int newWidth) override;
 	bool hasVisibleText() const override;
+	[[nodiscard]] int visibleTextLength() const;
+	[[nodiscard]] int visibleMediaTextLength() const;
 	[[nodiscard]] bool needInfoDisplay() const;
 
 	[[nodiscard]] bool isPinnedContext() const;

Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.cpp

@@ -15,52 +15,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 
 namespace HistoryView {
-namespace {
-
-class AnimatedSpoilerClickHandler final : public ClickHandler {
-public:
-	AnimatedSpoilerClickHandler(
-		not_null<Element*> view,
-		Ui::Text::String &text);
-
-	void onClick(ClickContext context) const override;
-
-private:
-	base::weak_ptr<Element> _weak;
-	Ui::Text::String &_text;
-
-};
-
-AnimatedSpoilerClickHandler::AnimatedSpoilerClickHandler(
-	not_null<Element*> view,
-	Ui::Text::String &text)
-: _weak(view)
-, _text(text) {
-}
-
-void AnimatedSpoilerClickHandler::onClick(ClickContext context) const {
-	const auto button = context.button;
-	const auto view = _weak.get();
-	if (button != Qt::LeftButton || !view) {
-		return;
-	}
-	const auto my = context.other.value<ClickHandlerContext>();
-	if (const auto d = my.elementDelegate ? my.elementDelegate() : nullptr) {
-		_text.setSpoilerRevealed(true, anim::type::normal);
-		if (const auto controller = my.sessionWindow.get()) {
-			controller->session().data().registerShownSpoiler(view);
-		}
-	}
-}
-
-} // namespace
 
 void FillTextWithAnimatedSpoilers(
 		not_null<Element*> view,
 		Ui::Text::String &text) {
 	if (text.hasSpoilers()) {
-		text.setSpoilerLink(
-			std::make_shared<AnimatedSpoilerClickHandler>(view, text));
+		text.setSpoilerLinkFilter([weak = base::make_weak(view.get())](
+				const ClickContext &context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			const auto button = context.button;
+			const auto view = weak.get();
+			if (button != Qt::LeftButton || !view || !my.elementDelegate) {
+				return false;
+			} else if (const auto d = my.elementDelegate()) {
+				if (const auto controller = my.sessionWindow.get()) {
+					controller->session().data().registerShownSpoiler(view);
+				}
+				return true;
+			}
+			return false;
+		});
 	}
 }
 

Telegram/SourceFiles/history/view/media/history_view_game.cpp

@@ -247,7 +247,17 @@ void Game::draw(Painter &p, const PaintContext &context) const {
 			endskip = _parent->skipBlockWidth();
 		}
 		_parent->prepareCustomEmojiPaint(p, context, _description);
-		_description.drawLeftElided(p, padding.left(), tshift, paintw, width(), _descriptionLines, style::al_left, 0, -1, endskip, false, toDescriptionSelection(context.selection));
+		_description.draw(p, {
+			.position = { padding.left(), tshift },
+			.outerWidth = width(),
+			.availableWidth = paintw,
+			.spoiler = Ui::Text::DefaultSpoilerCache(),
+			.now = context.now,
+			.paused = context.paused,
+			.selection = toDescriptionSelection(context.selection),
+			.elisionLines = _descriptionLines,
+			.elisionRemoveFromEnd = endskip,
+		});
 		tshift += _descriptionLines * lineHeight;
 	}
 	if (_attach) {

Telegram/SourceFiles/history/view/media/history_view_invoice.cpp

@@ -228,7 +228,16 @@ void Invoice::draw(Painter &p, const PaintContext &context) const {
 	}
 	if (_descriptionHeight) {
 		p.setPen(stm->historyTextFg);
-		_description.drawLeft(p, padding.left(), tshift, paintw, width(), style::al_left, 0, -1, toDescriptionSelection(context.selection));
+		_parent->prepareCustomEmojiPaint(p, context, _description);
+		_description.draw(p, {
+			.position = { padding.left(), tshift },
+			.outerWidth = width(),
+			.availableWidth = paintw,
+			.spoiler = Ui::Text::DefaultSpoilerCache(),
+			.now = context.now,
+			.paused = context.paused,
+			.selection = toDescriptionSelection(context.selection),
+		});
 		tshift += _descriptionHeight;
 	}
 	if (_attach) {
@@ -353,6 +362,17 @@ void Invoice::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed)
 	}
 }
 
+bool Invoice::hasHeavyPart() const {
+	return _attach ? _attach->hasHeavyPart() : false;
+}
+
+void Invoice::unloadHeavyPart() {
+	if (_attach) {
+		_attach->unloadHeavyPart();
+	}
+	_description.unloadPersistentAnimation();
+}
+
 TextForMimeData Invoice::selectedText(TextSelection selection) const {
 	auto titleResult = _title.toTextForMimeData(selection);
 	auto descriptionResult = _description.toTextForMimeData(

Telegram/SourceFiles/history/view/media/history_view_invoice.h

@@ -70,14 +70,8 @@ public:
 		return _attach.get();
 	}
 
-	bool hasHeavyPart() const override {
-		return _attach ? _attach->hasHeavyPart() : false;
-	}
-	void unloadHeavyPart() override {
-		if (_attach) {
-			_attach->unloadHeavyPart();
-		}
-	}
+	bool hasHeavyPart() const override;
+	void unloadHeavyPart() override;
 
 private:
 	QSize countOptimalSize() override;

Telegram/SourceFiles/history/view/media/history_view_web_page.cpp

@@ -568,13 +568,20 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			endskip = _parent->skipBlockWidth();
 		}
 		_parent->prepareCustomEmojiPaint(p, context, _description);
-		if (_descriptionLines > 0) {
-			_description.drawLeftElided(p, padding.left(), tshift, paintw, width(), _descriptionLines, style::al_left, 0, -1, endskip, false, toDescriptionSelection(context.selection));
-			tshift += _descriptionLines * lineHeight;
-		} else {
-			_description.drawLeft(p, padding.left(), tshift, paintw, width(), style::al_left, 0, -1, toDescriptionSelection(context.selection));
-			tshift += _description.countHeight(paintw);
-		}
+		_description.draw(p, {
+			.position = { padding.left(), tshift },
+			.outerWidth = width(),
+			.availableWidth = paintw,
+			.spoiler = Ui::Text::DefaultSpoilerCache(),
+			.now = context.now,
+			.paused = context.paused,
+			.selection = toDescriptionSelection(context.selection),
+			.elisionLines = std::max(_descriptionLines, 0),
+			.elisionRemoveFromEnd = (_descriptionLines > 0) ? endskip : 0,
+		});
+		tshift += (_descriptionLines > 0)
+			? (_descriptionLines * lineHeight)
+			: _description.countHeight(paintw);
 	}
 	if (_attach) {
 		auto attachAtTop = !_siteNameLines && !_titleLines && !_descriptionLines;

Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp

@@ -2284,6 +2284,12 @@ void OverlayWidget::refreshCaption() {
 			: AddTimestampLinks(caption, duration, base)),
 		Ui::ItemTextOptions(_message),
 		context);
+	if (_caption.hasSpoilers()) {
+		const auto weak = Ui::MakeWeak(widget());
+		_caption.setSpoilerLinkFilter([=](const ClickContext &context) {
+			return (weak != nullptr);
+		});
+	}
 }
 
 void OverlayWidget::refreshGroupThumbs() {

Telegram/SourceFiles/mtproto/session_private.cpp

@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "base/platform/base_platform_info.h"
 
-#include <KSandbox>
+#include <ksandbox.h>
 #include <zlib.h>
 
 namespace MTP {

Telegram/SourceFiles/platform/linux/specific_linux.cpp

@@ -35,8 +35,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QSystemTrayIcon>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QProcess>
-#include <KShell>
-#include <KSandbox>
+
+#include <kshell.h>
+#include <ksandbox.h>
 
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <glibmm.h>

Telegram/SourceFiles/settings/settings_folders.cpp

@@ -526,11 +526,13 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	return [=] {
 		auto ids = prepareGoodIdsForNewFilters();
 
-		using Requests = std::vector<MTPmessages_UpdateDialogFilter>;
-		auto addRequests = Requests(), removeRequests = Requests();
+		auto order = std::vector<FilterId>();
+		auto updates = std::vector<MTPUpdate>();
+		auto addRequests = std::vector<MTPmessages_UpdateDialogFilter>();
+		auto removeRequests = std::vector<MTPmessages_UpdateDialogFilter>();
+
 		auto &realFilters = session->data().chatsFilters();
 		const auto &list = realFilters.list();
-		auto order = std::vector<FilterId>();
 		order.reserve(rows->size());
 		for (const auto &row : *rows) {
 			const auto id = row.filter.id();
@@ -558,7 +560,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				addRequests.push_back(request);
 				order.push_back(newId);
 			}
-			realFilters.apply(MTP_updateDialogFilter(
+			updates.push_back(MTP_updateDialogFilter(
 				MTP_flags(removed
 					? MTPDupdateDialogFilter::Flag(0)
 					: MTPDupdateDialogFilter::Flag::f_filter),
@@ -578,16 +580,31 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			}
 			order.insert(order.begin() + position, FilterId(0));
 		}
-		auto previousId = mtpRequestId(0);
-		auto &&requests = ranges::views::concat(removeRequests, addRequests);
-		for (auto &request : requests) {
-			previousId = session->api().request(
-				std::move(request)
-			).afterRequest(previousId).send();
-		}
-		if (!order.empty() && !addRequests.empty()) {
-			realFilters.saveOrder(order, previousId);
-		}
+		crl::on_main(session, [
+			session,
+			order = std::move(order),
+			updates = std::move(updates),
+			addRequests = std::move(addRequests),
+			removeRequests = std::move(removeRequests)
+		] {
+			const auto api = &session->api();
+			const auto filters = &session->data().chatsFilters();
+			for (const auto &update : updates) {
+				filters->apply(update);
+			}
+			auto previousId = mtpRequestId(0);
+			auto &&requests = ranges::views::concat(
+				removeRequests,
+				addRequests);
+			for (auto &request : requests) {
+				previousId = api->request(
+					std::move(request)
+				).afterRequest(previousId).send();
+			}
+			if (!order.empty() && !addRequests.empty()) {
+				filters->saveOrder(order, previousId);
+			}
+		});
 	};
 }
 

Telegram/SourceFiles/settings/settings_premium.cpp

@@ -580,7 +580,7 @@ void EmojiStatusTopBar::paint(QPainter &p) {
 				crl::now(),
 				_paused);
 
-			p.drawImage(_rect, frame.image);
+			p.drawImage(_rect.toRect(), frame.image);
 			if (!_paused) {
 				_player->markFrameShown();
 			}
@@ -675,7 +675,7 @@ TopBarUser::TopBarUser(
 		if (document) {
 			_emojiStatus = std::make_unique<EmojiStatusTopBar>(
 				document,
-				[=](QRect r) { update(std::move(r)); },
+				[=](QRect r) { _content->update(std::move(r)); },
 				HistoryView::Sticker::EmojiSize());
 			_imageStar = QImage();
 		} else {
@@ -1650,7 +1650,10 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 		_radioGroup->setChangedCallback([=](int value) {
 			const auto options =
 				_controller->session().api().premium().subscriptionOptions();
-			Expects(value < options.size() && value >= 0);
+			if (options.empty()) {
+				return;
+			}
+			Assert(value < options.size() && value >= 0);
 			auto text = tr::lng_premium_subscribe_button(
 				tr::now,
 				lt_cost,
@@ -1783,7 +1786,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 			controller = args.controller,
 			computeRef = args.computeRef,
 			computeBotUrl = args.computeBotUrl] {
-		const auto url = computeBotUrl ? QString() : computeBotUrl();
+		const auto url = computeBotUrl ? computeBotUrl() : QString();
 		if (!url.isEmpty()) {
 			const auto local = Core::TryConvertUrlToLocal(url);
 			if (local.isEmpty()) {

Telegram/SourceFiles/storage/storage_media_prepare.cpp

@@ -88,14 +88,15 @@ void PrepareDetailsInParallel(PreparedList &result, int previewWidth) {
 } // namespace
 
 bool ValidatePhotoEditorMediaDragData(not_null<const QMimeData*> data) {
-	if (base::GetMimeUrls(data).size() > 1) {
+	const auto urls = base::GetMimeUrls(data);
+	if (urls.size() > 1) {
 		return false;
 	} else if (data->hasImage()) {
 		return true;
 	}
 
-	if (data->hasUrls()) {
-		const auto url = base::GetMimeUrls(data).front();
+	if (!urls.isEmpty()) {
+		const auto url = urls.front();
 		if (url.isLocalFile()) {
 			using namespace Core;
 			const auto info = QFileInfo(Platform::File::UrlToLocal(url));
@@ -111,14 +112,15 @@ bool ValidatePhotoEditorMediaDragData(not_null<const QMimeData*> data) {
 bool ValidateEditMediaDragData(
 		not_null<const QMimeData*> data,
 		Ui::AlbumType albumType) {
-	if (base::GetMimeUrls(data).size() > 1) {
+	const auto urls = base::GetMimeUrls(data);
+	if (urls.size() > 1) {
 		return false;
 	} else if (data->hasImage()) {
 		return (albumType != Ui::AlbumType::Music);
 	}
 
-	if (albumType == Ui::AlbumType::PhotoVideo && data->hasUrls()) {
-		const auto url = base::GetMimeUrls(data).front();
+	if (albumType == Ui::AlbumType::PhotoVideo && !urls.isEmpty()) {
+		const auto url = urls.front();
 		if (url.isLocalFile()) {
 			using namespace Core;
 			const auto info = QFileInfo(Platform::File::UrlToLocal(url));
@@ -138,12 +140,7 @@ MimeDataState ComputeMimeDataState(const QMimeData *data) {
 		return MimeDataState::Image;
 	}
 
-	const auto uriListFormat = qsl("text/uri-list");
-	if (!data->hasFormat(uriListFormat)) {
-		return MimeDataState::None;
-	}
-
-	const auto &urls = base::GetMimeUrls(data);
+	const auto urls = base::GetMimeUrls(data);
 	if (urls.isEmpty()) {
 		return MimeDataState::None;
 	}

Telegram/SourceFiles/ui/effects/premium_stars.cpp

@@ -24,7 +24,7 @@ MiniStars::MiniStars(Fn<void(const QRect &r)> updateCallback, bool opaque)
 	Interval{ 180 + 15, 50 },
 	Interval{ -15 - 50, 50 },
 })
-, _lifeLength({ 150, 200 })
+, _lifeLength({ 150 / 5, 200 / 5 })
 , _deathTime({ 1500, 2000 })
 , _size({ 5, 10 })
 , _alpha({ opaque ? 100 : 40, opaque ? 100 : 60 })

Telegram/build/docker/centos_env/Dockerfile

@@ -1,7 +1,7 @@
 {%- set GIT = "https://github.com" -%}
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
 {%- set QT = "6_4_0" -%}
-{%- set QT_TAG = "v6.4.0-rc1" -%}
+{%- set QT_TAG = "v6.4.0" -%}
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.0" -%}
 {%- set OPENSSL_VER = "1_1_1" -%}
 {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@@ -62,15 +62,6 @@ RUN git clone -b nasm-2.15.05 --depth=1 {{ GIT }}/netwide-assembler/nasm.git \
 	&& cd .. \
 	&& rm -rf nasm
 
-FROM builder AS extra-cmake-modules
-RUN git clone -b v5.98.0 --depth=1 {{ GIT }}/KDE/extra-cmake-modules.git \
-	&& cd extra-cmake-modules \
-	&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/extra-cmake-modules-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf extra-cmake-modules
-
 FROM builder AS libffi
 RUN git clone -b v3.4.2 --depth=1 {{ GIT }}/libffi/libffi.git \
 	&& cd libffi \
@@ -251,7 +242,7 @@ COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
 
-RUN git clone -b v0.7rc --depth=1 {{ GIT }}/libjxl/libjxl.git \
+RUN git clone -b v0.7.0 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& cd libjxl \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -718,39 +709,6 @@ RUN git clone -b {{ QT_TAG }} --depth=1 git://code.qt.io/qt/qt5.git qt_{{ QT }}
 	&& cd .. \
 	&& rm -rf qt_{{ QT }}
 
-FROM patches AS kcoreaddons
-COPY --link --from=extra-cmake-modules {{ LibrariesPath }}/extra-cmake-modules-cache /
-COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
-COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
-COPY --link --from=libproxy {{ LibrariesPath }}/libproxy-cache /
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
-COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
-COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /
-COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
-COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
-COPY --link --from=xcb-keysyms {{ LibrariesPath }}/xcb-keysyms-cache /
-COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
-COPY --link --from=wayland {{ LibrariesPath }}/wayland-cache /
-COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
-COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
-COPY --link --from=qt {{ LibrariesPath }}/qt-cache /
-
-RUN git clone -b v5.98.0 --depth=1 {{ GIT }}/KDE/kcoreaddons.git \
-	&& cd kcoreaddons \
-	&& curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply \
-	&& rm -rf po \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_PREFIX_PATH={{ QT_PREFIX }} \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DBUILD_TESTING=OFF \
-		-DBUILD_WITH_QT6=ON \
-		-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.78.0 \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/kcoreaddons-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf kcoreaddons
-
 FROM patches AS breakpad
 RUN git clone https://chromium.googlesource.com/breakpad/breakpad.git \
 	&& cd breakpad \
@@ -846,7 +804,6 @@ COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
 COPY --link --from=libsigcplusplus {{ LibrariesPath }}/libsigcplusplus-cache /
 COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
 COPY --link --from=qt {{ LibrariesPath }}/qt-cache /
-COPY --link --from=kcoreaddons {{ LibrariesPath }}/kcoreaddons-cache /
 COPY --link --from=breakpad {{ LibrariesPath }}/breakpad-cache /
 COPY --link --from=webrtc {{ LibrariesPath }}/tg_owt tg_owt
 COPY --link --from=webrtc_release {{ LibrariesPath }}/tg_owt/out/Release tg_owt/out/Release

Telegram/build/prepare/prepare.py

@@ -82,6 +82,7 @@ environment = {
     'USED_PREFIX': usedPrefix,
     'ROOT_DIR': rootDir,
     'LIBS_DIR': libsDir,
+    'THIRDPARTY_DIR': thirdPartyDir,
     'SPECIAL_TARGET': 'win' if win32 else 'win64' if win64 else 'mac',
     'X8664': 'x86' if win32 else 'x64',
     'WIN32X64': 'Win32' if win32 else 'x64',
@@ -446,8 +447,10 @@ win:
 depends:patches/gyp.diff
     git apply $LIBS_DIR/patches/gyp.diff
 mac:
-    python3 -m pip install --ignore-installed git+https://github.com/desktop-app/gyp-next@main
-    mkdir gyp
+    python3 -m pip install ^
+        --ignore-installed ^
+        --target=$THIRDPARTY_DIR/gyp ^
+        git+https://chromium.googlesource.com/external/gyp@master
 """, 'ThirdParty')
 
 stage('yasm', """
@@ -1033,6 +1036,7 @@ depends:patches/breakpad.diff
     cd src/third_party/lss
     git checkout e1e7b0ad8e
     cd ../../build
+    PYTHONPATH=$THIRDPARTY_DIR/gyp
     python3 gyp_breakpad
     cd ../processor
     xcodebuild -project processor.xcodeproj -target minidump_stackwalk -configuration Release build

Telegram/build/version

@@ -1,7 +1,7 @@
-AppVersion         4002001
+AppVersion         4002004
 AppVersionStrMajor 4.2
-AppVersionStrSmall 4.2.1
-AppVersionStr      4.2.1
-BetaChannel        1
+AppVersionStrSmall 4.2.4
+AppVersionStr      4.2.4
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.2.1.beta
+AppVersionOriginal 4.2.4

changelog.txt

@@ -1,3 +1,19 @@
+4.2.4 (30.09.22)
+
+- Fix crash in emoji statuses clearing.
+
+4.2.3 (28.09.22)
+
+- Improve scaling / cropping for photos / video files.
+- Improve touch support in channel comments.
+- Nice animation for spoilers.
+
+4.2.2 beta (23.09.22)
+
+- Fix crash in spoiler revealing in media captions.
+- Fix spoiler revealing in media viewer captions.
+- Fix crash in folder editing on Linux.
+
 4.2.1 beta (22.09.22)
 
 - Improve scaling / cropping for photos / video files.

snap/snapcraft.yaml

@@ -156,7 +156,6 @@ parts:
     after:
       - desktop-qt
       - ffmpeg
-      - kcoreaddons
       - libjxl
       - mozjpeg
       - openal
@@ -200,17 +199,6 @@ parts:
       - mozjpeg
       - qt
 
-  extra-cmake-modules:
-    source: https://github.com/KDE/extra-cmake-modules.git
-    source-depth: 1
-    source-tag: v5.98.0
-    plugin: cmake
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DBUILD_TESTING=OFF
-    prime: [-./*]
-
   ffmpeg:
     plugin: nil
     build-packages:
@@ -230,46 +218,11 @@ parts:
     after:
       - mozjpeg
 
-  kcoreaddons:
-    source: https://github.com/KDE/kcoreaddons.git
-    source-depth: 1
-    source-tag: v5.98.0
-    plugin: cmake
-    build-packages:
-      - curl
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DBUILD_TESTING=OFF
-      - -DBUILD_WITH_QT6=ON
-      - -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.78.0
-    override-pull: |
-      snapcraftctl pull
-      curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply
-      rm -rf po
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/cmake
-      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.so
-      - -./usr/mkspecs
-    after:
-      - extra-cmake-modules
-      - desktop-qt
-
   libjxl:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
-    source-tag: v0.7rc
+    source-tag: v0.7.0
     plugin: cmake
-    build-packages:
-      - libbrotli-dev
-      - libhwy-dev
-      - liblcms2-dev
-    stage-packages:
-      - libbrotli1
-      - libhwy0
-      - liblcms2-2
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
@@ -284,10 +237,16 @@ parts:
       - -DJPEGXL_ENABLE_SJPEG=OFF
       - -DJPEGXL_ENABLE_OPENEXR=OFF
       - -DJPEGXL_ENABLE_SKCMS=OFF
+    override-pull: |
+      craftctl default
+      sed -i 's/NOT JPEGXL_ENABLE_SKCMS/0/' lib/jxl.cmake
+    stage:
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libbrotli*
     prime:
       - -./usr/bin
       - -./usr/include
-      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgocnfig
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.a
       - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.so
       - -./usr/share
 
@@ -440,7 +399,7 @@ parts:
     override-pull: |
       QT=6_4_0
 
-      git clone -b v6.4.0-rc1 --depth=1 git://code.qt.io/qt/qt5.git .
+      git clone -b v6.4.0 --depth=1 git://code.qt.io/qt/qt5.git .
       perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat
 
       cd qtbase