Skip to content

Commit a37316c

Browse files
DimillianDimillian
committed
Lint
1 parent 189e10f commit a37316c

12 files changed

Lines changed: 103 additions & 102 deletions

File tree

‎IceCubesAppIntents/AppAccountEntity.swift‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import AppIntents
21
import AppAccount
2+
import AppIntents
33
import Env
44
import Foundation
55
import Models
66
import Network
77

8-
9-
extension IntentDescription: @unchecked Sendable { }
10-
extension TypeDisplayRepresentation: @unchecked Sendable { }
8+
extension IntentDescription: @unchecked Sendable {}
9+
extension TypeDisplayRepresentation: @unchecked Sendable {}
1110

1211
public struct AppAccountEntity: Identifiable, AppEntity {
1312
public var id: String { account.id }
@@ -24,8 +23,8 @@ public struct AppAccountEntity: Identifiable, AppEntity {
2423
}
2524

2625
public struct DefaultAppAccountEntityQuery: EntityQuery {
27-
public init() { }
28-
26+
public init() {}
27+
2928
public func entities(for identifiers: [AppAccountEntity.ID]) async throws -> [AppAccountEntity] {
3029
return await AppAccountsManager.shared.availableAccounts.filter { account in
3130
identifiers.contains { id in

‎IceCubesAppIntents/TimelineFilterEntity.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AppIntents
21
import AppAccount
2+
import AppIntents
33
import Env
44
import Foundation
55
import Models
@@ -21,14 +21,14 @@ public struct TimelineFilterEntity: Identifiable, AppEntity {
2121
}
2222

2323
public struct DefaultTimelineEntityQuery: EntityQuery {
24-
public init() { }
25-
26-
public func entities(for identifiers: [TimelineFilter.ID]) async throws -> [TimelineFilterEntity] {
27-
[.home, .trending, .federated, .local].map{ .init(timeline: $0) }
24+
public init() {}
25+
26+
public func entities(for _: [TimelineFilter.ID]) async throws -> [TimelineFilterEntity] {
27+
[.home, .trending, .federated, .local].map { .init(timeline: $0) }
2828
}
2929

3030
public func suggestedEntities() async throws -> [TimelineFilterEntity] {
31-
[.home, .trending, .federated, .local].map{ .init(timeline: $0) }
31+
[.home, .trending, .federated, .local].map { .init(timeline: $0) }
3232
}
3333

3434
public func defaultResult() async -> TimelineFilterEntity? {

‎IceCubesAppWidgetsExtension/HashtagPostsWidget/HashtagPostsWidget.swift‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import WidgetKit
2-
import SwiftUI
3-
import Network
41
import DesignSystem
52
import Models
3+
import Network
4+
import SwiftUI
65
import Timeline
6+
import WidgetKit
77

88
struct HashtagPostsWidgetProvider: AppIntentTimelineProvider {
9-
func placeholder(in context: Context) -> PostsWidgetEntry {
9+
func placeholder(in _: Context) -> PostsWidgetEntry {
1010
.init(date: Date(),
1111
title: "#Mastodon",
1212
statuses: [.placeholder()],
1313
images: [:])
1414
}
15-
15+
1616
func snapshot(for configuration: HashtagPostsWidgetConfiguration, in context: Context) async -> PostsWidgetEntry {
1717
if let entry = await timeline(for: configuration, context: context).entries.first {
1818
return entry
@@ -22,39 +22,40 @@ struct HashtagPostsWidgetProvider: AppIntentTimelineProvider {
2222
statuses: [],
2323
images: [:])
2424
}
25-
25+
2626
func timeline(for configuration: HashtagPostsWidgetConfiguration, in context: Context) async -> Timeline<PostsWidgetEntry> {
2727
await timeline(for: configuration, context: context)
2828
}
29-
29+
3030
private func timeline(for configuration: HashtagPostsWidgetConfiguration, context: Context) async -> Timeline<PostsWidgetEntry> {
3131
do {
3232
let timeline: TimelineFilter = .hashtag(tag: configuration.hashgtag, accountId: nil)
3333
let statuses = await loadStatuses(for: timeline,
3434
account: configuration.account,
3535
widgetFamily: context.family)
36-
let images = try await loadImages(urls: statuses.map{ $0.account.avatar } )
36+
let images = try await loadImages(urls: statuses.map { $0.account.avatar })
3737
return Timeline(entries: [.init(date: Date(),
38-
title: timeline.title,
39-
statuses: statuses,
40-
images: images)], policy: .atEnd)
38+
title: timeline.title,
39+
statuses: statuses,
40+
images: images)], policy: .atEnd)
4141
} catch {
4242
return Timeline(entries: [.init(date: Date(),
4343
title: "#Mastodon",
4444
statuses: [],
4545
images: [:])],
46-
policy: .atEnd)
46+
policy: .atEnd)
4747
}
4848
}
4949
}
5050

5151
struct HashtagPostsWidget: Widget {
5252
let kind: String = "HashtagPostsWidget"
53-
53+
5454
var body: some WidgetConfiguration {
5555
AppIntentConfiguration(kind: kind,
5656
intent: HashtagPostsWidgetConfiguration.self,
57-
provider: HashtagPostsWidgetProvider()) { entry in
57+
provider: HashtagPostsWidgetProvider())
58+
{ entry in
5859
PostsWidgetView(entry: entry)
5960
.containerBackground(Color("WidgetBackground").gradient, for: .widget)
6061
}
@@ -64,12 +65,11 @@ struct HashtagPostsWidget: Widget {
6465
}
6566
}
6667

67-
6868
#Preview(as: .systemMedium) {
6969
HashtagPostsWidget()
7070
} timeline: {
7171
PostsWidgetEntry(date: .now,
72-
title: "#Mastodon",
73-
statuses: [.placeholder(), .placeholder(), .placeholder(), .placeholder()],
74-
images: [:])
72+
title: "#Mastodon",
73+
statuses: [.placeholder(), .placeholder(), .placeholder(), .placeholder()],
74+
images: [:])
7575
}

‎IceCubesAppWidgetsExtension/HashtagPostsWidget/HashtagPostsWidgetConfiguration.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import WidgetKit
21
import AppIntents
2+
import WidgetKit
33

44
struct HashtagPostsWidgetConfiguration: WidgetConfigurationIntent {
55
static let title: LocalizedStringResource = "Configuration"
66
static let description = IntentDescription("Choose the account and hashtag for this widget")
7-
7+
88
@Parameter(title: "Account")
99
var account: AppAccountEntity
10-
10+
1111
@Parameter(title: "Hashtag")
1212
var hashgtag: String
1313
}

‎IceCubesAppWidgetsExtension/IceCubesAppWidgetsExtensionBundle.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import WidgetKit
21
import SwiftUI
2+
import WidgetKit
33

44
@main
55
struct IceCubesAppWidgetsExtensionBundle: WidgetBundle {

‎IceCubesAppWidgetsExtension/LatestPostsWidget/LatestPostsWidget.swift‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import WidgetKit
2-
import SwiftUI
3-
import Network
41
import DesignSystem
52
import Models
3+
import Network
4+
import SwiftUI
65
import Timeline
6+
import WidgetKit
77

88
struct LatestPostsWidgetProvider: AppIntentTimelineProvider {
9-
func placeholder(in context: Context) -> PostsWidgetEntry {
9+
func placeholder(in _: Context) -> PostsWidgetEntry {
1010
.init(date: Date(),
1111
title: "Home",
1212
statuses: [.placeholder()],
1313
images: [:])
1414
}
15-
15+
1616
func snapshot(for configuration: LatestPostsWidgetConfiguration, in context: Context) async -> PostsWidgetEntry {
1717
if let entry = await timeline(for: configuration, context: context).entries.first {
1818
return entry
@@ -22,30 +22,30 @@ struct LatestPostsWidgetProvider: AppIntentTimelineProvider {
2222
statuses: [],
2323
images: [:])
2424
}
25-
25+
2626
func timeline(for configuration: LatestPostsWidgetConfiguration, in context: Context) async -> Timeline<PostsWidgetEntry> {
2727
await timeline(for: configuration, context: context)
2828
}
29-
29+
3030
private func timeline(for configuration: LatestPostsWidgetConfiguration, context: Context) async -> Timeline<PostsWidgetEntry> {
3131
do {
3232
let statuses = await loadStatuses(for: configuration.timeline.timeline,
3333
account: configuration.account,
3434
widgetFamily: context.family)
35-
let images = try await loadImages(urls: statuses.map{ $0.account.avatar } )
35+
let images = try await loadImages(urls: statuses.map { $0.account.avatar })
3636
return Timeline(entries: [.init(date: Date(),
3737
title: configuration.timeline.timeline.title,
38-
statuses: statuses,
39-
images: images)], policy: .atEnd)
38+
statuses: statuses,
39+
images: images)], policy: .atEnd)
4040
} catch {
4141
return Timeline(entries: [.init(date: Date(),
4242
title: configuration.timeline.timeline.title,
4343
statuses: [],
4444
images: [:])],
45-
policy: .atEnd)
45+
policy: .atEnd)
4646
}
4747
}
48-
48+
4949
private func loadImages(urls: [URL]) async throws -> [URL: UIImage] {
5050
try await withThrowingTaskGroup(of: (URL, UIImage?).self) { group in
5151
for url in urls {
@@ -54,25 +54,26 @@ struct LatestPostsWidgetProvider: AppIntentTimelineProvider {
5454
return (url, UIImage(data: response.0))
5555
}
5656
}
57-
57+
5858
var images: [URL: UIImage] = [:]
59-
59+
6060
for try await (url, image) in group {
6161
images[url] = image
6262
}
63-
63+
6464
return images
6565
}
6666
}
6767
}
6868

6969
struct LatestPostsWidget: Widget {
7070
let kind: String = "LatestPostsWidget"
71-
71+
7272
var body: some WidgetConfiguration {
7373
AppIntentConfiguration(kind: kind,
7474
intent: LatestPostsWidgetConfiguration.self,
75-
provider: LatestPostsWidgetProvider()) { entry in
75+
provider: LatestPostsWidgetProvider())
76+
{ entry in
7677
PostsWidgetView(entry: entry)
7778
.containerBackground(Color("WidgetBackground").gradient, for: .widget)
7879
}
@@ -82,11 +83,10 @@ struct LatestPostsWidget: Widget {
8283
}
8384
}
8485

85-
8686
#Preview(as: .systemMedium) {
8787
LatestPostsWidget()
8888
} timeline: {
89-
PostsWidgetEntry(date: .now,
89+
PostsWidgetEntry(date: .now,
9090
title: "Mastodon",
9191
statuses: [.placeholder(), .placeholder(), .placeholder(), .placeholder()],
9292
images: [:])

‎IceCubesAppWidgetsExtension/LatestPostsWidget/LatestPostsWidgetConfiguration.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import WidgetKit
21
import AppIntents
2+
import WidgetKit
33

44
struct LatestPostsWidgetConfiguration: WidgetConfigurationIntent {
55
static let title: LocalizedStringResource = "Configuration"
66
static let description = IntentDescription("Choose the account and timeline for this widget")
7-
7+
88
@Parameter(title: "Account")
99
var account: AppAccountEntity
10-
10+
1111
@Parameter(title: "Timeline")
1212
var timeline: TimelineFilterEntity
1313
}

‎IceCubesAppWidgetsExtension/MentionWidget/MentionWidget.swift‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import WidgetKit
2-
import SwiftUI
3-
import Network
41
import DesignSystem
52
import Models
3+
import Network
4+
import SwiftUI
65
import Timeline
6+
import WidgetKit
77

88
struct MentionsWidgetProvider: AppIntentTimelineProvider {
9-
func placeholder(in context: Context) -> PostsWidgetEntry {
9+
func placeholder(in _: Context) -> PostsWidgetEntry {
1010
.init(date: Date(),
1111
title: "Mentions",
1212
statuses: [.placeholder()],
1313
images: [:])
1414
}
15-
15+
1616
func snapshot(for configuration: MentionsWidgetConfiguration, in context: Context) async -> PostsWidgetEntry {
1717
if let entry = await timeline(for: configuration, context: context).entries.first {
1818
return entry
@@ -22,45 +22,46 @@ struct MentionsWidgetProvider: AppIntentTimelineProvider {
2222
statuses: [],
2323
images: [:])
2424
}
25-
25+
2626
func timeline(for configuration: MentionsWidgetConfiguration, in context: Context) async -> Timeline<PostsWidgetEntry> {
2727
await timeline(for: configuration, context: context)
2828
}
29-
30-
private func timeline(for configuration: MentionsWidgetConfiguration, context: Context) async -> Timeline<PostsWidgetEntry> {
29+
30+
private func timeline(for configuration: MentionsWidgetConfiguration, context _: Context) async -> Timeline<PostsWidgetEntry> {
3131
do {
3232
let client = Client(server: configuration.account.account.server,
3333
oauthToken: configuration.account.account.oauthToken)
3434
var excludedTypes = Models.Notification.NotificationType.allCases
3535
excludedTypes.removeAll(where: { $0 == .mention })
3636
var notifications: [Models.Notification] =
37-
try await client.get(endpoint: Notifications.notifications(minId: nil,
38-
maxId: nil,
39-
types: excludedTypes.map(\.rawValue),
40-
limit: 5))
41-
let statuses = notifications.compactMap{ $0.status }
42-
let images = try await loadImages(urls: statuses.map{ $0.account.avatar } )
37+
try await client.get(endpoint: Notifications.notifications(minId: nil,
38+
maxId: nil,
39+
types: excludedTypes.map(\.rawValue),
40+
limit: 5))
41+
let statuses = notifications.compactMap { $0.status }
42+
let images = try await loadImages(urls: statuses.map { $0.account.avatar })
4343
return Timeline(entries: [.init(date: Date(),
44-
title: "Mentions",
45-
statuses: statuses,
46-
images: images)], policy: .atEnd)
44+
title: "Mentions",
45+
statuses: statuses,
46+
images: images)], policy: .atEnd)
4747
} catch {
4848
return Timeline(entries: [.init(date: Date(),
4949
title: "Mentions",
5050
statuses: [],
5151
images: [:])],
52-
policy: .atEnd)
52+
policy: .atEnd)
5353
}
5454
}
5555
}
5656

5757
struct MentionsWidget: Widget {
5858
let kind: String = "MentionsWidget"
59-
59+
6060
var body: some WidgetConfiguration {
6161
AppIntentConfiguration(kind: kind,
6262
intent: MentionsWidgetConfiguration.self,
63-
provider: MentionsWidgetProvider()) { entry in
63+
provider: MentionsWidgetProvider())
64+
{ entry in
6465
PostsWidgetView(entry: entry)
6566
.containerBackground(Color("WidgetBackground").gradient, for: .widget)
6667
}
@@ -70,7 +71,6 @@ struct MentionsWidget: Widget {
7071
}
7172
}
7273

73-
7474
#Preview(as: .systemMedium) {
7575
MentionsWidget()
7676
} timeline: {

‎IceCubesAppWidgetsExtension/MentionWidget/MentionWidgetConfiguration.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import WidgetKit
21
import AppIntents
2+
import WidgetKit
33

44
struct MentionsWidgetConfiguration: WidgetConfigurationIntent {
55
static let title: LocalizedStringResource = "Configuration"
66
static let description = IntentDescription("Choose the account for this widget")
7-
7+
88
@Parameter(title: "Account")
99
var account: AppAccountEntity
1010
}

0 commit comments

Comments
 (0)