Swiftlint fixes

leits · Aug 14, 2023 · ef98656 · ef98656
1 parent 98b0bdf
commit ef98656
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/MeetingBar/AppDelegate.swift b/MeetingBar/AppDelegate.swift
@@ -361,8 +361,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
     @objc
     func handleURLEvent(getURLEvent event: NSAppleEventDescriptor, replyEvent _: NSAppleEventDescriptor) {
         if let string = event.paramDescriptor(forKeyword: keyDirectObject)?.stringValue,
-           let url = URL(string: string)
-        {
+           let url = URL(string: string) {
             if url == URL(string: "meetingbar://preferences") {
                 openPrefecencesWindow(nil)
             } else {

diff --git a/MeetingBar/AppIntent.swift b/MeetingBar/AppIntent.swift
@@ -32,7 +32,7 @@ enum EventDetailsTypeAppEnum: String, AppEnum {
         .calendarTitle: "Calendar",
         .url: "URL",
         .notes: "Notes",
-        .location: "Location",
+        .location: "Location"
     ]
 }
 

diff --git a/MeetingBar/EventStores/Event.swift b/MeetingBar/EventStores/Event.swift
@@ -84,8 +84,7 @@ class MBEvent {
          endDate: Date,
          isAllDay: Bool,
          recurrent: Bool,
-         calendar: MBCalendar)
-    {
+         calendar: MBCalendar) {
         self.calendar = calendar
         self.ID = ID
         self.lastModifiedDate = lastModifiedDate
@@ -120,15 +119,14 @@ class MBEvent {
             location,
             url?.absoluteString,
             notes,
-            notes?.htmlTagsStripped(),
+            notes?.htmlTagsStripped()
         ].compactMap { $0 }
 
         for linkField in linkFields {
             if var detectedLink = detectMeetingLink(linkField) {
                 if detectedLink.service == .meet,
                    let account = calendar.email,
-                   let urlEncodedAccount = account.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
-                {
+                   let urlEncodedAccount = account.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) {
                     detectedLink.url = URL(string: (detectedLink.url.absoluteString) + "?authuser=\(urlEncodedAccount)")!
                 }
                 meetingLink = detectedLink

diff --git a/MeetingBar/EventStores/GCEventStore.swift b/MeetingBar/EventStores/GCEventStore.swift
@@ -274,7 +274,7 @@ class GCEventStore: NSObject, EventStore, OIDExternalUserAgent {
                     let scopes = [
                         "email",
                         "https://www.googleapis.com/auth/calendar.calendarlist.readonly",
-                        "https://www.googleapis.com/auth/calendar.events.readonly",
+                        "https://www.googleapis.com/auth/calendar.events.readonly"
                     ]
 
                     let request = OIDAuthorizationRequest(configuration: config,
@@ -340,8 +340,7 @@ class GCEventStore: NSObject, EventStore, OIDExternalUserAgent {
 
     func present(_ request: OIDExternalUserAgentRequest, session _: OIDExternalUserAgentSession) -> Bool {
         if let url = request.externalUserAgentRequestURL(),
-           NSWorkspace.shared.open(url)
-        {
+           NSWorkspace.shared.open(url) {
             return true
         }
 

diff --git a/MeetingBar/Extensions/String.swift b/MeetingBar/Extensions/String.swift
@@ -36,8 +36,7 @@ extension String {
                html: data,
                options: [.documentType: NSAttributedString.DocumentType.html],
                documentAttributes: nil
-           )
-        {
+           ) {
             return attributedSelf.string
         }
         return self

diff --git a/MeetingBar/Helpers.swift b/MeetingBar/Helpers.swift
@@ -129,7 +129,7 @@ func createNSViewFromText(text: String) -> NSView {
         text.splitWithNewLineAttributedString(
             with: [
                 NSAttributedString.Key.paragraphStyle: paragraphStyle,
-                NSAttributedString.Key.font: NSFont.systemFont(ofSize: 14),
+                NSAttributedString.Key.font: NSFont.systemFont(ofSize: 14)
             ],
             maxWidth: 300.0
         )

diff --git a/MeetingBar/StatusBarItemController.swift b/MeetingBar/StatusBarItemController.swift
@@ -234,7 +234,7 @@ class StatusBarItemController {
 
                     let timeAttributes = [
                         NSAttributedString.Key.font: NSFont.systemFont(ofSize: 9),
-                        NSAttributedString.Key.foregroundColor: NSColor.lightGray,
+                        NSAttributedString.Key.foregroundColor: NSColor.lightGray
                     ]
                     menuTitle.append(NSAttributedString(string: "\n" + time, attributes: timeAttributes))
 

diff --git a/MeetingBarTests/MeetingServicesTests.swift b/MeetingBarTests/MeetingServicesTests.swift
@@ -36,7 +36,7 @@ let meetings = [
     MeetingLink(service: .gather, url: URL(string: "https://app.gather.town/app/1a2S3d4F5G/1a2S-3d4F_5G6h?meeting=1a2S3d4F5G")!),
     MeetingLink(service: .vimeo, url: URL(string: "https://venues.vimeo.com/12345678/abcdef123")!),
     MeetingLink(service: .reclaim, url: URL(string: "https://reclaim.ai/z/T01ABCDEFGH/C02ABCDEFGH")!),
-    MeetingLink(service: .tuple, url: URL(string: "https://tuple.app/c/V1StGXR8_Z5jdHi6B")!),
+    MeetingLink(service: .tuple, url: URL(string: "https://tuple.app/c/V1StGXR8_Z5jdHi6B")!)
 ]
 
 class MeetingServicesTests: XCTestCase {