nxbat/discordbot-ng
1
0
Fork 0
mirror of https://github.com/nx-bat/discordbot-ng.git synced 2026-11-11 07:13:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

[DB] Merge getGuildSettings & putGuild into GetOrCreateSettings (#9)

Browse Source
This commit is contained in:
nxbat
2026-08-19 08:44:26 -07:00
committed by GitHub
parent 9c91e18962
commit cb2348f89c
23 changed files with 74 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/Database.ts
+19 -24
View File
@@ -2,7 +2,7 @@ import path from 'path';
import { open, Database as SqliteDatabase } from 'sqlite';
import sqlite3 from 'sqlite3';
import { Message } from '../events';
import { AppealMessage, Ban, GithubUserMapping, GuildArraySetting, GuildSetting, GuildSettings, KnowledgebaseItem, LoggedMessage, Note, PrivateHelpTicket, RoleButton, TicketMessage, TicketPhrase } from '../types';
import { AppealMessage, Ban, GithubUserMapping, GuildArraySetting, GuildSettings, KnowledgebaseItem, LoggedMessage, Note, PrivateHelpTicket, RoleButton, TicketMessage, TicketPhrase } from '../types';
import { deserializeMessage, serializeMessage, wait } from '../utils';
import { readFileSync } from 'fs';
import { Encrypter } from './Encrypter';
@@ -14,6 +14,7 @@ export const enum PrivateHelpTicketStatus {
export class Database {
private static db: SqliteDatabase;
private static settings: Map<string, GuildSettings> = new Map();
static async open(file: string): Promise<void> {
if (Database.db) return;
@@ -28,7 +29,6 @@ export class Database {
console.log('SQLite database opened');
await Database.ensure();
await Database.migrate();
}
@@ -75,50 +75,45 @@ export class Database {
//#region Guild Settings
static async getGuildSettings(guildId: string): Promise<GuildSettings> {
return await Database.db.get<GuildSettings>('SELECT * FROM settings WHERE guild_id = ?', guildId) as GuildSettings;
static async getOrCreateSettings(guildId: string): Promise<GuildSettings> {
const localStore = this.settings.get(guildId);
if (localStore) return localStore;
await Database.db.run('INSERT OR IGNORE INTO settings (guild_id) VALUES (?)', guildId);
const store = await Database.db.get<GuildSettings>('SELECT * FROM settings WHERE guild_id = ?', guildId) as GuildSettings;
this.settings.set(guildId, store);
return store;
}
static async putGuild(guildId: string) {
await Database.db.run('INSERT INTO settings(guild_id) VALUES (?)', guildId);
}
static async updateGuildSettings(guildId: string, key: GuildSetting, value: string) {
static async updateSettings(guildId: string, key: Exclude<keyof GuildSettings, 'guild_id'>, value: string) {
await Database.db.run(`UPDATE settings SET ${key} = ? WHERE guild_id = ?`, value, guildId);
this.settings.delete(guildId);
}
// Since "setting" has guaranteed values and is never set by the user, this shouldn't cause any security issues.
// But it does allow me to skip rewriting this a bunch.
static async getGuildArraySetting(setting: GuildArraySetting, guildId: string): Promise<string[]> {
const settings = await Database.db.get<{ [setting]: string }>(`SELECT ${setting} FROM settings WHERE guild_id = ?`, guildId);
if (!settings || !settings[setting]) return [];
const settings = await Database.getOrCreateSettings(guildId);
if (!settings[setting]) return [];
return settings[setting].split(',');
}
static async putGuildArraySetting(setting: GuildArraySetting, guildId: string, value: string) {
const values = await Database.getGuildArraySetting(setting, guildId);
if (!values.includes(value)) values.push(value);
if (values.indexOf(value) == -1) values.push(value);
const newString = values.join(',');
await Database.db.run(`UPDATE settings SET ${setting} = ? WHERE guild_id = ?`, newString, guildId);
await Database.updateSettings(guildId, setting, values.join(','));
}
static async removeGuildArraySetting(setting: GuildArraySetting, guildId: string, value: string): Promise<boolean> {
const values = await Database.getGuildArraySetting(setting, guildId);
const index = values.indexOf(value);
if (index == -1) return false;
if (index === -1) return false;
values.splice(index, 1);
const newString = values.join(',');
await Database.db.run(`UPDATE settings SET ${setting} = ? WHERE guild_id = ?`, newString, guildId);
await Database.updateSettings(guildId, setting, values.join(','));
return true;
}