@unavatar/core 3.7.77 → 3.7.78

package/package.json

@@ -2,7 +2,7 @@
   "name": "@unavatar/core",
   "description": "Get unified user avatar from social networks, including Instagram, SoundCloud, Telegram, Twitter, YouTube & more.",
   "homepage": "https://unavatar.io",
-  "version": "3.7.77",
+  "version": "3.7.78",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",

package/src/providers/linkedin.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const linkedinUrl = input => {
+const getAvatarUrl = input => {
   const [first, second] = input.split(':')
   const type = second ? first : 'user'
   const id = second ?? first
@@ -11,6 +11,8 @@ const linkedinUrl = input => {
 module.exports = ({ createHtmlProvider, getOgImage }) =>
   createHtmlProvider({
     name: 'linkedin',
-    url: linkedinUrl,
+    url: getAvatarUrl,
     getter: getOgImage
   })
+
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/mastodon.js

@@ -53,6 +53,7 @@ module.exports = ({ got, isReservedIp }) => {
     return body?.avatar
   }
 
-  mastodon.parseMastodonInput = parseMastodonInput
   return mastodon
 }
+
+module.exports.parseMastodonInput = parseMastodonInput

package/src/providers/onlyfans.js

@@ -4,8 +4,7 @@ const { get } = require('lodash')
 
 const getAvatarUrl = $ => {
   const text = $('script[type="application/ld+json"]').contents().text()
-  if (!text) return
-  return get(JSON.parse(text), 'mainEntity.image')
+  return text ? get(JSON.parse(text), 'mainEntity.image') : undefined
 }
 
 module.exports = ({ createHtmlProvider }) =>
@@ -21,3 +20,5 @@ module.exports = ({ createHtmlProvider }) =>
       }
     })
   })
+
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/openstreetmap.js

@@ -1,20 +1,24 @@
 'use strict'
 
+const OPENSTREETMAP_API_URL = 'https://api.openstreetmap.org/api/0.6/user'
+
 const OPENSTREETMAP_USER_ID_REGEX = /^\d+$/
 
 module.exports = ({ got, createHtmlProvider }) => {
-  const fromID = userId =>
-    got(`https://api.openstreetmap.org/api/0.6/user/${userId}.json`, {
-      responseType: 'json'
-    }).then(({ body }) => body?.user?.img?.href)
-
   const fromUsername = createHtmlProvider({
     name: 'openstreetmap',
-    url: username => `https://www.openstreetmap.org/user/${encodeURIComponent(username)}`,
+    url: username =>
+      `https://www.openstreetmap.org/user/${encodeURIComponent(username)}`,
     getter: $ => $('img.user_image').attr('src')
   })
 
-  return function openstreetmap ({ input }) {
-    return OPENSTREETMAP_USER_ID_REGEX.test(input) ? fromID(input) : fromUsername(...arguments)
+  return function openstreetmap (ctx) {
+    return OPENSTREETMAP_USER_ID_REGEX.test(ctx.input)
+      ? got(`${OPENSTREETMAP_API_URL}/${ctx.input}.json`, {
+        responseType: 'json'
+      }).then(({ body }) => body?.user?.img?.href)
+      : fromUsername(ctx)
   }
 }
+
+module.exports.OPENSTREETMAP_USER_ID_REGEX = OPENSTREETMAP_USER_ID_REGEX

package/src/providers/patreon.js

@@ -26,13 +26,11 @@ const getRscAvatar = $ => {
 const getAvatar = $ =>
   $jsonld('mainEntity.image.contentUrl')($) || getRscAvatar($)
 
-const factory = ({ createHtmlProvider }) =>
+module.exports = ({ createHtmlProvider }) =>
   createHtmlProvider({
     name: 'patreon',
     url: username => `https://www.patreon.com/${username}`,
     getter: getAvatar
   })
 
-factory.getAvatar = getAvatar
-
-module.exports = factory
+module.exports.getAvatar = getAvatar

package/src/providers/printables.js

@@ -1,11 +1,13 @@
 'use strict'
 
+const getAvatarUrl = input =>
+  `https://www.printables.com/${input.startsWith('@') ? input : `@${input}`}`
+
 module.exports = ({ createHtmlProvider, getOgImage }) =>
   createHtmlProvider({
     name: 'printables',
-    url: input =>
-      `https://www.printables.com/${
-        input.startsWith('@') ? input : `@${input}`
-      }`,
+    url: getAvatarUrl,
     getter: getOgImage
   })
+
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/spotify.js

@@ -1,18 +1,20 @@
 'use strict'
 
-const spotifyUri = input => {
+const getAvatarUrl = input => {
   const [first, second] = input.split(':')
   const type = second ? first : 'user'
   const id = second ?? first
-  return `${type}/${id}`
+  return `https://open.spotify.com/${type}/${id}`
 }
 
 module.exports = ({ createHtmlProvider, getOgImage }) =>
   createHtmlProvider({
     name: 'spotify',
-    url: input => `https://open.spotify.com/${spotifyUri(input)}`,
+    url: getAvatarUrl,
     getter: getOgImage,
     htmlOpts: () => ({
       prerender: true
     })
   })
+
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/substack.js

@@ -12,7 +12,9 @@ const getBestSrcsetUrl = srcset => {
   }))
 
   if (candidates.length === 0) return
-  return candidates.reduce((best, current) => (current.score > best.score ? current : best)).url
+  return candidates.reduce((best, current) =>
+    current.score > best.score ? current : best
+  ).url
 }
 
 const getPictureAvatar = $ => {
@@ -21,15 +23,14 @@ const getPictureAvatar = $ => {
   return getBestSrcsetUrl(srcset) || pictureImg.attr('src')
 }
 
-const getAvatarUrl = $ => $jsonld('publisher.logo.url')($) || getPictureAvatar($)
+const getAvatarUrl = $ =>
+  $jsonld('publisher.logo.url')($) || getPictureAvatar($)
 
-const factory = ({ createHtmlProvider }) =>
+module.exports = ({ createHtmlProvider }) =>
   createHtmlProvider({
     name: 'substack',
     url: input => `https://${input}.substack.com`,
     getter: getAvatarUrl
   })
 
-factory.getAvatarUrl = getAvatarUrl
-
-module.exports = factory
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/tiktok.js

@@ -14,13 +14,11 @@ const getAvatarUrl = $ => {
   ])
 }
 
-const factory = ({ createHtmlProvider }) =>
+module.exports = ({ createHtmlProvider }) =>
   createHtmlProvider({
     name: 'tiktok',
     url: input => `https://www.tiktok.com/@${input}`,
     getter: getAvatarUrl
   })
 
-factory.getAvatarUrl = getAvatarUrl
-
-module.exports = factory
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/whatsapp.js

@@ -8,7 +8,7 @@ const whatsappURI = input => {
   }
 }
 
-const whatsappURL = input => {
+const getAvatarUrl = input => {
   const { type, id } = whatsappURI(input)
   switch (type) {
     case 'phone':
@@ -26,6 +26,8 @@ const whatsappURL = input => {
 module.exports = ({ createHtmlProvider, getOgImage }) =>
   createHtmlProvider({
     name: 'whatsapp',
-    url: whatsappURL,
+    url: getAvatarUrl,
     getter: getOgImage
   })
+
+module.exports.getAvatarUrl = getAvatarUrl

package/src/providers/x.js

@@ -18,13 +18,11 @@ const getProfileImage = $ =>
       $('meta[property="og:image"]').attr('content')
   )
 
-const factory = ({ createHtmlProvider }) =>
+module.exports = ({ createHtmlProvider }) =>
   createHtmlProvider({
     name: 'x',
     url: input => `https://x.com/${input}`,
     getter: getProfileImage
   })
 
-factory.getProfileImage = getProfileImage
-
-module.exports = factory
+module.exports.getProfileImage = getProfileImage

package/src/providers/youtube.js

@@ -1,18 +1,22 @@
 'use strict'
 
+const getAvatarUrl = input => {
+  let path
+  if (input.startsWith('@')) {
+    path = input
+  } else if (input.startsWith('UC') && input.length === 24) {
+    path = `channel/${input}`
+  } else {
+    path = `@${input}`
+  }
+  return `https://www.youtube.com/${path}`
+}
+
 module.exports = ({ createHtmlProvider, getOgImage }) =>
   createHtmlProvider({
     name: 'youtube',
-    url: input => {
-      let path
-      if (input.startsWith('@')) {
-        path = input
-      } else if (input.startsWith('UC') && input.length === 24) {
-        path = `channel/${input}`
-      } else {
-        path = `@${input}`
-      }
-      return `https://www.youtube.com/${path}`
-    },
+    url: getAvatarUrl,
     getter: getOgImage
   })
+
+module.exports.getAvatarUrl = getAvatarUrl