tallship/FoundKey
0
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

backend: fix query for mentionedUsers

Browse source
This commit is contained in:
Norm 2022-09-07 13:34:38 -04:00
parent ad73d01986
commit f21e1afaa4
Signed by untrusted user: norm
GPG key ID: 7123E30E441E80DE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/mfm/to-html.ts
View file

@ -8,20 +8,20 @@ import { intersperse } from '@/prelude/array.js';
// Transforms MFM to HTML, given the MFM text and a list of user IDs that are // Transforms MFM to HTML, given the MFM text and a list of user IDs that are
// mentioned in the text. If the list of mentions is not given, all mentions // mentioned in the text. If the list of mentions is not given, all mentions
// from the text will be extracted. // from the text will be extracted.
export async function toHtml(mfmText: string, mentions?: string[]): string | null { export async function toHtml(mfmText: string, mentions?: string[]): Promise<string | null> {
const nodes = mfm.parse(mfmText); const nodes = mfm.parse(mfmText);
if (nodes == null) { if (nodes == null) {
return null; return null;
} }
const mentionedUsers = await UserProfiles.createQueryBuilder("user_profiles") const mentionedUsers = await UserProfiles.createQueryBuilder('user_profiles')
.leftJoin('user_profile.user', 'user') .leftJoin('user_profile.user', 'user')
.select('user.username') .select('user.username')
.addSelect('user.host') .addSelect('user.host')
// links should preferably use user friendly urls, only fall back to AP ids // links should preferably use user friendly urls, only fall back to AP ids
.addSelect('COALESCE(user_profile.url, user.uri)', 'url') .addSelect('COALESCE(user_profile.url, user.uri)', 'url')
.where('userId IN (:...ids)', { ids: mentions ?? extractMentions(nodes) }) .where('userId IN (:...ids)', { ids: mentions ?? extractMentions(nodes) })
.getManyRaw(); .getMany();
const doc = new JSDOM('').window.document; const doc = new JSDOM('').window.document;
@ -119,7 +119,7 @@ export async function toHtml(mfmText: string, mentions?: string[]): string | nul
mention(node) { mention(node) {
const { username, host, acct } = node.props; const { username, host, acct } = node.props;
const userInfo = mentionedUsers.find(user => user.username === username && user.host === host); const userInfo = mentionedUsers.find(user => user.user?.username === username && user.userHost === host);
if (userInfo != null) { if (userInfo != null) {
// Mastodon microformat: span.h-card > a.u-url.mention // Mastodon microformat: span.h-card > a.u-url.mention
const a = doc.createElement('a'); const a = doc.createElement('a');