HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

perf: add option to skip querying skilla

Browse source
This commit is contained in:
Namekuji 2023-08-05 07:03:32 -04:00
parent e115fed0db
commit 0da215aa7d
No known key found for this signature in database
GPG key ID: 1D62332C07FBA532
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/backend/src/models/repositories/note.ts
View file

@ -137,8 +137,7 @@ export const NoteRepository = db.getRepository(Note).extend({
Users.findOneByOrFail({ id: meId }), Users.findOneByOrFail({ id: meId }),
); );
if (!user.host) { if (Users.isLocalUser(user)) {
// user is local
const cache = await LocalFollowingsCache.init(meId); const cache = await LocalFollowingsCache.init(meId);
return await cache.isFollowing(note.userId); return await cache.isFollowing(note.userId);
} }
@ -169,6 +168,7 @@ export const NoteRepository = db.getRepository(Note).extend({
me?: { id: User["id"] } | null | undefined, me?: { id: User["id"] } | null | undefined,
options?: { options?: {
detail?: boolean; detail?: boolean;
scyllaNote?: boolean;
_hint_?: { _hint_?: {
myReactions: Map<Note["id"], NoteReaction | null>; myReactions: Map<Note["id"], NoteReaction | null>;
}; };
@ -187,7 +187,7 @@ export const NoteRepository = db.getRepository(Note).extend({
const isSrcNote = typeof src === "object"; const isSrcNote = typeof src === "object";
// Always lookup from ScyllaDB if enabled // Always lookup from ScyllaDB if enabled
if (isSrcNote && !scyllaClient) { if (isSrcNote && (!scyllaClient || options?.scyllaNote)) {
note = src; note = src;
} else { } else {
const noteId = isSrcNote ? src.id : src; const noteId = isSrcNote ? src.id : src;
@ -346,6 +346,7 @@ export const NoteRepository = db.getRepository(Note).extend({
me?: { id: User["id"] } | null | undefined, me?: { id: User["id"] } | null | undefined,
options?: { options?: {
detail?: boolean; detail?: boolean;
scyllaNote?: boolean;
}, },
) { ) {
if (notes.length === 0) return []; if (notes.length === 0) return [];

7
packages/backend/src/server/api/common/getters.ts
View file

@ -16,7 +16,7 @@ import {
export async function getNote( export async function getNote(
noteId: Note["id"], noteId: Note["id"],
me: { id: User["id"] } | null, me: { id: User["id"] } | null,
followingIds?: User["id"][] followingIds?: User["id"][],
) { ) {
let note: Note | null = null; let note: Note | null = null;
if (scyllaClient) { if (scyllaClient) {
@ -32,7 +32,10 @@ export async function getNote(
note = filtered[0]; note = filtered[0];
} }
} }
} else { }
// Fallback to Postgres
if (!note) {
const query = Notes.createQueryBuilder("note").where("note.id = :id", { const query = Notes.createQueryBuilder("note").where("note.id = :id", {
id: noteId, id: noteId,
}); });

4
packages/backend/src/server/api/endpoints/notes/renotes.ts
View file

@ -67,7 +67,9 @@ export default define(meta, paramDef, async (ps, user) => {
}; };
const foundNotes = await execTimelineQuery(ps, filter); const foundNotes = await execTimelineQuery(ps, filter);
return await Notes.packMany(foundNotes.slice(0, ps.limit), user); return await Notes.packMany(foundNotes.slice(0, ps.limit), user, {
scyllaNote: true,
});
} }
const query = makePaginationQuery( const query = makePaginationQuery(

4
packages/backend/src/server/api/endpoints/notes/timeline.ts
View file

@ -90,7 +90,9 @@ export default define(meta, paramDef, async (ps, user) => {
}; };
const foundNotes = await execTimelineQuery(ps, filter); const foundNotes = await execTimelineQuery(ps, filter);
return await Notes.packMany(foundNotes.slice(0, ps.limit), user); return await Notes.packMany(foundNotes.slice(0, ps.limit), user, {
scyllaNote: true,
});
} }
const hasFollowing = await followingsCache.hasFollowing(); const hasFollowing = await followingsCache.hasFollowing();