no message

TelegramUI/MessageContentKind.swift

@@ -2,7 +2,24 @@ import Foundation
 import Postbox
 import TelegramCore
 
-enum MessageContentKind: Equatable {
+public enum MessageContentKindKey {
+    case text
+    case image
+    case video
+    case videoMessage
+    case audioMessage
+    case sticker
+    case animation
+    case file
+    case contact
+    case game
+    case location
+    case liveLocation
+    case expiredImage
+    case expiredVideo
+}
+
+public enum MessageContentKind: Equatable {
     case text(String)
     case image
     case video
@@ -18,97 +35,41 @@ enum MessageContentKind: Equatable {
     case expiredImage
     case expiredVideo
     
-    static func ==(lhs: MessageContentKind, rhs: MessageContentKind) -> Bool {
+    public var key: MessageContentKindKey {
-        switch lhs {
+        switch self {
-            case let .text(text):
+            case .text:
-                if case .text(text) = rhs {
+                return .text
-                    return true
-                } else {
-                    return false
-                }
             case .image:
-                if case .image = rhs {
+                return .image
-                    return true
-                } else {
-                    return false
-                }
             case .video:
-                if case .video = rhs {
+                return .video
-                    return true
-                } else {
-                    return false
-                }
             case .videoMessage:
-                if case .videoMessage = rhs {
+                return .videoMessage
-                    return true
-                } else {
-                    return false
-                }
             case .audioMessage:
-                if case .audioMessage = rhs {
+                return .audioMessage
-                    return true
+            case .sticker:
-                } else {
+                return .sticker
-                    return false
-                }
-            case let .sticker(text):
-                if case .sticker(text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
             case .animation:
-                if case .animation = rhs {
+                return .animation
-                    return true
+            case .file:
-                } else {
+                return .file
-                    return false
-                }
-            case let .file(text):
-                if case .file(text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
             case .contact:
-                if case .contact = rhs {
+                return .contact
-                    return true
+            case .game:
-                } else {
+                return .game
-                    return false
-                }
-            case let .game(text):
-                if case .game(text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
             case .location:
-                if case .location = rhs {
+                return .location
-                    return true
-                } else {
-                    return false
-                }
             case .liveLocation:
-                if case .liveLocation = rhs {
+                return .liveLocation
-                    return true
-                } else {
-                    return false
-                }
             case .expiredImage:
-                if case .expiredImage = rhs {
+                return .expiredImage
-                    return true
-                } else {
-                    return false
-                }
             case .expiredVideo:
-                if case .expiredVideo = rhs {
+                return .expiredVideo
-                    return true
-                } else {
-                    return false
-                }
         }
     }
 }
 
-func messageContentKind(_ message: Message, strings: PresentationStrings, accountPeerId: PeerId) -> MessageContentKind {
+public func messageContentKind(_ message: Message, strings: PresentationStrings, accountPeerId: PeerId) -> MessageContentKind {
     for media in message.media {
         switch media {
             case let expiredMedia as TelegramMediaExpiredContent:

TelegramUI/PeerChannelMemberCategoriesContextsManager.swift

@@ -3,11 +3,24 @@ import Postbox
 import TelegramCore
 import SwiftSignalKit
 
-enum PeerChannelMemberContextKey: Hashable {
+enum PeerChannelMemberContextKey: Equatable, Hashable {
     case recent
     case recentSearch(String)
     case admins(String?)
     case restrictedAndBanned(String?)
+    
+    var hashValue: Int {
+        switch self {
+            case .recent:
+                return 1
+            case let .recentSearch(query):
+                return query.hashValue
+            case let .admins(query):
+                return query?.hashValue ?? 2
+            case let .restrictedAndBanned(query):
+                return query?.hashValue ?? 3
+        }
+    }
 }
 
 private final class PeerChannelMemberCategoriesContextsManagerImpl {