リファクタリング (#4587)

* Use I cap

* Avoid _

* Use default value instead of optional boolean

* Bye useless variable

* Bye verbose try-catch
This commit is contained in:
Acid Chicken (硫酸鶏)
2019-04-14 17:18:17 +09:00
committed by syuilo
parent 97bff010a8
commit 054220db70
8 changed files with 17 additions and 37 deletions

View File

@ -17,10 +17,9 @@ export async function deleteDriveFiles(job: Bull.Job, done: any): Promise<void>
}
let deletedCount = 0;
let ended = false;
let cursor: any = null;
while (!ended) {
while (true) {
const files = await DriveFiles.find({
where: {
userId: user.id,
@ -33,7 +32,6 @@ export async function deleteDriveFiles(job: Bull.Job, done: any): Promise<void>
});
if (files.length === 0) {
ended = true;
job.progress(100);
break;
}

View File

@ -33,10 +33,9 @@ export async function exportBlocking(job: Bull.Job, done: any): Promise<void> {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let ended = false;
let cursor: any = null;
while (!ended) {
while (true) {
const blockings = await Blockings.find({
where: {
blockerId: user.id,
@ -49,7 +48,6 @@ export async function exportBlocking(job: Bull.Job, done: any): Promise<void> {
});
if (blockings.length === 0) {
ended = true;
job.progress(100);
break;
}

View File

@ -33,10 +33,9 @@ export async function exportFollowing(job: Bull.Job, done: any): Promise<void> {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let ended = false;
let cursor: any = null;
while (!ended) {
while (true) {
const followings = await Followings.find({
where: {
followerId: user.id,
@ -49,7 +48,6 @@ export async function exportFollowing(job: Bull.Job, done: any): Promise<void> {
});
if (followings.length === 0) {
ended = true;
job.progress(100);
break;
}

View File

@ -33,10 +33,9 @@ export async function exportMute(job: Bull.Job, done: any): Promise<void> {
const stream = fs.createWriteStream(path, { flags: 'a' });
let exportedCount = 0;
let ended = false;
let cursor: any = null;
while (!ended) {
while (true) {
const mutes = await Mutings.find({
where: {
muterId: user.id,
@ -49,7 +48,6 @@ export async function exportMute(job: Bull.Job, done: any): Promise<void> {
});
if (mutes.length === 0) {
ended = true;
job.progress(100);
break;
}

View File

@ -46,10 +46,9 @@ export async function exportNotes(job: Bull.Job, done: any): Promise<void> {
});
let exportedNotesCount = 0;
let ended = false;
let cursor: any = null;
while (!ended) {
while (true) {
const notes = await Notes.find({
where: {
userId: user.id,
@ -62,7 +61,6 @@ export async function exportNotes(job: Bull.Job, done: any): Promise<void> {
});
if (notes.length === 0) {
ended = true;
job.progress(100);
break;
}