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

Merge branch 'master' into temp-10

Browse Source
This commit is contained in:
Ali
2023-06-12 18:22:33 +03:00
parent 2ca5e9595a d3b3d991bd
commit d1817dca18
26 changed files with 533 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramCore/Sources/TelegramEngine/Peers/Peer.swift
View File

@@ -88,15 +88,18 @@ public enum EnginePeer: Equatable {
public var muteState: MuteState
public var messageSound: MessageSound
public var displayPreviews: DisplayPreviews
public var storiesMuted: Bool?
public init(
muteState: MuteState,
messageSound: MessageSound,
displayPreviews: DisplayPreviews
displayPreviews: DisplayPreviews,
storiesMuted: Bool?
) {
self.muteState = muteState
self.messageSound = messageSound
self.displayPreviews = displayPreviews
self.storiesMuted = storiesMuted
}
}
@@ -216,11 +219,13 @@ public struct EngineGlobalNotificationSettings: Equatable {
public var enabled: Bool
public var displayPreviews: Bool
public var sound: EnginePeer.NotificationSettings.MessageSound
public var storiesMuted: Bool
public init(enabled: Bool, displayPreviews: Bool, sound: EnginePeer.NotificationSettings.MessageSound) {
public init(enabled: Bool, displayPreviews: Bool, sound: EnginePeer.NotificationSettings.MessageSound, storiesMuted: Bool) {
self.enabled = enabled
self.displayPreviews = displayPreviews
self.sound = sound
self.storiesMuted = storiesMuted
}
}
@@ -327,7 +332,8 @@ public extension EnginePeer.NotificationSettings {
self.init(
muteState: MuteState(notificationSettings.muteState),
messageSound: MessageSound(notificationSettings.messageSound),
displayPreviews: DisplayPreviews(notificationSettings.displayPreviews)
displayPreviews: DisplayPreviews(notificationSettings.displayPreviews),
storiesMuted: notificationSettings.storiesMuted
)
}
@@ -335,7 +341,8 @@ public extension EnginePeer.NotificationSettings {
return TelegramPeerNotificationSettings(
muteState: self.muteState._asMuteState(),
messageSound: self.messageSound._asMessageSound(),
displayPreviews: self.displayPreviews._asDisplayPreviews()
displayPreviews: self.displayPreviews._asDisplayPreviews(),
storiesMuted: self.storiesMuted
)
}
}
@@ -594,7 +601,8 @@ public extension EngineGlobalNotificationSettings.CategorySettings {
self.init(
enabled: categorySettings.enabled,
displayPreviews: categorySettings.displayPreviews,
sound: EnginePeer.NotificationSettings.MessageSound(categorySettings.sound)
sound: EnginePeer.NotificationSettings.MessageSound(categorySettings.sound),
storiesMuted: categorySettings.storiesMuted ?? false
)
}
@@ -602,7 +610,8 @@ public extension EngineGlobalNotificationSettings.CategorySettings {
return MessageNotificationSettings(
enabled: self.enabled,
displayPreviews: self.displayPreviews,
sound: self.sound._asMessageSound()
sound: self.sound._asMessageSound(),
storiesMuted: self.storiesMuted
)
}
}