From 91600d901af335e0a923e8d53cfc22927f393fe6 Mon Sep 17 00:00:00 2001
From: ari melody <ari@arimelody.me>
Date: Fri, 21 Jun 2024 03:18:21 +0100
Subject: [PATCH] use mastodon API for user fetching on firefish; stronger
 compatibility

---
 src/api/firefish.js | 18 ++----------------
 src/api/mastodon.js |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/api/firefish.js b/src/api/firefish.js
index 840a1f1..8302ff4 100644
--- a/src/api/firefish.js
+++ b/src/api/firefish.js
@@ -44,7 +44,7 @@ export async function parsePost(data, num_replies) {
     post.files = data.media_attachments;
     post.url = data.url;
     post.reply = data.in_reply_to_id && num_replies > 0 ? await getPost(data.in_reply_to_id, num_replies - 1) : null;
-    post.boost = data.reblog ? await Client.get().api.parsePost(data.reblog, 1) : null;
+    post.boost = data.reblog ? await parsePost(data.reblog, 1) : null;
     post.emojis = [];
     data.emojis.forEach(emoji_data => {
         let name = emoji_data.shortcode.split('@')[0];
@@ -86,21 +86,7 @@ export async function parsePost(data, num_replies) {
 }
 
 export async function parseUser(data) {
-    let user = new User();
-    user.id = data.id;
-    user.nickname = data.display_name;
-    user.username = data.username;
-    user.host = data.fqn.split('@')[1];
-    user.avatar_url = data.avatar;
-    user.emojis = [];
-    data.emojis.forEach(emoji_data => {
-        emoji_data.id = emoji_data.shortcode + '@' + user.host;
-        emoji_data.name = emoji_data.shortcode;
-        emoji_data.host = user.host;
-        user.emojis.push(Client.get().api.parseEmoji(emoji_data));
-    });
-    Client.get().putCacheUser(user);
-    return user;
+    return mastodonAPI.parseUser(data);
 }
 
 export function parseEmoji(data) {
diff --git a/src/api/mastodon.js b/src/api/mastodon.js
index 68e3efa..38d348e 100644
--- a/src/api/mastodon.js
+++ b/src/api/mastodon.js
@@ -145,7 +145,7 @@ export async function parsePost(data, num_replies) {
     post.files = data.media_attachments;
     post.url = data.url;
     post.reply = data.in_reply_to_id && num_replies > 0 ? await getPost(data.in_reply_to_id, num_replies - 1) : null;
-    post.boost = data.reblog ? await Client.get().api.parsePost(data.reblog, 1) : null;
+    post.boost = data.reblog ? await parsePost(data.reblog, 1) : null;
     post.emojis = [];
     data.emojis.forEach(emoji_data => {
         let name = emoji_data.shortcode.split('@')[0];