limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-29 05:17:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[mastodon-client] Fix banners and avatars

Browse source
This commit is contained in:
Laura Hausmann 2023-09-15 17:01:15 +02:00
parent b8cbcafe3a
commit cebfa5ccb8
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/backend/src/server/api/mastodon/converters/user.ts
View file

@ -1,6 +1,6 @@
import { User } from "@/models/entities/user.js"; import { User } from "@/models/entities/user.js";
import config from "@/config/index.js"; import config from "@/config/index.js";
import { UserProfiles, Users } from "@/models/index.js"; import { DriveFiles, UserProfiles, Users } from "@/models/index.js";
import { EmojiConverter } from "@/server/api/mastodon/converters/emoji.js"; import { EmojiConverter } from "@/server/api/mastodon/converters/emoji.js";
import { populateEmojis } from "@/misc/populate-emojis.js"; import { populateEmojis } from "@/misc/populate-emojis.js";
import { toHtml } from "@/mfm/to-html.js"; import { toHtml } from "@/mfm/to-html.js";
@ -24,6 +24,14 @@ export class UserConverter {
} }
const profile = UserProfiles.findOneBy({userId: u.id}); const profile = UserProfiles.findOneBy({userId: u.id});
const bio = profile.then(profile => toHtml(mfm.parse(profile?.description ?? "")) ?? escapeMFM(profile?.description ?? "")); const bio = profile.then(profile => toHtml(mfm.parse(profile?.description ?? "")) ?? escapeMFM(profile?.description ?? ""));
const avatar = u.avatarId
? (DriveFiles.findOneBy({ id: u.avatarId }))
.then(p => p?.url ?? Users.getIdenticonUrl(u.id))
: Users.getIdenticonUrl(u.id);
const banner = u.bannerId
? (DriveFiles.findOneBy({ id: u.bannerId }))
.then(p => p?.url ?? `${config.url}/static-assets/transparent.png`)
: `${config.url}/static-assets/transparent.png`;
return awaitAll({ return awaitAll({
id: u.id, id: u.id,
@ -37,10 +45,10 @@ export class UserConverter {
statuses_count: u.notesCount, statuses_count: u.notesCount,
note: bio, note: bio,
url: u.uri ?? acctUrl, url: u.uri ?? acctUrl,
avatar: u.avatar?.url ?? Users.getIdenticonUrl(u.id), avatar: avatar,
avatar_static: u.avatar?.url ?? Users.getIdenticonUrl(u.id), avatar_static: avatar,
header: u.banner?.url ?? `${config.url}/static-assets/transparent.png`, header: banner,
header_static: u.banner?.url ?? `${config.url}/static-assets/transparent.png`, header_static: banner,
emojis: populateEmojis(u.emojis, u.host).then(emoji => emoji.map((e) => EmojiConverter.encode(e))), emojis: populateEmojis(u.emojis, u.host).then(emoji => emoji.map((e) => EmojiConverter.encode(e))),
moved: null, //FIXME moved: null, //FIXME
fields: profile.then(profile => profile?.fields.map(p => this.encodeField(p)) ?? []), fields: profile.then(profile => profile?.fields.map(p => this.encodeField(p)) ?? []),