Sync upstream telegramdesktop/dev#360
Open
Newmcpe wants to merge 148 commits into
Open
Conversation
Synced 147 commits from telegramdesktop/tdesktop upstream/dev (288 files changed, ~11.6k insertions / ~2.5k deletions in the parent repo). Conflict resolutions: - README, .github/workflows/*: kept AyuGram side (deleted CI workflows). - api_polls.cpp: combined AyuGram ghost-mode mark-as-read with upstream's new error-typed fail() lambda. - delete_messages_box.cpp: took upstream (orphaned moderation members removed; no callers passed the suggestModerateActions boolean). - stickers_list_widget.cpp: dropped orphaned addSearchRow() — upstream rewrote the search-by-title flow and silently dropped both AyuGram callers. The showOnlyAddedEmojisAndStickers filter no longer applies to set-search results and may need re-hooking into the new code paths. - click_handler_types.cpp: combined AyuGram disableOpenLinkWarning with upstream's renamed HiddenUrlRequiresConfirmation(). - data_types.h: kept both bits (GuestChatViaFrom 1<<62, AyuNoForwards 1<<63). - history_inner_widget.cpp: kept AyuGram's kScrollDateHideTimeout = 800 alongside upstream's new kScrollDateHideOnDayCrossingTimeout. - compose_ai_button_factory.cpp: combined AyuGram setting toggle with upstream's HideAiButtonOption and new aiComposeTones() API. - unread_badge.cpp: took upstream (kPlayStatusLimit 12->2, new ScaledBotVerifiedEmoji class). Submodule Telegram/lib_ui updated: synced AyuGram/lib_ui against desktop-app/lib_ui master (clean merge, AyuGram's single feature commit on top of 7 upstream commits). New submodule pin requires pushing the lib_ui sync/upstream-2026-05-08 branch separately. Not built or tested. Build verification is the user's responsibility.
Newmcpe
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge 147 commits from
telegramdesktop/tdesktop:dev. Depends on AyuGram/lib_ui#2.Conflicts:
workflows/*.yml— kept deletedREADME.md— kept oursapi_polls.cpp— combined ghost-mode read with newMTP::Errorfaildelete_messages_box.cpp— took upstreamstickers_list_widget.cpp— dropped orphanedaddSearchRow(showOnlyAddedEmojisAndStickersno longer applies to set-search)click_handler_types.cpp— combineddisableOpenLinkWarningwith renamedHiddenUrlRequiresConfirmationdata_types.h— kept both bits (1<<62, 1<<63)history_inner_widget.cpp— keptkScrollDateHideTimeout=800compose_ai_button_factory.cpp— combined toggle withHideAiButtonOption+aiComposeTonesrenameunread_badge.cpp— took upstream