sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

テーブル分割

Browse Source
This commit is contained in:
syuilo
2019-04-10 15:04:27 +09:00
parent 9603f3fa4f
commit 626cfb61ac
33 changed files with 267 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/drive/add-file.ts
View File

@ -15,7 +15,7 @@ import { driveLogger } from './logger';
import { IImage, ConvertToJpeg, ConvertToWebp, ConvertToPng } from './image-processor';
import { contentDisposition } from '../../misc/content-disposition';
import { detectMine } from '../../misc/detect-mine';
import { DriveFiles, DriveFolders, Users, Instances } from '../../models';
import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '../../models';
import { InternalStorage } from './internal-storage';
import { DriveFile } from '../../models/entities/drive-file';
import { IRemoteUser, User } from '../../models/entities/user';
@ -365,6 +365,8 @@ export default async function(
propPromises = [calcWh(), calcAvg()];
}
const profile = await UserProfiles.findOne({ userId: user.id });
const [folder] = await Promise.all([fetchFolder(), Promise.all(propPromises)]);
let file = new DriveFile();
@ -376,7 +378,7 @@ export default async function(
file.comment = comment;
file.properties = properties;
file.isLink = isLink;
file.isSensitive = Users.isLocalUser(user) && user.alwaysMarkNsfw ? true :
file.isSensitive = Users.isLocalUser(user) && profile.alwaysMarkNsfw ? true :
(sensitive !== null && sensitive !== undefined)
? sensitive
: false;