Compare commits
No commits in common. "9d1c3f14109d4e0ad7400b496a5e82cee88e7bd0" and "e6a5b899bed54d0b401c0606ba6c0a5f85368165" have entirely different histories.
9d1c3f1410
...
e6a5b899be
|
@ -30,7 +30,11 @@ public class Notification: Decodable {
|
||||||
}
|
}
|
||||||
self.createdAt = try container.decode(Date.self, forKey: .createdAt)
|
self.createdAt = try container.decode(Date.self, forKey: .createdAt)
|
||||||
self.account = try container.decode(Account.self, forKey: .account)
|
self.account = try container.decode(Account.self, forKey: .account)
|
||||||
self.status = try container.decodeIfPresent(Status.self, forKey: .status)
|
if container.contains(.status) {
|
||||||
|
self.status = try container.decode(Status.self, forKey: .status)
|
||||||
|
} else {
|
||||||
|
self.status = nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static func dismiss(id notificationID: String) -> Request<Empty> {
|
public static func dismiss(id notificationID: String) -> Request<Empty> {
|
||||||
|
|
|
@ -112,7 +112,7 @@ class ProfileDirectoryViewController: UIViewController {
|
||||||
private func updateProfiles() {
|
private func updateProfiles() {
|
||||||
let scope = self.scope
|
let scope = self.scope
|
||||||
let order = self.order
|
let order = self.order
|
||||||
let local = scope == .instance
|
let local = scope == .everywhere
|
||||||
let request = Client.getFeaturedProfiles(local: local, order: order)
|
let request = Client.getFeaturedProfiles(local: local, order: order)
|
||||||
mastodonController.run(request) { (response) in
|
mastodonController.run(request) { (response) in
|
||||||
guard case let .success(accounts, _) = response,
|
guard case let .success(accounts, _) = response,
|
||||||
|
|
|
@ -18,7 +18,7 @@ class ProfileFieldsView: UIView {
|
||||||
|
|
||||||
private var isUsingSingleColumn: Bool = false
|
private var isUsingSingleColumn: Bool = false
|
||||||
private var needsSingleColumn: Bool {
|
private var needsSingleColumn: Bool {
|
||||||
traitCollection.horizontalSizeClass == .compact && traitCollection.preferredContentSizeCategory > .extraLarge
|
traitCollection.preferredContentSizeCategory > .large
|
||||||
}
|
}
|
||||||
|
|
||||||
override init(frame: CGRect) {
|
override init(frame: CGRect) {
|
||||||
|
|
Loading…
Reference in New Issue