Skip to content

Commit 7309736

Browse files
authored
Merge pull request #732 from DominikTo/master
Added support for Cal Video links
2 parents 4fd4864 + 9f4485d commit 7309736

File tree

4 files changed

+19
-0
lines changed

4 files changed

+19
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "calcom_icon.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Loading

MeetingBar/MeetingServices.swift

+6
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ enum MeetingServices: String, Codable, CaseIterable {
7676
case pumble = "Pumble"
7777
case suitConference = "Suit Conference"
7878
case doxyMe = "Doxy.me"
79+
case calcom = "Cal Video"
7980
case zmPage = "zm.page"
8081
case other = "Other"
8182

@@ -322,6 +323,7 @@ struct LinksRegex {
322323
let pumble = try! NSRegularExpression(pattern: #"https?://meet\.pumble\.com/[a-z-]+"#)
323324
let suitConference = try! NSRegularExpression(pattern: #"https?://([a-z0-9.]+)?conference\.istesuit\.com/[^\s]*+"#)
324325
let doxyMe = try! NSRegularExpression(pattern: #"https://([a-z0-9.]+)?doxy\.me/[^\s]*"#)
326+
let calcom = try! NSRegularExpression(pattern: #"https?://app.cal\.com/video/[A-Za-z0-9./]+"#)
325327
let zmPage = try! NSRegularExpression(pattern: #"https?://([a-zA-Z0-9.]+)\.zm\.page"#)
326328
}
327329

@@ -627,6 +629,10 @@ func getIconForMeetingService(_ meetingService: MeetingServices?) -> NSImage {
627629
image = NSImage(named: "gather_icon")!
628630
image.size = NSSize(width: 16, height: 16)
629631

632+
case .some(.calcom):
633+
image = NSImage(named: "calcom_icon")!
634+
image.size = NSSize(width: 16, height: 16)
635+
630636
case .some(.url):
631637
image = NSImage(named: NSImage.touchBarOpenInBrowserTemplateName)!
632638
image.size = NSSize(width: 16, height: 16)

MeetingBarTests/MeetingServicesTests.swift

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ let meetings = [
4242
MeetingLink(service: .pumble, url: URL(string: "https://meet.pumble.com/vly-hggs-xsn")!),
4343
MeetingLink(service: .suitConference, url: URL(string: "https://turkcell.conference.istesuit.com/username")!),
4444
MeetingLink(service: .doxyMe, url: URL(string: "https://bbc.doxy.me/dr.who")!),
45+
MeetingLink(service: .calcom, url: URL(string: "https://app.cal.com/video/1de4BmdXEb983kIUHomUnA")!),
4546
MeetingLink(service: .zmPage, url: URL(string: "https://meetingbar.zm.page")!)
4647
]
4748

0 commit comments

Comments
 (0)