Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,138 @@
|
||||
import { Brackets } from "typeorm";
|
||||
import { fetchMeta } from "../../../../misc/fetch-meta.js";
|
||||
import { Notes } from "../../../../models/index.js";
|
||||
import { activeUsersChart } from "../../../../services/chart/index.js";
|
||||
import define from "../../define.js";
|
||||
import { ApiError } from "../../error.js";
|
||||
import { generateMutedUserQuery } from "../../common/generate-muted-user-query.js";
|
||||
import { makePaginationQuery } from "../../common/make-pagination-query.js";
|
||||
import { generateRepliesQuery } from "../../common/generate-replies-query.js";
|
||||
import { generateChannelQuery } from "../../common/generate-channel-query.js";
|
||||
import { generateBlockedUserQuery } from "../../common/generate-block-query.js";
|
||||
import { generateMutedUserRenotesQueryForNotes } from "../../common/generated-muted-renote-query.js";
|
||||
import { generateExcludeMemorietQuery } from "../../common/generate-exclude-memoriet-query.js";
|
||||
import { injectPromo } from "../../common/inject-promo.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"notes"
|
||||
],
|
||||
requireCredentialPrivateMode: true,
|
||||
res: {
|
||||
type: "array",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
items: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "Note"
|
||||
}
|
||||
},
|
||||
errors: {
|
||||
rtlDisabled: {
|
||||
message: "Recommended timeline has been disabled.",
|
||||
code: "RTL_DISABLED",
|
||||
id: "45a6eb02-7695-4393-b023-dd3be9aaaefe"
|
||||
},
|
||||
queryError: {
|
||||
message: "Please follow more users.",
|
||||
code: "QUERY_ERROR",
|
||||
id: "620763f4-f621-4533-ab33-0577a1a3c343"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
withFiles: {
|
||||
type: "boolean",
|
||||
default: false,
|
||||
description: "Only show notes that have attached files."
|
||||
},
|
||||
fileType: {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "string"
|
||||
}
|
||||
},
|
||||
excludeNsfw: {
|
||||
type: "boolean",
|
||||
default: false
|
||||
},
|
||||
limit: {
|
||||
type: "integer",
|
||||
minimum: 1,
|
||||
maximum: 100,
|
||||
default: 10
|
||||
},
|
||||
sinceId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
untilId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
sinceDate: {
|
||||
type: "integer"
|
||||
},
|
||||
untilDate: {
|
||||
type: "integer"
|
||||
},
|
||||
withReplies: {
|
||||
type: "boolean",
|
||||
default: false,
|
||||
description: "Show replies in the timeline"
|
||||
}
|
||||
},
|
||||
required: []
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
const m = await fetchMeta();
|
||||
if (m.disableRecommendedTimeline) {
|
||||
if (user == null || !(user.isAdmin || user.isModerator)) {
|
||||
throw new ApiError(meta.errors.rtlDisabled);
|
||||
}
|
||||
}
|
||||
//#region Construct query
|
||||
const query = makePaginationQuery(Notes.createQueryBuilder("note"), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate).andWhere(`note.userHost IN (:...instances)`, {
|
||||
instances: m.recommendedInstances
|
||||
}).andWhere("note.visibility = 'public'").andWhere(`NOT ('adservice' = ANY(note.tags))`).innerJoinAndSelect("note.user", "user").leftJoinAndSelect("note.reply", "reply").leftJoinAndSelect("note.renote", "renote").leftJoinAndSelect("reply.user", "replyUser").leftJoinAndSelect("renote.user", "renoteUser");
|
||||
generateChannelQuery(query, user);
|
||||
generateRepliesQuery(query, ps.withReplies, user);
|
||||
if (user) generateMutedUserQuery(query, user);
|
||||
if (user) generateBlockedUserQuery(query, user);
|
||||
if (user) generateMutedUserRenotesQueryForNotes(query, user);
|
||||
generateExcludeMemorietQuery(query);
|
||||
if (ps.withFiles) {
|
||||
query.andWhere("note.fileIds != '{}'");
|
||||
}
|
||||
if (ps.fileType != null) {
|
||||
query.andWhere("note.fileIds != '{}'");
|
||||
query.andWhere(new Brackets((qb)=>{
|
||||
for (const type of ps.fileType){
|
||||
const i = ps.fileType.indexOf(type);
|
||||
qb.orWhere(`:type${i} = ANY(note.attachedFileTypes)`, {
|
||||
[`type${i}`]: type
|
||||
});
|
||||
}
|
||||
}));
|
||||
if (ps.excludeNsfw) {
|
||||
query.andWhere("note.cw IS NULL");
|
||||
query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)');
|
||||
}
|
||||
}
|
||||
//#endregion
|
||||
process.nextTick(()=>{
|
||||
if (user) {
|
||||
activeUsersChart.read(user);
|
||||
}
|
||||
});
|
||||
try {
|
||||
const notes = await query.take(ps.limit).getMany();
|
||||
await injectPromo(notes, user);
|
||||
return await Notes.packMany(notes, user);
|
||||
} catch (error) {
|
||||
throw new ApiError(meta.errors.queryError);
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user