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

backend: fix mentionedUsers and userInfo queries

Browse source 
Turns out `getMany` doesn't work with the specific query used, so use
`getRawMany` instead.

Also fixup the predicate used in userInfo to use the correct field
names.
This commit is contained in:
Norm 2022-09-11 15:28:35 -04:00
parent c926b4fbcc
commit a2fad7ce61
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

@ -108,13 +108,13 @@ export async function toHtml(mfmText: string, mentions?: string[]): Promise<stri
if (ids.length > 0) { if (ids.length > 0) {
const mentionedUsers = await UserProfiles.createQueryBuilder('user_profile') const mentionedUsers = await UserProfiles.createQueryBuilder('user_profile')
.leftJoin('user_profile.user', 'user') .leftJoin('user_profile.user', 'user')
.select('user.username') .select('user.username', 'username')
.addSelect('user.host') .addSelect('user.host', '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 }) .where('"userId" IN (:...ids)', { ids })
.getMany(); .getRawMany();
const userInfo = mentionedUsers.find(user => user.user?.username === username && user.userHost === host); const userInfo = mentionedUsers.find(user => user.username === username && user.host === 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');