-
-
Notifications
You must be signed in to change notification settings - Fork 10
chore: merge dev to main
#52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
d34d3a5
feat(bots/discord): auto migrate database schema
PalmDevs 18a119f
feat(bots/discord): add remind/unremind command (#51)
oSumAtrIX d9754f2
chore(release): 1.6.0-dev.1 [skip ci]
semantic-release-bot f24a8fb
fix(bots/discord): add missing database migration file
PalmDevs 99c7422
feat(bots/discord/database/schemas): add indexes on reminders
PalmDevs 26680a9
fix(bots/discord): off-by-one reminders query + log if query fails
PalmDevs 13c48d5
chore(release): 1.6.0-dev.2 [skip ci]
semantic-release-bot 1f1dd74
fix(bots/discord): add min max intervals in `remind` command
PalmDevs a94fd74
fix(bots/discord): throw error if nothing inserted during adding remi…
PalmDevs cafdbc0
fix(bots/discord/database/schemas): index instead of unique index on …
PalmDevs b519b56
fix(bots/discord): require roles for using utility commands
PalmDevs 9ba040f
chore(release): 1.6.0-dev.3 [skip ci]
semantic-release-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| CREATE TABLE `applied_presets` ( | ||
| `member` text NOT NULL, | ||
| `guild` text NOT NULL, | ||
| `roles` text DEFAULT '[]' NOT NULL, | ||
| `preset` text NOT NULL, | ||
| `until` integer | ||
| ); | ||
| --> statement-breakpoint | ||
| CREATE UNIQUE INDEX `unique_composite` ON `applied_presets` (`member`,`preset`,`guild`);--> statement-breakpoint | ||
| CREATE TABLE `responses` ( | ||
| `reply` text PRIMARY KEY NOT NULL, | ||
| `channel` text NOT NULL, | ||
| `guild` text NOT NULL, | ||
| `ref` text NOT NULL, | ||
| `label` text NOT NULL, | ||
| `text` text NOT NULL, | ||
| `by` text | ||
| ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| { | ||
| "version": "6", | ||
| "dialect": "sqlite", | ||
| "id": "81c6e9da-4d03-4d2f-9934-1a6cf376dd6e", | ||
| "prevId": "00000000-0000-0000-0000-000000000000", | ||
| "tables": { | ||
| "applied_presets": { | ||
| "name": "applied_presets", | ||
| "columns": { | ||
| "member": { | ||
| "name": "member", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "guild": { | ||
| "name": "guild", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "roles": { | ||
| "name": "roles", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false, | ||
| "default": "'[]'" | ||
| }, | ||
| "preset": { | ||
| "name": "preset", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "until": { | ||
| "name": "until", | ||
| "type": "integer", | ||
| "primaryKey": false, | ||
| "notNull": false, | ||
| "autoincrement": false | ||
| } | ||
| }, | ||
| "indexes": { | ||
| "unique_composite": { | ||
| "name": "unique_composite", | ||
| "columns": [ | ||
| "member", | ||
| "preset", | ||
| "guild" | ||
| ], | ||
| "isUnique": true | ||
| } | ||
| }, | ||
| "foreignKeys": {}, | ||
| "compositePrimaryKeys": {}, | ||
| "uniqueConstraints": {}, | ||
| "checkConstraints": {} | ||
| }, | ||
| "responses": { | ||
| "name": "responses", | ||
| "columns": { | ||
| "reply": { | ||
| "name": "reply", | ||
| "type": "text", | ||
| "primaryKey": true, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "channel": { | ||
| "name": "channel", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "guild": { | ||
| "name": "guild", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "ref": { | ||
| "name": "ref", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "label": { | ||
| "name": "label", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "text": { | ||
| "name": "text", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": true, | ||
| "autoincrement": false | ||
| }, | ||
| "by": { | ||
| "name": "by", | ||
| "type": "text", | ||
| "primaryKey": false, | ||
| "notNull": false, | ||
| "autoincrement": false | ||
| } | ||
| }, | ||
| "indexes": {}, | ||
| "foreignKeys": {}, | ||
| "compositePrimaryKeys": {}, | ||
| "uniqueConstraints": {}, | ||
| "checkConstraints": {} | ||
PalmDevs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| }, | ||
| "views": {}, | ||
| "enums": {}, | ||
| "_meta": { | ||
| "schemas": {}, | ||
| "tables": {}, | ||
| "columns": {} | ||
| }, | ||
| "internal": { | ||
| "indexes": {} | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "version": "7", | ||
| "dialect": "sqlite", | ||
| "entries": [ | ||
| { | ||
| "idx": 0, | ||
| "version": "6", | ||
| "when": 1771768794695, | ||
| "tag": "0000_schema", | ||
| "breakpoints": true | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -178,7 +178,6 @@ dist | |
| *.db | ||
| *.sqlite | ||
| *.sqlite3 | ||
| .drizzle | ||
|
|
||
| # Auto-generated files | ||
| src/commands/index.ts | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| import { EmbedBuilder, MessageFlags } from 'discord.js' | ||
| import { eq } from 'drizzle-orm' | ||
| import Command from '$/classes/Command' | ||
| import { database } from '$/context' | ||
| import { reminders } from '$/database/schemas' | ||
| import { applyCommonEmbedStyles } from '$/utils/discord/embeds' | ||
| import { durationToString, parseDuration } from '$/utils/duration' | ||
|
|
||
| export default new Command({ | ||
| name: 'remind', | ||
| description: 'Set a reminder or list your reminders', | ||
| type: Command.Type.ChatGuild, | ||
| requirements: { | ||
| defaultCondition: 'pass', | ||
| }, | ||
| options: { | ||
| message: { | ||
| description: 'The reminder message', | ||
| required: false, | ||
| type: Command.OptionType.String, | ||
| maxLength: 1000, | ||
| }, | ||
| interval: { | ||
| description: 'When to remind (e.g., 1d, 2h30m, 1w). Default: 1 day', | ||
| required: false, | ||
| type: Command.OptionType.String, | ||
| }, | ||
| user: { | ||
| description: 'The user to remind (defaults to yourself)', | ||
| required: false, | ||
| type: Command.OptionType.User, | ||
| }, | ||
| }, | ||
| async execute({ logger }, interaction, { message, interval, user }) { | ||
| // If no message is provided, list all reminders | ||
| if (!message) { | ||
| const userReminders = await database.query.reminders.findMany({ | ||
| where: eq(reminders.creatorId, interaction.user.id), | ||
| }) | ||
|
|
||
| if (userReminders.length === 0) { | ||
| const embed = applyCommonEmbedStyles( | ||
| new EmbedBuilder().setTitle('No Reminders').setDescription('You have no active reminders.'), | ||
| false, | ||
| true, | ||
| true, | ||
| ) | ||
|
|
||
| await interaction.reply({ | ||
| embeds: [embed], | ||
| flags: MessageFlags.Ephemeral, | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| const reminderList = userReminders | ||
| .map(r => { | ||
| const targetStr = r.targetId === r.creatorId ? 'yourself' : `<@${r.targetId}>` | ||
| return ( | ||
| `**${r.id}.** ${r.message.substring(0, 50)}${r.message.length > 50 ? '...' : ''}\n` + | ||
| `-# For ${targetStr} • <t:${r.remindAt}:R> • Reminded ${r.count}x` | ||
| ) | ||
| }) | ||
| .join('\n\n') | ||
|
|
||
| const embed = applyCommonEmbedStyles( | ||
| new EmbedBuilder().setTitle('Your Reminders').setDescription(reminderList), | ||
| false, | ||
| true, | ||
| true, | ||
| ) | ||
|
|
||
| await interaction.reply({ | ||
| embeds: [embed], | ||
| flags: MessageFlags.Ephemeral, | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| // Create a new reminder | ||
| const targetUser = user ?? interaction.user | ||
| const durationMs = parseDuration(interval ?? '1d', 'd') | ||
|
|
||
| if (durationMs <= 0 || !Number.isFinite(durationMs)) { | ||
| const embed = applyCommonEmbedStyles( | ||
| new EmbedBuilder() | ||
| .setTitle('Invalid duration') | ||
| .setDescription('Please provide a valid duration (e.g., 1d, 2h30m, 1w).') | ||
| .setColor('Red'), | ||
| false, | ||
| false, | ||
| false, | ||
| ) | ||
|
|
||
| await interaction.reply({ | ||
| embeds: [embed], | ||
| flags: MessageFlags.Ephemeral, | ||
| }) | ||
| return | ||
| } | ||
PalmDevs marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
PalmDevs marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| const now = Math.floor(Date.now() / 1000) | ||
| const remindAt = now + Math.floor(durationMs / 1000) | ||
|
|
||
| const intervalSeconds = Math.floor(durationMs / 1000) | ||
| const [inserted] = await database | ||
| .insert(reminders) | ||
| .values({ | ||
| creatorId: interaction.user.id, | ||
| targetId: targetUser.id, | ||
| guildId: interaction.guildId!, | ||
| channelId: interaction.channelId, | ||
| message: message, | ||
| createdAt: now, | ||
| remindAt: remindAt, | ||
| intervalSeconds: intervalSeconds, | ||
| count: 0, | ||
| }) | ||
| .returning() | ||
|
|
||
| const reminderId = inserted?.id ?? 'unknown' | ||
PalmDevs marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| const targetStr = targetUser.id === interaction.user.id ? 'You' : targetUser.toString() | ||
|
|
||
| const embed = applyCommonEmbedStyles( | ||
| new EmbedBuilder() | ||
| .setTitle('Reminder set') | ||
| .setDescription( | ||
| `${targetStr} will be reminded <t:${remindAt}:R>.\n\n` + | ||
| `**Message:** ${message}\n` + | ||
| `-# Reminder ID: ${reminderId}`, | ||
| ), | ||
| false, | ||
| true, | ||
| true, | ||
| ) | ||
|
|
||
| await interaction.reply({ | ||
| embeds: [embed], | ||
| }) | ||
|
|
||
| logger.info( | ||
| `User ${interaction.user.tag} (${interaction.user.id}) set reminder #${reminderId} ` + | ||
| `for ${targetUser.tag} (${targetUser.id}) in ${durationToString(durationMs)}`, | ||
| ) | ||
| }, | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.