mtg-playerinfo 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtg-playerinfo",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A simple NPM module and CLI tool to pull Magic: The Gathering player data from various sources",
   "main": "src/index.js",
   "bin": {

package/src/fetchers/melee.js

@@ -1,5 +1,6 @@
 const { request } = require('../utils/httpClient')
 const cheerio = require('cheerio')
+const { extractHandle, getPlatformName } = require('../utils/socialMediaExtractor')
 
 class MeleeFetcher {
   async fetchById (username) {
@@ -33,17 +34,10 @@ class MeleeFetcher {
     $('.social-link').each((i, el) => {
       const href = $(el).attr('href')
       if (href) {
-        try {
-          const urlObj = new URL(href)
-          const platform = urlObj.hostname.replace('www.', '').split('.')[0]
-          let handle = urlObj.pathname.split('/').filter(Boolean).pop()
-          if (handle) {
-            handle = decodeURIComponent(handle)
-            const label = platform.charAt(0).toLowerCase() + platform.slice(1)
-            data[label] = handle
-          }
-        } catch (e) {
-          console.log('Invalid URL in social link ' + href + ': ' + e.message)
+        const handle = extractHandle(href)
+        const platform = getPlatformName(href)
+        if (handle && platform) {
+          data[platform] = handle
         }
       }
     })

package/src/fetchers/topdeck.js

@@ -1,5 +1,6 @@
 const httpClient = require('../utils/httpClient')
 const cheerio = require('cheerio')
+const { extractHandle } = require('../utils/socialMediaExtractor')
 
 class TopdeckFetcher {
   async fetchById (handle) {
@@ -84,12 +85,18 @@ class TopdeckFetcher {
 
     const twitterLink = $('a[href*="twitter.com"]').attr('href')
     if (twitterLink) {
-      data.twitter = twitterLink
+      const handle = extractHandle(twitterLink)
+      if (handle) {
+        data.twitter = handle
+      }
     }
 
     const youtubeLink = $('a[href*="youtube.com"]').attr('href')
     if (youtubeLink) {
-      data.youtube = youtubeLink
+      const handle = extractHandle(youtubeLink)
+      if (handle) {
+        data.youtube = handle
+      }
     }
 
     const statsMap = {

package/src/utils/socialMediaExtractor.js

@@ -0,0 +1,50 @@
+/**
+ * Extracts social media handle from a URL
+ * @param {string} url - The full social media URL
+ * @returns {string|null} - The handle (without the URL), or null if extraction fails
+ */
+function extractHandle (url) {
+  if (!url) {
+    return null
+  }
+
+  try {
+    const urlObj = new URL(url)
+    let handle = urlObj.pathname.split('/').filter(Boolean).pop()
+    if (handle) {
+      handle = decodeURIComponent(handle)
+      return handle
+    }
+  } catch (e) {
+    console.log('Invalid URL in social link ' + url + ': ' + e.message)
+  }
+
+  return null
+}
+
+/**
+ * Extracts platform name from a URL hostname
+ * @param {string} url - The full social media URL
+ * @returns {string|null} - The platform name (e.g., 'twitter', 'youtube'), or null if extraction fails
+ */
+function getPlatformName (url) {
+  if (!url) {
+    return null
+  }
+
+  try {
+    const urlObj = new URL(url)
+    const platform = urlObj.hostname.replace('www.', '').split('.')[0]
+    return platform.charAt(0).toLowerCase() + platform.slice(1)
+  } catch (e) {
+    console.log('Invalid URL: ' + url + ': ' + e.message)
+  }
+
+  return null
+}
+
+module.exports = {
+  extractHandle,
+  getPlatformName
+}
+

package/test/topdeck.test.js

@@ -24,8 +24,8 @@ test('TopdeckFetcher: parseHtml extracts stats from DOM when available', () => {
   assert.equal(result.url, url)
   assert.equal(result.name, 'Björn Kimminich')
   assert.equal(result.pronouns, 'He/Him', 'Should extract pronouns from badge')
-  assert.equal(result.twitter, 'https://twitter.com/bkimminich', 'Should extract Twitter link')
-  assert.equal(result.youtube, 'https://www.youtube.com/@Bj%C3%B6rnKimminich', 'Should extract YouTube link')
+  assert.equal(result.twitter, 'bkimminich', 'Should extract Twitter handle')
+  assert.equal(result.youtube, '@BjörnKimminich', 'Should extract YouTube handle')
 })
 
 test('TopdeckFetcher: fetchStats updates playerInfo with data from stats JSON', async () => {