Close #574: autojoin event with meeting link only

leits · Jul 5, 2023 · 1ed16a7 · 1ed16a7
1 parent 5509b08
commit 1ed16a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MeetingBar/ActionsOnEventStart.swift b/MeetingBar/ActionsOnEventStart.swift
@@ -43,7 +43,7 @@ class ActionsOnEventStart: NSObject {
         }
         //
 
-        if let nextEvent = getNextEvent(events: app.statusBarItem.events) {
+        if let nextEvent = getNextEvent(events: app.statusBarItem.events, linkRequired: true) {
             let now = Date()
 
             let startEndRange = nextEvent.startDate ... nextEvent.endDate

diff --git a/MeetingBar/EventStores/Event.swift b/MeetingBar/EventStores/Event.swift
@@ -222,7 +222,7 @@ func filterEvents(_ events: [MBEvent]) -> [MBEvent] {
     return filteredCalendarEvents
 }
 
-func getNextEvent(events: [MBEvent]) -> MBEvent? {
+func getNextEvent(events: [MBEvent], linkRequired: Bool = false) -> MBEvent? {
     var nextEvent: MBEvent?
 
     let now = Date()
@@ -257,7 +257,8 @@ func getNextEvent(events: [MBEvent]) -> MBEvent? {
         }
 
         // Skip event if events without links should be skipped
-        if event.meetingLink == nil && (Defaults[.nonAllDayEvents] == .show_inactive_without_meeting_link || Defaults[.nonAllDayEvents] == .hide_without_meeting_link) {
+        let nonAllDaysEventOnlyWithLink = (Defaults[.nonAllDayEvents] == .show_inactive_without_meeting_link || Defaults[.nonAllDayEvents] == .hide_without_meeting_link)
+        if event.meetingLink == nil, (linkRequired || nonAllDaysEventOnlyWithLink) {
             continue
         }