ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 21:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-02-19 15:35:23 +04:00
commit 324f9d76a0
20 changed files with 6 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SiriIntents/ar.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/be.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/ca.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/de.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/en.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/es.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/fa.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/fr.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/id.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/it.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/ko.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/ms.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/nl.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/pl.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/pt.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/ru.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/tr.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/uk.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

4
Telegram/SiriIntents/uz.lproj/Intents.intentdefinition
View File

@ -74,10 +74,6 @@
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Search</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>ORCbLf</string>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>

8
submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift
View File

@ -705,8 +705,8 @@ struct ChatRecentActionsEntry: Comparable, Identifiable {
}
} else if case let .member(_, _, prevAdminRights, _, prevRank) = prev.participant {
if case let .member(_, _, newAdminRights, _, newRank) = new.participant {
let prevFlags = prevAdminRights?.rights.rights ?? []
let newFlags = newAdminRights?.rights.rights ?? []
var prevFlags = prevAdminRights?.rights.rights ?? []
var newFlags = newAdminRights?.rights.rights ?? []
let order: [(TelegramChatAdminRightsFlags, String)]
@ -721,6 +721,8 @@ struct ChatRecentActionsEntry: Comparable, Identifiable {
(.canAddAdmins, self.presentationData.strings.Channel_AdminLog_CanAddAdmins),
(.canManageCalls, self.presentationData.strings.Channel_AdminLog_CanManageCalls)
]
prevFlags = prevFlags.intersection(TelegramChatAdminRightsFlags.broadcastSpecific)
newFlags = newFlags.intersection(TelegramChatAdminRightsFlags.broadcastSpecific)
} else {
order = [
(.canChangeInfo, self.presentationData.strings.Channel_AdminLog_CanChangeInfo),
@ -732,6 +734,8 @@ struct ChatRecentActionsEntry: Comparable, Identifiable {
(.canAddAdmins, self.presentationData.strings.Channel_AdminLog_CanAddAdmins),
(.canManageCalls, self.presentationData.strings.Channel_AdminLog_CanManageCalls)
]
prevFlags = prevFlags.intersection(TelegramChatAdminRightsFlags.groupSpecific)
newFlags = newFlags.intersection(TelegramChatAdminRightsFlags.groupSpecific)
}
if prevFlags.isEmpty && newFlags.isEmpty && (prevAdminRights != nil) != (newAdminRights != nil) {