From 120b9e18b137dc82b8d636f0334a7436b1314786 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Fri, 5 Jan 2024 12:59:59 +0100 Subject: [PATCH] Fix warnings --- .../Extension/MastodonSDK/Mastodon+Entity+Account.swift | 2 +- .../FeedFetchedResultsController.swift | 1 - .../Scene/ComposeContent/ComposeContentViewModel.swift | 2 +- .../FamiliarFollowersDashboardView+Configuration.swift | 2 +- .../MastodonUI/View/Content/StatusView+Configuration.swift | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MastodonSDK/Sources/MastodonCore/Extension/MastodonSDK/Mastodon+Entity+Account.swift b/MastodonSDK/Sources/MastodonCore/Extension/MastodonSDK/Mastodon+Entity+Account.swift index 56c00e31d..0e4ba9966 100644 --- a/MastodonSDK/Sources/MastodonCore/Extension/MastodonSDK/Mastodon+Entity+Account.swift +++ b/MastodonSDK/Sources/MastodonCore/Extension/MastodonSDK/Mastodon+Entity+Account.swift @@ -14,7 +14,7 @@ extension Mastodon.Entity.Account { let isAnimated = !UserDefaults.shared.preferredStaticEmoji var dict = MastodonContent.Emojis() - for emoji in emojis ?? [] { + for emoji in emojis { dict[emoji.shortcode] = isAnimated ? emoji.url : emoji.staticURL } return dict diff --git a/MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift b/MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift index ee2a1ac9b..c3b8886f5 100644 --- a/MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift +++ b/MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift @@ -10,7 +10,6 @@ import Foundation import UIKit import Combine import MastodonSDK -import MastodonCore final public class FeedFetchedResultsController { diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift index a70b35a42..b35d94f03 100644 --- a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift +++ b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift @@ -314,7 +314,7 @@ extension ComposeContentViewModel { self.avatarURL = account.avatarImageURL() do { - let content = MastodonContent(content: account.displayNameWithFallback, emojis: (account.emojis ?? []).asDictionary) + let content = MastodonContent(content: account.displayNameWithFallback, emojis: account.emojis.asDictionary) let metaContent = try MastodonMetaContent.convert(document: content) self.name = metaContent } catch { diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView+Configuration.swift b/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView+Configuration.swift index d8fbbf6ca..12aadb040 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView+Configuration.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/FamiliarFollowersDashboardView+Configuration.swift @@ -20,7 +20,7 @@ extension FamiliarFollowersDashboardView { viewModel.emojis = { var array: [Mastodon.Entity.Emoji] = [] for account in accounts { - array.append(contentsOf: account.emojis ?? []) + array.append(contentsOf: account.emojis) } return array.asDictionary }() diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift index 37cab065c..998bae1f8 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift @@ -91,7 +91,7 @@ extension StatusView { let account = authenticationBox.authentication.account() { let name = account.displayNameWithFallback - let emojis = account.emojis ?? [] + let emojis = account.emojis viewModel.header = { let text = L10n.Common.Controls.Status.userReblogged(name) @@ -106,7 +106,7 @@ extension StatusView { }() } else if status.reblog != nil { let name = status.entity.account.displayNameWithFallback - let emojis = status.entity.account.emojis ?? [] + let emojis = status.entity.account.emojis viewModel.header = { let text = L10n.Common.Controls.Status.userReblogged(name)