mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-25 17:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup / format / lint

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-27 20:36:40 +01:00
parent 8cac9df8c6
commit b89221a535
29 changed files with 239 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
IceCubesActionExtension/ActionRequestHandler.swift
View file

@ -5,100 +5,100 @@
// Created by Thomas Durand on 26/01/2023. // Created by Thomas Durand on 26/01/2023.
// //
import UIKit
import MobileCoreServices import MobileCoreServices
import UIKit
import UniformTypeIdentifiers import UniformTypeIdentifiers
import Models import Models
import Network import Network
// Sample code was sending this from a thread to another, let asume @Sendable for this // Sample code was sending this from a thread to another, let asume @Sendable for this
extension NSExtensionContext: @unchecked Sendable { } extension NSExtensionContext: @unchecked Sendable {}
class ActionRequestHandler: NSObject, NSExtensionRequestHandling { class ActionRequestHandler: NSObject, NSExtensionRequestHandling {
enum Error: Swift.Error { enum Error: Swift.Error {
case inputProviderNotFound case inputProviderNotFound
case loadedItemHasWrongType case loadedItemHasWrongType
case urlNotFound case urlNotFound
case noHost case noHost
case notMastodonInstance case notMastodonInstance
} }
func beginRequest(with context: NSExtensionContext) { func beginRequest(with context: NSExtensionContext) {
// Do not call super in an Action extension with no user interface // Do not call super in an Action extension with no user interface
Task { Task {
do { do {
let url = try await url(from: context) let url = try await url(from: context)
guard await url.isMastodonInstance else { guard await url.isMastodonInstance else {
throw Error.notMastodonInstance throw Error.notMastodonInstance
}
await MainActor.run {
let deeplink = url.iceCubesAppDeepLink
let output = output(wrapping: deeplink)
context.completeRequest(returningItems: output)
}
} catch {
await MainActor.run {
context.completeRequest(returningItems: [])
}
}
} }
await MainActor.run {
let deeplink = url.iceCubesAppDeepLink
let output = output(wrapping: deeplink)
context.completeRequest(returningItems: output)
}
} catch {
await MainActor.run {
context.completeRequest(returningItems: [])
}
}
} }
}
} }
extension URL { extension URL {
var isMastodonInstance: Bool { var isMastodonInstance: Bool {
get async { get async {
do { do {
guard let host = host() else { guard let host = host() else {
throw ActionRequestHandler.Error.noHost throw ActionRequestHandler.Error.noHost
}
let _: Instance = try await Client(server: host).get(endpoint: Instances.instance)
return true
} catch {
return false
}
} }
let _: Instance = try await Client(server: host).get(endpoint: Instances.instance)
return true
} catch {
return false
}
} }
}
var iceCubesAppDeepLink: URL { var iceCubesAppDeepLink: URL {
var components = URLComponents(url: self, resolvingAgainstBaseURL: false)! var components = URLComponents(url: self, resolvingAgainstBaseURL: false)!
components.scheme = AppInfo.scheme.trimmingCharacters(in: [":", "/"]) components.scheme = AppInfo.scheme.trimmingCharacters(in: [":", "/"])
return components.url! return components.url!
} }
} }
extension ActionRequestHandler { extension ActionRequestHandler {
/// Will look for an input item that might provide the property list that Javascript sent us /// Will look for an input item that might provide the property list that Javascript sent us
private func url(from context: NSExtensionContext) async throws -> URL { private func url(from context: NSExtensionContext) async throws -> URL {
for item in context.inputItems as! [NSExtensionItem] { for item in context.inputItems as! [NSExtensionItem] {
guard let attachments = item.attachments else { guard let attachments = item.attachments else {
continue continue
} }
for itemProvider in attachments { for itemProvider in attachments {
guard itemProvider.hasItemConformingToTypeIdentifier(UTType.propertyList.identifier) else { guard itemProvider.hasItemConformingToTypeIdentifier(UTType.propertyList.identifier) else {
continue continue
}
guard let dictionary = try await itemProvider.loadItem(forTypeIdentifier: UTType.propertyList.identifier) as? [String: Any] else {
throw Error.loadedItemHasWrongType
}
let input = dictionary[NSExtensionJavaScriptPreprocessingResultsKey] as! [String: Any]? ?? [:]
guard let absoluteStringUrl = input["url"] as? String, let url = URL(string: absoluteStringUrl) else {
throw Error.urlNotFound
}
return url
}
} }
throw Error.inputProviderNotFound guard let dictionary = try await itemProvider.loadItem(forTypeIdentifier: UTType.propertyList.identifier) as? [String: Any] else {
throw Error.loadedItemHasWrongType
}
let input = dictionary[NSExtensionJavaScriptPreprocessingResultsKey] as! [String: Any]? ?? [:]
guard let absoluteStringUrl = input["url"] as? String, let url = URL(string: absoluteStringUrl) else {
throw Error.urlNotFound
}
return url
}
} }
throw Error.inputProviderNotFound
}
/// Wrap the output to the expected object so we send back results to JS /// Wrap the output to the expected object so we send back results to JS
private func output(wrapping deeplink: URL) -> [NSExtensionItem] { private func output(wrapping deeplink: URL) -> [NSExtensionItem] {
let results = ["deeplink": deeplink.absoluteString] let results = ["deeplink": deeplink.absoluteString]
let dictionary = [NSExtensionJavaScriptFinalizeArgumentKey: results] let dictionary = [NSExtensionJavaScriptFinalizeArgumentKey: results]
let provider = NSItemProvider(item: dictionary as NSDictionary, typeIdentifier: UTType.propertyList.identifier) let provider = NSItemProvider(item: dictionary as NSDictionary, typeIdentifier: UTType.propertyList.identifier)
let item = NSExtensionItem() let item = NSExtensionItem()
item.attachments = [provider] item.attachments = [provider]
return [item] return [item]
} }
} }

2
IceCubesApp/App/SideBarView.swift
View file

@ -2,8 +2,8 @@ import Account
import AppAccount import AppAccount
import DesignSystem import DesignSystem
import Env import Env
import SwiftUI
import Models import Models
import SwiftUI
struct SideBarView<Content: View>: View { struct SideBarView<Content: View>: View {
@EnvironmentObject private var appAccounts: AppAccountsManager @EnvironmentObject private var appAccounts: AppAccountsManager

5
IceCubesApp/App/Tabs/Settings/AccountSettingView.swift
View file

@ -1,9 +1,9 @@
import SwiftUI
import Account import Account
import AppAccount
import DesignSystem import DesignSystem
import Env import Env
import Models import Models
import AppAccount import SwiftUI
struct AccountSettingsView: View { struct AccountSettingsView: View {
@Environment(\.dismiss) private var dismiss @Environment(\.dismiss) private var dismiss
@ -54,7 +54,6 @@ struct AccountSettingsView: View {
} label: { } label: {
Text("account.action.logout") Text("account.action.logout")
} }
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
} }

11
IceCubesApp/App/Tabs/Settings/ContentSettingsView.swift
View file

@ -8,7 +8,6 @@ import SwiftUI
import UserNotifications import UserNotifications
struct ContentSettingsView: View { struct ContentSettingsView: View {
@EnvironmentObject private var userPreferences: UserPreferences @EnvironmentObject private var userPreferences: UserPreferences
@EnvironmentObject private var theme: Theme @EnvironmentObject private var theme: Theme
@ -19,7 +18,7 @@ struct ContentSettingsView: View {
Text("settings.content.use-instance-settings") Text("settings.content.use-instance-settings")
} }
} footer: { } footer: {
Text("settings.content.main-toggle.description") Text("settings.content.main-toggle.description")
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
.onChange(of: userPreferences.useInstanceContentSettings) { newVal in .onChange(of: userPreferences.useInstanceContentSettings) { newVal in
@ -29,7 +28,6 @@ struct ContentSettingsView: View {
userPreferences.appDefaultPostsSensitive = userPreferences.postIsSensitive userPreferences.appDefaultPostsSensitive = userPreferences.postIsSensitive
userPreferences.appDefaultPostVisibility = userPreferences.postVisibility userPreferences.appDefaultPostVisibility = userPreferences.postVisibility
} }
} }
Section("settings.content.reading") { Section("settings.content.reading") {
@ -54,22 +52,15 @@ struct ContentSettingsView: View {
} }
.disabled(userPreferences.useInstanceContentSettings) .disabled(userPreferences.useInstanceContentSettings)
Toggle(isOn: $userPreferences.appDefaultPostsSensitive) { Toggle(isOn: $userPreferences.appDefaultPostsSensitive) {
Text("settings.content.default-sensitive") Text("settings.content.default-sensitive")
} }
.disabled(userPreferences.useInstanceContentSettings) .disabled(userPreferences.useInstanceContentSettings)
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
} }
.navigationTitle("settings.content.navigation-title") .navigationTitle("settings.content.navigation-title")
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(theme.secondaryBackgroundColor) .background(theme.secondaryBackgroundColor)
} }
} }

1
IceCubesApp/App/Tabs/Settings/PushNotificationsView.swift
View file

@ -101,7 +101,6 @@ struct PushNotificationsView: View {
Text("settings.push.duplicate.footer") Text("settings.push.duplicate.footer")
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
} }
.navigationTitle("settings.push.navigation-title") .navigationTitle("settings.push.navigation-title")
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)

3
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -75,7 +75,8 @@ struct SettingsTabs: View {
if let index = indexSet.first { if let index = indexSet.first {
let account = appAccountsManager.availableAccounts[index] let account = appAccountsManager.availableAccounts[index]
if let token = account.oauthToken, if let token = account.oauthToken,
let sub = pushNotifications.subscriptions.first(where: { $0.account.token == token }) { let sub = pushNotifications.subscriptions.first(where: { $0.account.token == token })
{
Task { Task {
await sub.deleteSubscription() await sub.deleteSubscription()
appAccountsManager.delete(account: account) appAccountsManager.delete(account: account)

2
Packages/Account/Sources/Account/Edit/EditAccountView.swift
View file

@ -10,7 +10,7 @@ public struct EditAccountView: View {
@StateObject private var viewModel = EditAccountViewModel() @StateObject private var viewModel = EditAccountViewModel()
public init() { } public init() {}
public var body: some View { public var body: some View {
NavigationStack { NavigationStack {

25
Packages/Account/Sources/Account/Filters/EditFilterView.swift
View file

@ -1,8 +1,8 @@
import SwiftUI
import Models
import Env
import DesignSystem import DesignSystem
import Env
import Models
import Network import Network
import SwiftUI
struct EditFilterView: View { struct EditFilterView: View {
@Environment(\.dismiss) private var dismiss @Environment(\.dismiss) private var dismiss
@ -55,7 +55,7 @@ struct EditFilterView: View {
.background(theme.secondaryBackgroundColor) .background(theme.secondaryBackgroundColor)
.onAppear { .onAppear {
if filter == nil { if filter == nil {
isTitleFocused = true isTitleFocused = true
} }
} }
.toolbar { .toolbar {
@ -76,7 +76,6 @@ struct EditFilterView: View {
} }
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
} }
private var keywordsSection: some View { private var keywordsSection: some View {
@ -182,7 +181,7 @@ struct EditFilterView: View {
} else { } else {
let newFilter: ServerFilter = try await client.post(endpoint: ServerFilters.createFilter(json: data), let newFilter: ServerFilter = try await client.post(endpoint: ServerFilters.createFilter(json: data),
forceVersion: .v2) forceVersion: .v2)
self.filter = newFilter filter = newFilter
} }
} catch {} } catch {}
isSavingFilter = false isSavingFilter = false
@ -193,12 +192,12 @@ struct EditFilterView: View {
isSavingFilter = true isSavingFilter = true
do { do {
let keyword: ServerFilter.Keyword = try await let keyword: ServerFilter.Keyword = try await
client.post(endpoint: ServerFilters.addKeyword(filter: filterId, client.post(endpoint: ServerFilters.addKeyword(filter: filterId,
keyword: name, keyword: name,
wholeWord: true), wholeWord: true),
forceVersion: .v2) forceVersion: .v2)
self.keywords.append(keyword) keywords.append(keyword)
} catch { } } catch {}
isSavingFilter = false isSavingFilter = false
} }
@ -210,7 +209,7 @@ struct EditFilterView: View {
if response?.statusCode == 200 { if response?.statusCode == 200 {
keywords.removeAll(where: { $0.id == keyword.id }) keywords.removeAll(where: { $0.id == keyword.id })
} }
} catch { } } catch {}
isSavingFilter = false isSavingFilter = false
} }
} }

10
Packages/Account/Sources/Account/Filters/FiltersListView.swift
View file

@ -1,8 +1,8 @@
import SwiftUI
import Env
import Network
import DesignSystem import DesignSystem
import Env
import Models import Models
import Network
import SwiftUI
public struct FiltersListView: View { public struct FiltersListView: View {
@Environment(\.dismiss) private var dismiss @Environment(\.dismiss) private var dismiss
@ -14,7 +14,7 @@ public struct FiltersListView: View {
@State private var isLoading: Bool = true @State private var isLoading: Bool = true
@State private var filters: [ServerFilter] = [] @State private var filters: [ServerFilter] = []
public init() { } public init() {}
public var body: some View { public var body: some View {
NavigationStack { NavigationStack {
@ -31,7 +31,7 @@ public struct FiltersListView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text(filter.title) Text(filter.title)
.font(.scaledSubheadline) .font(.scaledSubheadline)
Text("\(filter.context.map{ $0.name }.joined(separator: ", "))") Text("\(filter.context.map { $0.name }.joined(separator: ", "))")
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(.gray) .foregroundColor(.gray)
} }

12
Packages/AppAccount/Sources/AppAccount/AppAccount.swift
View file

@ -4,7 +4,7 @@ import Models
import Network import Network
import SwiftUI import SwiftUI
extension AppAccount { public extension AppAccount {
private static var keychain: KeychainSwift { private static var keychain: KeychainSwift {
let keychain = KeychainSwift() let keychain = KeychainSwift()
#if !DEBUG && !targetEnvironment(simulator) #if !DEBUG && !targetEnvironment(simulator)
@ -13,17 +13,17 @@ extension AppAccount {
return keychain return keychain
} }
public func save() throws { func save() throws {
let encoder = JSONEncoder() let encoder = JSONEncoder()
let data = try encoder.encode(self) let data = try encoder.encode(self)
Self.keychain.set(data, forKey: key) Self.keychain.set(data, forKey: key)
} }
public func delete() { func delete() {
Self.keychain.delete(key) Self.keychain.delete(key)
} }
public static func retrieveAll() -> [AppAccount] { static func retrieveAll() -> [AppAccount] {
migrateLegacyAccounts() migrateLegacyAccounts()
let keychain = Self.keychain let keychain = Self.keychain
let decoder = JSONDecoder() let decoder = JSONDecoder()
@ -39,7 +39,7 @@ extension AppAccount {
return accounts return accounts
} }
public static func migrateLegacyAccounts() { static func migrateLegacyAccounts() {
let keychain = KeychainSwift() let keychain = KeychainSwift()
let decoder = JSONDecoder() let decoder = JSONDecoder()
let keys = keychain.allKeys let keys = keychain.allKeys
@ -52,7 +52,7 @@ extension AppAccount {
} }
} }
public static func deleteAll() { static func deleteAll() {
let keychain = Self.keychain let keychain = Self.keychain
let keys = keychain.allKeys let keys = keychain.allKeys
for key in keys { for key in keys {

6
Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift
View file

@ -39,8 +39,8 @@ public struct ConversationDetailView: View {
ForEach(viewModel.messages) { message in ForEach(viewModel.messages) { message in
ConversationMessageView(message: message, ConversationMessageView(message: message,
conversation: viewModel.conversation) conversation: viewModel.conversation)
.padding(.vertical, 4) .padding(.vertical, 4)
.id(message.id) .id(message.id)
} }
bottomAnchorView bottomAnchorView
} }
@ -129,7 +129,7 @@ public struct ConversationDetailView: View {
.overlay( .overlay(
RoundedRectangle(cornerRadius: 14) RoundedRectangle(cornerRadius: 14)
.stroke(.gray, lineWidth: 1) .stroke(.gray, lineWidth: 1)
) )
.font(.scaledBody) .font(.scaledBody)
if !viewModel.newMessageText.isEmpty { if !viewModel.newMessageText.isEmpty {
Button { Button {

2
Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
View file

@ -68,7 +68,7 @@ struct ConversationMessageView: View {
} }
Group { Group {
Text(message.createdAt.shortDateFormatted) + Text(message.createdAt.shortDateFormatted) +
Text(" ") Text(" ")
Text(message.createdAt.asDate, style: .time) Text(message.createdAt.asDate, style: .time)
} }
.font(.scaledFootnote) .font(.scaledFootnote)

20
Packages/Env/Sources/Env/PushNotificationsService.swift
View file

@ -64,7 +64,7 @@ public class PushNotificationsService: ObservableObject {
await withTaskGroup(of: Void.self, body: { group in await withTaskGroup(of: Void.self, body: { group in
group.addTask { group.addTask {
await subscription.fetchSubscription() await subscription.fetchSubscription()
if await subscription.subscription != nil && !forceCreate { if await subscription.subscription != nil, !forceCreate {
await subscription.deleteSubscription() await subscription.deleteSubscription()
await subscription.updateSubscription() await subscription.updateSubscription()
} else if forceCreate { } else if forceCreate {
@ -176,15 +176,15 @@ public class PushNotificationSubscriptionSettings: ObservableObject {
listenerURL += "?sandbox=true" listenerURL += "?sandbox=true"
#endif #endif
subscription = subscription =
try await client.post(endpoint: Push.createSub(endpoint: listenerURL, try await client.post(endpoint: Push.createSub(endpoint: listenerURL,
p256dh: key, p256dh: key,
auth: authKey, auth: authKey,
mentions: isMentionNotificationEnabled, mentions: isMentionNotificationEnabled,
status: isNewPostsNotificationEnabled, status: isNewPostsNotificationEnabled,
reblog: isReblogNotificationEnabled, reblog: isReblogNotificationEnabled,
follow: isFollowNotificationEnabled, follow: isFollowNotificationEnabled,
favorite: isFavoriteNotificationEnabled, favorite: isFavoriteNotificationEnabled,
poll: isPollNotificationEnabled)) poll: isPollNotificationEnabled))
isEnabled = subscription != nil isEnabled = subscription != nil
} catch { } catch {

9
Packages/Env/Sources/Env/Router.swift
View file

@ -35,7 +35,7 @@ public enum SheetDestinations: Identifiable {
public var id: String { public var id: String {
switch self { switch self {
case .editStatusEditor, .newStatusEditor, .replyToStatusEditor, .quoteStatusEditor, case .editStatusEditor, .newStatusEditor, .replyToStatusEditor, .quoteStatusEditor,
.mentionStatusEditor, .settings, .accountPushNotficationsSettings: .mentionStatusEditor, .settings, .accountPushNotficationsSettings:
return "statusEditor" return "statusEditor"
case .listEdit: case .listEdit:
return "listEdit" return "listEdit"
@ -67,8 +67,8 @@ public class RouterPath: ObservableObject {
public func handleStatus(status: AnyStatus, url: URL) -> OpenURLAction.Result { public func handleStatus(status: AnyStatus, url: URL) -> OpenURLAction.Result {
if url.pathComponents.count == 3 && url.pathComponents[1] == "tags" && if url.pathComponents.count == 3 && url.pathComponents[1] == "tags" &&
url.host() == status.account.url?.host(), url.host() == status.account.url?.host(),
let tag = url.pathComponents.last let tag = url.pathComponents.last
{ {
// OK this test looks weird but it's // OK this test looks weird but it's
// A 3 component path i.e. ["/", "tags", "tagname"] // A 3 component path i.e. ["/", "tags", "tagname"]
@ -110,7 +110,8 @@ public class RouterPath: ObservableObject {
} else if let client = client, } else if let client = client,
client.isAuth, client.isAuth,
client.hasConnection(with: url), client.hasConnection(with: url),
let id = Int(url.lastPathComponent) { let id = Int(url.lastPathComponent)
{
if url.absoluteString.contains(client.server) { if url.absoluteString.contains(client.server) {
navigate(to: .statusDetail(id: String(id))) navigate(to: .statusDetail(id: String(id)))
} else { } else {

55
Packages/Env/Sources/Env/UserPreferences.swift
View file

@ -22,57 +22,42 @@ public class UserPreferences: ObservableObject {
@AppStorage("use_instance_content_settings") public var useInstanceContentSettings: Bool = true @AppStorage("use_instance_content_settings") public var useInstanceContentSettings: Bool = true
@AppStorage("app_auto_expand_spoilers") public var appAutoExpandSpoilers = false @AppStorage("app_auto_expand_spoilers") public var appAutoExpandSpoilers = false
@AppStorage("app_auto_expand_media") public var appAutoExpandMedia:ServerPreferences.AutoExpandMedia = .hideSensitive @AppStorage("app_auto_expand_media") public var appAutoExpandMedia: ServerPreferences.AutoExpandMedia = .hideSensitive
@AppStorage("app_default_post_visibility") public var appDefaultPostVisibility:Models.Visibility = .pub @AppStorage("app_default_post_visibility") public var appDefaultPostVisibility: Models.Visibility = .pub
@AppStorage("app_default_posts_sensitive") public var appDefaultPostsSensitive = false @AppStorage("app_default_posts_sensitive") public var appDefaultPostsSensitive = false
public var postVisibility: Models.Visibility {
public var postVisibility:Models.Visibility { if useInstanceContentSettings {
get{ return serverPreferences?.postVisibility ?? .pub
if useInstanceContentSettings { } else {
return serverPreferences?.postVisibility ?? .pub return appDefaultPostVisibility
}
else {
return appDefaultPostVisibility
}
} }
} }
public var postIsSensitive:Bool { public var postIsSensitive: Bool {
get { if useInstanceContentSettings {
if useInstanceContentSettings { return serverPreferences?.postIsSensitive ?? false
return serverPreferences?.postIsSensitive ?? false } else {
} return appDefaultPostsSensitive
else {
return appDefaultPostsSensitive
}
} }
} }
public var autoExpandSpoilers: Bool { public var autoExpandSpoilers: Bool {
get { if useInstanceContentSettings {
if useInstanceContentSettings { return serverPreferences?.autoExpandSpoilers ?? true
return serverPreferences?.autoExpandSpoilers ?? true } else {
} return appAutoExpandSpoilers
else {
return appAutoExpandSpoilers
}
} }
} }
public var autoExpandMedia: ServerPreferences.AutoExpandMedia { public var autoExpandMedia: ServerPreferences.AutoExpandMedia {
get { if useInstanceContentSettings {
if useInstanceContentSettings { return serverPreferences?.autoExpandMedia ?? .hideSensitive
return serverPreferences?.autoExpandMedia ?? .hideSensitive } else {
} return appAutoExpandMedia
else {
return appAutoExpandMedia
}
} }
} }
public var pushNotificationsCount: Int { public var pushNotificationsCount: Int {
get { get {
Self.sharedDefault?.integer(forKey: "push_notifications_count") ?? 0 Self.sharedDefault?.integer(forKey: "push_notifications_count") ?? 0

3
Packages/Models/Sources/Models/AppAccount.swift
View file

@ -20,7 +20,8 @@ public struct AppAccount: Codable, Identifiable, Hashable {
public init(server: String, public init(server: String,
accountName: String?, accountName: String?,
oauthToken: OauthToken? = nil) { oauthToken: OauthToken? = nil)
{
self.server = server self.server = server
self.accountName = accountName self.accountName = accountName
self.oauthToken = oauthToken self.oauthToken = oauthToken

4
Packages/Models/Sources/Models/Poll.swift
View file

@ -35,9 +35,9 @@ public struct NullableString: Codable, Equatable, Hashable {
public init(from decoder: Decoder) throws { public init(from decoder: Decoder) throws {
do { do {
let container = try decoder.singleValueContainer() let container = try decoder.singleValueContainer()
self.value = try container.decode(String.self) value = try container.decode(String.self)
} catch { } catch {
self.value = nil value = nil
} }
} }
} }

10
Packages/Models/Sources/Models/ServerFilter.swift
View file

@ -23,8 +23,8 @@ public struct ServerFilter: Codable, Identifiable, Hashable {
public let expireIn: Int? public let expireIn: Int?
} }
extension ServerFilter.Context { public extension ServerFilter.Context {
public var iconName: String { var iconName: String {
switch self { switch self {
case .home: case .home:
return "rectangle.on.rectangle" return "rectangle.on.rectangle"
@ -39,7 +39,7 @@ extension ServerFilter.Context {
} }
} }
public var name: String { var name: String {
switch self { switch self {
case .home: case .home:
return "Home and lists" return "Home and lists"
@ -55,8 +55,8 @@ extension ServerFilter.Context {
} }
} }
extension ServerFilter.Action { public extension ServerFilter.Action {
public var label: String { var label: String {
switch self { switch self {
case .warn: case .warn:
return "Hide with a warning" return "Hide with a warning"

5
Packages/Network/Sources/Network/Endpoint/ServerFilters.swift
View file

@ -30,7 +30,7 @@ public enum ServerFilters: Endpoint {
switch self { switch self {
case let .addKeyword(_, keyword, wholeWord): case let .addKeyword(_, keyword, wholeWord):
return [.init(name: "keyword", value: keyword), return [.init(name: "keyword", value: keyword),
.init(name: "whole_word", value: wholeWord ? "true": "false")] .init(name: "whole_word", value: wholeWord ? "true" : "false")]
default: default:
return nil return nil
} }
@ -57,7 +57,8 @@ public struct ServerFilterData: Encodable {
public init(title: String, public init(title: String,
context: [ServerFilter.Context], context: [ServerFilter.Context],
filterAction: ServerFilter.Action, filterAction: ServerFilter.Action,
expireIn: Int?) { expireIn: Int?)
{
self.title = title self.title = title
self.context = context self.context = context
self.filterAction = filterAction self.filterAction = filterAction

4
Packages/Notifications/Sources/Notifications/NotificationsViewModel.swift
View file

@ -76,7 +76,7 @@ class NotificationsViewModel: ObservableObject {
newNotifications = newNotifications.filter { notification in newNotifications = newNotifications.filter { notification in
!consolidatedNotifications.contains(where: { $0.id == notification.id }) !consolidatedNotifications.contains(where: { $0.id == notification.id })
} }
self.notifications.append(contentsOf: newNotifications) notifications.append(contentsOf: newNotifications)
consolidatedNotifications.insert(contentsOf: newNotifications.consolidated(), at: 0) consolidatedNotifications.insert(contentsOf: newNotifications.consolidated(), at: 0)
} }
withAnimation { withAnimation {
@ -98,7 +98,7 @@ class NotificationsViewModel: ObservableObject {
maxId: lastId, maxId: lastId,
types: queryTypes)) types: queryTypes))
consolidatedNotifications.append(contentsOf: newNotifications.consolidated()) consolidatedNotifications.append(contentsOf: newNotifications.consolidated())
self.notifications.append(contentsOf: newNotifications) notifications.append(contentsOf: newNotifications)
state = .display(notifications: consolidatedNotifications, nextPageState: newNotifications.count < 15 ? .none : .hasNextPage) state = .display(notifications: consolidatedNotifications, nextPageState: newNotifications.count < 15 ? .none : .hasNextPage)
} catch { } catch {
state = .error(error: error) state = .error(error: error)

3
Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift
View file

@ -159,11 +159,10 @@ struct StatusEditorMediaView: View {
.foregroundColor(.red) .foregroundColor(.red)
} }
.alert("alert.error", isPresented: $isErrorDisplayed) { .alert("alert.error", isPresented: $isErrorDisplayed) {
Button("Ok", action: { }) Button("Ok", action: {})
} message: { } message: {
Text(error.error ?? "") Text(error.error ?? "")
} }
} }
private var altMarker: some View { private var altMarker: some View {

6
Packages/Status/Sources/Status/Editor/Components/StatusEditorUTTypeSupported.swift
View file

@ -1,9 +1,9 @@
import AVFoundation
import Foundation import Foundation
import PhotosUI import PhotosUI
import SwiftUI import SwiftUI
import UIKit import UIKit
import UniformTypeIdentifiers import UniformTypeIdentifiers
import AVFoundation
@MainActor @MainActor
enum StatusEditorUTTypeSupported: String, CaseIterable { enum StatusEditorUTTypeSupported: String, CaseIterable {
@ -74,7 +74,7 @@ struct MovieFileTranseferable: Transferable {
private let url: URL private let url: URL
var compressedVideoURL: URL? { var compressedVideoURL: URL? {
get async { get async {
return await withCheckedContinuation { continuation in await withCheckedContinuation { continuation in
let urlAsset = AVURLAsset(url: url, options: nil) let urlAsset = AVURLAsset(url: url, options: nil)
guard let exportSession = AVAssetExportSession(asset: urlAsset, presetName: AVAssetExportPresetMediumQuality) else { guard let exportSession = AVAssetExportSession(asset: urlAsset, presetName: AVAssetExportPresetMediumQuality) else {
continuation.resume(returning: nil) continuation.resume(returning: nil)
@ -84,7 +84,7 @@ struct MovieFileTranseferable: Transferable {
exportSession.outputURL = outputURL exportSession.outputURL = outputURL
exportSession.outputFileType = .mp4 exportSession.outputFileType = .mp4
exportSession.shouldOptimizeForNetworkUse = true exportSession.shouldOptimizeForNetworkUse = true
exportSession.exportAsynchronously { () -> Void in exportSession.exportAsynchronously { () in
continuation.resume(returning: outputURL) continuation.resume(returning: outputURL)
} }
} }

1
Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
View file

@ -56,6 +56,7 @@ public class StatusEditorViewModel: ObservableObject {
inflateSelectedMedias() inflateSelectedMedias()
} }
} }
@Published var isMediasLoading: Bool = false @Published var isMediasLoading: Bool = false
@Published var mediasImages: [StatusEditorMediaContainer] = [] @Published var mediasImages: [StatusEditorMediaContainer] = []

10
Packages/Status/Sources/Status/Row/StatusRowView.swift
View file

@ -225,13 +225,12 @@ public struct StatusRowView: View {
private func makeStatusContentView(status: AnyStatus) -> some View { private func makeStatusContentView(status: AnyStatus) -> some View {
Group { Group {
if !status.spoilerText.asRawText.isEmpty { if !status.spoilerText.asRawText.isEmpty {
HStack(alignment: .top) { HStack(alignment: .top) {
Text("⚠︎") Text("⚠︎")
.font(.system(.subheadline , weight:.bold)) .font(.system(.subheadline, weight: .bold))
.foregroundColor(.secondary) .foregroundColor(.secondary)
EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language) EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language)
.font(.system(.subheadline , weight:.bold)) .font(.system(.subheadline, weight: .bold))
.foregroundColor(.secondary) .foregroundColor(.secondary)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
Spacer() Spacer()
@ -247,7 +246,7 @@ public struct StatusRowView: View {
.accessibility(label: viewModel.displaySpoiler ? Text("status.show-more") : Text("status.show-less")) .accessibility(label: viewModel.displaySpoiler ? Text("status.show-more") : Text("status.show-less"))
.accessibilityHidden(true) .accessibilityHidden(true)
} }
.onTapGesture { // make whole row tapable to make up for smaller button size .onTapGesture { // make whole row tapable to make up for smaller button size
withAnimation { withAnimation {
viewModel.displaySpoiler.toggle() viewModel.displaySpoiler.toggle()
} }
@ -376,7 +375,8 @@ public struct StatusRowView: View {
!viewModel.isCompact, !viewModel.isCompact,
theme.statusDisplayStyle == .large, theme.statusDisplayStyle == .large,
status.content.statusesURLs.isEmpty, status.content.statusesURLs.isEmpty,
status.mediaAttachments.isEmpty { status.mediaAttachments.isEmpty
{
StatusCardView(card: card) StatusCardView(card: card)
} }
} }