ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Isaac
2024-02-02 14:32:13 +01:00
parent 48531db09e
commit bd4a534097
66 changed files with 1502 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
submodules/Postbox/Sources/MessageHistoryView.swift
View File

@@ -540,8 +540,8 @@ final class MutableMessageHistoryView {
if case let .tag(currentTag) = self.tag, currentTag == tag {
matchesSpace = true
}
case let .customTag(customTag):
if case let .customTag(currentTag) = self.tag, currentTag == customTag {
case let .customTag(customTag, regularTag):
if case let .customTag(currentTag, currentRegularTag) = self.tag, currentTag == customTag, currentRegularTag == regularTag {
matchesSpace = true
}
}
@@ -589,9 +589,17 @@ final class MutableMessageHistoryView {
if message.tags.contains(value) {
matchesTag = true
}
case let .customTag(value):
if message.customTags.contains(value) {
matchesTag = true
case let .customTag(value, regularTag):
if let regularTag {
if message.tags.contains(regularTag) {
if message.customTags.contains(value) {
matchesTag = true
}
}
} else {
if message.customTags.contains(value) {
matchesTag = true
}
}
}
@@ -608,9 +616,17 @@ final class MutableMessageHistoryView {
if groupMessage.tags.contains(value) {
groupMatchesTag = true
}
case let .customTag(value):
if groupMessage.customTags.contains(value) {
groupMatchesTag = true
case let .customTag(value, regularValue):
if let regularValue {
if groupMessage.tags.contains(regularValue) {
if groupMessage.customTags.contains(value) {
groupMatchesTag = true
}
}
} else {
if groupMessage.customTags.contains(value) {
groupMatchesTag = true
}
}
}
@@ -700,8 +716,8 @@ final class MutableMessageHistoryView {
if case let .tag(currentTag) = self.tag, currentTag == tag {
matchesSpace = true
}
case let .customTag(customTag):
if case let .customTag(currentTag) = self.tag, currentTag == customTag {
case let .customTag(customTag, regularTag):
if case let .customTag(currentTag, currentRegularTag) = self.tag, currentTag == customTag, currentRegularTag == regularTag {
matchesSpace = true
}
}
@@ -968,8 +984,8 @@ final class MutableMessageHistoryView {
switch tag {
case let .tag(value):
space = .tag(value)
case let .customTag(value):
space = .customTag(value)
case let .customTag(value, regularTag):
space = .customTag(value, regularTag)
}
} else {
space = .everywhere