From 30cedb503f3ad5a229048554e005f9d14c7ce7a6 Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Thu, 3 Dec 2020 14:40:33 -0800 Subject: [PATCH] Style changes --- DB/Sources/DB/Entities/Identity.swift | 2 +- Mastodon/Sources/Mastodon/Entities/Filter.swift | 4 ++-- Secrets/Sources/Secrets/Secrets.swift | 2 +- .../Sources/ServiceLayer/Services/InstanceURLService.swift | 2 +- ViewModels/Sources/ViewModels/StatusViewModel.swift | 2 +- Views/TabNavigationView.swift | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DB/Sources/DB/Entities/Identity.swift b/DB/Sources/DB/Entities/Identity.swift index e2b8ef3..27cd01e 100644 --- a/DB/Sources/DB/Entities/Identity.swift +++ b/DB/Sources/DB/Entities/Identity.swift @@ -50,7 +50,7 @@ public extension Identity { var handle: String { if let account = account, let host = account.url.host { - return account.url.lastPathComponent + "@" + host + return account.url.lastPathComponent.appending("@").appending(host) } return instance?.title ?? url.host ?? url.absoluteString diff --git a/Mastodon/Sources/Mastodon/Entities/Filter.swift b/Mastodon/Sources/Mastodon/Entities/Filter.swift index 4ff1fcc..e492e7d 100644 --- a/Mastodon/Sources/Mastodon/Entities/Filter.swift +++ b/Mastodon/Sources/Mastodon/Entities/Filter.swift @@ -50,11 +50,11 @@ extension Array where Element == Filter { if $0.wholeWord { if expression.range(of: #"^[\w]"#, options: .regularExpression) != nil { - expression = #"\b"# + expression + expression = #"\b"#.appending(expression) } if expression.range(of: #"[\w]$"#, options: .regularExpression) != nil { - expression += #"\b"# + expression.append(#"\b"#) } } diff --git a/Secrets/Sources/Secrets/Secrets.swift b/Secrets/Sources/Secrets/Secrets.swift index 7bdd516..a326503 100644 --- a/Secrets/Sources/Secrets/Secrets.swift +++ b/Secrets/Sources/Secrets/Secrets.swift @@ -200,7 +200,7 @@ private extension Secrets { } func scopedKey(item: Item) -> String { - identityId.uuidString + "." + item.rawValue + identityId.uuidString.appending(".").appending(item.rawValue) } func set(_ data: SecretsStorable, forItem item: Item) throws { diff --git a/ServiceLayer/Sources/ServiceLayer/Services/InstanceURLService.swift b/ServiceLayer/Sources/ServiceLayer/Services/InstanceURLService.swift index fcc7e40..f1d6620 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/InstanceURLService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/InstanceURLService.swift @@ -27,7 +27,7 @@ public extension InstanceURLService { if text.hasPrefix(Self.httpsPrefix), let prefixedURL = URL(string: text) { url = prefixedURL - } else if let unprefixedURL = URL(string: Self.httpsPrefix + text) { + } else if let unprefixedURL = URL(string: Self.httpsPrefix.appending(text)) { url = unprefixedURL } else { return .failure(URLError(.badURL)) diff --git a/ViewModels/Sources/ViewModels/StatusViewModel.swift b/ViewModels/Sources/ViewModels/StatusViewModel.swift index 73c7596..eaaca47 100644 --- a/ViewModels/Sources/ViewModels/StatusViewModel.swift +++ b/ViewModels/Sources/ViewModels/StatusViewModel.swift @@ -72,7 +72,7 @@ public extension StatusViewModel { sensitive || identification.identity.preferences.readingExpandMedia == .hideAll } - var accountName: String { "@" + statusService.status.displayStatus.account.acct } + var accountName: String { "@".appending(statusService.status.displayStatus.account.acct) } var avatarURL: URL { if !identification.appPreferences.shouldReduceMotion, diff --git a/Views/TabNavigationView.swift b/Views/TabNavigationView.swift index 66af4ce..baf0c39 100644 --- a/Views/TabNavigationView.swift +++ b/Views/TabNavigationView.swift @@ -156,7 +156,7 @@ private extension Timeline { case let .list(list): return list.title case let .tag(tag): - return "#" + tag + return "#".appending(tag) case .profile: return "" case .favorites: