|
|
@ -201,7 +201,7 @@ extension EventCenter { |
|
|
|
for event in events { |
|
|
|
for event in events { |
|
|
|
if selectedCalendars.contains(event.event.calendar.calendarIdentifier) { |
|
|
|
if selectedCalendars.contains(event.event.calendar.calendarIdentifier) { |
|
|
|
if filteredEvents[date] == nil { |
|
|
|
if filteredEvents[date] == nil { |
|
|
|
filteredEvents[date] = [] |
|
|
|
filteredEvents[date] = Array() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
filteredEvents[date]?.append(event) |
|
|
|
filteredEvents[date]?.append(event) |
|
|
@ -342,7 +342,7 @@ extension EventCenter { |
|
|
|
return eventInfo |
|
|
|
return eventInfo |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static var dataDetector: NSDataDetector? = nil |
|
|
|
static var dataDetector: NSDataDetector? |
|
|
|
|
|
|
|
|
|
|
|
// Borrowing logic from Ityscal |
|
|
|
// Borrowing logic from Ityscal |
|
|
|
@discardableResult |
|
|
|
@discardableResult |
|
|
@ -356,7 +356,7 @@ extension EventCenter { |
|
|
|
if actualLink.contains("zoom.us/j/") || actualLink.contains("zoom.us/s/") || actualLink.contains("zoom.us/w/") { |
|
|
|
if actualLink.contains("zoom.us/j/") || actualLink.contains("zoom.us/s/") || actualLink.contains("zoom.us/w/") { |
|
|
|
// Create a Zoom App link |
|
|
|
// Create a Zoom App link |
|
|
|
let workspace = NSWorkspace.shared |
|
|
|
let workspace = NSWorkspace.shared |
|
|
|
if (workspace.urlForApplication(toOpen: URL(string: "zoommtg://")!) != nil) { |
|
|
|
if workspace.urlForApplication(toOpen: URL(string: "zoommtg://")!) != nil { |
|
|
|
actualLink = actualLink.replacingOccurrences(of: "https://", with: "zoommtg://") |
|
|
|
actualLink = actualLink.replacingOccurrences(of: "https://", with: "zoommtg://") |
|
|
|
actualLink = actualLink.replacingOccurrences(of: "?", with: "&") |
|
|
|
actualLink = actualLink.replacingOccurrences(of: "?", with: "&") |
|
|
|
actualLink = actualLink.replacingOccurrences(of: "/j/", with: "/join?confno=") |
|
|
|
actualLink = actualLink.replacingOccurrences(of: "/j/", with: "/join?confno=") |
|
|
@ -365,21 +365,20 @@ extension EventCenter { |
|
|
|
if let appLink = URL(string: actualLink) { |
|
|
|
if let appLink = URL(string: actualLink) { |
|
|
|
return appLink |
|
|
|
return appLink |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} else if actualLink.contains("zoommtg://") |
|
|
|
} else if actualLink.contains("zoommtg://") |
|
|
|
|| actualLink.contains("meet.google.com/") |
|
|
|
|| actualLink.contains("meet.google.com/") |
|
|
|
|| actualLink.contains("hangouts.google.com/") |
|
|
|
|| actualLink.contains("hangouts.google.com/") |
|
|
|
|| actualLink.contains("webex.com/") |
|
|
|
|| actualLink.contains("webex.com/") |
|
|
|
|| actualLink.contains("gotomeeting.com/join") |
|
|
|
|| actualLink.contains("gotomeeting.com/join") |
|
|
|
|| actualLink.contains("ringcentral.com/j") |
|
|
|
|| actualLink.contains("ringcentral.com/j") |
|
|
|
|| actualLink.contains("bigbluebutton.org/gl") |
|
|
|
|| actualLink.contains("bigbluebutton.org/gl") |
|
|
|
|| actualLink.contains("://bigbluebutton.") |
|
|
|
|| actualLink.contains("://bigbluebutton.") |
|
|
|
|| actualLink.contains("://bbb.") |
|
|
|
|| actualLink.contains("://bbb.") |
|
|
|
|| actualLink.contains("indigo.collocall.de") |
|
|
|
|| actualLink.contains("indigo.collocall.de") |
|
|
|
|| actualLink.contains("public.senfcall.de") |
|
|
|
|| actualLink.contains("public.senfcall.de") |
|
|
|
|| actualLink.contains("youcanbook.me/zoom/") |
|
|
|
|| actualLink.contains("youcanbook.me/zoom/") |
|
|
|
|| actualLink.contains("workplace.com/groupcall") { |
|
|
|
|| actualLink.contains("workplace.com/groupcall") { |
|
|
|
if let zoomLink = result.url { |
|
|
|
if let zoomLink = result.url { |
|
|
|
return zoomLink |
|
|
|
return zoomLink |
|
|
|
} |
|
|
|
} |
|
|
|