From fe25e6f3677738b3f9493ec9053881acf494f4a9 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 18 Jun 2025 22:53:04 -0400 Subject: [PATCH] remove useless async/await from charts --- .../src/core/chart/charts/active-users.ts | 8 +++--- .../src/core/chart/charts/ap-request.ts | 12 ++++---- .../backend/src/core/chart/charts/drive.ts | 4 +-- .../src/core/chart/charts/federation.ts | 8 +++--- .../backend/src/core/chart/charts/instance.ts | 28 +++++++++---------- .../backend/src/core/chart/charts/notes.ts | 4 +-- .../src/core/chart/charts/per-user-drive.ts | 4 +-- .../core/chart/charts/per-user-following.ts | 2 +- .../src/core/chart/charts/per-user-pv.ts | 8 +++--- .../core/chart/charts/per-user-reactions.ts | 2 +- .../src/core/chart/charts/test-grouped.ts | 4 +-- .../core/chart/charts/test-intersection.ts | 8 +++--- .../src/core/chart/charts/test-unique.ts | 4 +-- .../backend/src/core/chart/charts/test.ts | 8 +++--- .../backend/src/core/chart/charts/users.ts | 4 +-- 15 files changed, 54 insertions(+), 54 deletions(-) diff --git a/packages/backend/src/core/chart/charts/active-users.ts b/packages/backend/src/core/chart/charts/active-users.ts index 20432fb293..4858633973 100644 --- a/packages/backend/src/core/chart/charts/active-users.ts +++ b/packages/backend/src/core/chart/charts/active-users.ts @@ -50,9 +50,9 @@ export default class ActiveUsersChart extends Chart { // eslint-d } @bindThis - public async read(user: { id: MiUser['id'], host: null }): Promise { + public read(user: { id: MiUser['id'], host: null }): void { const createdAt = this.idService.parse(user.id).date; - await this.commit({ + this.commit({ 'read': [user.id], 'registeredWithinWeek': (this.timeService.now - createdAt.getTime() < week) ? [user.id] : [], 'registeredWithinMonth': (this.timeService.now - createdAt.getTime() < month) ? [user.id] : [], @@ -64,8 +64,8 @@ export default class ActiveUsersChart extends Chart { // eslint-d } @bindThis - public async write(user: { id: MiUser['id'], host: null }): Promise { - await this.commit({ + public write(user: { id: MiUser['id'], host: null }): void { + this.commit({ 'write': [user.id], }); } diff --git a/packages/backend/src/core/chart/charts/ap-request.ts b/packages/backend/src/core/chart/charts/ap-request.ts index 8cae5753c7..f4177955b7 100644 --- a/packages/backend/src/core/chart/charts/ap-request.ts +++ b/packages/backend/src/core/chart/charts/ap-request.ts @@ -43,22 +43,22 @@ export default class ApRequestChart extends Chart { // eslint-dis } @bindThis - public async deliverSucc(): Promise { - await this.commit({ + public deliverSucc(): void { + this.commit({ 'deliverSucceeded': 1, }); } @bindThis - public async deliverFail(): Promise { - await this.commit({ + public deliverFail(): void { + this.commit({ 'deliverFailed': 1, }); } @bindThis - public async inbox(): Promise { - await this.commit({ + public inbox(): void { + this.commit({ 'inboxReceived': 1, }); } diff --git a/packages/backend/src/core/chart/charts/drive.ts b/packages/backend/src/core/chart/charts/drive.ts index cce07f3b5b..2818faf1cb 100644 --- a/packages/backend/src/core/chart/charts/drive.ts +++ b/packages/backend/src/core/chart/charts/drive.ts @@ -44,9 +44,9 @@ export default class DriveChart extends Chart { // eslint-disable } @bindThis - public async update(file: MiDriveFile, isAdditional: boolean): Promise { + public update(file: MiDriveFile, isAdditional: boolean): void { const fileSizeKb = file.size / 1000; - await this.commit(file.userHost === null ? { + this.commit(file.userHost === null ? { 'local.incCount': isAdditional ? 1 : 0, 'local.incSize': isAdditional ? fileSizeKb : 0, 'local.decCount': isAdditional ? 0 : 1, diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts index 199c263cce..ab160128f5 100644 --- a/packages/backend/src/core/chart/charts/federation.ts +++ b/packages/backend/src/core/chart/charts/federation.ts @@ -118,8 +118,8 @@ export default class FederationChart extends Chart { // eslint-di } @bindThis - public async deliverd(host: string, succeeded: boolean): Promise { - await this.commit(succeeded ? { + public deliverd(host: string, succeeded: boolean): void { + this.commit(succeeded ? { 'deliveredInstances': [host], } : { 'stalled': [host], @@ -127,8 +127,8 @@ export default class FederationChart extends Chart { // eslint-di } @bindThis - public async inbox(host: string): Promise { - await this.commit({ + public inbox(host: string): void { + this.commit({ 'inboxInstances': [host], }); } diff --git a/packages/backend/src/core/chart/charts/instance.ts b/packages/backend/src/core/chart/charts/instance.ts index ca6c1c5026..d3690820e8 100644 --- a/packages/backend/src/core/chart/charts/instance.ts +++ b/packages/backend/src/core/chart/charts/instance.ts @@ -80,31 +80,31 @@ export default class InstanceChart extends Chart { // eslint-disa } @bindThis - public async requestReceived(host: string): Promise { - await this.commit({ + public requestReceived(host: string): void { + this.commit({ 'requests.received': 1, }, this.utilityService.toPuny(host)); } @bindThis - public async requestSent(host: string, isSucceeded: boolean): Promise { - await this.commit({ + public requestSent(host: string, isSucceeded: boolean): void { + this.commit({ 'requests.succeeded': isSucceeded ? 1 : 0, 'requests.failed': isSucceeded ? 0 : 1, }, this.utilityService.toPuny(host)); } @bindThis - public async newUser(host: string): Promise { - await this.commit({ + public newUser(host: string): void { + this.commit({ 'users.total': 1, 'users.inc': 1, }, this.utilityService.toPuny(host)); } @bindThis - public async updateNote(host: string, note: MiNote, isAdditional: boolean): Promise { - await this.commit({ + public updateNote(host: string, note: MiNote, isAdditional: boolean): void { + this.commit({ 'notes.total': isAdditional ? 1 : -1, 'notes.inc': isAdditional ? 1 : 0, 'notes.dec': isAdditional ? 0 : 1, @@ -116,8 +116,8 @@ export default class InstanceChart extends Chart { // eslint-disa } @bindThis - public async updateFollowing(host: string, isAdditional: boolean): Promise { - await this.commit({ + public updateFollowing(host: string, isAdditional: boolean): void { + this.commit({ 'following.total': isAdditional ? 1 : -1, 'following.inc': isAdditional ? 1 : 0, 'following.dec': isAdditional ? 0 : 1, @@ -125,8 +125,8 @@ export default class InstanceChart extends Chart { // eslint-disa } @bindThis - public async updateFollowers(host: string, isAdditional: boolean): Promise { - await this.commit({ + public updateFollowers(host: string, isAdditional: boolean): void { + this.commit({ 'followers.total': isAdditional ? 1 : -1, 'followers.inc': isAdditional ? 1 : 0, 'followers.dec': isAdditional ? 0 : 1, @@ -134,9 +134,9 @@ export default class InstanceChart extends Chart { // eslint-disa } @bindThis - public async updateDrive(file: MiDriveFile, isAdditional: boolean): Promise { + public updateDrive(file: MiDriveFile, isAdditional: boolean): void { const fileSizeKb = file.size / 1000; - await this.commit({ + this.commit({ 'drive.totalFiles': isAdditional ? 1 : -1, 'drive.incFiles': isAdditional ? 1 : 0, 'drive.incUsage': isAdditional ? fileSizeKb : 0, diff --git a/packages/backend/src/core/chart/charts/notes.ts b/packages/backend/src/core/chart/charts/notes.ts index 43cabd0b98..f8c3676009 100644 --- a/packages/backend/src/core/chart/charts/notes.ts +++ b/packages/backend/src/core/chart/charts/notes.ts @@ -56,10 +56,10 @@ export default class NotesChart extends Chart { // eslint-disable } @bindThis - public async update(note: MiNote, isAdditional: boolean): Promise { + public update(note: MiNote, isAdditional: boolean): void { const prefix = note.userHost === null ? 'local' : 'remote'; - await this.commit({ + this.commit({ [`${prefix}.total`]: isAdditional ? 1 : -1, [`${prefix}.inc`]: isAdditional ? 1 : 0, [`${prefix}.dec`]: isAdditional ? 0 : 1, diff --git a/packages/backend/src/core/chart/charts/per-user-drive.ts b/packages/backend/src/core/chart/charts/per-user-drive.ts index 663abc5f00..b1bd7c6173 100644 --- a/packages/backend/src/core/chart/charts/per-user-drive.ts +++ b/packages/backend/src/core/chart/charts/per-user-drive.ts @@ -58,9 +58,9 @@ export default class PerUserDriveChart extends Chart { // eslint- } @bindThis - public async update(file: MiDriveFile, isAdditional: boolean): Promise { + public update(file: MiDriveFile, isAdditional: boolean): void { const fileSizeKb = file.size / 1000; - await this.commit({ + this.commit({ 'totalCount': isAdditional ? 1 : -1, 'totalSize': isAdditional ? fileSizeKb : -fileSizeKb, 'incCount': isAdditional ? 1 : 0, diff --git a/packages/backend/src/core/chart/charts/per-user-following.ts b/packages/backend/src/core/chart/charts/per-user-following.ts index 71678b0573..05e971616a 100644 --- a/packages/backend/src/core/chart/charts/per-user-following.ts +++ b/packages/backend/src/core/chart/charts/per-user-following.ts @@ -70,7 +70,7 @@ export default class PerUserFollowingChart extends Chart { // esl } @bindThis - public async update(follower: { id: MiUser['id']; host: MiUser['host']; }, followee: { id: MiUser['id']; host: MiUser['host']; }, isFollow: boolean): Promise { + public update(follower: { id: MiUser['id']; host: MiUser['host']; }, followee: { id: MiUser['id']; host: MiUser['host']; }, isFollow: boolean): void { const prefixFollower = this.userEntityService.isLocalUser(follower) ? 'local' : 'remote'; const prefixFollowee = this.userEntityService.isLocalUser(followee) ? 'local' : 'remote'; diff --git a/packages/backend/src/core/chart/charts/per-user-pv.ts b/packages/backend/src/core/chart/charts/per-user-pv.ts index 75a61aae07..272bc9180b 100644 --- a/packages/backend/src/core/chart/charts/per-user-pv.ts +++ b/packages/backend/src/core/chart/charts/per-user-pv.ts @@ -44,16 +44,16 @@ export default class PerUserPvChart extends Chart { // eslint-dis } @bindThis - public async commitByUser(user: { id: MiUser['id'] }, key: string): Promise { - await this.commit({ + public commitByUser(user: { id: MiUser['id'] }, key: string): void { + this.commit({ 'upv.user': [key], 'pv.user': 1, }, user.id); } @bindThis - public async commitByVisitor(user: { id: MiUser['id'] }, key: string): Promise { - await this.commit({ + public commitByVisitor(user: { id: MiUser['id'] }, key: string): void { + this.commit({ 'upv.visitor': [key], 'pv.visitor': 1, }, user.id); diff --git a/packages/backend/src/core/chart/charts/per-user-reactions.ts b/packages/backend/src/core/chart/charts/per-user-reactions.ts index 9fb78a28e9..89f6567f50 100644 --- a/packages/backend/src/core/chart/charts/per-user-reactions.ts +++ b/packages/backend/src/core/chart/charts/per-user-reactions.ts @@ -47,7 +47,7 @@ export default class PerUserReactionsChart extends Chart { // esl } @bindThis - public async update(user: { id: MiUser['id'], host: MiUser['host'] }, note: MiNote): Promise { + public update(user: { id: MiUser['id'], host: MiUser['host'] }, note: MiNote): void { const prefix = this.userEntityService.isLocalUser(user) ? 'local' : 'remote'; this.commit({ [`${prefix}.count`]: 1, diff --git a/packages/backend/src/core/chart/charts/test-grouped.ts b/packages/backend/src/core/chart/charts/test-grouped.ts index 6cc48d483d..186e056efc 100644 --- a/packages/backend/src/core/chart/charts/test-grouped.ts +++ b/packages/backend/src/core/chart/charts/test-grouped.ts @@ -48,12 +48,12 @@ export default class TestGroupedChart extends Chart { // eslint-d } @bindThis - public async increment(group: string): Promise { + public increment(group: string): void { if (this.total[group] == null) this.total[group] = 0; this.total[group]++; - await this.commit({ + this.commit({ 'foo.total': 1, 'foo.inc': 1, }, group); diff --git a/packages/backend/src/core/chart/charts/test-intersection.ts b/packages/backend/src/core/chart/charts/test-intersection.ts index d0ae1dab24..f84d498d52 100644 --- a/packages/backend/src/core/chart/charts/test-intersection.ts +++ b/packages/backend/src/core/chart/charts/test-intersection.ts @@ -44,15 +44,15 @@ export default class TestIntersectionChart extends Chart { // esl } @bindThis - public async addA(key: string): Promise { - await this.commit({ + public addA(key: string): void { + this.commit({ a: [key], }); } @bindThis - public async addB(key: string): Promise { - await this.commit({ + public addB(key: string): void { + this.commit({ b: [key], }); } diff --git a/packages/backend/src/core/chart/charts/test-unique.ts b/packages/backend/src/core/chart/charts/test-unique.ts index 54a081fe2a..10a7e0dad2 100644 --- a/packages/backend/src/core/chart/charts/test-unique.ts +++ b/packages/backend/src/core/chart/charts/test-unique.ts @@ -44,8 +44,8 @@ export default class TestUniqueChart extends Chart { // eslint-di } @bindThis - public async uniqueIncrement(key: string): Promise { - await this.commit({ + public uniqueIncrement(key: string): void { + this.commit({ foo: [key], }); } diff --git a/packages/backend/src/core/chart/charts/test.ts b/packages/backend/src/core/chart/charts/test.ts index e95259f3b2..b281d50e67 100644 --- a/packages/backend/src/core/chart/charts/test.ts +++ b/packages/backend/src/core/chart/charts/test.ts @@ -48,20 +48,20 @@ export default class TestChart extends Chart { // eslint-disable- } @bindThis - public async increment(): Promise { + public increment(): void { this.total++; - await this.commit({ + this.commit({ 'foo.total': 1, 'foo.inc': 1, }); } @bindThis - public async decrement(): Promise { + public decrement(): void { this.total--; - await this.commit({ + this.commit({ 'foo.total': -1, 'foo.dec': 1, }); diff --git a/packages/backend/src/core/chart/charts/users.ts b/packages/backend/src/core/chart/charts/users.ts index 91bf972371..ca5e58f07b 100644 --- a/packages/backend/src/core/chart/charts/users.ts +++ b/packages/backend/src/core/chart/charts/users.ts @@ -61,10 +61,10 @@ export default class UsersChart extends Chart { // eslint-disable } @bindThis - public async update(user: { id: MiUser['id'], host: MiUser['host'] }, isAdditional: boolean): Promise { + public update(user: { id: MiUser['id'], host: MiUser['host'] }, isAdditional: boolean): void { const prefix = this.userEntityService.isLocalUser(user) ? 'local' : 'remote'; - await this.commit({ + this.commit({ [`${prefix}.total`]: isAdditional ? 1 : -1, [`${prefix}.inc`]: isAdditional ? 1 : 0, [`${prefix}.dec`]: isAdditional ? 0 : 1,