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

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