natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix: 500 server error when attempting to fetch followers-only reply as guest' (#9983) from s1idewhist1e/calckey:issue/9075 into develop 

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9983
This commit is contained in:
Kainoa Kanter 2023-05-01 19:38:16 +00:00
parent 9722b7bafe 6f32efd898
commit 93309db051
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/backend/src/server/web/index.ts
View File

@ -399,28 +399,31 @@ router.get("/notes/:note", async (ctx, next) => {
visibility: In(["public", "home"]), visibility: In(["public", "home"]),
}); });
if (note) { try {
const _note = await Notes.pack(note); if (note) {
const profile = await UserProfiles.findOneByOrFail({ userId: note.userId }); const _note = await Notes.pack(note);
const meta = await fetchMeta();
await ctx.render("note", { const profile = await UserProfiles.findOneByOrFail({ userId: note.userId });
note: _note, const meta = await fetchMeta();
profile, await ctx.render("note", {
avatarUrl: await Users.getAvatarUrl( note: _note,
await Users.findOneByOrFail({ id: note.userId }), profile,
), avatarUrl: await Users.getAvatarUrl(
// TODO: Let locale changeable by instance setting await Users.findOneByOrFail({ id: note.userId }),
summary: getNoteSummary(_note), ),
instanceName: meta.name || "Calckey", // TODO: Let locale changeable by instance setting
icon: meta.iconUrl, summary: getNoteSummary(_note),
privateMode: meta.privateMode, instanceName: meta.name || "Calckey",
themeColor: meta.themeColor, icon: meta.iconUrl,
}); privateMode: meta.privateMode,
themeColor: meta.themeColor,
});
ctx.set("Cache-Control", "public, max-age=15"); ctx.set("Cache-Control", "public, max-age=15");
return; return;
} }
} catch {}
await next(); await next();
}); });