fix(backend): requested limit to be fulfilled if possible
This commit is contained in:
parent
d9ee4737bc
commit
695bc0068a
|
@ -2,6 +2,7 @@ import { db } from "@/db/postgre.js";
|
|||
import { NoteFavorite } from "@/models/entities/note-favorite.js";
|
||||
import { Notes } from "../index.js";
|
||||
import type { User } from "@/models/entities/user.js";
|
||||
import Logger from "@/services/logger.js";
|
||||
|
||||
export const NoteFavoriteRepository = db.getRepository(NoteFavorite).extend({
|
||||
async pack(
|
||||
|
@ -23,9 +24,16 @@ export const NoteFavoriteRepository = db.getRepository(NoteFavorite).extend({
|
|||
packMany(favorites: any[], me: { id: User["id"] }) {
|
||||
return Promise.allSettled(favorites.map((x) => this.pack(x, me))).then(
|
||||
(promises) =>
|
||||
promises.flatMap((result) =>
|
||||
result.status === "fulfilled" ? [result.value] : [],
|
||||
),
|
||||
promises.flatMap((result, i) => {
|
||||
if (result.status === "fulfilled") {
|
||||
return [result.value];
|
||||
}
|
||||
const logger = new Logger("models-note-favorite");
|
||||
logger.error(
|
||||
`dropping note favorite due to violating visibility restrictions, note favorite ${favorites[i].id} user ${me.id}`,
|
||||
);
|
||||
return [];
|
||||
}),
|
||||
);
|
||||
},
|
||||
});
|
||||
|
|
|
@ -4,6 +4,7 @@ import { Notes, Users } from "../index.js";
|
|||
import type { Packed } from "@/misc/schema.js";
|
||||
import { decodeReaction } from "@/misc/reaction-lib.js";
|
||||
import type { User } from "@/models/entities/user.js";
|
||||
import Logger from "@/services/logger.js";
|
||||
|
||||
export const NoteReactionRepository = db.getRepository(NoteReaction).extend({
|
||||
async pack(
|
||||
|
@ -49,8 +50,15 @@ export const NoteReactionRepository = db.getRepository(NoteReaction).extend({
|
|||
);
|
||||
|
||||
// filter out rejected promises, only keep fulfilled values
|
||||
return reactions.flatMap((result) =>
|
||||
result.status === "fulfilled" ? [result.value] : [],
|
||||
);
|
||||
return reactions.flatMap((result, i) => {
|
||||
if (result.status === "fulfilled") {
|
||||
return [result.value];
|
||||
}
|
||||
const logger = new Logger("models-note-reaction");
|
||||
logger.error(
|
||||
`dropping note reaction due to violating visibility restrictions, reason is ${result.reason}`,
|
||||
);
|
||||
return [];
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
@ -23,6 +23,7 @@ import {
|
|||
} from "@/misc/populate-emojis.js";
|
||||
import { db } from "@/db/postgre.js";
|
||||
import { IdentifiableError } from "@/misc/identifiable-error.js";
|
||||
import Logger from "@/services/logger.js";
|
||||
|
||||
export async function populatePoll(note: Note, meId: User["id"] | null) {
|
||||
const poll = await Polls.findOneByOrFail({ noteId: note.id });
|
||||
|
@ -325,8 +326,15 @@ export const NoteRepository = db.getRepository(Note).extend({
|
|||
);
|
||||
|
||||
// filter out rejected promises, only keep fulfilled values
|
||||
return promises.flatMap((result) =>
|
||||
result.status === "fulfilled" ? [result.value] : [],
|
||||
);
|
||||
return promises.flatMap((result, i) => {
|
||||
if (result.status === "fulfilled") {
|
||||
return [result.value];
|
||||
}
|
||||
const logger = new Logger("models-note");
|
||||
logger.error(
|
||||
`dropping note due to violating visibility restrictions, note ${notes[i].id} user ${meId}`,
|
||||
);
|
||||
return [];
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
@ -73,7 +73,21 @@ export default async (ctx: Router.RouterContext) => {
|
|||
)
|
||||
.andWhere("note.localOnly = FALSE");
|
||||
|
||||
const notes = await query.take(limit).getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, this is not normal behavior of any API.
|
||||
const notes = [];
|
||||
const take = Math.floor(limit * 1.5);
|
||||
let skip = 0;
|
||||
while (notes.length < limit) {
|
||||
const notes_query = await query.take(take).skip(skip).getMany();
|
||||
notes.push(...(await Notes.packMany(notes_query)));
|
||||
skip += take;
|
||||
if (notes_query.length < take) break;
|
||||
}
|
||||
|
||||
if (notes.length > limit) {
|
||||
notes.length = limit;
|
||||
}
|
||||
|
||||
if (sinceId) notes.reverse();
|
||||
|
||||
|
|
|
@ -117,11 +117,25 @@ export default define(meta, paramDef, async (ps, user) => {
|
|||
generateMutedUserQuery(query, user);
|
||||
generateBlockedUserQuery(query, user);
|
||||
|
||||
const notes = await query.take(limit).getMany();
|
||||
|
||||
if (notes.length > 0) {
|
||||
readNote(user.id, notes);
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const notes = await query.take(take).skip(skip).getMany();
|
||||
found.push(...(await Notes.packMany(notes)));
|
||||
skip += take;
|
||||
if (notes.length < take) break;
|
||||
}
|
||||
|
||||
return await Notes.packMany(notes, user);
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
if (found.length > 0) {
|
||||
readNote(user.id, found);
|
||||
}
|
||||
|
||||
return found;
|
||||
});
|
||||
|
|
|
@ -76,9 +76,23 @@ export default define(meta, paramDef, async (ps, user) => {
|
|||
.leftJoinAndSelect("note.channel", "channel");
|
||||
//#endregion
|
||||
|
||||
const timeline = await query.take(ps.limit).getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const timeline = await query.take(take).skip(skip).getMany();
|
||||
found.push(...(await Notes.packMany(timeline, user)));
|
||||
skip += take;
|
||||
if (timeline.length < take) break;
|
||||
}
|
||||
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
if (user) activeUsersChart.read(user);
|
||||
|
||||
return await Notes.packMany(timeline, user);
|
||||
return found;
|
||||
});
|
||||
|
|
|
@ -88,7 +88,21 @@ export default define(meta, paramDef, async (ps, user) => {
|
|||
generateBlockedUserQuery(query, user);
|
||||
}
|
||||
|
||||
const notes = await query.take(ps.limit).getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const notes = await query.take(take).skip(skip).getMany();
|
||||
found.push(...(await Notes.packMany(notes, user)));
|
||||
skip += take;
|
||||
if (notes.length < take) break;
|
||||
}
|
||||
|
||||
return await Notes.packMany(notes, user);
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
return found;
|
||||
});
|
||||
|
|
|
@ -85,7 +85,21 @@ export default define(meta, paramDef, async (ps) => {
|
|||
// query.isBot = bot;
|
||||
//}
|
||||
|
||||
const notes = await query.take(ps.limit).getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const notes = await query.take(take).skip(skip).getMany();
|
||||
found.push(...(await Notes.packMany(notes)));
|
||||
skip += take;
|
||||
if (notes.length < take) break;
|
||||
}
|
||||
|
||||
return await Notes.packMany(notes);
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
return found;
|
||||
});
|
||||
|
|
|
@ -57,7 +57,25 @@ export default define(meta, paramDef, async (ps, user) => {
|
|||
generateBlockedUserQuery(query, user);
|
||||
}
|
||||
|
||||
const notes = await query.getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const notes = await query.take(take).skip(skip).getMany();
|
||||
found.push(
|
||||
...(await Notes.packMany(notes, user, {
|
||||
detail: false,
|
||||
})),
|
||||
);
|
||||
skip += take;
|
||||
if (notes.length < take) break;
|
||||
}
|
||||
|
||||
return await Notes.packMany(notes, user, { detail: false });
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
return found;
|
||||
});
|
||||
|
|
|
@ -138,7 +138,21 @@ export default define(meta, paramDef, async (ps, me) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
const timeline = await query.take(ps.limit).getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const timeline = await query.take(take).skip(skip).getMany();
|
||||
found.push(...(await Notes.packMany(timeline, user)));
|
||||
skip += take;
|
||||
if (timeline.length < take) break;
|
||||
}
|
||||
|
||||
return await Notes.packMany(timeline, me);
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
return found;
|
||||
});
|
||||
|
|
|
@ -70,7 +70,23 @@ export default define(meta, paramDef, async (ps, me) => {
|
|||
|
||||
generateVisibilityQuery(query, me);
|
||||
|
||||
const reactions = await query.take(ps.limit).getMany();
|
||||
// We fetch more than requested because some may be filtered out, and if there's less than
|
||||
// requested, the pagination stops.
|
||||
const found = [];
|
||||
const take = Math.floor(ps.limit * 1.5);
|
||||
let skip = 0;
|
||||
while (found.length < ps.limit) {
|
||||
const reactions = await query.take(take).skip(skip).getMany();
|
||||
found.push(
|
||||
...(await NoteReactions.packMany(reactions, me, { withNote: true })),
|
||||
);
|
||||
skip += take;
|
||||
if (reactions.length < take) break;
|
||||
}
|
||||
|
||||
return await NoteReactions.packMany(reactions, me, { withNote: true });
|
||||
if (found.length > ps.limit) {
|
||||
found.length = ps.limit;
|
||||
}
|
||||
|
||||
return found;
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue