fix searching stickers from my sets by emoji

.gitignore

@@ -2,3 +2,17 @@ fastlane/README.md
 fastlane/report.xml
 xcuserdata
 xcuserstate
+.DS_Store
+core-xprojects/Mozjpeg/build
+core-xprojects/openssl/build
+core-xprojects/libwebp/build
+core-xprojects/libopus/build
+core-xprojects/ffmpeg/build
+core-xprojects/webrtc/build
+core-xprojects/libvpx/build
+core-xprojects/OpenH264/build
+submodules/libwebp/SharedHeaders
+submodules/Mozjpeg/SharedHeaders
+submodules/OpenSSLEncryptionProvider/SharedHeaders
+core-xprojects/dav1d/build
+core-xprojects/tde2e/build

.gitlab-ci.yml

@@ -20,7 +20,7 @@ beta:
     except:
         - tags
     script:
-        - bash ./buildbox/internal.sh beta
+        - sh ./buildbox/internal.sh Beta
     environment:
         name: beta
 
@@ -33,7 +33,7 @@ alpha:
     except:
         - tags
     script:
-        - bash ./buildbox/internal.sh alpha
+        - sh ./buildbox/internal.sh Alpha
     environment:
         name: alpha
 
@@ -46,7 +46,7 @@ appstore:
     except:
         - tags
     script:
-        - bash ./buildbox/internal.sh appstore
+        - sh ./buildbox/internal.sh Appstore
     environment:
         name: appstore
 
@@ -59,6 +59,6 @@ release:
     except:
         - tags
     script:
-        - bash ./buildbox/internal.sh release
+        - sh ./buildbox/internal.sh Stable
     environment:
         name: release

.gitmodules

@@ -3,16 +3,22 @@
 url=git@github.com:telegramdesktop/libtgvoip
 [submodule "submodules/Sparkle"]
 	path = submodules/Sparkle
-url=https://github.com/overtake/Sparkle
-[submodule "submodules/Zip"]
-	path = submodules/Zip
-	url = https://github.com/overtake/Zip
+url=git@gitlab.com:overtake/Sparkle.git
 [submodule "submodules/telegram-ios"]
 	path = submodules/telegram-ios
-url=git@gitlab.com:peter-iakovlev/telegram-ios.git
+url=git@github.com:overtake/Telegram-iOS.git
 [submodule "submodules/rlottie"]
 	path = submodules/rlottie
 url=git@github.com:overtake/rlottie.git
-[submodule "submodules/ton"]
-	path = submodules/ton
-url=git@github.com:overtake/ton.git
+[submodule "submodules/tgcalls"]
+	path = submodules/tgcalls
+url=git@github.com:overtake/tgcalls.git
+[submodule "submodules/tg_owt"]
+	path = submodules/tg_owt
+	url = git@github.com:desktop-app/tg_owt.git
+[submodule "submodules/libprisma"]
+	path = submodules/libprisma
+url=git@github.com:desktop-app/libprisma.git
+[submodule "submodules/regex"]
+	path = submodules/regex
+	url = git@github.com:boostorg/regex.git

FocusIntents/FocusIntents.entitlements

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>6N38VWS5BX.ru.keepcoder.Telegram.FocusIntents</string>
+		<string>6N38VWS5BX.ru.keepcoder.Telegram</string>
+	</array>
+</dict>
+</plist>

FocusIntents/FocusIntents.swift

@@ -0,0 +1,69 @@
+//
+//  FocusIntents.swift
+//  FocusIntents
+//
+//  Created by Mikhail Filimonov on 25.04.2024.
+//  Copyright © 2024 Telegram. All rights reserved.
+//
+
+import AppIntents
+import OSLog
+import TelegramCore
+import Postbox
+import SwiftSignalKit
+import InAppSettings
+import ApiCredentials
+
+
+@available(macOS 13, *)
+struct FocusFilter: SetFocusFilterIntent {
+
+    @Parameter(title: "Use Dark Mode", description: "Automatically enable dark mode.", default: false)
+    var alwaysUseDarkMode: Bool
+
+    @Parameter(title: "Set Unable Status", description: "Set your account status to Unable. This feature requires Telegram Premium.", default: false)
+    var unableStatus: Bool
+
+
+    static var title: LocalizedStringResource = "Set Appearance And Status"
+
+    static var description: LocalizedStringResource? = """
+    Configure Appearance of app in focus mode
+    """
+
+    var displayRepresentation: DisplayRepresentation {
+        var status: String = ""
+        if alwaysUseDarkMode {
+            status += "Dark Mode"
+        }
+        if unableStatus {
+            if status.isEmpty {
+                status += "Status"
+            } else {
+                status += ", Status"
+            }
+        }
+        return DisplayRepresentation(title: "Appearance And Status",
+                                     subtitle: LocalizedStringResource(stringLiteral: status))
+    }
+
+
+    var appContext: FocusFilterAppContext {
+        return FocusFilterAppContext(notificationFilterPredicate: nil)
+    }
+
+    static func suggestedFocusFilters(for context: FocusFilterSuggestionContext) async -> [FocusFilter] {
+        let workFilter = FocusFilter()
+        workFilter.alwaysUseDarkMode = true
+        workFilter.unableStatus = true
+        return [workFilter]
+    }
+
+    func perform() async throws -> some IntentResult {
+        let model = AppIntentDataModel(alwaysUseDarkMode: self.alwaysUseDarkMode, useUnableStatus: self.unableStatus)
+        if let model = model.encoded() {
+            UserDefaults(suiteName: ApiEnvironment.intentsBundleId)?.set(model, forKey: AppIntentDataModel.key)
+        }
+        return .result()
+    }
+}

FocusIntents/FocusIntentsExtension.swift

@@ -0,0 +1,18 @@
+//
+//  FocusIntentsExtension.swift
+//  FocusIntents
+//
+//  Created by Mikhail Filimonov on 25.04.2024.
+//  Copyright © 2024 Telegram. All rights reserved.
+//
+
+import AppIntents
+import OSLog
+
+
+@main
+struct FocusIntentsExtension: AppIntentsExtension {
+    init() {
+        AppDependencyManager.shared.add(dependency: AppIntentsData.shared)
+    }
+}

FocusIntents/Info.plist

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>EXAppExtensionAttributes</key>
+	<dict>
+		<key>EXExtensionPointIdentifier</key>
+		<string>com.apple.appintents-extension</string>
+	</dict>
+	<key>SOURCE</key>
+	<string>${SOURCE}</string>
+</dict>
+</plist>

INSTALL.md

@@ -1,19 +1,34 @@
 # How to Build Telegram for macOS
 
 1. Clone this repository with submodules:
-
-	```sh
+	```
 	git clone https://github.com/overtake/TelegramSwift.git --recurse-submodules
 	```
-2.  ```brew install cmake ninja openssl@1.1 zlib```
-3. Open `Telegram-Mac.xcworkspace` in **Xcode 10.3**.  Avoid Xcode 10.11+ because it causes additional errors when building the libraries with optimizations turned on.  
-4. Select build target to **Github** and **Run** build.
+2. Install Homebrew:
+	```
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+	```
+3. Install tools: 
+	```
+	brew install cmake ninja openssl@1.1 zlib autoconf libtool automake yasm pkg-config
+ 	```
+4. Update ./scripts/rebuild file 
+	```
+	replace "no" to "yes"
+	```
+5. Run scripts to configurate framework: 
+	```
+	sh %project_dir%/scripts/configure_frameworks.sh
+	```
+
+6. Open `Telegram-Mac.xcworkspace` in [the latest Xcode](https://apps.apple.com/us/app/xcode/id497799835).  
+7. Setup codesign and **Build**!
 
 
 
 # If you want to develop a fork
 
-1. Do first and second step above.
+1. For starters, you need [to build application](https://github.com/overtake/TelegramSwift/blob/master/INSTALL.md#how-to-build-telegram-for-macos).
 2. Change bundle Identifier and team-id. Easiest way is to search all mentions `ru.keepcoder.Telegram` and change it to your own. Team-id you can find on apple developer portal.
 3. Obtain your [API ID](https://core.telegram.org/api/obtaining_api_id). **Note:** The built-in `apiId` is highly limited for api usage. **Do not use it** in any circumstances except verify binaries.
 4. Open `Telegram-Mac/Config.swift` and repalce `apiId` and `apiHash` from previous step. **Note:** Do not forget to change `teamId` either.

README.md

@@ -1,17 +1,35 @@
 <div align="center">
-  <img src="https://github.com/overtake/TelegramSwift/raw/master/Telegram-Mac/Assets.xcassets/AppIcon.appiconset/icon2_128.png">
+  <img src="Telegram-Mac/Assets.xcassets/AppIcon.appiconset/Logo_1024.png"
+      width="125" 
+      height="125">
+
   <h2 align="center">Telegram for macOS</h2>
 </div>
 
-![Telegram macOS screenshot](https://github.com/s0ph0s-2/TelegramSwift/raw/docs/better-readme/images/tg.png)
+![Telegram macOS screenshot](images/tg.png)
 
 [**Telegram**](https://telegram.org) is a messaging app with a focus on speed and security. It’s superfast, simple, and free! This repo contains the official source code for [Telegram for macOS](https://macos.telegram.org/).
 
 ## Get it
 
-[![Download on the Mac App Store](https://github.com/s0ph0s-2/TelegramSwift/raw/docs/better-readme/images/mas_badge.png)](https://itunes.apple.com/us/app/telegram/id747648890?mt=12)
+[![Download on the Mac App Store](images/mas_badge.png)](https://itunes.apple.com/us/app/telegram/id747648890?mt=12)
 
-If you would like, you can [download the non-MAS version](https://telegram.org/dl/macos). It removes some restrictions (like banned chats), but also lacks some functionality (like the share extension and sandboxing).
+
+### Using Homebrew
+
+```
+brew cask install telegram
+```
+
+### Using `mas-cli`
+
+```
+mas install 747648890
+```
+
+### Manual download
+
+If you would like, you can [download the non-MAS version](https://telegram.org/dl/macos).
 
 You can also [download the beta version](https://telegram.org/dl/macos/beta) if you want to try the latest features and you are prepared for bugs and crashes. If you are running the beta, join the [beta testing chat on Telegram](https://t.me/macswift) to report bugs.
 
@@ -20,11 +38,14 @@ You can also [download the beta version](https://telegram.org/dl/macos/beta) if
 ### Contributors on GitHub
 See [this repository’s contributors graph](https://github.com/overtake/TelegramSwift/graphs/contributors).
 
+### Bugs and Suggestions
+You can report bug or suggestions feature for Telegram for macOS on [Telegram’s Bugs & Suggestions platform](https://bugs.telegram.org). Read [the platform tip](https://bugs.telegram.org/c/746) before creating first card.
+
 ### Translations
 You can help translate Telegram for macOS on [Telegram’s translations platform](https://translations.telegram.org). Pick your language, then look for the macOS translation set.
 
 <!--### Third-party libraries-->
-<!--See [LIBRARIES](https://github.com/overtake/TelegramSwift/blob/master/LIBRARIES.md).-->
+<!--See [LIBRARIES](LIBRARIES.md).-->
 
 ## Permissions
 Telegram strives to protect your privacy.  This app asks for as few permissions as possible:
@@ -37,8 +58,11 @@ Telegram strives to protect your privacy.  This app asks for as few permissions
 * **User-selected files**: You can save files or images to your Mac.
 * **Downloads folder**: Telegram can automatically download files or images you receive.
 
+## Shortcuts
+With [Shortcuts](https://github.com/overtake/TelegramSwift/wiki) you can learn how easy is navigate using your devices.
+
 ## License
-Telegram for macOS is licensed under the GNU Public License, version 2.0. See [LICENSE](https://github.com/overtake/TelegramSwift/blob/master/LICENSE.md) for more information.
+Telegram for macOS is licensed under the GNU Public License, version 2.0. See [LICENSE](LICENSE) for more information.
 
 ## Forking
 You can fork this application and make something awesome! Make sure that your fork follows these five requirements:
@@ -47,8 +71,8 @@ You can fork this application and make something awesome! Make sure that your fo
 2. **Don’t** call your fork **Telegram** — or at least make sure your users understand that yours is unofficial.
 3. **Don’t** use our standard logo (white paper plane in a blue circle) for your fork.
 3. **Do** read and follow our [security guidelines](https://core.telegram.org/mtproto/security_guidelines) to make sure you take good care of your users’ data and protect their privacy.
-4. **Do** publish your code. The [GPL license](https://github.com/overtake/TelegramSwift/blob/master/LICENSE) requires it!
+4. **Do** publish your code. The [GPL license](LICENSE) requires it!
 
 ## How to Build
 
-Instructions for building Telegram for macOS are in [INSTALL.md](https://github.com/overtake/TelegramSwift/blob/master/INSTALL.md).
+Instructions for building Telegram for macOS are in [INSTALL.md](INSTALL.md).

Telegram-Mac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>BuildSystemType</key>
-	<string>Latest</string>
-</dict>
+<dict/>
 </plist>