feat: support mail option, better display of contacts info

Avivbens · Jun 7, 2024 · 5ca4e20 · 5ca4e20
1 parent 28a0b7c
commit 5ca4e20
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 14 deletions.
diff --git a/0B935763-800C-48CC-9AC6-938A999A89A8.png b/0B935763-800C-48CC-9AC6-938A999A89A8.png
diff --git a/info.plist b/info.plist
@@ -8,6 +8,19 @@
     <string>Tools</string>
     <key>connections</key>
     <dict>
+      <key>0B935763-800C-48CC-9AC6-938A999A89A8</key>
+      <array>
+        <dict>
+          <key>destinationuid</key>
+          <string>EA32942B-CBBB-4905-936E-5DE495CCC2A0</string>
+          <key>modifiers</key>
+          <integer>0</integer>
+          <key>modifiersubtext</key>
+          <string></string>
+          <key>vitoclose</key>
+          <false></false>
+        </dict>
+      </array>
       <key>0D0645C0-EC0C-45FA-823E-FCC07F34732B</key>
       <array>
         <dict>
@@ -243,6 +256,55 @@
         <key>version</key>
         <integer>2</integer>
       </dict>
+      <dict>
+        <key>config</key>
+        <dict>
+          <key>alfredfiltersresults</key>
+          <false></false>
+          <key>alfredfiltersresultsmatchmode</key>
+          <integer>0</integer>
+          <key>argumenttreatemptyqueryasnil</key>
+          <true></true>
+          <key>argumenttrimmode</key>
+          <integer>0</integer>
+          <key>argumenttype</key>
+          <integer>0</integer>
+          <key>escaping</key>
+          <integer>102</integer>
+          <key>keyword</key>
+          <string>ecm</string>
+          <key>queuedelaycustom</key>
+          <integer>3</integer>
+          <key>queuedelayimmediatelyinitially</key>
+          <false></false>
+          <key>queuedelaymode</key>
+          <integer>0</integer>
+          <key>queuemode</key>
+          <integer>1</integer>
+          <key>runningsubtext</key>
+          <string>Searching...</string>
+          <key>script</key>
+          <string>./build/Release/run-node.sh build/contacts.js "$1" "mail"</string>
+          <key>scriptargtype</key>
+          <integer>1</integer>
+          <key>scriptfile</key>
+          <string></string>
+          <key>subtext</key>
+          <string>Send an email</string>
+          <key>title</key>
+          <string>Search for Contacts...</string>
+          <key>type</key>
+          <integer>5</integer>
+          <key>withspace</key>
+          <true></true>
+        </dict>
+        <key>type</key>
+        <string>alfred.workflow.input.scriptfilter</string>
+        <key>uid</key>
+        <string>0B935763-800C-48CC-9AC6-938A999A89A8</string>
+        <key>version</key>
+        <integer>3</integer>
+      </dict>
       <dict>
         <key>config</key>
         <dict>
@@ -300,6 +362,13 @@ See the workflow codebase in here:
 https://github.com/Avivbens/alfred-engage-contact</string>
     <key>uidata</key>
     <dict>
+      <key>0B935763-800C-48CC-9AC6-938A999A89A8</key>
+      <dict>
+        <key>xpos</key>
+        <integer>75</integer>
+        <key>ypos</key>
+        <integer>475</integer>
+      </dict>
       <key>0D0645C0-EC0C-45FA-823E-FCC07F34732B</key>
       <dict>
         <key>xpos</key>

diff --git a/src/main/contacts.ts b/src/main/contacts.ts
@@ -44,12 +44,10 @@ import { searchContacts } from '@services/search.service.js'
                 platform: platform as SupportedPlatform,
             }
 
-            const subtitle =
-                phoneNumbers.length > 0
-                    ? `Phone: ${phoneNumbers[0]}`
-                    : emailAddresses.length > 0
-                      ? `Email: ${emailAddresses[0]}`
-                      : ''
+            const emailSubtitle = emailAddresses.length ? `Email: ${emailAddresses[0]}` : ''
+            const phoneSubtitle = phoneNumbers.length ? `Phone: ${phoneNumbers[0]}` : ''
+
+            const subtitle = [phoneSubtitle, emailSubtitle].filter(Boolean).join(' | ')
 
             return {
                 title: `${firstName} ${lastName}`,

diff --git a/src/main/engage-contact.ts b/src/main/engage-contact.ts
@@ -15,7 +15,12 @@ import { buildOpenUrl } from '@services/platform-url-builder.service.js'
 
         const { number }: PhoneNumber = parsePhoneNumber(inputPhoneNumber, inputCountryCode)
 
-        const openUrl = buildOpenUrl(platform, number)
+        const parsedInput = {
+            ...input,
+            phoneNumber: number,
+        }
+
+        const openUrl = buildOpenUrl(platform, parsedInput)
 
         await execPromise(`open ${openUrl}`)
     } catch (error) {

diff --git a/src/models/platform.model.ts b/src/models/platform.model.ts
@@ -1,2 +1,2 @@
-export const SUPPORTED_PLATFORMS = ['whatsapp', 'sms', 'call'] as const
+export const SUPPORTED_PLATFORMS = ['whatsapp', 'sms', 'call', 'mail'] as const
 export type SupportedPlatform = (typeof SUPPORTED_PLATFORMS)[number]
diff --git a/src/services/platform-url-builder.service.ts b/src/services/platform-url-builder.service.ts
@@ -1,18 +1,39 @@
+import type { ContactPayload } from '@models/contact-payload.model.js'
 import type { SupportedPlatform } from '@models/platform.model.js'
 
-const PLATFORMS_URLS: Record<SupportedPlatform, (phoneNumber: string) => string> = {
-    whatsapp: (phoneNumber: string) => `whatsapp://send?phone=${phoneNumber}`,
-    sms: (phoneNumber: string) => `sms:${phoneNumber}`,
-    call: (phoneNumber: string) => `tel:${phoneNumber}`,
+const PLATFORMS_URLS: Record<SupportedPlatform, (referrer: string) => string> = {
+    whatsapp: (referrer: string) => `whatsapp://send?phone=${referrer}`,
+    sms: (referrer: string) => `sms:${referrer}`,
+    call: (referrer: string) => `tel:${referrer}`,
+    mail: (referrer: string) => `mailto:${referrer}`,
 }
 
-export function buildOpenUrl(platform: SupportedPlatform, phoneNumber: string): string {
+const EXTRACT_REFERRER: Record<SupportedPlatform, keyof ContactPayload> = {
+    call: 'phoneNumber',
+    mail: 'emailAddress',
+    sms: 'phoneNumber',
+    whatsapp: 'phoneNumber',
+}
+
+export function buildOpenUrl(platform: SupportedPlatform, payload: ContactPayload): string {
     const urlBuilder = PLATFORMS_URLS[platform]
 
     if (!urlBuilder) {
         throw new Error(`Unsupported platform: ${platform}`)
     }
 
-    const res = urlBuilder(phoneNumber)
+    const referrerKey = EXTRACT_REFERRER[platform]
+
+    if (!referrerKey) {
+        throw new Error(`Unsupported platform: ${platform}`)
+    }
+
+    const referrer = payload[referrerKey]
+
+    if (!referrer) {
+        throw new Error(`Referrer is empty: ${referrerKey}`)
+    }
+
+    const res = urlBuilder(referrer)
     return res
 }