Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,80 @@
|
||||
import define from "../../define.js";
|
||||
import { DriveFiles } from "../../../../models/index.js";
|
||||
import { makePaginationQuery } from "../../common/make-pagination-query.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "read:drive",
|
||||
res: {
|
||||
type: "array",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
items: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFile"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
limit: {
|
||||
type: "integer",
|
||||
minimum: 1,
|
||||
maximum: 100,
|
||||
default: 10
|
||||
},
|
||||
sinceId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
untilId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
folderId: {
|
||||
type: "string",
|
||||
format: "misskey:id",
|
||||
nullable: true,
|
||||
default: null
|
||||
},
|
||||
type: {
|
||||
type: "string",
|
||||
nullable: true,
|
||||
pattern: /^[a-zA-Z\/\-*]+$/.toString().slice(1, -1)
|
||||
}
|
||||
},
|
||||
required: []
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
const query = makePaginationQuery(DriveFiles.createQueryBuilder("file"), ps.sinceId, ps.untilId).andWhere("file.userId = :userId", {
|
||||
userId: user.id
|
||||
});
|
||||
if (ps.folderId) {
|
||||
query.andWhere("file.folderId = :folderId", {
|
||||
folderId: ps.folderId
|
||||
});
|
||||
} else {
|
||||
query.andWhere("file.folderId IS NULL");
|
||||
}
|
||||
if (ps.type) {
|
||||
if (ps.type.endsWith("/*")) {
|
||||
query.andWhere("file.type like :type", {
|
||||
type: `${ps.type.replace("/*", "/")}%`
|
||||
});
|
||||
} else {
|
||||
query.andWhere("file.type = :type", {
|
||||
type: ps.type
|
||||
});
|
||||
}
|
||||
}
|
||||
const files = await query.take(ps.limit).getMany();
|
||||
return await DriveFiles.packMany(files, {
|
||||
detail: false,
|
||||
self: true
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,61 @@
|
||||
import define from "../../define.js";
|
||||
import { DriveFolders } from "../../../../models/index.js";
|
||||
import { makePaginationQuery } from "../../common/make-pagination-query.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "read:drive",
|
||||
res: {
|
||||
type: "array",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
items: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFolder"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
limit: {
|
||||
type: "integer",
|
||||
minimum: 1,
|
||||
maximum: 100,
|
||||
default: 10
|
||||
},
|
||||
sinceId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
untilId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
folderId: {
|
||||
type: "string",
|
||||
format: "misskey:id",
|
||||
nullable: true,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
required: []
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
const query = makePaginationQuery(DriveFolders.createQueryBuilder("folder"), ps.sinceId, ps.untilId).andWhere("folder.userId = :userId", {
|
||||
userId: user.id
|
||||
});
|
||||
if (ps.folderId) {
|
||||
query.andWhere("folder.parentId = :parentId", {
|
||||
parentId: ps.folderId
|
||||
});
|
||||
} else {
|
||||
query.andWhere("folder.parentId IS NULL");
|
||||
}
|
||||
const folders = await query.take(ps.limit).getMany();
|
||||
return await Promise.all(folders.map((folder)=>DriveFolders.pack(folder)));
|
||||
});
|
||||
@@ -0,0 +1,67 @@
|
||||
import { publishDriveStream } from "../../../../../services/stream.js";
|
||||
import define from "../../../define.js";
|
||||
import { ApiError } from "../../../error.js";
|
||||
import { DriveFolders } from "../../../../../models/index.js";
|
||||
import { genId } from "../../../../../misc/gen-id.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "write:drive",
|
||||
errors: {
|
||||
noSuchFolder: {
|
||||
message: "No such folder.",
|
||||
code: "NO_SUCH_FOLDER",
|
||||
id: "53326628-a00d-40a6-a3cd-8975105c0f95"
|
||||
}
|
||||
},
|
||||
res: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFolder"
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
name: {
|
||||
type: "string",
|
||||
default: "Untitled",
|
||||
maxLength: 200
|
||||
},
|
||||
parentId: {
|
||||
type: "string",
|
||||
format: "misskey:id",
|
||||
nullable: true
|
||||
}
|
||||
},
|
||||
required: []
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
// If the parent folder is specified
|
||||
let parent = null;
|
||||
if (ps.parentId) {
|
||||
// Fetch parent folder
|
||||
parent = await DriveFolders.findOneBy({
|
||||
id: ps.parentId,
|
||||
userId: user.id
|
||||
});
|
||||
if (parent == null) {
|
||||
throw new ApiError(meta.errors.noSuchFolder);
|
||||
}
|
||||
}
|
||||
// Create folder
|
||||
const folder = await DriveFolders.insert({
|
||||
id: genId(),
|
||||
createdAt: new Date(),
|
||||
name: ps.name,
|
||||
parentId: parent !== null ? parent.id : null,
|
||||
userId: user.id
|
||||
}).then((x)=>DriveFolders.findOneByOrFail(x.identifiers[0]));
|
||||
const folderObj = await DriveFolders.pack(folder);
|
||||
// Publish folderCreated event
|
||||
publishDriveStream(user.id, "folderCreated", folderObj);
|
||||
return folderObj;
|
||||
});
|
||||
@@ -0,0 +1,59 @@
|
||||
import define from "../../../define.js";
|
||||
import { publishDriveStream } from "../../../../../services/stream.js";
|
||||
import { ApiError } from "../../../error.js";
|
||||
import { DriveFolders, DriveFiles } from "../../../../../models/index.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "write:drive",
|
||||
errors: {
|
||||
noSuchFolder: {
|
||||
message: "No such folder.",
|
||||
code: "NO_SUCH_FOLDER",
|
||||
id: "1069098f-c281-440f-b085-f9932edbe091"
|
||||
},
|
||||
hasChildFilesOrFolders: {
|
||||
message: "This folder has child files or folders.",
|
||||
code: "HAS_CHILD_FILES_OR_FOLDERS",
|
||||
id: "b0fc8a17-963c-405d-bfbc-859a487295e1"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
folderId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
}
|
||||
},
|
||||
required: [
|
||||
"folderId"
|
||||
]
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
// Get folder
|
||||
const folder = await DriveFolders.findOneBy({
|
||||
id: ps.folderId,
|
||||
userId: user.id
|
||||
});
|
||||
if (folder == null) {
|
||||
throw new ApiError(meta.errors.noSuchFolder);
|
||||
}
|
||||
const [childFoldersCount, childFilesCount] = await Promise.all([
|
||||
DriveFolders.countBy({
|
||||
parentId: folder.id
|
||||
}),
|
||||
DriveFiles.countBy({
|
||||
folderId: folder.id
|
||||
})
|
||||
]);
|
||||
if (childFoldersCount !== 0 || childFilesCount !== 0) {
|
||||
throw new ApiError(meta.errors.hasChildFilesOrFolders);
|
||||
}
|
||||
await DriveFolders.delete(folder.id);
|
||||
// Publish folderCreated event
|
||||
publishDriveStream(user.id, "folderDeleted", folder.id);
|
||||
});
|
||||
@@ -0,0 +1,46 @@
|
||||
import define from "../../../define.js";
|
||||
import { DriveFolders } from "../../../../../models/index.js";
|
||||
import { IsNull } from "typeorm";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "read:drive",
|
||||
res: {
|
||||
type: "array",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
items: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFolder"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
name: {
|
||||
type: "string"
|
||||
},
|
||||
parentId: {
|
||||
type: "string",
|
||||
format: "misskey:id",
|
||||
nullable: true,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
required: [
|
||||
"name"
|
||||
]
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
const folders = await DriveFolders.findBy({
|
||||
name: ps.name,
|
||||
userId: user.id,
|
||||
parentId: ps.parentId ?? IsNull()
|
||||
});
|
||||
return await Promise.all(folders.map((folder)=>DriveFolders.pack(folder)));
|
||||
});
|
||||
@@ -0,0 +1,48 @@
|
||||
import define from "../../../define.js";
|
||||
import { ApiError } from "../../../error.js";
|
||||
import { DriveFolders } from "../../../../../models/index.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "read:drive",
|
||||
res: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFolder"
|
||||
},
|
||||
errors: {
|
||||
noSuchFolder: {
|
||||
message: "No such folder.",
|
||||
code: "NO_SUCH_FOLDER",
|
||||
id: "d74ab9eb-bb09-4bba-bf24-fb58f761e1e9"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
folderId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
}
|
||||
},
|
||||
required: [
|
||||
"folderId"
|
||||
]
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
// Get folder
|
||||
const folder = await DriveFolders.findOneBy({
|
||||
id: ps.folderId,
|
||||
userId: user.id
|
||||
});
|
||||
if (folder == null) {
|
||||
throw new ApiError(meta.errors.noSuchFolder);
|
||||
}
|
||||
return await DriveFolders.pack(folder, {
|
||||
detail: true
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,111 @@
|
||||
import { publishDriveStream } from "../../../../../services/stream.js";
|
||||
import define from "../../../define.js";
|
||||
import { ApiError } from "../../../error.js";
|
||||
import { DriveFolders } from "../../../../../models/index.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "write:drive",
|
||||
errors: {
|
||||
noSuchFolder: {
|
||||
message: "No such folder.",
|
||||
code: "NO_SUCH_FOLDER",
|
||||
id: "f7974dac-2c0d-4a27-926e-23583b28e98e"
|
||||
},
|
||||
noSuchParentFolder: {
|
||||
message: "No such parent folder.",
|
||||
code: "NO_SUCH_PARENT_FOLDER",
|
||||
id: "ce104e3a-faaf-49d5-b459-10ff0cbbcaa1"
|
||||
},
|
||||
recursiveNesting: {
|
||||
message: "It can not be structured like nesting folders recursively.",
|
||||
code: "NO_SUCH_PARENT_FOLDER",
|
||||
id: "ce104e3a-faaf-49d5-b459-10ff0cbbcaa1"
|
||||
}
|
||||
},
|
||||
res: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFolder"
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
folderId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
name: {
|
||||
type: "string",
|
||||
maxLength: 200
|
||||
},
|
||||
parentId: {
|
||||
type: "string",
|
||||
format: "misskey:id",
|
||||
nullable: true
|
||||
}
|
||||
},
|
||||
required: [
|
||||
"folderId"
|
||||
]
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
// Fetch folder
|
||||
const folder = await DriveFolders.findOneBy({
|
||||
id: ps.folderId,
|
||||
userId: user.id
|
||||
});
|
||||
if (folder == null) {
|
||||
throw new ApiError(meta.errors.noSuchFolder);
|
||||
}
|
||||
if (ps.name) folder.name = ps.name;
|
||||
if (ps.parentId !== undefined) {
|
||||
if (ps.parentId === folder.id) {
|
||||
throw new ApiError(meta.errors.recursiveNesting);
|
||||
} else if (ps.parentId === null) {
|
||||
folder.parentId = null;
|
||||
} else {
|
||||
// Get parent folder
|
||||
const parent = await DriveFolders.findOneBy({
|
||||
id: ps.parentId,
|
||||
userId: user.id
|
||||
});
|
||||
if (parent == null) {
|
||||
throw new ApiError(meta.errors.noSuchParentFolder);
|
||||
}
|
||||
// Check if the circular reference will occur
|
||||
async function checkCircle(folderId) {
|
||||
// Fetch folder
|
||||
const folder2 = await DriveFolders.findOneBy({
|
||||
id: folderId
|
||||
});
|
||||
if (folder2.id === folder.id) {
|
||||
return true;
|
||||
} else if (folder2.parentId) {
|
||||
return await checkCircle(folder2.parentId);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (parent.parentId !== null) {
|
||||
if (await checkCircle(parent.parentId)) {
|
||||
throw new ApiError(meta.errors.recursiveNesting);
|
||||
}
|
||||
}
|
||||
folder.parentId = parent.id;
|
||||
}
|
||||
}
|
||||
// Update
|
||||
DriveFolders.update(folder.id, {
|
||||
name: folder.name,
|
||||
parentId: folder.parentId
|
||||
});
|
||||
const folderObj = await DriveFolders.pack(folder);
|
||||
// Publish folderUpdated event
|
||||
publishDriveStream(user.id, "folderUpdated", folderObj);
|
||||
return folderObj;
|
||||
});
|
||||
@@ -0,0 +1,66 @@
|
||||
import define from "../../define.js";
|
||||
import { DriveFiles } from "../../../../models/index.js";
|
||||
import { makePaginationQuery } from "../../common/make-pagination-query.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"drive"
|
||||
],
|
||||
requireCredential: true,
|
||||
kind: "read:drive",
|
||||
res: {
|
||||
type: "array",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
items: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "DriveFile"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
limit: {
|
||||
type: "integer",
|
||||
minimum: 1,
|
||||
maximum: 100,
|
||||
default: 10
|
||||
},
|
||||
sinceId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
untilId: {
|
||||
type: "string",
|
||||
format: "misskey:id"
|
||||
},
|
||||
type: {
|
||||
type: "string",
|
||||
pattern: /^[a-zA-Z\/\-*]+$/.toString().slice(1, -1)
|
||||
}
|
||||
},
|
||||
required: []
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, user)=>{
|
||||
const query = makePaginationQuery(DriveFiles.createQueryBuilder("file"), ps.sinceId, ps.untilId).andWhere("file.userId = :userId", {
|
||||
userId: user.id
|
||||
});
|
||||
if (ps.type) {
|
||||
if (ps.type.endsWith("/*")) {
|
||||
query.andWhere("file.type like :type", {
|
||||
type: `${ps.type.replace("/*", "/")}%`
|
||||
});
|
||||
} else {
|
||||
query.andWhere("file.type = :type", {
|
||||
type: ps.type
|
||||
});
|
||||
}
|
||||
}
|
||||
const files = await query.take(ps.limit).getMany();
|
||||
return await DriveFiles.packMany(files, {
|
||||
detail: false,
|
||||
self: true
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user