From a12397cf387da7d411184a72f9c128ba6486a631 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Wed, 6 Feb 2019 11:34:21 -0700
Subject: Hashtag opens in same tab

---
 src/components/status/status.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f..cccb19cc 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -282,8 +282,15 @@ const Status = {
             this.$router.push(link)
             return
           }
+        } else {
+          if (target.hostname === window.location.hostname) {
+            // if the hashtag's target is current instance, open in same tab
+            this.$router.push(target.pathname)
+          } else {
+            // if it is different instance, open in a new tab
+            window.open(target.href, '_blank')
+          }
         }
-        window.open(target.href, '_blank')
       }
     },
     toggleReplying () {
-- 
cgit v1.2.3-70-g09d2


From a215f6856d0dff53869a4c20e538eb744b636a4d Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Wed, 6 Feb 2019 21:26:32 -0700
Subject: Always open tag in same instance

---
 src/components/status/status.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index cccb19cc..1ebb8a8d 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -283,13 +283,7 @@ const Status = {
             return
           }
         } else {
-          if (target.hostname === window.location.hostname) {
-            // if the hashtag's target is current instance, open in same tab
-            this.$router.push(target.pathname)
-          } else {
-            // if it is different instance, open in a new tab
-            window.open(target.href, '_blank')
-          }
+          this.$router.push(target.pathname)
         }
       }
     },
-- 
cgit v1.2.3-70-g09d2


From c0b833cb85ccd10942accbefc3ba4d70cf3d745e Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 14:46:10 -0700
Subject: Added tag extractor method and spec

---
 src/services/matcher/matcher.service.js            | 23 ++++++
 src/services/mention_matcher/mention_matcher.js    |  9 ---
 test/unit/specs/services/matcher/matcher.spec.js   | 82 ++++++++++++++++++++++
 .../mention_matcher/mention_matcher.spec.js        | 63 -----------------
 4 files changed, 105 insertions(+), 72 deletions(-)
 create mode 100644 src/services/matcher/matcher.service.js
 delete mode 100644 src/services/mention_matcher/mention_matcher.js
 create mode 100644 test/unit/specs/services/matcher/matcher.spec.js
 delete mode 100644 test/unit/specs/services/mention_matcher/mention_matcher.spec.js

(limited to 'src')

diff --git a/src/services/matcher/matcher.service.js b/src/services/matcher/matcher.service.js
new file mode 100644
index 00000000..b6c4e909
--- /dev/null
+++ b/src/services/matcher/matcher.service.js
@@ -0,0 +1,23 @@
+export const mentionMatchesUrl = (attention, url) => {
+  if (url === attention.statusnet_profile_url) {
+    return true
+  }
+  const [namepart, instancepart] = attention.screen_name.split('@')
+  const matchstring = new RegExp('://' + instancepart + '/.*' + namepart + '$', 'g')
+
+  return !!url.match(matchstring)
+}
+
+/**
+ * Extract tag name from pleroma or mastodon url.
+ * i.e https://bikeshed.party/tag/photo or https://quey.org/tags/sky
+ * @param {string} url
+ */
+export const extractTagFromUrl = (url) => {
+  const regex = /tag[s]*\/(\w+)$/g
+  const result = regex.exec(url)
+  if (!result) {
+    return false
+  }
+  return result[1]
+}
diff --git a/src/services/mention_matcher/mention_matcher.js b/src/services/mention_matcher/mention_matcher.js
deleted file mode 100644
index 2c1ed970..00000000
--- a/src/services/mention_matcher/mention_matcher.js
+++ /dev/null
@@ -1,9 +0,0 @@
-
-export const mentionMatchesUrl = (attention, url) => {
-  if (url === attention.statusnet_profile_url) {
-    return true
-  }
-  const [namepart, instancepart] = attention.screen_name.split('@')
-  const matchstring = new RegExp('://' + instancepart + '/.*' + namepart + '$', 'g')
-  return !!url.match(matchstring)
-}
diff --git a/test/unit/specs/services/matcher/matcher.spec.js b/test/unit/specs/services/matcher/matcher.spec.js
new file mode 100644
index 00000000..0b5363b4
--- /dev/null
+++ b/test/unit/specs/services/matcher/matcher.spec.js
@@ -0,0 +1,82 @@
+import * as MatcherService from 'src/services/matcher/matcher.service.js'
+
+const localAttn = () => ({
+  id: 123,
+  is_local: true,
+  name: 'Guy',
+  screen_name: 'person',
+  statusnet_profile_url: 'https://instance.com/users/person'
+})
+
+const externalAttn = () => ({
+  id: 123,
+  is_local: false,
+  name: 'Guy',
+  screen_name: 'person@instance.com',
+  statusnet_profile_url: 'https://instance.com/users/person'
+})
+
+describe('MatcherService', () => {
+  describe.only('mentionMatchesUrl', () => {
+    it('should match local mention', () => {
+      const attention = localAttn()
+      const url = 'https://instance.com/users/person'
+
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(true)
+    })
+
+    it('should not match a local mention with same name but different instance', () => {
+      const attention = localAttn()
+      const url = 'https://website.com/users/person'
+
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
+    })
+
+    it('should match external pleroma mention', () => {
+      const attention = externalAttn()
+      const url = 'https://instance.com/users/person'
+
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(true)
+    })
+
+    it('should not match external pleroma mention with same name but different instance', () => {
+      const attention = externalAttn()
+      const url = 'https://website.com/users/person'
+
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
+    })
+
+    it('should match external mastodon mention', () => {
+      const attention = externalAttn()
+      const url = 'https://instance.com/@person'
+
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(true)
+    })
+
+    it('should not match external mastodon mention with same name but different instance', () => {
+      const attention = externalAttn()
+      const url = 'https://website.com/@person'
+
+      expect(MatcherService.mentionMatchesUrl(attention, url)).to.eql(false)
+    })
+  })
+  describe.only('extractTagFromUrl', () => {
+    it('should return tag name from valid pleroma url', () => {
+      const url = 'https://website.com/tag/photo'
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('photo')
+    })
+
+    it('should return tag name from valid mastodon url', () => {
+      const url = 'https://website.com/tags/sky'
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('sky')
+    })
+
+    it('should not return string but false if invalid url', () => {
+      const url = 'https://website.com/users/sky'
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql(false)
+    })
+  })
+})
diff --git a/test/unit/specs/services/mention_matcher/mention_matcher.spec.js b/test/unit/specs/services/mention_matcher/mention_matcher.spec.js
deleted file mode 100644
index 4f6f58ff..00000000
--- a/test/unit/specs/services/mention_matcher/mention_matcher.spec.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import * as MentionMatcher from 'src/services/mention_matcher/mention_matcher.js'
-
-const localAttn = () => ({
-  id: 123,
-  is_local: true,
-  name: 'Guy',
-  screen_name: 'person',
-  statusnet_profile_url: 'https://instance.com/users/person'
-})
-
-const externalAttn = () => ({
-  id: 123,
-  is_local: false,
-  name: 'Guy',
-  screen_name: 'person@instance.com',
-  statusnet_profile_url: 'https://instance.com/users/person'
-})
-
-describe('MentionMatcher', () => {
-  describe.only('mentionMatchesUrl', () => {
-    it('should match local mention', () => {
-      const attention = localAttn()
-      const url = 'https://instance.com/users/person'
-
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(true)
-    })
-
-    it('should not match a local mention with same name but different instance', () => {
-      const attention = localAttn()
-      const url = 'https://website.com/users/person'
-
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(false)
-    })
-
-    it('should match external pleroma mention', () => {
-      const attention = externalAttn()
-      const url = 'https://instance.com/users/person'
-
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(true)
-    })
-
-    it('should not match external pleroma mention with same name but different instance', () => {
-      const attention = externalAttn()
-      const url = 'https://website.com/users/person'
-
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(false)
-    })
-
-    it('should match external mastodon mention', () => {
-      const attention = externalAttn()
-      const url = 'https://instance.com/@person'
-
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(true)
-    })
-
-    it('should not match external mastodon mention with same name but different instance', () => {
-      const attention = externalAttn()
-      const url = 'https://website.com/@person'
-
-      expect(MentionMatcher.mentionMatchesUrl(attention, url)).to.eql(false)
-    })
-  })
-})
-- 
cgit v1.2.3-70-g09d2


From e44d8ad71eb1128ae53bfdd47ac81d3aa5d8ae07 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 14:54:49 -0700
Subject: Extract tag name from href and open in same tab

---
 src/components/status/status.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 1ebb8a8d..a3b662b6 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -10,7 +10,7 @@ import LinkPreview from '../link-preview/link-preview.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import fileType from 'src/services/file_type/file_type.service'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
-import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
+import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
 import { filter, find } from 'lodash'
 
 const Status = {
@@ -273,7 +273,7 @@ const Status = {
       }
       if (target.tagName === 'A') {
         if (target.className.match(/mention/)) {
-          const href = target.getAttribute('href')
+          const href = target.href
           const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
           if (attn) {
             event.stopPropagation()
@@ -282,8 +282,14 @@ const Status = {
             this.$router.push(link)
             return
           }
-        } else {
-          this.$router.push(target.pathname)
+        }
+        if (target.className.match(/hashtag/)) {
+          // Extract tag name from link url
+          const tag = extractTagFromUrl(target.href)
+          if (tag) {
+            const link = this.generateTagLink(tag)
+            this.$router.push(link)
+          }
         }
       }
     },
@@ -340,6 +346,9 @@ const Status = {
     generateUserProfileLink (id, name) {
       return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     },
+    generateTagLink (tag) {
+      return `/tag/${tag}`
+    },
     setMedia () {
       const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
       return () => this.$store.dispatch('setMedia', attachments)
-- 
cgit v1.2.3-70-g09d2


From d39e2643f523e84cdce1945538149a9bd6419fd6 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Thu, 7 Feb 2019 14:56:00 -0700
Subject: Fix lint warning

---
 src/components/status/status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 9986107f..779696ea 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -57,7 +57,7 @@
               </div>
               <h4 class="replies" v-if="inConversation && !noReplyLinks">
                 <small v-if="replies.length">Replies:</small>
-                <small class="reply-link" v-for="reply in replies">
+                <small class="reply-link" v-bind:key="reply.id" v-for="reply in replies">
                   <a href="#" @click.prevent="gotoOriginal(reply.id)" @mouseenter="replyEnter(reply.id, $event)" @mouseout="replyLeave()">{{reply.name}}&nbsp;</a>
                 </small>
               </h4>
-- 
cgit v1.2.3-70-g09d2