zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

feat: Delete Status and Notification Feeds for Blocked/Muted Users

This commit is contained in:
Marcus Kida 2022-11-25 14:43:36 +01:00
parent 803571bb81
commit 54a75d4138
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MastodonSDK/Sources/MastodonCore/Service/API/APIService+Block.swift
View File

@ -54,7 +54,7 @@ extension APIService {
let users = try managedObjectContext.fetch(fetchRequest) as! [MastodonUser] let users = try managedObjectContext.fetch(fetchRequest) as! [MastodonUser]
for user in users { for user in users {
user.statuses.deleteAllFeedsForBlockOrMute(in: managedObjectContext) user.deleteStatusAndNotificationFeeds(in: managedObjectContext)
} }
} }
@ -150,10 +150,20 @@ extension APIService {
} }
extension Set<Status> { extension MastodonUser {
func deleteAllFeedsForBlockOrMute(in managedObjectContext: NSManagedObjectContext) { func deleteStatusAndNotificationFeeds(in context: NSManagedObjectContext) {
map { $0.feeds.union($0.reblogFrom.map { $0.feeds }.flatMap { $0 }) } statuses.map {
$0.feeds
.union($0.reblogFrom.map { $0.feeds }.flatMap { $0 })
.union($0.notifications.map { $0.feeds }.flatMap { $0 })
}
.flatMap { $0 } .flatMap { $0 }
.forEach(managedObjectContext.delete) .forEach(context.delete)
notifications.map {
$0.feeds
}
.flatMap { $0 }
.forEach(context.delete)
} }
} }

2
MastodonSDK/Sources/MastodonCore/Service/API/APIService+Mute.swift
View File

@ -53,7 +53,7 @@ extension APIService {
let users = try managedObjectContext.fetch(fetchRequest) as! [MastodonUser] let users = try managedObjectContext.fetch(fetchRequest) as! [MastodonUser]
for user in users { for user in users {
user.statuses.deleteAllFeedsForBlockOrMute(in: managedObjectContext) user.deleteStatusAndNotificationFeeds(in: managedObjectContext)
} }
} }