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

Merge commit '30e40411499e3bfdfe41f47c1a3c39236a50a1c8'

Browse Source 
# Conflicts:
#	submodules/TelegramCore/Sources/TelegramEngine/Payments/Stars.swift
This commit is contained in:
Isaac
2024-10-29 00:41:00 +01:00
parent b3e0d64b37 30e4041149
commit bc54ab68f0
52 changed files with 1429 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
View File

@@ -547,7 +547,7 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Info"), color: theme.actionSheet.primaryTextColor)
}, iconSource: nil, action: { _, f in
f(.dismissWithoutContent)
controllerInteraction.navigationController()?.pushViewController(AdsInfoScreen(context: context))
controllerInteraction.navigationController()?.pushViewController(AdsInfoScreen(context: context, mode: .channel))
})))
actions.append(.action(ContextMenuActionItem(text: presentationData.strings.Chat_ContextMenu_ReportAd, textColor: .primary, textLayout: .twoLinesMax, textFont: .custom(font: Font.regular(presentationData.listsFontSize.baseDisplaySize - 1.0), height: nil, verticalOffset: nil), badge: nil, icon: { theme in
@@ -2332,24 +2332,9 @@ func chatAvailableMessageActionsImpl(engine: TelegramEngine, accountPeerId: Peer
case .creator, .admin:
optionsMap[id]!.insert(.deleteGlobally)
case .member:
var hasMediaToReport = false
for media in message.media {
if let _ = media as? TelegramMediaImage {
hasMediaToReport = true
} else if let _ = media as? TelegramMediaFile {
hasMediaToReport = true
} else if let webpage = media as? TelegramMediaWebpage, case let .Loaded(content) = webpage.content {
if let _ = content.image {
hasMediaToReport = true
} else if let _ = content.file {
hasMediaToReport = true
}
}
}
if hasMediaToReport {
optionsMap[id]!.insert(.report)
}
break
}
optionsMap[id]!.insert(.report)
}
} else if let user = peer as? TelegramUser {
if !isScheduled && message.id.peerId.namespace != Namespaces.Peer.SecretChat && !message.containsSecretMedia && !isAction && !message.id.peerId.isReplies && !message.isCopyProtected() && !isShareProtected {