From 518f39aeab5db94f288719480dfc310643b63e0c Mon Sep 17 00:00:00 2001
From: Benedikt Magnus <magnus@magnuscraft.de>
Date: Sun, 14 Nov 2021 20:32:02 +0100
Subject: [PATCH] Smaller changes
---
scripts/utility/localisation.ts | 2 +-
scripts/wichtelbot/database/database.ts | 24 +++++++++----------
.../wichtelbot/endpoint/definitions/state.ts | 3 ++-
.../message/modules/assignmentModule.ts | 2 +-
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/scripts/utility/localisation.ts b/scripts/utility/localisation.ts
index 746a216..01da981 100644
--- a/scripts/utility/localisation.ts
+++ b/scripts/utility/localisation.ts
@@ -27,7 +27,7 @@ interface Commands
informationBothAnalogueAndDigital: CommandInfo;
informationDigital: CommandInfo;
maybe: CommandInfo;
- moddingRunAssignment: CommandInfo;
+ moddingRunAssignment: CommandInfo; // TODO: Rename "modding" commands to "moderation".
moddingStatus: CommandInfo;
no: CommandInfo;
registration: CommandInfo;
diff --git a/scripts/wichtelbot/database/database.ts b/scripts/wichtelbot/database/database.ts
index 22158cd..38a570a 100644
--- a/scripts/wichtelbot/database/database.ts
+++ b/scripts/wichtelbot/database/database.ts
@@ -206,7 +206,7 @@ export default class Database
}
/**
- * NOTE: The contact objects's lastUpdateTime will be updated.
+ * NOTE: The contact object's lastUpdateTime will be updated.
* TODO: Give the save methods a better name like "insert" or "create" or "saveNew".
*/
public saveContact (contact: Contact): void
@@ -244,7 +244,7 @@ export default class Database
}
/**
- * NOTE: The contact objects's lastUpdateTime will be updated.
+ * NOTE: The contact object's lastUpdateTime will be updated.
*/
public updateContact (contact: Contact): void
{
@@ -426,15 +426,6 @@ export default class Database
runTransaction();
}
- public getWaitingMemberCount (): number
- {
- const statement = this.mainDatabase.prepare(
- 'SELECT COUNT(*) FROM contact WHERE contact.state = ?'
- );
-
- return this.getCount(statement, State.Waiting);
- }
-
/**
* Will return the type of contact that can be found for this ID. \
* If no contact is found, the given contactCoreData will be returned instead.
@@ -466,7 +457,16 @@ export default class Database
}
}
- public getWaitingMember (): Member[]
+ public getWaitingMemberCount (): number
+ {
+ const statement = this.mainDatabase.prepare(
+ 'SELECT COUNT(*) FROM contact WHERE contact.state = ?'
+ );
+
+ return this.getCount(statement, State.Waiting);
+ }
+
+ public getWaitingMembers (): Member[]
{
const statement = this.mainDatabase.prepare(
`SELECT
diff --git a/scripts/wichtelbot/endpoint/definitions/state.ts b/scripts/wichtelbot/endpoint/definitions/state.ts
index 9f4db0a..5ab407a 100644
--- a/scripts/wichtelbot/endpoint/definitions/state.ts
+++ b/scripts/wichtelbot/endpoint/definitions/state.ts
@@ -17,7 +17,8 @@ enum State
InformationUserExclusion = 'informationUserExclusion',
InformationFreeText = 'informationFreeText',
// As member:
- Waiting = 'waiting', // Waiting for becoming a wichtel.
+ /** Waiting for becoming a Wichtel. */
+ Waiting = 'waiting', // TODO: Rename to "registered".
ConfirmDeregistration = 'confirmDeregistration',
// As wichtel:
MessageToGiftGiver = 'messageToGiftGiver',
diff --git a/scripts/wichtelbot/message/modules/assignmentModule.ts b/scripts/wichtelbot/message/modules/assignmentModule.ts
index 535dda3..2c67d7d 100644
--- a/scripts/wichtelbot/message/modules/assignmentModule.ts
+++ b/scripts/wichtelbot/message/modules/assignmentModule.ts
@@ -42,7 +42,7 @@ export class AssignmentModule
*/
public runAssignment (): boolean // TODO: Return the reason for failure.
{
- const members = this.database.getWaitingMember();
+ const members = this.database.getWaitingMembers();
if (members.length === 0)
{
--
GitLab