Merge pull request #2185 from h3poteto/fix/detector

Fix detector for capitalized upstream name
h3poteto · Jun 19, 2024 · 1a6cd89 · 1a6cd89
2 parents 95042d9 + 4d75ea5
commit 1a6cd89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/megalodon/src/detector.ts b/megalodon/src/detector.ts
@@ -74,7 +74,7 @@ export const detector = async (url: string): Promise<'mastodon' | 'pleroma' | 'f
  case 'gotosocial':
  return 'gotosocial'
  default:
- if (res.data.metadata.upstream?.name && res.data.metadata.upstream.name === 'mastodon') {
+ if (res.data.metadata.upstream?.name && res.data.metadata.upstream.name.toLowerCase() === 'mastodon') {
  return 'mastodon'
  }
  throw new NodeinfoError('Unknown SNS')
@@ -98,7 +98,7 @@ export const detector = async (url: string): Promise<'mastodon' | 'pleroma' | 'f
  case 'gotosocial':
  return 'gotosocial'
  default:
- if (res.data.metadata.upstream?.name && res.data.metadata.upstream.name === 'mastodon') {
+ if (res.data.metadata.upstream?.name && res.data.metadata.upstream.name.toLowerCase() === 'mastodon') {
  return 'mastodon'
  }
  throw new NodeinfoError('Unknown SNS')
@@ -122,7 +122,7 @@ export const detector = async (url: string): Promise<'mastodon' | 'pleroma' | 'f
  case 'gotosocial':
  return 'gotosocial'
  default:
- if (res.data.metadata.upstream?.name && res.data.metadata.upstream.name === 'mastodon') {
+ if (res.data.metadata.upstream?.name && res.data.metadata.upstream.name.toLowerCase() === 'mastodon') {
  return 'mastodon'
  }
  throw new NodeinfoError('Unknown SNS')

diff --git a/megalodon/test/integration/detector.spec.ts b/megalodon/test/integration/detector.spec.ts
@@ -65,6 +65,14 @@ describe('detector', () => {
  })
  })
 
+ describe('kmy.blue', () => {
+ const url = 'https://kmy.blue'
+ it('should be mastodon', async () => {
+ const kmyblue = await detector(url)
+ expect(kmyblue).toEqual('mastodon')
+ })
+ })
+
  describe('unknown', () => {
  const url = 'https://google.com'
  it('should be null', async () => {