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

fix: break if no user ids left

Browse source
This commit is contained in:
Namekuji 2023-08-26 12:20:43 -04:00
parent 5493fefe0f
commit 5cb04189ac
No known key found for this signature in database
GPG key ID: 1D62332C07FBA532
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/backend/src/db/scylla.ts
View file

@ -406,7 +406,9 @@ export async function execPaginationQuery(
} else if (kind === "notification" && userId) {
params.push(userId, untilDate, untilDate);
} else if (kind === "list" && ps.userIds) {
params.push(ps.userIds.pop() as string, untilDate);
const targetId = ps.userIds.pop();
if (!targetId) break;
params.push(targetId, untilDate);
} else {
params.push(untilDate, untilDate);
}
@ -415,7 +417,8 @@ export async function execPaginationQuery(
params.push(sinceDate);
}
params.push(kind === "list" ? ps.limit : queryLimit);
const fetchLimit = kind === "list" ? ps.limit : queryLimit;
params.push(fetchLimit);
const result = await scyllaClient.execute(query, params, {
prepare: true,
@ -437,7 +440,7 @@ export async function execPaginationQuery(
}
}
if (result.rowLength < queryLimit) {
if (result.rowLength < fetchLimit) {
// Reached the end of partition. Queries posts created one day before.
scannedPartitions++;
const yesterday = new Date(untilDate.getTime() - 86400000);

16
packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
View file

@ -76,6 +76,16 @@ export default define(meta, paramDef, async (ps, user) => {
}
if (scyllaClient) {
const userIds = await UserListJoinings.find({
select: ["userId"],
where: {
userListId: list.id,
},
}).then((lists) => lists.map(({ userId }) => userId));
if (userIds.length === 0) {
return await Notes.packMany([]);
}
const followingUserIds = await LocalFollowingsCache.init(user.id).then(
(cache) => cache.getAll(),
);
@ -106,11 +116,13 @@ export default define(meta, paramDef, async (ps, user) => {
const foundNotes = (
(await execPaginationQuery(
"list",
ps,
{ ...ps, userIds },
{ note: filter },
user.id,
)) as ScyllaNote[]
).slice(0, ps.limit * 1.5); // Some may filtered out by Notes.packMany, thus we take more than ps.limit.
)
.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
.slice(0, ps.limit * 1.5); // Some may filtered out by Notes.packMany, thus we take more than ps.limit.
foundPacked.push(...(await Notes.packMany(foundNotes, user)));
if (foundNotes.length < ps.limit) break;
ps.untilDate = foundNotes[foundNotes.length - 1].createdAt.getTime();