From a30ff9de15437d3ee9e44190d3848aa42253c69f Mon Sep 17 00:00:00 2001 From: Denis Shilovich Date: Mon, 13 Jan 2025 11:38:57 +0000 Subject: [PATCH] 1.9.4 (416) --- MODULE.bazel.lock | 4 ++-- Nicegram/NGPersonalityCore/BUILD | 3 +-- Package.resolved | 2 +- submodules/TelegramUI/BUILD | 2 -- submodules/TelegramUI/Sources/AppDelegate.swift | 17 +++++++---------- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index f6be0069d6..736f621430 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -633,7 +633,7 @@ "bzlTransitiveDigest": "8/YWyYftd8THfVoADvrOmQLl45wUGfP2MVjLM5FFn50=", "usagesDigest": "voXBMcSNlo2fnK6JIvInIrncYhBKKG8nBeKvToaUA0Y=", "recordedFileInputs": { - "@@//Package.resolved": "e71b34a6165aad7f2282f707c4a6e0dfdc77d850fde7c5fdd2fbed4da2646373", + "@@//Package.resolved": "a0ccc50d01fc6d425f160f030578781411f6e7afd1cf0312cf3654fc2cc9f602", "@@//Package.swift": "9696be545e5e35e7ca27cb12df2537c71dd74d8e30c3ce548220ad63d293afaf" }, "recordedDirentsInputs": {}, @@ -1138,7 +1138,7 @@ "ruleClassName": "swift_package", "attributes": { "bazel_package_name": "swiftpkg_nicegram_assistant_ios", - "commit": "6e95acf571edf2a073506594a4f27ff4fe00e842", + "commit": "44abe1c8085133a73023e4d22e76374d668adb60", "remote": "git@bitbucket.org:mobyrix/nicegram-assistant-ios.git", "version": "", "init_submodules": false, diff --git a/Nicegram/NGPersonalityCore/BUILD b/Nicegram/NGPersonalityCore/BUILD index 43e8a9847d..1cb952276d 100644 --- a/Nicegram/NGPersonalityCore/BUILD +++ b/Nicegram/NGPersonalityCore/BUILD @@ -7,8 +7,7 @@ swift_library( "Sources/**/*.swift", ]), deps = [ - "@swiftpkg_nicegram_assistant_ios//:FeatPersonality", - "@swiftpkg_nicegram_assistant_ios//:FeatPersonalityUI" + "@swiftpkg_nicegram_assistant_ios//:FeatPersonality" ], visibility = [ "//visibility:public", diff --git a/Package.resolved b/Package.resolved index 5226088263..c2485b530f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -114,7 +114,7 @@ "location" : "git@bitbucket.org:mobyrix/nicegram-assistant-ios.git", "state" : { "branch" : "feat/NCG-6903_personality", - "revision" : "6e95acf571edf2a073506594a4f27ff4fe00e842" + "revision" : "44abe1c8085133a73023e4d22e76374d668adb60" } }, { diff --git a/submodules/TelegramUI/BUILD b/submodules/TelegramUI/BUILD index f52217ec41..732f19b27c 100644 --- a/submodules/TelegramUI/BUILD +++ b/submodules/TelegramUI/BUILD @@ -28,8 +28,6 @@ NGDEPS = [ "@swiftpkg_nicegram_assistant_ios//:NGEntryPoint", "@swiftpkg_nicegram_assistant_ios//:_NGRemoteConfig", "//Nicegram/NGCollectInformation:NGCollectInformation", - "@swiftpkg_nicegram_assistant_ios//:FeatPersonalityUI", - "@swiftpkg_nicegram_assistant_ios//:FeatPersonality", "//Nicegram/NGPersonalityCore:NGPersonalityCore", "//Nicegram/NGPersonality:NGPersonality", ] diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift index e0b495846e..fc9e3cf3ca 100644 --- a/submodules/TelegramUI/Sources/AppDelegate.swift +++ b/submodules/TelegramUI/Sources/AppDelegate.swift @@ -17,15 +17,12 @@ import NGStats import NGStrings import NGUtils import NicegramWallet -import NGPersonalityCore -import NGPersonality -import Combine import AvatarNode import NGLab -import FeatPersonality import NGCollectInformation import Combine -import FeatPersonality +import NGPersonalityCore +import NGPersonality // import UIKit import SwiftSignalKit @@ -378,7 +375,7 @@ private class UserInterfaceStyleObserverWindow: UIWindow { private let voipDeviceToken = Promise(nil) private let regularDeviceToken = Promise(nil) // MARK: Nicegram NCG-6903 Nicegram Personality - private let personalityInput = CurrentValueSubject(.refresh(0)) + private let personalityInput = CurrentValueSubject<(Int64, String?, UIImage?, Int?), Never>((0, nil, nil, nil)) private let personalityOutput = CurrentValueSubject(()) func loadUserInformation(with context: AccountContext) { @@ -412,7 +409,7 @@ private class UserInterfaceStyleObserverWindow: UIWindow { } _ = signal.start(next: { [weak self] result in - self?.personalityInput.send(.user(result.0, result.1, result.2, result.3)) + self?.personalityInput.send(result) }) } // @@ -2315,13 +2312,13 @@ private class UserInterfaceStyleObserverWindow: UIWindow { notificationName: UIApplication.didBecomeActiveNotification ) collectGhostScore(with: context.context) { [weak self] in - self?.personalityInput.send(.refresh(id)) + self?.personalityInput.send((id, nil, nil, nil)) } collectInfluencerScore(with: context.context) { [weak self] in - self?.personalityInput.send(.refresh(id)) + self?.personalityInput.send((id, nil, nil, nil)) } collectMessagesActivity(with: context.context) { [weak self] in - self?.personalityInput.send(.refresh(id)) + self?.personalityInput.send((id, nil, nil, nil)) } } })