Revert "Experiment"

This reverts commit 8c54db6.

Author: Isaac

Telegram/NotificationService/Sources/NotificationService.swift

@@ -1978,18 +1978,13 @@ private final class NotificationServiceHandler {
                                                 if let media = message.media.first {
                                                     parsedMedia = media
                                                 }
-                                                if enableInlineEmoji, let textEntitiesAttribute = message.textEntitiesAttribute, let author = message.author {
-                                                    let authorTitle = author.debugDisplayTitle
-                                                    let messagePrefix = "\(authorTitle): "
-                                                    let messagePrefixLength = (messagePrefix as NSString).length
+                                                if enableInlineEmoji, let textEntitiesAttribute = message.textEntitiesAttribute {
+                                                    content.body = message.text
                                                     for entity in textEntitiesAttribute.entities {
                                                         if case let .CustomEmoji(_, fileId) = entity.type {
-                                                            content.customEmoji.append(NotificationContent.CustomEmoji(range: (entity.range.lowerBound + messagePrefixLength) ..< (entity.range.upperBound + messagePrefixLength), fileId: fileId))
+                                                            content.customEmoji.append(NotificationContent.CustomEmoji(range: entity.range, fileId: fileId))
                                                         }
                                                     }
-                                                    if !content.customEmoji.isEmpty {
-                                                        content.body = messagePrefix + message.text
-                                                    }
                                                 }
                                             }
 

submodules/DebugSettingsUI/Sources/DebugController.swift

@@ -109,7 +109,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     case playerV2(Bool)
     case devRequests(Bool)
     case enableUpdates(Bool)
-    case pwa(Bool)
+    case fakeAds(Bool)
     case enableLocalTranslation(Bool)
     case preferredVideoCodec(Int, String, String?, Bool)
     case disableVideoAspectScaling(Bool)
@@ -135,7 +135,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             return DebugControllerSection.web.rawValue
         case .keepChatNavigationStack, .skipReadHistory, .alwaysDisplayTyping, .debugRatingLayout, .crashOnSlowQueries, .crashOnMemoryPressure:
             return DebugControllerSection.experiments.rawValue
-        case .clearTips, .resetNotifications, .crash, .fillLocalSavedMessageCache, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .resetTagHoles, .reindexUnread, .resetCacheIndex, .reindexCache, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .compressedEmojiCache, .storiesJpegExperiment, .checkSerializedData, .enableQuickReactionSwitch, .experimentalCompatibility, .enableDebugDataDisplay, .fakeGlass, .browserExperiment, .allForumsHaveTabs, .enableReactionOverrides, .restorePurchases, .disableReloginTokens, .liveStreamV2, .experimentalCallMute, .playerV2, .devRequests, .enableUpdates, .pwa, .enableLocalTranslation:
+        case .clearTips, .resetNotifications, .crash, .fillLocalSavedMessageCache, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .resetTagHoles, .reindexUnread, .resetCacheIndex, .reindexCache, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .compressedEmojiCache, .storiesJpegExperiment, .checkSerializedData, .enableQuickReactionSwitch, .experimentalCompatibility, .enableDebugDataDisplay, .fakeGlass, .browserExperiment, .allForumsHaveTabs, .enableReactionOverrides, .restorePurchases, .disableReloginTokens, .liveStreamV2, .experimentalCallMute, .playerV2, .devRequests, .enableUpdates, .fakeAds, .enableLocalTranslation:
             return DebugControllerSection.experiments.rawValue
         case .logTranslationRecognition, .resetTranslationStates:
             return DebugControllerSection.translation.rawValue
@@ -258,7 +258,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             return 54
         case .devRequests:
             return 55
-        case .pwa:
+        case .fakeAds:
             return 56
         case .enableLocalTranslation:
             return 57
@@ -1392,12 +1392,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     })
                 }).start()
             })
-        case let .pwa(value):
-            return ItemListSwitchItem(presentationData: presentationData, systemStyle: .glass, title: "Test1", value: value, sectionId: self.section, style: .blocks, updated: { value in
+        case let .fakeAds(value):
+            return ItemListSwitchItem(presentationData: presentationData, systemStyle: .glass, title: "Fake Ads", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
                     transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
                         var settings = settings?.get(ExperimentalUISettings.self) ?? ExperimentalUISettings.defaultSettings
-                        settings.enablePWA = value
+                        settings.fakeAds = value
                         return PreferencesEntry(settings)
                     })
                 }).start()
@@ -1488,7 +1488,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     }
 }
 
-private func debugControllerEntries(context: AccountContext?, sharedContext: SharedAccountContext, presentationData: PresentationData, loggingSettings: LoggingSettings, mediaInputSettings: MediaInputSettings, experimentalSettings: ExperimentalUISettings, networkSettings: NetworkSettings?, hasLegacyAppData: Bool, useBetaFeatures: Bool) -> [DebugControllerEntry] {
+private func debugControllerEntries(sharedContext: SharedAccountContext, presentationData: PresentationData, loggingSettings: LoggingSettings, mediaInputSettings: MediaInputSettings, experimentalSettings: ExperimentalUISettings, networkSettings: NetworkSettings?, hasLegacyAppData: Bool, useBetaFeatures: Bool) -> [DebugControllerEntry] {
     var entries: [DebugControllerEntry] = []
 
     let isMainApp = sharedContext.applicationBindings.isMainApp
@@ -1572,18 +1572,7 @@ private func debugControllerEntries(context: AccountContext?, sharedContext: Sha
         entries.append(.playerV2(experimentalSettings.playerV2))
 
         entries.append(.devRequests(experimentalSettings.devRequests))
-        
-        if let data = context?.currentAppConfiguration.with({ $0 }).data {
-            var displayPwa = false
-            if let _ = data["ios_display_pwa"] {
-                displayPwa = true
-            } else if let isDev = data["dev"] as? Double, isDev == 1.0 {
-                displayPwa = true
-            }
-            if displayPwa {
-                entries.append(.pwa(experimentalSettings.enablePWA))
-            }
-        }
+        entries.append(.fakeAds(experimentalSettings.fakeAds))
         entries.append(.enableLocalTranslation(experimentalSettings.enableLocalTranslation))
         entries.append(.enableUpdates(experimentalSettings.enableUpdates))
     }
@@ -1669,7 +1658,7 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
         }
 
         let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text("Debug"), leftNavigationButton: leftNavigationButton, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back))
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: debugControllerEntries(context: context, sharedContext: sharedContext, presentationData: presentationData, loggingSettings: loggingSettings, mediaInputSettings: mediaInputSettings, experimentalSettings: experimentalSettings, networkSettings: networkSettings, hasLegacyAppData: hasLegacyAppData, useBetaFeatures: useBetaFeatures), style: .blocks)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: debugControllerEntries(sharedContext: sharedContext, presentationData: presentationData, loggingSettings: loggingSettings, mediaInputSettings: mediaInputSettings, experimentalSettings: experimentalSettings, networkSettings: networkSettings, hasLegacyAppData: hasLegacyAppData, useBetaFeatures: useBetaFeatures), style: .blocks)
 
         return (controllerState, (listState, arguments))
     }

submodules/TelegramCore/Sources/Network/FetchedMediaResource.swift

@@ -729,7 +729,7 @@ final class MediaReferenceRevalidationContext {
 
     func attachBot(accountPeerId: PeerId, postbox: Postbox, network: Network, background: Bool, peer: PeerReference) -> Signal<AttachMenuBot, RevalidateMediaReferenceError> {
         return self.genericItem(key: .attachBot(peer: peer), background: background, request: { next, error in
-            return (_internal_getAttachMenuBot(accountPeerId: accountPeerId, postbox: postbox, network: network, botId: peer.id, cached: false, allowManuallyCached: false)
+            return (_internal_getAttachMenuBot(accountPeerId: accountPeerId, postbox: postbox, network: network, botId: peer.id, cached: false)
             |> mapError { _ -> RevalidateMediaReferenceError in
                 return .generic
             }).start(next: { value in

submodules/TelegramCore/Sources/SyncCore/SyncCore_Namespaces.swift

@@ -149,8 +149,6 @@ public struct Namespaces {
         public static let cachedChatThemes: Int8 = 50
         public static let cachedLiveStorySendAsPeers: Int8 = 51
         public static let cachedGiftUpgradesAttributes: Int8 = 52
-        public static let manuallyCachedAttachMenuBots: Int8 = 53
-        public static let cachedBotWebViews: Int8 = 54
     }
 
     public struct UnorderedItemList {

submodules/TelegramCore/Sources/TelegramEngine/Messages/AttachMenuBots.swift

@@ -283,51 +283,6 @@ private func removeCachedAttachMenuBot(postbox: Postbox, botId: PeerId) -> Signa
     }
 }
 
-enum CachedAttachMenuBotResult {
-    case empty
-    case bot(AttachMenuBots.Bot)
-}
-
-private func manuallyCachedAttachMenuBot(transaction: Transaction, peerId: PeerId) -> CachedAttachMenuBotResult? {
-    let key = ValueBoxKey(length: 8)
-    key.setInt64(0, value: peerId.toInt64())
-
-    if let entry = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.manuallyCachedAttachMenuBots, key: key)) {
-        let cached = entry.get(AttachMenuBots.Bot.self)
-        if let cached {
-            return .bot(cached)
-        } else if let _ = entry.get(EmptyAttachMenuBotMarker.self) {
-            return .empty
-        } else {
-            return nil
-        }
-    } else {
-        return nil
-    }
-}
-
-struct EmptyAttachMenuBotMarker: Codable {
-    var trueValue: Bool
-}
-
-private func setManuallyCachedAttachMenuBot(transaction: Transaction, peerId: PeerId, bot: AttachMenuBots.Bot?) {
-    let key = ValueBoxKey(length: 8)
-    key.setInt64(0, value: peerId.toInt64())
-    
-    let entryId = ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.manuallyCachedAttachMenuBots, key: key)
-    if let bot {
-        if let entry = CodableEntry(bot) {
-            transaction.putItemCacheEntry(id: entryId, entry: entry)
-        } else {
-            transaction.removeItemCacheEntry(id: entryId)
-        }
-    } else {
-        if let entry = CodableEntry(EmptyAttachMenuBotMarker(trueValue: true)) {
-            transaction.putItemCacheEntry(id: entryId, entry: entry)
-        }
-    }
-}
-
 func managedSynchronizeAttachMenuBots(accountPeerId: PeerId, postbox: Postbox, network: Network, force: Bool = false) -> Signal<Void, NoError> {
     let poll = Signal<Void, NoError> { subscriber in
         let signal: Signal<Void, NoError> = cachedAttachMenuBots(postbox: postbox)
@@ -554,33 +509,19 @@ public enum GetAttachMenuBotError {
     case generic
 }
 
-func _internal_getAttachMenuBot(accountPeerId: PeerId, postbox: Postbox, network: Network, botId: PeerId, cached: Bool, allowManuallyCached: Bool) -> Signal<AttachMenuBot, GetAttachMenuBotError> {
+func _internal_getAttachMenuBot(accountPeerId: PeerId, postbox: Postbox, network: Network, botId: PeerId, cached: Bool) -> Signal<AttachMenuBot, GetAttachMenuBotError> {
     return postbox.transaction { transaction -> Signal<AttachMenuBot, GetAttachMenuBotError> in
         if cached, let cachedBots = cachedAttachMenuBots(transaction: transaction)?.bots {
             if let bot = cachedBots.first(where: { $0.peerId == botId }), let peer = transaction.getPeer(bot.peerId) {
                 return .single(AttachMenuBot(peer: EnginePeer(peer), shortName: bot.name, icons: bot.icons, peerTypes: bot.peerTypes, flags: bot.flags))
             }
         }
-        if allowManuallyCached, let bot = manuallyCachedAttachMenuBot(transaction: transaction, peerId: botId) {
-            switch bot {
-            case let .bot(bot):
-                if let peer = transaction.getPeer(bot.peerId) {
-                    return .single(AttachMenuBot(peer: EnginePeer(peer), shortName: bot.name, icons: bot.icons, peerTypes: bot.peerTypes, flags: bot.flags))
-                }
-            case .empty:
-                return .fail(.generic)
-            }
-        }
 
         guard let peer = transaction.getPeer(botId), let inputUser = apiInputUser(peer) else {
             return .complete()
         }
         return network.request(Api.functions.messages.getAttachMenuBot(bot: inputUser))
         |> mapError { _ -> GetAttachMenuBotError in
-            let _ = postbox.transaction({ transaction -> Void in
-                setManuallyCachedAttachMenuBot(transaction: transaction, peerId: peer.id, bot: nil)
-            }).startStandalone()
-            
             return .generic
         }
         |> mapToSignal { result -> Signal<AttachMenuBot, GetAttachMenuBotError> in
@@ -645,15 +586,6 @@ func _internal_getAttachMenuBot(accountPeerId: PeerId, postbox: Postbox, network
                                 if (apiFlags & (1 << 5)) != 0 {
                                     flags.insert(.showInSettingsDisclaimer)
                                 }
-                            
-                                setManuallyCachedAttachMenuBot(transaction: transaction, peerId: peer.id, bot: AttachMenuBots.Bot(
-                                    peerId: peer.id,
-                                    name: name,
-                                    icons: icons,
-                                    peerTypes: peerTypes,
-                                    flags: flags
-                                ))
-                            
                                 return .single(AttachMenuBot(peer: EnginePeer(peer), shortName: name, icons: icons, peerTypes: peerTypes, flags: flags))
                         }
                 }