diff --git a/src/Feed.svelte b/src/Feed.svelte index d883ded..cafdfa0 100644 --- a/src/Feed.svelte +++ b/src/Feed.svelte @@ -24,8 +24,6 @@ return; } - console.log(timeline_data); - for (let i in timeline_data) { const post_data = timeline_data[i]; const post = await parsePost(post_data, 1); diff --git a/src/client/api.js b/src/client/api.js index 36b5987..9dc440c 100644 --- a/src/client/api.js +++ b/src/client/api.js @@ -214,11 +214,14 @@ export async function parseUser(data) { user.id = data.id; user.nickname = data.display_name; user.username = data.username; + user.avatar_url = data.avatar; + user.url = data.url; + if (data.acct.includes('@')) user.host = data.acct.split('@')[1]; else user.host = data.username + '@' + Client.get().instance.host; - user.avatar_url = data.avatar; + user.emojis = []; data.emojis.forEach(emoji_data => { emoji_data.id = emoji_data.shortcode + '@' + user.host; @@ -226,6 +229,7 @@ export async function parseUser(data) { emoji_data.host = user.host; user.emojis.push(parseEmoji(emoji_data)); }); + Client.get().putCacheUser(user); return user; } diff --git a/src/post/Body.svelte b/src/post/Body.svelte index 2b914c4..cd726b7 100644 --- a/src/post/Body.svelte +++ b/src/post/Body.svelte @@ -28,7 +28,7 @@
{#each post.files as file}
- + {file.alt}
@@ -43,10 +43,11 @@ diff --git a/src/post/post.js b/src/post/post.js index 34783cd..3550c0f 100644 --- a/src/post/post.js +++ b/src/post/post.js @@ -1,6 +1,4 @@ -import { Client } from '../client/client.js'; -import { capabilities, server_types } from '../client/instance.js'; -import { parseOne as parseEmoji, EMOJI_REGEX } from '../emoji.js'; +import { parseText as parseEmoji } from '../emoji.js'; export default class Post { id; @@ -19,6 +17,11 @@ export default class Post { boost; visibility; + async rich_text() { + return parseEmoji(this.text, this.user.host); + } + + /* async rich_text() { let text = this.text; if (!text) return text; @@ -165,4 +168,5 @@ export default class Post { return response; } + */ } diff --git a/src/user/user.js b/src/user/user.js index 6410c48..6940309 100644 --- a/src/user/user.js +++ b/src/user/user.js @@ -7,6 +7,7 @@ export default class User { host; avatar_url; emojis; + url; get name() { return this.nickname || this.username;