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

chore(Widget): Fix picked account not desired account

This commit is contained in:
Marcus Kida 2023-02-07 09:07:37 +01:00
parent 0647cae24a
commit 0e303418d7
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
WidgetExtension/Variants/FollowersCount/FollowersCountWidget.swift
View File

@ -84,21 +84,24 @@ private extension FollowersCountWidgetProvider {
return completion(.unconfigured)
}
guard let desiredAccount: String = {
guard let account = configuration.account else {
return authBox.authenticationRecord.object(in: WidgetExtension.appContext.managedObjectContext)?.user.acct
}
return account
}() else {
guard
let desiredAccount = configuration.account ?? authBox.authenticationRecord.object(
in: WidgetExtension.appContext.managedObjectContext
)?.user.acct
else {
return completion(.unconfigured)
}
let resultingAccount = try await WidgetExtension.appContext
.apiService
.search(query: .init(q: desiredAccount, type: .accounts), authenticationBox: authBox)
.value
.accounts
.first!
guard
let resultingAccount = try await WidgetExtension.appContext
.apiService
.search(query: .init(q: desiredAccount, type: .accounts), authenticationBox: authBox)
.value
.accounts
.first(where: { $0.acct == desiredAccount })
else {
return completion(.unconfigured)
}
let imageData = try await URLSession.shared.data(from: resultingAccount.avatarImageURLWithFallback(domain: authBox.domain)).0

36
WidgetExtension/Variants/MultiFollowersCount/MultiFollowersCountWidget.swift
View File

@ -82,27 +82,31 @@ private extension MultiFollowersCountWidgetProvider {
return completion(.unconfigured)
}
guard let desiredAccounts: [String] = {
guard let account = configuration.accounts?.compactMap({ $0 }) else {
if let acct = authBox.authenticationRecord.object(in: WidgetExtension.appContext.managedObjectContext)?.user.acct {
return [acct]
}
return nil
}
return account
}() else {
let desiredAccounts: [String]
if let configuredAccounts = configuration.accounts?.compactMap({ $0 }) {
desiredAccounts = configuredAccounts
} else if let currentlyLoggedInAccount = authBox.authenticationRecord.object(
in: WidgetExtension.appContext.managedObjectContext
)?.user.acct {
desiredAccounts = [currentlyLoggedInAccount]
} else {
return completion(.unconfigured)
}
var accounts = [MultiFollowersEntryAccountable]()
for desiredAccount in desiredAccounts {
let resultingAccount = try await WidgetExtension.appContext
.apiService
.search(query: .init(q: desiredAccount, type: .accounts), authenticationBox: authBox)
.value
.accounts
.first!
guard
let resultingAccount = try await WidgetExtension.appContext
.apiService
.search(query: .init(q: desiredAccount, type: .accounts), authenticationBox: authBox)
.value
.accounts
.first(where: { $0.acct == desiredAccount })
else {
continue
}
let imageData = try await URLSession.shared.data(from: resultingAccount.avatarImageURLWithFallback(domain: authBox.domain)).0