From c9134be6f72794e9bc861bcd2207848ffa29865b Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 25 Oct 2020 13:05:52 +0100
Subject: [PATCH] #50 pronouns cards - more link providers

---
 components/ProfileLink.vue | 80 ++++++++++++++++++++++----------------
 routes/profile.vue         | 12 +++---
 2 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/components/ProfileLink.vue b/components/ProfileLink.vue
index f14ae63c8..a1e5a279f 100644
--- a/components/ProfileLink.vue
+++ b/components/ProfileLink.vue
@@ -1,9 +1,9 @@
 <template>
     <span>
-        <img v-if="icon.startsWith('https://')" :src="icon" class="icon"/>
-        <Icon v-else :v="icon" :set="iconSet"/>
+        <img v-if="provider.icon.startsWith('https://')" :src="provider.icon" class="icon"/>
+        <Icon v-else :v="provider.icon" :set="provider.iconSet || 'l'"/>
         <a :href="link" target="_blank" rel="noopener">
-            {{text}}
+            {{provider.text}}
         </a>
     </span>
 </template>
@@ -11,47 +11,59 @@
 <script>
     import {clearUrl} from "../src/helpers";
 
-    const REGEX_TWITTER = '^https://twitter.com/([^/]+)';
-    const REGEX_CAKE = '^https://cake.avris.it/([bgoprc][A-E][0-6])$';
+    const LINK_PROVIDERS = {
+        twitter: {
+            regex: '^https://twitter.com/([^/]+)',
+            icon: 'twitter',
+            iconSet: 'b',
+        },
+        email: {
+            regex: '^mailto:([^/]+)',
+            icon: 'envelope',
+        },
+        reddit: {
+            regex: '^https://reddit.com/u/([^/]+)',
+            icon: 'reddit',
+            iconSet: 'b',
+        },
+        telegram: {
+            regex: '^https://t.me/([^/]+)',
+            icon: 'telegram',
+            iconSet: 'b',
+        },
+        paypal: {
+            regex: '^https://paypal.me/([^/]+)',
+            icon: 'paypal',
+            iconSet: 'b',
+        },
+        cake: {
+            regex: '^https://cake.avris.it/([bgoprc][A-E][0-6])$',
+            icon: 'https://cake.avris.it/favicon.png',
+        },
+    };
 
     export default {
         props: {
             link: { required: true },
         },
         computed: {
-            type() {
-                if (this.link.match(REGEX_TWITTER)) {
-                    return 'twitter';
+            provider() {
+                for (let name in LINK_PROVIDERS) {
+                    if (!LINK_PROVIDERS.hasOwnProperty(name)) { continue; }
+                    const provider = LINK_PROVIDERS[name];
+                    const m = this.link.match(provider.regex);
+                    if (m) {
+                        return {
+                            ...provider,
+                            text: m[1],
+                        };
+                    }
                 }
 
-                if (this.link.match(REGEX_CAKE)) {
-                    return 'cake';
-                }
-
-                return 'other';
-            },
-            icon() {
                 return {
-                    twitter: 'twitter',
-                    cake: 'https://cake.avris.it/favicon.png',
-                    other: 'globe-europe',
-                }[this.type];
-            },
-            iconSet() {
-                return {
-                    twitter: 'b',
-                }[this.type] || 'l';
-            },
-            text() {
-                if (this.type === 'twitter') {
-                    return this.link.match(REGEX_TWITTER)[1];
+                    icon: 'globe-europe',
+                    text: clearUrl(this.link),
                 }
-
-                if (this.type === 'cake') {
-                    return this.link.match(REGEX_CAKE)[1];
-                }
-
-                return clearUrl(this.link);
             },
         }
     };
diff --git a/routes/profile.vue b/routes/profile.vue
index 1561bc828..be23364c2 100644
--- a/routes/profile.vue
+++ b/routes/profile.vue
@@ -23,18 +23,18 @@
             </div>
         </div>
 
-        <section v-if="profile.description.trim().length">
+        <section v-if="profile.age ||profile.description.trim().length">
             <p v-for="line in profile.description.split('\n')" class="mb-1">
                 {{ line }}
             </p>
+            <p v-if="profile.age">
+                <Icon v="birthday-cake"/>
+                {{ profile.age }}
+            </p>
         </section>
 
-        <section v-if="profile.age || Object.keys(profile.links).length">
+        <section v-if="Object.keys(profile.links).length">
             <ul class="list-inline">
-                <li v-if="profile.age" class="list-inline-item">
-                    <Icon v="birthday-cake"/>
-                    {{ profile.age }}
-                </li>
                 <li v-for="link in profile.links" class="list-inline-item pr-2">
                     <ProfileLink :link="link"/>
                 </li>