heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
tamaina 2023-01-14 04:48:17 +00:00
commit 73d735a1f7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/server/api/endpoints/drive/files/create.ts
View file

@ -90,7 +90,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
}
}
const meta = await this.metaService.fetch();
const instance = await this.metaService.fetch();
try {
// Create file
@ -102,8 +102,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
folderId: ps.folderId,
force: ps.force,
sensitive: ps.isSensitive,
requestIp: meta.enableIpLogging ? ip : null,
requestHeaders: meta.enableIpLogging ? headers : null,
requestIp: instance.enableIpLogging ? ip : null,
requestHeaders: instance.enableIpLogging ? headers : null,
});
return await this.driveFileEntityService.pack(driveFile, { self: true });
} catch (err) {
@ -116,7 +116,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
}
throw new ApiError();
} finally {
cleanup!();
cleanup!();
}
});
}