Merge branch 'main' into snug.moe

This commit is contained in:
vib 2023-07-02 16:23:45 +03:00
commit 56eab21a92
1 changed files with 8 additions and 6 deletions

View File

@ -344,24 +344,26 @@ export async function sideEffects(user: User, note: Note, silent = false, create
// If the post is a reply and the poster is a local user and the poster of the post to which you are replying is a remote user, deliver
if (note.replyId) {
const subquery = Notes.createaQueryBuilder()
.select('userId')
const subquery = Notes.createQueryBuilder()
.select('"userId"')
.where('"id" = :replyId', { replyId: note.replyId });
const u = await Users.createQueryBuilder()
.where('"id" IN (' + subquery.getQuery() + ')')
.andWhere('"userHost" IS NOT NULL')
.setParameters(subquery.getParameters())
.andWhere('host IS NOT NULL')
.getOne();
if (u != null) dm.addDirectRecipe(u);
}
// If the post is a Renote and the poster is a local user and the poster of the original Renote post is a remote user, deliver
if (note.renoteId) {
const subquery = Notes.createaQueryBuilder()
.select('userId')
const subquery = Notes.createQueryBuilder()
.select('"userId"')
.where('"id" = :renoteId', { renoteId: note.renoteId });
const u = await Users.createQueryBuilder()
.where('"id" IN (' + subquery.getQuery() + ')')
.andWhere('"userHost" IS NOT NULL')
.setParameters(subquery.getParameters())
.andWhere('host IS NOT NULL')
.getOne();
if (u != null) dm.addDirectRecipe(u);
}