meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #839 from meshtastic/explicit-message-sort

Browse source 
Sort Descriptors for Message Extensions
This commit is contained in:
Garth Vander Houwen 2024-08-03 07:44:22 -07:00 • committed by GitHub
commit 5ad8596acb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Meshtastic/Extensions/CoreData/ChannelEntityExtension.swift
View file

@ -13,6 +13,7 @@ extension ChannelEntity {
var allPrivateMessages: [MessageEntity] {
let context = PersistenceController.shared.container.viewContext
let fetchRequest = MessageEntity.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
fetchRequest.predicate = NSPredicate(format: "channel == %ld AND toUser == nil AND isEmoji == false", self.index)
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()

3
Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
View file

@ -14,7 +14,7 @@ import SwiftUI
extension MessageEntity {
var timestamp: Date {
let time = messageTimestamp
let time = messageTimestamp
return Date(timeIntervalSince1970: TimeInterval(time))
}
@ -25,6 +25,7 @@ extension MessageEntity {
var tapbacks: [MessageEntity] {
let context = PersistenceController.shared.container.viewContext
let fetchRequest = MessageEntity.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
fetchRequest.predicate = NSPredicate(format: "replyID == %lld AND isEmoji == true", self.messageId)
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()

1
Meshtastic/Extensions/CoreData/MyInfoEntityExtension.swift
View file

@ -12,6 +12,7 @@ extension MyInfoEntity {
var messageList: [MessageEntity] {
let context = PersistenceController.shared.container.viewContext
let fetchRequest = MessageEntity.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
fetchRequest.predicate = NSPredicate(format: "toUser == nil")
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()

2
Meshtastic/Extensions/CoreData/UserEntityExtension.swift
View file

@ -14,6 +14,7 @@ extension UserEntity {
var messageList: [MessageEntity] {
let context = PersistenceController.shared.container.viewContext
let fetchRequest = MessageEntity.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
fetchRequest.predicate = NSPredicate(format: "((toUser == %@) OR (fromUser == %@)) AND toUser != nil AND fromUser != nil AND isEmoji == false AND admin = false AND portNum != 10", self, self)
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
@ -22,6 +23,7 @@ extension UserEntity {
var sensorMessageList: [MessageEntity] {
let context = PersistenceController.shared.container.viewContext
let fetchRequest = MessageEntity.fetchRequest()
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
fetchRequest.predicate = NSPredicate(format: "(fromUser == %@) AND portNum = 10", self)
return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()