diff options
| author | Mar0xy <marie@kaifa.ch> | 2023-09-25 05:22:45 +0200 |
|---|---|---|
| committer | Mar0xy <marie@kaifa.ch> | 2023-09-25 05:22:45 +0200 |
| commit | c10f7856147e656faadee97a22e52e31f1e9087e (patch) | |
| tree | 055845e4d9f19e1dab091aa24a80c34d7855ad52 | |
| parent | upd: return empty list on empty custom emoji (diff) | |
| download | sharkey-c10f7856147e656faadee97a22e52e31f1e9087e.tar.gz sharkey-c10f7856147e656faadee97a22e52e31f1e9087e.tar.bz2 sharkey-c10f7856147e656faadee97a22e52e31f1e9087e.zip | |
upd: get alt and blurhash on media
| -rw-r--r-- | packages/megalodon/src/misskey.ts | 2 | ||||
| -rw-r--r-- | packages/megalodon/src/misskey/api_client.ts | 4 | ||||
| -rw-r--r-- | packages/megalodon/src/misskey/entities/file.ts | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/packages/megalodon/src/misskey.ts b/packages/megalodon/src/misskey.ts index 4807fcdfbf..0ea66cb49a 100644 --- a/packages/megalodon/src/misskey.ts +++ b/packages/megalodon/src/misskey.ts @@ -2178,7 +2178,7 @@ export default class Misskey implements MegalodonInterface { public async getInstanceCustomEmojis(): Promise<Response<Array<Entity.Emoji>>> { return this.client .get<{ emojis: Array<MisskeyAPI.Entity.Emoji> }>('/api/emojis') - .then(res => ({ ...res, data: res.data.emojis && res.data.emojis.length > 0 ? res.data.emojis.map(e => MisskeyAPI.Converter.emoji(e)) : [] })) + .then(res => ({ ...res, data: res.data.emojis.map(e => MisskeyAPI.Converter.emoji(e)) })) } // ====================================== diff --git a/packages/megalodon/src/misskey/api_client.ts b/packages/megalodon/src/misskey/api_client.ts index 36746c1e87..a9806c0abf 100644 --- a/packages/megalodon/src/misskey/api_client.ts +++ b/packages/megalodon/src/misskey/api_client.ts @@ -204,8 +204,8 @@ namespace MisskeyAPI { width: f.properties.width, height: f.properties.height }, - description: null, - blurhash: null + description: f.comment ? f.comment : null, + blurhash: f.blurhash ? f.blurhash : null } } diff --git a/packages/megalodon/src/misskey/entities/file.ts b/packages/megalodon/src/misskey/entities/file.ts index 6e4e09eee0..3bb0272fda 100644 --- a/packages/megalodon/src/misskey/entities/file.ts +++ b/packages/megalodon/src/misskey/entities/file.ts @@ -13,6 +13,8 @@ namespace MisskeyEntity { avgColor: string } url: string + comment?: string + blurhash?: string thumbnailUrl: string } } |