@unavatar/core 3.32.5 → 3.32.7

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.32.5",
+  "version": "3.32.7",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",

package/src/providers/dockerhub.js

@@ -3,8 +3,17 @@
 const API_URL = 'https://hub.docker.com/v2/users'
 
 const getAvatarUrl = input => `${API_URL}/${encodeURIComponent(input)}/`
+const getMaxResGravatarUrl = ({ constants, input }) => {
+  const url = new URL(input)
 
-module.exports = ({ got }) =>
+  // `d=404` makes missing avatars fail instead of falling back to placeholders.
+  url.searchParams.set('s', String(constants.AVATAR_SIZE))
+  url.searchParams.set('d', '404')
+
+  return url.toString()
+}
+
+module.exports = ({ constants, got }) =>
   async function dockerhub (input) {
     const { body, statusCode } = await got(getAvatarUrl(input), {
       responseType: 'json',
@@ -13,7 +22,10 @@ module.exports = ({ got }) =>
 
     if (statusCode >= 400) return
 
-    return body?.gravatar_url || undefined
+    if (!body?.gravatar_url) return undefined
+
+    return getMaxResGravatarUrl({ constants, input: body.gravatar_url })
   }
 
 module.exports.getAvatarUrl = getAvatarUrl
+module.exports.getMaxResGravatarUrl = getMaxResGravatarUrl

package/src/providers/npm.js

@@ -1,24 +1,62 @@
 'use strict'
 
-const NPM_URL = 'https://www.npmjs.com'
+const { getAvatarUrl: getGitHubAvatarUrl } = require('./github')
+const stringify = require('../util/stringify')
+
+const NPM_REGISTRY_URL = 'https://registry.npmjs.org'
+const GITLAB_API_URL = 'https://gitlab.com/api/v4'
 
 const stripAtPrefix = input => input.replace(/^@/, '')
 
-const getAvatarUrl = input => `${NPM_URL}/~${stripAtPrefix(input)}`
+const GITHUB_RE = /github\.com[/:]([^/]+)/
+const GITLAB_RE = /gitlab\.com[/:]([^/]+)/
+
+const getRepoUsername = objects => {
+  let gitlabFallback
+
+  for (const { package: pkg } of objects) {
+    const repo = pkg?.links?.repository
+    if (!repo) continue
 
-const getAvatar = $ => {
-  const src = $('a[aria-label="Your profile picture"] img').attr('src')
-  if (!src) return
+    const githubMatch = GITHUB_RE.exec(repo)
+    if (githubMatch) return { platform: 'github', username: githubMatch[1] }
 
-  return src.startsWith('/') ? `${NPM_URL}${src}` : src
+    if (!gitlabFallback) {
+      const gitlabMatch = GITLAB_RE.exec(repo)
+      if (gitlabMatch) { gitlabFallback = { platform: 'gitlab', username: gitlabMatch[1] } }
+    }
+  }
+
+  return gitlabFallback
 }
 
-module.exports = ({ createHtmlProvider }) =>
-  createHtmlProvider({
-    name: 'npm',
-    url: getAvatarUrl,
-    getter: getAvatar
-  })
+const getGitLabAvatarUrl = async ({ got, username }) => {
+  const { body } = await got(
+    `${GITLAB_API_URL}/users?username=${encodeURIComponent(username)}`,
+    { responseType: 'json' }
+  )
+  return body?.[0]?.avatar_url
+}
+
+module.exports = ({ constants, got }) =>
+  async function npm (input) {
+    const username = stripAtPrefix(input)
+    const url = `${NPM_REGISTRY_URL}/-/v1/search?${stringify({
+      text: `maintainer:${username}`,
+      size: 5
+    })}`
+
+    const { body } = await got(url, { responseType: 'json' })
+    const objects = (body?.objects ?? []).filter(
+      o => o.package?.publisher?.username === username
+    )
+
+    const match = getRepoUsername(objects)
+    if (!match) return
+
+    if (match.platform === 'github') {
+      return getGitHubAvatarUrl({ constants, input: match.username })
+    }
 
-module.exports.getAvatarUrl = getAvatarUrl
-module.exports.getAvatar = getAvatar
+    return getGitLabAvatarUrl({ got, username: match.username })
+  }