ash/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'fix: proper expire remote user drivefile over limits at adding time' (#10382) from cgsama/calckey:cgsama-patch-1 into develop

Browse source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10382
This commit is contained in:
Kainoa Kanter 2023-06-30 17:15:48 +00:00
commit 7a9782b3bb
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/src/services/drive/add-file.ts
View file

@ -368,7 +368,7 @@ async function upload(
);
}
async function deleteOldFile(user: IRemoteUser) {
async function expireOldFile(user: IRemoteUser, driveCapacity: number) {
const q = DriveFiles.createQueryBuilder("file")
.where("file.userId = :userId", { userId: user.id })
.andWhere("file.isLink = FALSE");
@ -381,12 +381,17 @@ async function deleteOldFile(user: IRemoteUser) {
q.andWhere("file.id != :bannerId", { bannerId: user.bannerId });
}
//This selete is hard coded, be careful if change database schema
q.addSelect('SUM("file"."size") OVER (ORDER BY "file"."id" DESC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)', 'acc_usage');
q.orderBy("file.id", "ASC");
const oldFile = await q.getOne();
const fileList = await q.getRawMany();
const exceedFileIds = fileList.filter((x: any) => x.acc_usage > driveCapacity).map((x: any) => x.file_id);
if (oldFile) {
deleteFile(oldFile, true);
for (const fileId of exceedFileIds) {
const file = await DriveFiles.findOneBy({ id: fileId });
deleteFile(file, true);
}
}
@ -529,8 +534,9 @@ export async function addFile({
);
} else {
// (アバターまたはバナーを含まず)最も古いファイルを削除する
deleteOldFile(
expireOldFile(
(await Users.findOneByOrFail({ id: user.id })) as IRemoteUser,
driveCapacity - info.size
);
}
}