From 055e8827bd9ca59bb468f4bd141687cd2c0e6204 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Wed, 8 Feb 2023 09:23:13 +0900
Subject: [PATCH] 5.1.14

---
 megalodon/src/misskey.ts                       |  2 +-
 megalodon/src/misskey/web_socket.ts            | 12 ++++++++----
 megalodon/test/unit/misskey/api_client.spec.ts |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/megalodon/src/misskey.ts b/megalodon/src/misskey.ts
index aa18484..5fc8c94 100644
--- a/megalodon/src/misskey.ts
+++ b/megalodon/src/misskey.ts
@@ -38,7 +38,7 @@ export default class Misskey implements MegalodonInterface {
     this.proxyConfig = proxyConfig
   }
 
-  public baseUrlToHost(baseUrl: string): string {
+  private baseUrlToHost(baseUrl: string): string {
     return baseUrl.replace('https://', '')
   }
 
diff --git a/megalodon/src/misskey/web_socket.ts b/megalodon/src/misskey/web_socket.ts
index b0f092c..0529068 100644
--- a/megalodon/src/misskey/web_socket.ts
+++ b/megalodon/src/misskey/web_socket.ts
@@ -14,7 +14,7 @@ import MisskeyAPI from './api_client'
 export default class WebSocket extends EventEmitter implements WebSocketInterface {
   public url: string
   public channel: 'user' | 'localTimeline' | 'hybridTimeline' | 'globalTimeline' | 'conversation' | 'list'
-  public parser: Parser
+  public parser: any
   public headers: { [key: string]: string }
   public proxyConfig: ProxyConfig | false = false
   public listId: string | null = null
@@ -74,6 +74,10 @@ export default class WebSocket extends EventEmitter implements WebSocketInterfac
     this._startWebSocketConnection()
   }
 
+  private baseUrlToHost(baseUrl: string): string {
+    return baseUrl.replace('https://', '')
+  }
+
   /**
    * Reset connection and start new websocket connection.
    */
@@ -282,13 +286,13 @@ export default class WebSocket extends EventEmitter implements WebSocketInterfac
    */
   private _setupParser() {
     this.parser.on('update', (note: MisskeyAPI.Entity.Note) => {
-      this.emit('update', MisskeyAPI.Converter.note(note))
+      this.emit('update', MisskeyAPI.Converter.note(note, this.baseUrlToHost(this.url)))
     })
     this.parser.on('notification', (notification: MisskeyAPI.Entity.Notification) => {
-      this.emit('notification', MisskeyAPI.Converter.notification(notification))
+      this.emit('notification', MisskeyAPI.Converter.notification(notification, this.baseUrlToHost(this.url)))
     })
     this.parser.on('conversation', (note: MisskeyAPI.Entity.Note) => {
-      this.emit('conversation', MisskeyAPI.Converter.noteToConversation(note))
+      this.emit('conversation', MisskeyAPI.Converter.noteToConversation(note, this.baseUrlToHost(this.url)))
     })
     this.parser.on('error', (err: Error) => {
       this.emit('parser-error', err)
diff --git a/megalodon/test/unit/misskey/api_client.spec.ts b/megalodon/test/unit/misskey/api_client.spec.ts
index c728e07..ceb0211 100644
--- a/megalodon/test/unit/misskey/api_client.spec.ts
+++ b/megalodon/test/unit/misskey/api_client.spec.ts
@@ -198,7 +198,7 @@ describe('api_client', () => {
           replyId: null,
           renoteId: null
         }
-        const megalodonStatus = MisskeyAPI.Converter.note(note)
+        const megalodonStatus = MisskeyAPI.Converter.note(note, user.host || 'misskey.io')
         expect(megalodonStatus.plain_content).toEqual(plainContent)
         expect(megalodonStatus.content).toEqual(content)
       })
@@ -222,7 +222,7 @@ describe('api_client', () => {
           replyId: null,
           renoteId: null
         }
-        const megalodonStatus = MisskeyAPI.Converter.note(note)
+        const megalodonStatus = MisskeyAPI.Converter.note(note, user.host || 'misskey.io')
         expect(megalodonStatus.plain_content).toEqual(plainContent)
         expect(megalodonStatus.content).toEqual(content)
       })