Merge commit '920755afa56f421d27758f0cb24e461514a316b1' into beta

Isaac · Isaac · commit 0dd09cf7faab · 2024-12-10T11:24:55.000+08:00
diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -13304,6 +13304,8 @@ Sorry for the inconvenience.";
 
 "Chat.VideoProcessingInfo" = "The video will be published once converted and optimized.";
 
+"Camera.CollageRetake" = "Retake";
+"Camera.CollageDelete" = "Delete";
 "Camera.CollageManagementTooltip" = "Tap a tile to delete or reorder it.";
 "Camera.CollageReorderingInfo" = "Hold and drag tiles to reorder them.";
 
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
@@ -519,10 +519,13 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
                                         default:
                                             break
                                         }
+                                    } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {
+                                        canManage = true
+                                    } else if case let .channel(peer) = peer, case .broadcast = peer.info, peer.hasPermission(.addAdmins) {
+                                        canManage = true
                                     }
                                     
                                     if canManage {
-                                    } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {
                                     } else {
                                         enabled = false
                                     }
@@ -2413,10 +2416,13 @@ public final class ChatListNode: ListView {
                                     default:
                                         break
                                     }
+                                } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {
+                                    canManage = true
+                                } else if case let .channel(peer) = peer, case .broadcast = peer.info, peer.hasPermission(.addAdmins) {
+                                    canManage = true
                                 }
                                 
                                 if canManage {
-                                } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {
                                 } else {
                                     return false
                                 }
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
@@ -605,6 +605,7 @@ func chatListNodeEntriesForView(view: EngineChatList, state: ChatListNodeState,
     
     var result: [ChatListNodeEntry] = []
     
+    var hasContacts = false
     if !view.hasEarlier {
         var existingPeerIds = Set<EnginePeer.Id>()
         for item in view.items {
@@ -620,8 +621,9 @@ func chatListNodeEntriesForView(view: EngineChatList, state: ChatListNodeState,
                 peer: contact.peer,
                 presence: contact.presence
             )))
+            hasContacts = true
         }
-        if !contacts.isEmpty {
+        if hasContacts {
             result.append(.SectionHeader(presentationData: state.presentationData, displayHide: !view.items.isEmpty))
         }
     }
diff --git a/submodules/ChatPresentationInterfaceState/Sources/ChatPresentationInterfaceState.swift b/submodules/ChatPresentationInterfaceState/Sources/ChatPresentationInterfaceState.swift
@@ -1277,9 +1277,20 @@ public final class ChatPresentationInterfaceState: Equatable {
     }
 }
 
+public func canBypassRestrictions(chatPresentationInterfaceState: ChatPresentationInterfaceState) -> Bool {
+    guard let boostsToUnrestrict = chatPresentationInterfaceState.boostsToUnrestrict, boostsToUnrestrict > 0 else {
+        return false
+    }
+    if let appliedBoosts = chatPresentationInterfaceState.appliedBoosts, appliedBoosts >= boostsToUnrestrict {
+        return true
+    }
+    return false
+}
+
 public func canSendMessagesToChat(_ state: ChatPresentationInterfaceState) -> Bool {
     if let peer = state.renderedPeer?.peer {
-        if canSendMessagesToPeer(peer) {
+        let canBypassRestrictions = canBypassRestrictions(chatPresentationInterfaceState: state)
+        if canSendMessagesToPeer(peer, ignoreDefault: canBypassRestrictions) {
             return true
         } else {
             return false
diff --git a/submodules/Display/Source/NavigationTransitionCoordinator.swift b/submodules/Display/Source/NavigationTransitionCoordinator.swift
@@ -97,7 +97,11 @@ final class NavigationTransitionCoordinator {
         case .Push:
             self.container.addSubnode(topNode)
         case .Pop:
-            self.container.insertSubnode(bottomNode, belowSubnode: topNode)
+            if topNode.supernode == self.container {
+                self.container.insertSubnode(bottomNode, belowSubnode: topNode)
+            } else {
+                self.container.addSubnode(topNode)
+            }
         }
         
         if !self.isFlat {
diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift
@@ -871,6 +871,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, ASScroll
                 
                 if !isVideo {
                     canEdit = true
+                    isImage = true
                 }
             } else if let media = media as? TelegramMediaWebpage, case let .Loaded(content) = media.content {
                 let type = webEmbedType(content: content)
diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift
@@ -908,7 +908,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[1577421297] = { return Api.StarsGiftOption.parse_starsGiftOption($0) }
     dict[-1798404822] = { return Api.StarsGiveawayOption.parse_starsGiveawayOption($0) }
     dict[1411605001] = { return Api.StarsGiveawayWinnersOption.parse_starsGiveawayWinnersOption($0) }
-    dict[2033461574] = { return Api.StarsRevenueStatus.parse_starsRevenueStatus($0) }
+    dict[-21080943] = { return Api.StarsRevenueStatus.parse_starsRevenueStatus($0) }
     dict[779004698] = { return Api.StarsSubscription.parse_starsSubscription($0) }
     dict[88173912] = { return Api.StarsSubscriptionPricing.parse_starsSubscriptionPricing($0) }
     dict[198776256] = { return Api.StarsTopupOption.parse_starsTopupOption($0) }
diff --git a/submodules/TelegramApi/Sources/Api24.swift b/submodules/TelegramApi/Sources/Api24.swift
@@ -904,18 +904,18 @@ public extension Api {
 }
 public extension Api {
     enum StarsRevenueStatus: TypeConstructorDescription {
-        case starsRevenueStatus(flags: Int32, currentBalance: Int64, availableBalance: Int64, overallRevenue: Int64, nextWithdrawalAt: Int32?)
+        case starsRevenueStatus(flags: Int32, currentBalance: Api.StarsAmount, availableBalance: Api.StarsAmount, overallRevenue: Api.StarsAmount, nextWithdrawalAt: Int32?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
                 case .starsRevenueStatus(let flags, let currentBalance, let availableBalance, let overallRevenue, let nextWithdrawalAt):
                     if boxed {
-                        buffer.appendInt32(2033461574)
+                        buffer.appendInt32(-21080943)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
-                    serializeInt64(currentBalance, buffer: buffer, boxed: false)
-                    serializeInt64(availableBalance, buffer: buffer, boxed: false)
-                    serializeInt64(overallRevenue, buffer: buffer, boxed: false)
+                    currentBalance.serialize(buffer, true)
+                    availableBalance.serialize(buffer, true)
+                    overallRevenue.serialize(buffer, true)
                     if Int(flags) & Int(1 << 1) != 0 {serializeInt32(nextWithdrawalAt!, buffer: buffer, boxed: false)}
                     break
     }
@@ -931,12 +931,18 @@ public extension Api {
         public static func parse_starsRevenueStatus(_ reader: BufferReader) -> StarsRevenueStatus? {
             var _1: Int32?
             _1 = reader.readInt32()
-            var _2: Int64?
-            _2 = reader.readInt64()
-            var _3: Int64?
-            _3 = reader.readInt64()
-            var _4: Int64?
-            _4 = reader.readInt64()
+            var _2: Api.StarsAmount?
+            if let signature = reader.readInt32() {
+                _2 = Api.parse(reader, signature: signature) as? Api.StarsAmount
+            }
+            var _3: Api.StarsAmount?
+            if let signature = reader.readInt32() {
+                _3 = Api.parse(reader, signature: signature) as? Api.StarsAmount
+            }
+            var _4: Api.StarsAmount?
+            if let signature = reader.readInt32() {
+                _4 = Api.parse(reader, signature: signature) as? Api.StarsAmount
+            }
             var _5: Int32?
             if Int(_1!) & Int(1 << 1) != 0 {_5 = reader.readInt32() }
             let _c1 = _1 != nil
diff --git a/submodules/TelegramCore/Sources/ApiUtils/TelegramChannel.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramChannel.swift
@@ -24,7 +24,7 @@ public enum TelegramChannelPermission {
 }
 
 public extension TelegramChannel {
-    func hasPermission(_ permission: TelegramChannelPermission) -> Bool {
+    func hasPermission(_ permission: TelegramChannelPermission, ignoreDefault: Bool = false) -> Bool {
         if self.flags.contains(.isCreator) {
             if case .canBeAnonymous = permission {
                 if let adminRights = self.adminRights {
@@ -50,7 +50,7 @@ public extension TelegramChannel {
                     if let bannedRights = self.bannedRights, bannedRights.flags.contains(.banSendText) {
                         return false
                     }
-                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendText) {
+                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendText) && !ignoreDefault {
                         return false
                     }
                     return true
@@ -69,7 +69,7 @@ public extension TelegramChannel {
                     if let bannedRights = self.bannedRights, bannedRights.flags.contains(.banSendPhotos) {
                         return false
                     }
-                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendPhotos) {
+                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendText) && !ignoreDefault {
                         return false
                     }
                     return true
@@ -88,7 +88,7 @@ public extension TelegramChannel {
                     if let bannedRights = self.bannedRights, bannedRights.flags.contains(.banSendVideos) {
                         return false
                     }
-                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendVideos) {
+                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendVideos) && !ignoreDefault {
                         return false
                     }
                     return true
@@ -121,7 +121,7 @@ public extension TelegramChannel {
                     if let bannedRights = self.bannedRights, bannedRights.flags.intersection(flags) == flags {
                         return false
                     }
-                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.intersection(flags) == flags {
+                    if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.intersection(flags) == flags && !ignoreDefault {
                         return false
                     }
                     return true
diff --git a/submodules/TelegramCore/Sources/Statistics/StarsRevenueStatistics.swift b/submodules/TelegramCore/Sources/Statistics/StarsRevenueStatistics.swift
@@ -146,7 +146,7 @@ extension StarsRevenueStats.Balances {
     init(apiStarsRevenueStatus: Api.StarsRevenueStatus) {
         switch apiStarsRevenueStatus {
         case let .starsRevenueStatus(flags, currentBalance, availableBalance, overallRevenue, nextWithdrawalAt):
-            self.init(currentBalance: StarsAmount(value: currentBalance, nanos: 0), availableBalance: StarsAmount(value: availableBalance, nanos: 0), overallRevenue: StarsAmount(value: overallRevenue, nanos: 0), withdrawEnabled: ((flags & (1 << 0)) != 0), nextWithdrawalTimestamp: nextWithdrawalAt)
+            self.init(currentBalance: StarsAmount(apiAmount: currentBalance), availableBalance: StarsAmount(apiAmount: availableBalance), overallRevenue: StarsAmount(apiAmount: overallRevenue), withdrawEnabled: ((flags & (1 << 0)) != 0), nextWithdrawalTimestamp: nextWithdrawalAt)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/Utils/CanSendMessagesToPeer.swift b/submodules/TelegramCore/Sources/Utils/CanSendMessagesToPeer.swift
@@ -6,15 +6,15 @@ import Postbox
 private final class LinkHelperClass: NSObject {
 }
 
-public func canSendMessagesToPeer(_ peer: Peer) -> Bool {
+public func canSendMessagesToPeer(_ peer: Peer, ignoreDefault: Bool = false) -> Bool {
     if let peer = peer as? TelegramUser, peer.addressName == "replies" {
         return false
     } else if peer is TelegramUser || peer is TelegramGroup {
         return !peer.isDeleted
     } else if let peer = peer as? TelegramSecretChat {
         return peer.embeddedState == .active
     } else if let peer = peer as? TelegramChannel {
-        return peer.hasPermission(.sendSomething)
+        return peer.hasPermission(.sendSomething, ignoreDefault: ignoreDefault)
     } else {
         return false
     }
diff --git a/submodules/TelegramUI/Components/Calls/CallScreen/BUILD b/submodules/TelegramUI/Components/Calls/CallScreen/BUILD
@@ -70,6 +70,7 @@ swift_library(
         "//submodules/AppBundle",
         "//submodules/UIKitRuntimeUtils",
         "//submodules/TelegramPresentationData",
+        "//submodules/Components/MultilineTextComponent",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraCollage.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraCollage.swift
@@ -504,6 +504,10 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
             self.contextAction?(item.uniqueId, self.extractedContainerView, nil)
         }
         
+        func stopPlayback() {
+            self.videoPlayer?.pause()
+        }
+        
         func resetPlayback() {
             self.videoPlayer?.seek(to: .zero)
             self.videoPlayer?.play()
@@ -677,13 +681,13 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
                 var delayAppearance = false
                 if let snapshotView = self.snapshotView {
                     if snapshotView is UIImageView {
-                        
+      
                     } else {
                         delayAppearance = true
-                        Queue.mainQueue().after(0.2, {
-                            snapshotView.removeFromSuperview()
-                        })
                     }
+                    Queue.mainQueue().after(0.2, {
+                        snapshotView.removeFromSuperview()
+                    })
                     self.snapshotView = nil
                 }
                 if let previewLayer = self.previewLayer {
@@ -991,6 +995,12 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
         }
     }
     
+    func stopPlayback() {
+        for (_, itemView) in self.itemViews {
+            itemView.stopPlayback()
+        }
+    }
+    
     func resetPlayback() {
         for (_, itemView) in self.itemViews {
             itemView.resetPlayback()
@@ -1054,7 +1064,7 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
         
         var itemList: [ContextMenuItem] = []
         if self.collage.cameraIndex == nil {
-            itemList.append(.action(ContextMenuActionItem(text: "Retake", icon: { theme in
+            itemList.append(.action(ContextMenuActionItem(text: presentationData.strings.Camera_CollageRetake, icon: { theme in
                 return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Camera"), color: theme.contextMenu.primaryColor)
             }, action: { [weak self] _, f in
                 f(.default)
@@ -1066,7 +1076,7 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
         if self.itemViews.count > 2 {
             itemList.append(.separator)
             
-            itemList.append(.action(ContextMenuActionItem(text: "Delete", textColor: .destructive, icon: { theme in
+            itemList.append(.action(ContextMenuActionItem(text: presentationData.strings.Camera_CollageDelete, textColor: .destructive, icon: { theme in
                 return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor)
             }, action: { [weak self] _, f in
                 f(.dismissWithoutContent)
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
@@ -2615,13 +2615,9 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                 view.animateOutToEditor(transition: transition)
             }
             
-            Queue.mainQueue().after(2.0, {
-                if self.cameraState.isCollageEnabled {
-                    self.collage = nil
-                    if let collageView = self.collageView {
-                        collageView.removeFromSuperview()
-                        self.collageView = nil
-                    }
+            Queue.mainQueue().after(1.5, {
+                if let collageView = self.collageView {
+                    collageView.stopPlayback()
                 }
             })
         }
@@ -2679,6 +2675,10 @@ public class CameraScreenImpl: ViewController, CameraScreen {
             if !toGallery {
                 self.resumeCameraCapture(fromGallery: false)
                 
+                if let collageView = self.collageView {
+                    collageView.resetPlayback()
+                }
+                
                 self.cameraIsActive = true
                 self.requestUpdateLayout(transition: .immediate)
                 
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CaptureControlsComponent.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CaptureControlsComponent.swift
@@ -999,14 +999,22 @@ final class CaptureControlsComponent: Component {
         func animateInFromEditor(transition: ComponentTransition) {
             self.animatedOut = false
 
+            guard let component = self.component else {
+                return
+            }
+            
             if let view = self.galleryButtonView.view {
                 transition.setScale(view: view, scale: 1.0)
-                transition.setAlpha(view: view, alpha: 1.0)
+                if !component.hideControls {
+                    transition.setAlpha(view: view, alpha: 1.0)
+                }
             }
             
             if let view = self.flipButtonView.view {
                 transition.setScale(view: view, scale: 1.0)
-                transition.setAlpha(view: view, alpha: 1.0)
+                if !component.hideControls {
+                    transition.setAlpha(view: view, alpha: 1.0)
+                }
             }
             
             if let view = self.shutterButtonView.view {
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift
@@ -432,8 +432,8 @@ public final class ChatMessageSelectionInputPanelNode: ChatInputPanelNode {
                 buttons = [
                     self.deleteButton,
                     tagButton,
-                    self.forwardButton,
-                    self.shareButton
+                    self.shareButton,
+                    self.forwardButton
                 ]
             } else {
                 buttons = [
diff --git a/submodules/TelegramUI/Components/Gifts/GiftSetupScreen/Sources/GiftSetupScreen.swift b/submodules/TelegramUI/Components/Gifts/GiftSetupScreen/Sources/GiftSetupScreen.swift
@@ -406,7 +406,7 @@ final class GiftSetupScreenComponent: Component {
                         purpose: .starGift(peerId: component.peerId, requiredStars: starGift.price),
                         completion: { [weak starsContext] stars in
                             starsContext?.add(balance: StarsAmount(value: stars, nanos: 0))
-                            Queue.mainQueue().after(0.1) {
+                            Queue.mainQueue().after(2.0) {
                                 proceed()
                             }
                         }
diff --git a/submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift b/submodules/TelegramUI/Components/LegacyMessageInputPanel/Sources/LegacyMessageInputPanel.swift
diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
diff --git a/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateInputPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateInputPanels.swift

Original file line number	Diff line number	Diff line change
`@@ -519,10 +519,13 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL`
`519`	`519`	`default:`
`520`	`520`	`break`
`521`	`521`	`}`
	`522`	`+ } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {`
	`523`	`+ canManage = true`
	`524`	`+ } else if case let .channel(peer) = peer, case .broadcast = peer.info, peer.hasPermission(.addAdmins) {`
	`525`	`+ canManage = true`
`522`	`526`	`}`
`523`	`527`
`524`	`528`	`if canManage {`
`525`		`- } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {`
`526`	`529`	`} else {`
`527`	`530`	`enabled = false`
`528`	`531`	`}`
`@@ -2413,10 +2416,13 @@ public final class ChatListNode: ListView {`
`2413`	`2416`	`default:`
`2414`	`2417`	`break`
`2415`	`2418`	`}`
	`2419`	`+ } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {`
	`2420`	`+ canManage = true`
	`2421`	`+ } else if case let .channel(peer) = peer, case .broadcast = peer.info, peer.hasPermission(.addAdmins) {`
	`2422`	`+ canManage = true`
`2416`	`2423`	`}`
`2417`	`2424`
`2418`	`2425`	`if canManage {`
`2419`		`- } else if case let .channel(peer) = peer, case .group = peer.info, peer.hasPermission(.inviteMembers) {`
`2420`	`2426`	`} else {`
`2421`	`2427`	`return false`
`2422`	`2428`	`}`
Original file line number	Diff line number	Diff line change
`@@ -605,6 +605,7 @@ func chatListNodeEntriesForView(view: EngineChatList, state: ChatListNodeState,`
`605`	`605`
`606`	`606`	`var result: [ChatListNodeEntry] = []`
`607`	`607`
	`608`	`+ var hasContacts = false`
`608`	`609`	`if !view.hasEarlier {`
`609`	`610`	`var existingPeerIds = Set<EnginePeer.Id>()`
`610`	`611`	`for item in view.items {`
`@@ -620,8 +621,9 @@ func chatListNodeEntriesForView(view: EngineChatList, state: ChatListNodeState,`
`620`	`621`	`peer: contact.peer,`
`621`	`622`	`presence: contact.presence`
`622`	`623`	`)))`
	`624`	`+ hasContacts = true`
`623`	`625`	`}`
`624`		`- if !contacts.isEmpty {`
	`626`	`+ if hasContacts {`
`625`	`627`	`result.append(.SectionHeader(presentationData: state.presentationData, displayHide: !view.items.isEmpty))`
`626`	`628`	`}`
`627`	`629`	`}`
Original file line number	Diff line number	Diff line change
`@@ -871,6 +871,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, ASScroll`
`871`	`871`
`872`	`872`	`if !isVideo {`
`873`	`873`	`canEdit = true`
	`874`	`+ isImage = true`
`874`	`875`	`}`
`875`	`876`	`} else if let media = media as? TelegramMediaWebpage, case let .Loaded(content) = media.content {`
`876`	`877`	`let type = webEmbedType(content: content)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public enum TelegramChannelPermission {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public extension TelegramChannel {`
`27`		`- func hasPermission(_ permission: TelegramChannelPermission) -> Bool {`
	`27`	`+ func hasPermission(_ permission: TelegramChannelPermission, ignoreDefault: Bool = false) -> Bool {`
`28`	`28`	`if self.flags.contains(.isCreator) {`
`29`	`29`	`if case .canBeAnonymous = permission {`
`30`	`30`	`if let adminRights = self.adminRights {`
`@@ -50,7 +50,7 @@ public extension TelegramChannel {`
`50`	`50`	`if let bannedRights = self.bannedRights, bannedRights.flags.contains(.banSendText) {`
`51`	`51`	`return false`
`52`	`52`	`}`
`53`		`- if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendText) {`
	`53`	`+ if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendText) && !ignoreDefault {`
`54`	`54`	`return false`
`55`	`55`	`}`
`56`	`56`	`return true`
`@@ -69,7 +69,7 @@ public extension TelegramChannel {`
`69`	`69`	`if let bannedRights = self.bannedRights, bannedRights.flags.contains(.banSendPhotos) {`
`70`	`70`	`return false`
`71`	`71`	`}`
`72`		`- if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendPhotos) {`
	`72`	`+ if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendText) && !ignoreDefault {`
`73`	`73`	`return false`
`74`	`74`	`}`
`75`	`75`	`return true`
`@@ -88,7 +88,7 @@ public extension TelegramChannel {`
`88`	`88`	`if let bannedRights = self.bannedRights, bannedRights.flags.contains(.banSendVideos) {`
`89`	`89`	`return false`
`90`	`90`	`}`
`91`		`- if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendVideos) {`
	`91`	`+ if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.contains(.banSendVideos) && !ignoreDefault {`
`92`	`92`	`return false`
`93`	`93`	`}`
`94`	`94`	`return true`
`@@ -121,7 +121,7 @@ public extension TelegramChannel {`
`121`	`121`	`if let bannedRights = self.bannedRights, bannedRights.flags.intersection(flags) == flags {`
`122`	`122`	`return false`
`123`	`123`	`}`
`124`		`- if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.intersection(flags) == flags {`
	`124`	`+ if let defaultBannedRights = self.defaultBannedRights, defaultBannedRights.flags.intersection(flags) == flags && !ignoreDefault {`
`125`	`125`	`return false`
`126`	`126`	`}`
`127`	`127`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ extension StarsRevenueStats.Balances {`
`146`	`146`	`init(apiStarsRevenueStatus: Api.StarsRevenueStatus) {`
`147`	`147`	`switch apiStarsRevenueStatus {`
`148`	`148`	`case let .starsRevenueStatus(flags, currentBalance, availableBalance, overallRevenue, nextWithdrawalAt):`
`149`		`- self.init(currentBalance: StarsAmount(value: currentBalance, nanos: 0), availableBalance: StarsAmount(value: availableBalance, nanos: 0), overallRevenue: StarsAmount(value: overallRevenue, nanos: 0), withdrawEnabled: ((flags & (1 << 0)) != 0), nextWithdrawalTimestamp: nextWithdrawalAt)`
	`149`	`+ self.init(currentBalance: StarsAmount(apiAmount: currentBalance), availableBalance: StarsAmount(apiAmount: availableBalance), overallRevenue: StarsAmount(apiAmount: overallRevenue), withdrawEnabled: ((flags & (1 << 0)) != 0), nextWithdrawalTimestamp: nextWithdrawalAt)`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`