1.8.7 (354)

Nicegram/NGData/Sources/NGSettings.swift

@@ -1,5 +1,4 @@
 import FeatPremium
-import Postbox
 import Foundation
 import NGAppCache
 
@@ -109,14 +108,6 @@ public struct NGSettings {
 
     @NGStorage(key: "recordAllCalls", defaultValue: false)
     public static var recordAllCalls: Bool
-
-    @NGStorage(key: "showFeedTab", defaultValue: false)
-    public static var showFeedTab: Bool
-
-    @NGStorage(key: "feedPeerId", defaultValue: NGSettings.zeroFeedPeerId)
-    public static var feedPeerId: PeerId
-
-    public static let zeroFeedPeerId: PeerId = .init(namespace: PeerId.Namespace._internalFromInt32Value(0), id: PeerId.Id._internalFromInt64Value(0))
 }
 
 public struct NGWebSettings {

Nicegram/NGUI/Sources/NicegramSettingsController.swift

@@ -92,7 +92,6 @@ private enum NicegramSettingsControllerEntry: ItemListNodeEntry {
     case showCallsTab(String, Bool)
     case showNicegramTab
     case showTabNames(String, Bool)
-    case showFeedTab(String, Bool)
 
     case pinnedChatsHeader
     case pinnedChat(Int32, PinnedChat)
@@ -128,7 +127,7 @@ private enum NicegramSettingsControllerEntry: ItemListNodeEntry {
 
     var section: ItemListSectionId {
         switch self {
-        case .TabsHeader, .showContactsTab, .showCallsTab, .showNicegramTab, .showTabNames, .showFeedTab:
+        case .TabsHeader, .showContactsTab, .showCallsTab, .showNicegramTab, .showTabNames:
             return NicegramSettingsControllerSection.Tabs.rawValue
         case .FoldersHeader, .foldersAtBottom, .foldersAtBottomNotice:
             return NicegramSettingsControllerSection.Folders.rawValue
@@ -174,9 +173,6 @@ private enum NicegramSettingsControllerEntry: ItemListNodeEntry {
         case .showTabNames:
             return 1600
 
-        case .showFeedTab:
-            return 1650
-
         case .FoldersHeader:
             return 1700
 
@@ -272,13 +268,6 @@ private enum NicegramSettingsControllerEntry: ItemListNodeEntry {
             } else {
                 return false
             }
-
-        case let .showFeedTab(lhsText, lhsVar0Bool):
-            if case let .showFeedTab(rhsText, rhsVar0Bool) = rhs, lhsText == rhsText, lhsVar0Bool == rhsVar0Bool {
-                return true
-            } else {
-                return false
-            }
 
         case let .FoldersHeader(lhsText):
             if case let .FoldersHeader(rhsText) = rhs, lhsText == rhsText {
@@ -468,13 +457,6 @@ private enum NicegramSettingsControllerEntry: ItemListNodeEntry {
                 arguments.presentController(controller, nil)
             })
 
-        case let .showFeedTab(text, value):
-            return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, enabled: true, sectionId: section, style: .blocks, updated: { value in
-                ngLog("[showFeedTab] invoked with \(value)", LOGTAG)
-                NGSettings.showFeedTab = value
-                arguments.updateTabs()
-            })
-
         case let .FoldersHeader(text):
             return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: section)
 
@@ -650,10 +632,6 @@ private func nicegramSettingsControllerEntries(presentationData: PresentationDat
         l("NiceFeatures.Tabs.ShowNames"),
         NGSettings.showTabNames
     ))
-    entries.append(.showFeedTab(
-        l("Show Feed Tab"),
-        NGSettings.showFeedTab
-    ))
 
     entries.append(.FoldersHeader(l("NiceFeatures.Folders.Header")))
     entries.append(.foldersAtBottom(
@@ -839,23 +817,19 @@ public func nicegramSettingsController(context: AccountContext, accountsContexts
         controller?.view.window?.rootViewController
     }
     updateTabsImpl = {
-        updateTabs(with: context)
-    }
-    return controller
-}
-
-public func updateTabs(with context: AccountContext) {
-    _ = updateCallListSettingsInteractively(accountManager: context.sharedContext.accountManager) { settings in
-        var settings = settings
-        settings.showTab = !settings.showTab
-        return settings
-    }.start(completed: {
         _ = updateCallListSettingsInteractively(accountManager: context.sharedContext.accountManager) { settings in
             var settings = settings
             settings.showTab = !settings.showTab
             return settings
         }.start(completed: {
-            ngLog("Tabs refreshed", LOGTAG)
+            _ = updateCallListSettingsInteractively(accountManager: context.sharedContext.accountManager) { settings in
+                var settings = settings
+                settings.showTab = !settings.showTab
+                return settings
+            }.start(completed: {
+                ngLog("Tabs refreshed", LOGTAG)
+            })
         })
-    })
+    }
+    return controller
 }

Package.resolved

@@ -114,7 +114,7 @@
       "location" : "[email protected]:mobyrix/nicegram-assistant-ios.git",
       "state" : {
         "branch" : "develop",
-        "revision" : "66d6fe9535b718018566630c5407c383ad20651d"
+        "revision" : "b1d4897f36e71c8faef3a06278d503c42f737e98"
       }
     },
     {

Telegram/Telegram-iOS/en.lproj/NiceLocalizable.strings

@@ -214,7 +214,3 @@
 "NicegramCallRecord.StopAlertButtonCancel" = "Cancel";
 "NicegramCallRecord.SavedMessage" = "Recorded Call saved to **Saved Messages**.";
 
-/*Feed*/
-"NicegramFeed.Title" = "Feed";
-"NicegramFeed.Add" = "Add to Feed";
-"NicegramFeed.Remove" = "Remove from Feed";

crowdin.yml

@@ -1,3 +1,5 @@
+"project_id": "378913"
+"api_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiJ3UUVxdmhVM3ZMT2EyWGljbVV5VCIsImp0aSI6IjY0MDRiZTFlOGIyOTVhNzg2ZGEyYmI0MmZmYjAwN2MyYmQ3MmM4MGI0YzJhZGEzNTk4MzBmMjEzZjQ4ZGFhNDkxYTcyNjgwYjJiYzFkOTUyIiwiaWF0IjoxNzIyODYzNDcxLjcwNDc3NywibmJmIjoxNzIyODYzNDcxLjcwNDc3OSwiZXhwIjoxNzU0Mzk5NDcxLjYyOTI5Mywic3ViIjoiMTUyNDUwMTYiLCJzY29wZXMiOlsicHJvamVjdCJdLCJkb21haW4iOm51bGwsImFzc29jaWF0aW9ucyI6WyIqIl0sInNlc3Npb24iOjB9.dLOqTsIngzAsXnrh2PRnzAtZVtosy0dnIPWViL9kVYnxGCGL3LJMPZ_cji-G9aHPhgmxERmBNeMp4Pynw7Y7NbtpT0QmgL9Gn6Ljjd5TTGwwS1UX81m-l69J6wTd1sRufs8X9vIAkxp-3boW7N0BkasBm9gRr_fBlnOFX_yV6mYj-gB5bRxI2CmakUcRVVZFk7hNfRT1LZnn60ghSllSoXM4dGF647Ey_Qm8kgerVqy1cshKc1X8jBKVLTXPTPnIpTESp4pFFbmDUlcnvvLa76FbW-5qBDXjPIEl6ASCqR8pIRV8Bh3n6-oaean7WBb_ZwPkrwxVczGlRd2io8xhVpQq33P6ebSnHp8hZFGS7kYyBZqBRfgzYTBSnNUCTWd-SQJzVeGiqzO-Qodi30X4AA7_nDYNun_soY3ma5sJsdaq2muMKXP2uWV9epLHp-VSTcIWEki0ozZqHKkUVlfzoWhtBKfQbLa5G48LQB9PVgOj3CQ4qgY8FPPdPk29-R_ytnQkXFTHXpudH0Ga_hrM7xtqYNmCttAVYZMGRoFZqH8GZs5KjSG2c0F9-x0554qi0fLgczJDOW15zjwZXRyUtqTD4SGaKQPvtYQn6AxBVRsUlLVUpPH7OLo8Kn7gMu3bx6fJhIURC6kA_Ap9YEgcnMRTuY_pTXSJi3VCJqP2iSw"
 "base_path": "."
 "base_url": "https://api.crowdin.com"
 "preserve_hierarchy": true

submodules/AccountContext/Sources/AccountContext.swift

@@ -1164,10 +1164,6 @@ public protocol AccountContext: AnyObject {
     func scheduleGroupCall(peerId: PeerId, parentController: ViewController)
     func joinGroupCall(peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, activeCall: EngineGroupCallDescription)
     func requestCall(peerId: PeerId, isVideo: Bool, completion: @escaping () -> Void)
-// MARK: Nicegram NCG-6373 Feed tab
-    var updateFeed: Signal<Void, NoError> { get }
-    func needUpdateFeed()
-//
 }
 
 public struct AntiSpamBotConfiguration {

submodules/ChatListUI/Sources/ChatContextMenus.swift

@@ -2,10 +2,6 @@
 import FeatHiddenChats
 import NGStrings
 //
-// MARK: Nicegram NCG-6373 Feed tab
-import NGData
-import NGUI
-//
 import Foundation
 import UIKit
 import SwiftSignalKit
@@ -120,41 +116,7 @@ func chatContextMenuItems(context: AccountContext, peerId: PeerId, promoInfo: Ch
                     }
 
                     var items: [ContextMenuItem] = []
-// MARK: Nicegram NCG-6373 Feed tab
-                    if case .chatList = source {
-                        let isFeedPeerEqualPeer = NGSettings.feedPeerId == peerId
-                        let text = isFeedPeerEqualPeer ? l("NicegramFeed.Remove") : l("NicegramFeed.Add")
-                        let color: ContextMenuActionItemTextColor = isFeedPeerEqualPeer ? .destructive : .primary
-                        items.append(
-                            .action(ContextMenuActionItem(
-                                text: text,
-                                textColor: color,
-                                icon: { theme in
-                                    let color = isFeedPeerEqualPeer ? theme.contextMenu.destructiveColor : theme.contextMenu.primaryColor
-                                    return generateTintedImage(image: UIImage(bundleImageName: "feed"), color: color)
-                                },
-                                action: { _, f in
-                                    if isFeedPeerEqualPeer {
-                                        NGSettings.feedPeerId = NGSettings.zeroFeedPeerId
-                                        updateTabs(with: context)
-                                    } else {
-                                        let needUpdateTabs =
-                                        !NGSettings.showFeedTab ||
-                                        NGSettings.feedPeerId == NGSettings.zeroFeedPeerId
 
-                                        NGSettings.feedPeerId = peerId
-                                        if needUpdateTabs {
-                                            NGSettings.showFeedTab = true
-                                            updateTabs(with: context)
-                                        }
-                                    }
-                                    context.needUpdateFeed()
-                                    f(.default)
-                                }
-                            ))
-                        )
-                    }
-//
                     if case let .search(search) = source {
                         switch search {
                         case .recentPeers:

submodules/DebugSettingsUI/Sources/DebugController.swift

@@ -739,8 +739,24 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             })
         case .sendNGLogs:
         return ItemListDisclosureItem(presentationData: presentationData, title: "Send Nicegram Logs", label: "", sectionId: self.section, style: .blocks, action: {
-            let _ = (Logger(rootPath: arguments.sharedContext.basePath, basePath: arguments.sharedContext.basePath + "/ngLogs").collectLogs()
-                |> deliverOnMainQueue).start(next: { logs in
+            let ngLogs = Logger(
+                rootPath: arguments.sharedContext.basePath,
+                basePath: arguments.sharedContext.basePath + "/ngLogs"
+            ).collectLogs()
+
+            let accountPathName: String? = if let context = arguments.context {
+                accountRecordIdPathName(context.account.id)
+            } else {
+                nil
+            }
+            let callRecorderLogs = Logger.shared.collectLogs(
+                with: arguments.sharedContext.basePath,
+                accountPathName: accountPathName
+            )
+
+            let _ = (combineLatest(ngLogs, callRecorderLogs) |> deliverOnMainQueue)
+                .start(next: { logs in
+                    let allLogs = logs.0 + logs.1
                     guard let context = arguments.context else {
                         return
                     }
@@ -750,8 +766,8 @@ private enum DebugControllerEntry: ItemListNodeEntry {
 
                         if let strongController = controller {
                             strongController.dismiss()
-                            
-                            let messages = logs.map { (name, path) -> EnqueueMessage in
+
+                            let messages = allLogs.map { (name, path) -> EnqueueMessage in
                                 let id = Int64.random(in: Int64.min ... Int64.max)
                                 let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: name)], alternativeRepresentations: [])
                                 return .message(text: "", attributes: [], inlineStickers: [:], mediaReference: .standalone(media: file), threadId: nil, replyToMessageId: nil, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])

submodules/TelegramCore/Sources/Utils/Log.swift

@@ -212,7 +212,35 @@ public final class Logger {
             return EmptyDisposable
         }
     }
-
+// MARK: Nicegram NCG-5828 call recording
+    public func collectLogs(
+        with basePath: String,
+        accountPathName: String?
+    ) -> Signal<[(String, String)], NoError> {
+        guard let accountPathName else { return .never() }
+
+        return Signal { subscriber in
+            self.queue.async {
+                let logsPath: String = basePath + "/\(accountPathName)/calls"
+                var result: [(Date, String, String)] = []
+                if let files = try? FileManager.default.contentsOfDirectory(at: URL(fileURLWithPath: logsPath), includingPropertiesForKeys: [URLResourceKey.creationDateKey], options: []) {
+                    for url in files {
+                        if url.lastPathComponent.hasSuffix(".log") {
+                            if let creationDate = (try? url.resourceValues(forKeys: Set([.creationDateKey])))?.creationDate {
+                                result.append((creationDate, url.lastPathComponent, url.path))
+                            }
+                        }
+                    }
+                }
+                result.sort(by: { $0.0 < $1.0 })
+                subscriber.putNext(result.map { ($0.1, $0.2) })
+                subscriber.putCompletion()
+            }
+
+            return EmptyDisposable
+        }
+    }
+//
     public func collectShortLog() -> Signal<[(Double, String)], NoError> {
         return Signal { subscriber in
             self.queue.async {

submodules/TelegramUI/Sources/AccountContext.swift

@@ -267,16 +267,7 @@ public final class AccountContextImpl: AccountContext {
     public private(set) var isPremium: Bool
 
     public let imageCache: AnyObject?
-// MARK: Nicegram NCG-6373 Feed tab
-    private let _updateFeed = Promise<Void>()
-    public var updateFeed: Signal<Void, NoError> {
-        _updateFeed.get()
-    }
 
-    public func needUpdateFeed() {
-        _updateFeed.set(.single(()))
-    }
-//
     public init(sharedContext: SharedAccountContextImpl, account: Account, limitsConfiguration: LimitsConfiguration, contentSettings: ContentSettings, appConfiguration: AppConfiguration, availableReplyColors: EngineAvailableColorOptions, availableProfileColors: EngineAvailableColorOptions, temp: Bool = false)
     {
         self.sharedContextImpl = sharedContext

submodules/TelegramUI/Sources/ApplicationContext.swift

@@ -154,7 +154,7 @@ final class AuthorizedApplicationContext {
     private var showCallsTab: Bool
     private var showCallsTabDisposable: Disposable?
     private var enablePostboxTransactionsDiposable: Disposable?
-
+    
     init(sharedApplicationContext: SharedApplicationContext, mainWindow: Window1, watchManagerArguments: Signal<WatchManagerArguments?, NoError>, context: AccountContextImpl, accountManager: AccountManager<TelegramAccountManagerTypes>, showCallsTab: Bool, reinitializedNotificationSettings: @escaping () -> Void) {
         self.sharedApplicationContext = sharedApplicationContext
 

submodules/TelegramUI/Sources/Chat/ChatControllerLoadDisplayNode.swift

@@ -126,7 +126,7 @@ import AdsInfoScreen
 
 extension ChatControllerImpl {
     func loadDisplayNodeImpl() {
-        self.displayNode = ChatControllerNode(context: self.context, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, subject: self.subject, controllerInteraction: self.controllerInteraction!, chatPresentationInterfaceState: self.presentationInterfaceState, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, navigationBar: self.navigationBar, statusBar: self.statusBar, backgroundNode: self.chatBackgroundNode, controller: self, isFeed: self.isFeed)
+        self.displayNode = ChatControllerNode(context: self.context, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, subject: self.subject, controllerInteraction: self.controllerInteraction!, chatPresentationInterfaceState: self.presentationInterfaceState, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, navigationBar: self.navigationBar, statusBar: self.statusBar, backgroundNode: self.chatBackgroundNode, controller: self)
 
         if let currentItem = self.tempVoicePlaylistCurrentItem {
             self.chatDisplayNode.historyNode.voicePlaylistItemChanged(nil, currentItem)

submodules/TelegramUI/Sources/ChatController.swift

@@ -651,10 +651,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             self.chatDisplayNode.showListEmptyResults = self.showListEmptyResults
         }
     }
-// MARK: Nicegram NCG-6373 Feed tab
-    let isFeed: Bool
-//
-// MARK: Nicegram NCG-6373 Feed tab, isFeed
+
     public init(
         context: AccountContext,
         chatLocation: ChatLocation,
@@ -669,12 +666,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         chatListFilter: Int32? = nil,
         chatNavigationStack: [ChatNavigationStackItem] = [],
         customChatNavigationStack: [EnginePeer.Id]? = nil,
-        params: ChatControllerParams? = nil,
-        isFeed: Bool = false
+        params: ChatControllerParams? = nil
     ) {
-// MARK: Nicegram NCG-6373 Feed tab
-        self.isFeed = isFeed
-//
         let _ = ChatControllerCount.modify { value in
             return value + 1
         }
@@ -5876,8 +5869,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     return interfaceState
                                 }
                         })
-                        // MARK: Nicegram NCG-6373 Feed tab, !isFeed
-                        if case .standard(.default) = mode, let channel = renderedPeer?.chatMainPeer as? TelegramChannel, case .broadcast = channel.info, !isFeed {
+
+                        if case .standard(.default) = mode, let channel = renderedPeer?.chatMainPeer as? TelegramChannel, case .broadcast = channel.info {
                             var isRegularChat = false
                             if let subject = subject {
                                 if case .message = subject {