ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1cc27e2a20c8cd889584c327f697d3c8c5c4b8fe'

Browse Source 
# Conflicts:
#	submodules/AccountContext/Sources/AccountContext.swift
#	submodules/TelegramCore/Sources/ApiUtils/StoreMessage_Telegram.swift
#	submodules/TelegramCore/Sources/TelegramEngine/Messages/MediaArea.swift
#	submodules/TelegramCore/Sources/TelegramEngine/Messages/StoryListContext.swift
#	submodules/TelegramUI/Components/PeerInfo/PeerInfoStoryGridScreen/Sources/StorySearchGridScreen.swift
#	submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
#	submodules/TelegramUI/Sources/SharedAccountContext.swift
This commit is contained in:
Isaac
2024-06-07 15:27:36 +04:00
parent 8ab94ac4f6 1cc27e2a20
commit a2bbf58b76
96 changed files with 4283 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
submodules/TelegramUI/Sources/SharedAccountContext.swift
View File

@@ -1775,7 +1775,6 @@ public final class SharedAccountContextImpl: SharedAccountContext {
}, openRecommendedChannelContextMenu: { _, _, _ in
}, openGroupBoostInfo: { _, _ in
}, openStickerEditor: {
}, openPhoneContextMenu: { _ in
}, openAgeRestrictedMessageMedia: { _, _ in
}, playMessageEffect: { _ in
}, editMessageFactCheck: { _ in
@@ -1908,8 +1907,8 @@ public final class SharedAccountContextImpl: SharedAccountContext {
return HashtagSearchController(context: context, peer: peer, query: query, all: all)
}
public func makeStorySearchController(context: AccountContext, scope: StorySearchControllerScope) -> ViewController {
return StorySearchGridScreen(context: context, scope: scope)
public func makeStorySearchController(context: AccountContext, scope: StorySearchControllerScope, listContext: SearchStoryListContext?) -> ViewController {
return StorySearchGridScreen(context: context, scope: scope, listContext: listContext)
}
public func makeMyStoriesController(context: AccountContext, isArchive: Bool) -> ViewController {
@@ -2638,6 +2637,10 @@ public final class SharedAccountContextImpl: SharedAccountContext {
public func makeStarsReceiptScreen(context: AccountContext, receipt: BotPaymentReceipt) -> ViewController {
return StarsTransactionScreen(context: context, subject: .receipt(receipt), action: {})
}
public func makeStarsStatisticsScreen(context: AccountContext, starsContext: StarsContext) -> ViewController {
return StarsStatisticsScreen(context: context, starsContext: starsContext)
}
}
private func peerInfoControllerImpl(context: AccountContext, updatedPresentationData: (PresentationData, Signal<PresentationData, NoError>)?, peer: Peer, mode: PeerInfoControllerMode, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, requestsContext: PeerInvitationImportersContext? = nil) -> ViewController? {