From 164ba5c55f3c68cb13706e281ae371c629d0aa2e Mon Sep 17 00:00:00 2001 From: Jens Gerdes Date: Mon, 11 Sep 2023 16:10:13 +0200 Subject: [PATCH 1/2] Added support for zoom-x.de links --- MeetingBar/MeetingServices.swift | 2 +- MeetingBarTests/MeetingServicesTests.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MeetingBar/MeetingServices.swift b/MeetingBar/MeetingServices.swift index 0f102143..33bbe15d 100644 --- a/MeetingBar/MeetingServices.swift +++ b/MeetingBar/MeetingServices.swift @@ -257,7 +257,7 @@ func openMeetingURL(_ service: MeetingServices?, _ url: URL, _ browser: Browser? struct LinksRegex { let meet = try! NSRegularExpression(pattern: #"https?://meet.google.com/(_meet/)?[a-z-]+"#) - let zoom = try! NSRegularExpression(pattern: #"https?:\/\/(?:[a-zA-Z0-9-.]+)?zoom.(?:us|com.cn)\/(?:my|[a-z]|webinar)\/[-a-zA-Z0-9()@:%_\+.~#?&=\/]*"#) + let zoom = try! NSRegularExpression(pattern: #"https?:\/\/(?:[a-zA-Z0-9-.]+)?((zoom.(?:us|com.cn))|zoom-x.de)\/(?:my|[a-z]|webinar)\/[-a-zA-Z0-9()@:%_\+.~#?&=\/]*"#) let zoom_native = try! NSRegularExpression(pattern: #"zoommtg://([a-z0-9-.]+)?zoom\.(us|com\.cn)/join[-a-zA-Z0-9()@:%_\+.~#?&=\/]*"#) let teams = try! NSRegularExpression(pattern: #"https?://(gov.)?teams\.microsoft\.(com|us)/l/meetup-join/[a-zA-Z0-9_%\/=\-\+\.?]+"#) let webex = try! NSRegularExpression(pattern: #"https?://([a-z0-9-.]+)?webex\.com/[^\s]*"#) diff --git a/MeetingBarTests/MeetingServicesTests.swift b/MeetingBarTests/MeetingServicesTests.swift index 8023887d..a4eb2f12 100644 --- a/MeetingBarTests/MeetingServicesTests.swift +++ b/MeetingBarTests/MeetingServicesTests.swift @@ -12,6 +12,7 @@ import XCTest let meetings = [ MeetingLink(service: .zoom, url: URL(string: "https://zoom.us/j/5551112222")!), + MeetingLink(service: .zoom, url: URL(string: "https://any-client.zoom-x.de/j/65194487075")!), MeetingLink(service: .zoom_native, url: URL(string: "zoommtg://zoom.us/join?confno=123456789&pwd=xxxx&zc=0&browser=chrome&uname=Betty")!), MeetingLink(service: .around, url: URL(string: "https://meet.around.co/r/kyafvk1b")!), MeetingLink(service: .around, url: URL(string: "https://around.co/r/kyafvk1b")!), From 75cae5fc7fddb598130351e149820e2b90865af1 Mon Sep 17 00:00:00 2001 From: Jens Gerdes Date: Mon, 11 Sep 2023 16:39:27 +0200 Subject: [PATCH 2/2] Added test for Zoom native --- MeetingBarTests/MeetingServicesTests.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/MeetingBarTests/MeetingServicesTests.swift b/MeetingBarTests/MeetingServicesTests.swift index a4eb2f12..9499e9b6 100644 --- a/MeetingBarTests/MeetingServicesTests.swift +++ b/MeetingBarTests/MeetingServicesTests.swift @@ -14,6 +14,7 @@ let meetings = [ MeetingLink(service: .zoom, url: URL(string: "https://zoom.us/j/5551112222")!), MeetingLink(service: .zoom, url: URL(string: "https://any-client.zoom-x.de/j/65194487075")!), MeetingLink(service: .zoom_native, url: URL(string: "zoommtg://zoom.us/join?confno=123456789&pwd=xxxx&zc=0&browser=chrome&uname=Betty")!), + MeetingLink(service: .zoom_native, url: URL(string: "zoommtg://zoom-x.de/join?confno=123456789&pwd=xxxx&zc=0&browser=chrome&uname=Betty")!), MeetingLink(service: .around, url: URL(string: "https://meet.around.co/r/kyafvk1b")!), MeetingLink(service: .around, url: URL(string: "https://around.co/r/kyafvk1b")!), MeetingLink(service: .blackboard_collab, url: URL(string: "https://us.bbcollab.com/guest/C2419D0F68382D351B97376D6B47ABA2")!),