SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS notifications badge and posts in channel/thread (#6885)

Browse Source
This commit is contained in:
Elias Nahum
2022-12-20 11:43:30 +02:00
committed by GitHub
parent 0f1a29e2da
commit 3de85b2bd1
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ios/Gekidou/Sources/Gekidou/Storage/Database+Mentions.swift
View File

@@ -35,14 +35,25 @@ extension Database {
}
public func getChannelMentions(_ db: Connection) -> Int {
let mentionsCol = Expression<Int?>("mentions_count")
let mentions = try? db.scalar(myChannelTable.select(mentionsCol.total))
let stmtString = """
SELECT SUM(my.mentions_count) \
FROM MyChannel my \
INNER JOIN Channel c ON c.id=my.id \
WHERE c.delete_at = 0
"""
let mentions = try? db.prepare(stmtString).scalar() as? Double
return Int(mentions ?? 0)
}
public func getThreadMentions(_ db: Connection) -> Int {
let mentionsCol = Expression<Int?>("unread_mentions")
let mentions = try? db.scalar(threadTable.select(mentionsCol.total))
let stmtString = """
SELECT SUM(unread_mentions) \
FROM Thread t
INNER JOIN Post p ON t.id=p.id \
INNER JOIN Channel c ON p.channel_id=c.id
WHERE c.delete_at = 0
"""
let mentions = try? db.prepare(stmtString).scalar() as? Double
return Int(mentions ?? 0)
}

7
ios/Gekidou/Sources/Gekidou/Storage/Database+Posts.swift
View File

@@ -181,8 +181,9 @@ extension Database {
public func handlePostData(_ db: Connection, _ postData: PostData, _ channelId: String, _ usedSince: Bool = false, _ receivingThreads: Bool = false) throws {
let sortedChainedPosts = chainAndSortPosts(postData)
try insertOrUpdatePosts(db, sortedChainedPosts, channelId)
let earliest = sortedChainedPosts.first!.create_at
let latest = sortedChainedPosts.last!.create_at
let sortedAndNotDeletedPosts = sortedChainedPosts.filter({$0.delete_at == 0})
let earliest = sortedAndNotDeletedPosts.first!.create_at
let latest = sortedAndNotDeletedPosts.last!.create_at
if (!receivingThreads) {
try handlePostsInChannel(db, channelId, earliest, latest, usedSince)
@@ -564,7 +565,7 @@ extension Database {
var postsInThread = [String: [Post]]()
for post in posts {
if !post.root_id.isEmpty {
if !post.root_id.isEmpty && post.delete_at == 0 {
var threadPosts = postsInThread[post.root_id] ?? [Post]()
threadPosts.append(post)