move messageTemplates out of counters table
This commit is contained in:
parent
98e80af87d
commit
8d66d125b8
|
@ -0,0 +1,21 @@
|
||||||
|
/**
|
||||||
|
* @param { import("knex").Knex } knex
|
||||||
|
* @returns { Promise<void> }
|
||||||
|
*/
|
||||||
|
exports.up = function(knex) {
|
||||||
|
return knex.schema
|
||||||
|
.alterTable('counters', table => {
|
||||||
|
table.dropColumn('messageTemplate');
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param { import("knex").Knex } knex
|
||||||
|
* @returns { Promise<void> }
|
||||||
|
*/
|
||||||
|
exports.down = function(knex) {
|
||||||
|
return knex.schema
|
||||||
|
.alterTable('counters', table => {
|
||||||
|
table.string('messageTemplate');
|
||||||
|
});
|
||||||
|
};
|
|
@ -61,7 +61,6 @@ export async function getCounterConfigRaw(counter: Counter) {
|
||||||
|
|
||||||
// just the ugly way of life
|
// just the ugly way of life
|
||||||
config.set('emoji', counter.emoji);
|
config.set('emoji', counter.emoji);
|
||||||
config.set('messageTemplate', counter.messageTemplate || (counterConfigs.get('messageTemplate')!.default! as string)); // wow! this line is truly awful
|
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
@ -93,14 +92,6 @@ export async function setCounterConfig(id: number, option: string, value: string
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (option === 'messageTemplate') {
|
|
||||||
await db<Counter>('counters')
|
|
||||||
.where('id', id)
|
|
||||||
.update({
|
|
||||||
'messageTemplate': value
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const updated = await db<CounterConfiguration>('counterConfigurations')
|
const updated = await db<CounterConfiguration>('counterConfigurations')
|
||||||
.update({
|
.update({
|
||||||
|
@ -170,15 +161,15 @@ export const counterConfigs = new Map([
|
||||||
type: ConfigType.Bool,
|
type: ConfigType.Bool,
|
||||||
default: false
|
default: false
|
||||||
}],
|
}],
|
||||||
|
['messageTemplate', {
|
||||||
|
type: ConfigType.String,
|
||||||
|
default: '**%user** has %action the counter by **%amt**.'
|
||||||
|
}],
|
||||||
|
|
||||||
// these ones are fake and are just stand-ins for values defined inside the actual counters table
|
// these ones are fake and are just stand-ins for values defined inside the actual counters table
|
||||||
['emoji', {
|
['emoji', {
|
||||||
type: ConfigType.String,
|
type: ConfigType.String,
|
||||||
default: ''
|
default: ''
|
||||||
}],
|
|
||||||
['messageTemplate', {
|
|
||||||
type: ConfigType.String,
|
|
||||||
default: '**%user** has %action the counter by **%amt**.'
|
|
||||||
}]
|
}]
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -213,8 +204,8 @@ export async function updateCounter(bot: Client, counter: Counter, value: number
|
||||||
export async function announceCounterUpdate(bot: Client, member: GuildMember, delta: number, counter: Counter, value: number) {
|
export async function announceCounterUpdate(bot: Client, member: GuildMember, delta: number, counter: Counter, value: number) {
|
||||||
const channel = await bot.channels.fetch(counter.channel) as TextChannel;
|
const channel = await bot.channels.fetch(counter.channel) as TextChannel;
|
||||||
|
|
||||||
const template = counter.messageTemplate || counterConfigs.get('messageTemplate')!.default as string;
|
const template = await getCounterConfig(counter.id, 'messageTemplate') as string;
|
||||||
const anonymous = await getCounterConfig(counter.id, 'anonymous');
|
const anonymous = await getCounterConfig(counter.id, 'anonymous') as boolean;
|
||||||
|
|
||||||
const embed = new EmbedBuilder()
|
const embed = new EmbedBuilder()
|
||||||
//.setDescription(`**${member.toString()}** has ${delta > 0 ? 'increased' : 'decreased'} the counter by **${Math.abs(delta)}**.`)
|
//.setDescription(`**${member.toString()}** has ${delta > 0 ? 'increased' : 'decreased'} the counter by **${Math.abs(delta)}**.`)
|
||||||
|
|
|
@ -32,7 +32,6 @@ export interface Counter {
|
||||||
channel: string,
|
channel: string,
|
||||||
guild: string,
|
guild: string,
|
||||||
message?: string,
|
message?: string,
|
||||||
messageTemplate?: string,
|
|
||||||
allowlistConsumer: boolean,
|
allowlistConsumer: boolean,
|
||||||
allowlistProducer: boolean
|
allowlistProducer: boolean
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue