From 8a9a439526ff8eac5359fb0ae60c9b2920d4eded Mon Sep 17 00:00:00 2001 From: ThatKev <65928584+thatkev@users.noreply.github.com> Date: Mon, 24 Jun 2024 22:31:01 +0930 Subject: [PATCH 01/29] add dash cmd --- bot/en_us/slash_commands/dashboard.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 bot/en_us/slash_commands/dashboard.json diff --git a/bot/en_us/slash_commands/dashboard.json b/bot/en_us/slash_commands/dashboard.json new file mode 100644 index 0000000..60c9fb5 --- /dev/null +++ b/bot/en_us/slash_commands/dashboard.json @@ -0,0 +1,4 @@ +{ + "name": "dashboard", + "description": "Visit Quark's web dashboard" +} From a27a23c50913c28ce4ee673743ee96dba9e6638f Mon Sep 17 00:00:00 2001 From: lis0ownik <97831192+lis0ownik@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:20:34 +0200 Subject: [PATCH 02/29] Update channelEvents.json --- bot/pl/standard/channelEvents.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bot/pl/standard/channelEvents.json b/bot/pl/standard/channelEvents.json index b6447a4..9df6eb9 100644 --- a/bot/pl/standard/channelEvents.json +++ b/bot/pl/standard/channelEvents.json @@ -1,30 +1,30 @@ { "channelCreated": { - "title": "Kanał Utworzony", + "title": "Utworzono Kanał {type}", "description": "{channel} został utworzony przez {executor}", "descriptionWithCategory": "{channel} został utworzony przez {executor} w kategorii {category}." }, "channelDeleted": { - "title": "Kanał Usunięty", + "title": "Usunięto Kanał {type}", "description": "{channel_name} został usunięty przez {executor}", "channel": "Kanał" }, "channelUpdated": { - "title": "Kanał Zmodyfikowany", + "title": "Zmodyfikowano Kanał {type}", "description": "{channel} został zmodyfikowany przez {executor}" }, "channelOverwriteCreate": { - "title": "Dodano Uprawnienia do Kanału", + "title": "Dodano Uprawnienia do Kanału {type}", "description": "{executor} dodał uprawnienia do {channel} dla {special}" }, "channelOverwriteDelete": { - "title": "Usunięto Uprawnienia z Kanału", + "title": "Usunięto Uprawnienia z Kanału {type}", "description": "{executor} usunął uprawnienia z {channel} dla {special}" }, "channelOverwriteUpdate": { - "title": "Zaktualizowano Uprawnienia Kanału", + "title": "Zaktualizowano Uprawnienia Kanału {type}", "description": "{executor} zaktualizował uprawnienia dla {channel} dla {special}", "newPermissions": "Nowe Uprawnienia", "viewFullNewPermissions": "Zobacz Pełne Nowe Uprawnienia" } -} \ No newline at end of file +} From cbea5b7b90c8b3432c7b0cb37ba3d436cedb5d7f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 16:01:21 +0100 Subject: [PATCH 03/29] add quark event strings --- bot/en_gb/standard/quarkEvents.json | 45 +++++++++++++++++++++++++++++ bot/en_pr/standard/quarkEvents.json | 45 +++++++++++++++++++++++++++++ bot/en_us/standard/quarkEvents.json | 45 +++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 bot/en_gb/standard/quarkEvents.json create mode 100644 bot/en_pr/standard/quarkEvents.json create mode 100644 bot/en_us/standard/quarkEvents.json diff --git a/bot/en_gb/standard/quarkEvents.json b/bot/en_gb/standard/quarkEvents.json new file mode 100644 index 0000000..7149230 --- /dev/null +++ b/bot/en_gb/standard/quarkEvents.json @@ -0,0 +1,45 @@ +{ + "serverlogChannelUpdate": { + "title": "Logging Channel Changed", + "description_set": "{executor} set the {type} logging channel to {channel}", + "description_category_disable": "{executor} disabled the {type} logging channel", + "description_unset": "{executor} unset the {type} logging channel" + }, + "serverlogIgnoreUpdate": { + "title": "Ignored Options Updated", + "description_set": "{executor} enabled {type}", + "description_unset": "{executor} disabled {type}", + "description_added": "{executor} added {target} to {type}", + "description_removed": "{executor} removed {target} from {type}" + }, + "languageUpdate": { + "title": "Language Changed", + "description": "{executor} changed the language to {language}" + }, + "reset": { + "title": "Configuration Reset", + "description": "{executor} reset the configuration for this server" + }, + "tagAdded": { + "title": "Tag Added", + "description": "{executor} created a tag {tag}" + }, + "tagUpdated": { + "title": "Tag Updated", + "description": "{executor} updated the tag {tag}" + }, + "tagDeleted": { + "title": "Tag Deleted", + "description": "{executor} deleted the tag {tag}" + }, + "tokenAdded": { + "title": "Token Generated", + "description": "{executor} generated a Quark access token with {permissions} permissions for this server", + "unique_id": "Token ID", + "revoke": "Revoke" + }, + "tokenRevoked": { + "title": "Token Revoked", + "description": "{executor} revoked the Quark access token with ID {token}" + } +} \ No newline at end of file diff --git a/bot/en_pr/standard/quarkEvents.json b/bot/en_pr/standard/quarkEvents.json new file mode 100644 index 0000000..7149230 --- /dev/null +++ b/bot/en_pr/standard/quarkEvents.json @@ -0,0 +1,45 @@ +{ + "serverlogChannelUpdate": { + "title": "Logging Channel Changed", + "description_set": "{executor} set the {type} logging channel to {channel}", + "description_category_disable": "{executor} disabled the {type} logging channel", + "description_unset": "{executor} unset the {type} logging channel" + }, + "serverlogIgnoreUpdate": { + "title": "Ignored Options Updated", + "description_set": "{executor} enabled {type}", + "description_unset": "{executor} disabled {type}", + "description_added": "{executor} added {target} to {type}", + "description_removed": "{executor} removed {target} from {type}" + }, + "languageUpdate": { + "title": "Language Changed", + "description": "{executor} changed the language to {language}" + }, + "reset": { + "title": "Configuration Reset", + "description": "{executor} reset the configuration for this server" + }, + "tagAdded": { + "title": "Tag Added", + "description": "{executor} created a tag {tag}" + }, + "tagUpdated": { + "title": "Tag Updated", + "description": "{executor} updated the tag {tag}" + }, + "tagDeleted": { + "title": "Tag Deleted", + "description": "{executor} deleted the tag {tag}" + }, + "tokenAdded": { + "title": "Token Generated", + "description": "{executor} generated a Quark access token with {permissions} permissions for this server", + "unique_id": "Token ID", + "revoke": "Revoke" + }, + "tokenRevoked": { + "title": "Token Revoked", + "description": "{executor} revoked the Quark access token with ID {token}" + } +} \ No newline at end of file diff --git a/bot/en_us/standard/quarkEvents.json b/bot/en_us/standard/quarkEvents.json new file mode 100644 index 0000000..7149230 --- /dev/null +++ b/bot/en_us/standard/quarkEvents.json @@ -0,0 +1,45 @@ +{ + "serverlogChannelUpdate": { + "title": "Logging Channel Changed", + "description_set": "{executor} set the {type} logging channel to {channel}", + "description_category_disable": "{executor} disabled the {type} logging channel", + "description_unset": "{executor} unset the {type} logging channel" + }, + "serverlogIgnoreUpdate": { + "title": "Ignored Options Updated", + "description_set": "{executor} enabled {type}", + "description_unset": "{executor} disabled {type}", + "description_added": "{executor} added {target} to {type}", + "description_removed": "{executor} removed {target} from {type}" + }, + "languageUpdate": { + "title": "Language Changed", + "description": "{executor} changed the language to {language}" + }, + "reset": { + "title": "Configuration Reset", + "description": "{executor} reset the configuration for this server" + }, + "tagAdded": { + "title": "Tag Added", + "description": "{executor} created a tag {tag}" + }, + "tagUpdated": { + "title": "Tag Updated", + "description": "{executor} updated the tag {tag}" + }, + "tagDeleted": { + "title": "Tag Deleted", + "description": "{executor} deleted the tag {tag}" + }, + "tokenAdded": { + "title": "Token Generated", + "description": "{executor} generated a Quark access token with {permissions} permissions for this server", + "unique_id": "Token ID", + "revoke": "Revoke" + }, + "tokenRevoked": { + "title": "Token Revoked", + "description": "{executor} revoked the Quark access token with ID {token}" + } +} \ No newline at end of file From 61ea2ed03a51df58904e06c6f454d37c982b675f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 18:34:24 +0100 Subject: [PATCH 04/29] rewording --- bot/en_gb/standard/quarkEvents.json | 2 +- bot/en_pr/standard/quarkEvents.json | 2 +- bot/en_us/standard/quarkEvents.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/standard/quarkEvents.json b/bot/en_gb/standard/quarkEvents.json index 7149230..4dd02ac 100644 --- a/bot/en_gb/standard/quarkEvents.json +++ b/bot/en_gb/standard/quarkEvents.json @@ -36,7 +36,7 @@ "title": "Token Generated", "description": "{executor} generated a Quark access token with {permissions} permissions for this server", "unique_id": "Token ID", - "revoke": "Revoke" + "revoke": "Revoke this token" }, "tokenRevoked": { "title": "Token Revoked", diff --git a/bot/en_pr/standard/quarkEvents.json b/bot/en_pr/standard/quarkEvents.json index 7149230..4dd02ac 100644 --- a/bot/en_pr/standard/quarkEvents.json +++ b/bot/en_pr/standard/quarkEvents.json @@ -36,7 +36,7 @@ "title": "Token Generated", "description": "{executor} generated a Quark access token with {permissions} permissions for this server", "unique_id": "Token ID", - "revoke": "Revoke" + "revoke": "Revoke this token" }, "tokenRevoked": { "title": "Token Revoked", diff --git a/bot/en_us/standard/quarkEvents.json b/bot/en_us/standard/quarkEvents.json index 7149230..4dd02ac 100644 --- a/bot/en_us/standard/quarkEvents.json +++ b/bot/en_us/standard/quarkEvents.json @@ -36,7 +36,7 @@ "title": "Token Generated", "description": "{executor} generated a Quark access token with {permissions} permissions for this server", "unique_id": "Token ID", - "revoke": "Revoke" + "revoke": "Revoke this token" }, "tokenRevoked": { "title": "Token Revoked", From b27a537c402be61e772c676fa6bebea0e5b308fe Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:29:38 +0100 Subject: [PATCH 05/29] add log categories --- bot/en_gb/log_categories.json | 12 ++++++++++++ bot/en_pr/log_categories.json | 12 ++++++++++++ bot/en_us/log_categories.json | 12 ++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 bot/en_gb/log_categories.json create mode 100644 bot/en_pr/log_categories.json create mode 100644 bot/en_us/log_categories.json diff --git a/bot/en_gb/log_categories.json b/bot/en_gb/log_categories.json new file mode 100644 index 0000000..bd90c4e --- /dev/null +++ b/bot/en_gb/log_categories.json @@ -0,0 +1,12 @@ +{ + "serverEvents": "Members", + "serverActions": "Actions", + "textEvents": "Messages", + "voiceEvents": "Voice", + "fileEvents": "Files", + "generalEvents": "Server", + "roleEvents": "Roles", + "channelEvents": "Channels", + "quarkEvents": "Quark Config", + "modLog": "Modlogs" +} \ No newline at end of file diff --git a/bot/en_pr/log_categories.json b/bot/en_pr/log_categories.json new file mode 100644 index 0000000..bd90c4e --- /dev/null +++ b/bot/en_pr/log_categories.json @@ -0,0 +1,12 @@ +{ + "serverEvents": "Members", + "serverActions": "Actions", + "textEvents": "Messages", + "voiceEvents": "Voice", + "fileEvents": "Files", + "generalEvents": "Server", + "roleEvents": "Roles", + "channelEvents": "Channels", + "quarkEvents": "Quark Config", + "modLog": "Modlogs" +} \ No newline at end of file diff --git a/bot/en_us/log_categories.json b/bot/en_us/log_categories.json new file mode 100644 index 0000000..bd90c4e --- /dev/null +++ b/bot/en_us/log_categories.json @@ -0,0 +1,12 @@ +{ + "serverEvents": "Members", + "serverActions": "Actions", + "textEvents": "Messages", + "voiceEvents": "Voice", + "fileEvents": "Files", + "generalEvents": "Server", + "roleEvents": "Roles", + "channelEvents": "Channels", + "quarkEvents": "Quark Config", + "modLog": "Modlogs" +} \ No newline at end of file From 55a5c7c639104e0d5f608c9846df70f306c19814 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:34:08 +0100 Subject: [PATCH 06/29] add quark events to config command --- bot/en_gb/command_responses.json | 4 ++++ bot/en_pr/command_responses.json | 4 ++++ bot/en_us/command_responses.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index 749bf97..595277c 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -206,6 +206,10 @@ "title": "Overview", "description": "Overview of main category options" }, + "quarkEvents": { + "title": "Quark Config", + "description": "Changes made to Quark's configuration for this server" + }, "fileEvents": { "title": "Files" } diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index c94f083..daecefd 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -206,6 +206,10 @@ "title": "Overview", "description": "Overview of main category options" }, + "quarkEvents": { + "title": "Quark Config", + "description": "Changes made to Quark's configuration for this server" + }, "fileEvents": { "title": "Files" } diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index 4bc3e8c..cbe3b9d 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -206,6 +206,10 @@ "title": "Overview", "description": "Overview of main category options" }, + "quarkEvents": { + "title": "Quark Config", + "description": "Changes made to Quark's configuration for this server" + }, "fileEvents": { "title": "Files" } From 1f22147e3b2af454bbb76ee48acda0e562211ee9 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:41:20 +0100 Subject: [PATCH 07/29] add access token permission groups --- bot/en_gb/access_token.json | 4 ++++ bot/en_pr/access_token.json | 4 ++++ bot/en_us/access_token.json | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 bot/en_gb/access_token.json create mode 100644 bot/en_pr/access_token.json create mode 100644 bot/en_us/access_token.json diff --git a/bot/en_gb/access_token.json b/bot/en_gb/access_token.json new file mode 100644 index 0000000..721f000 --- /dev/null +++ b/bot/en_gb/access_token.json @@ -0,0 +1,4 @@ +{ + "1": "Admin", + "2": "Basic" +} \ No newline at end of file diff --git a/bot/en_pr/access_token.json b/bot/en_pr/access_token.json new file mode 100644 index 0000000..721f000 --- /dev/null +++ b/bot/en_pr/access_token.json @@ -0,0 +1,4 @@ +{ + "1": "Admin", + "2": "Basic" +} \ No newline at end of file diff --git a/bot/en_us/access_token.json b/bot/en_us/access_token.json new file mode 100644 index 0000000..721f000 --- /dev/null +++ b/bot/en_us/access_token.json @@ -0,0 +1,4 @@ +{ + "1": "Admin", + "2": "Basic" +} \ No newline at end of file From 6d47b018ee0d998fa9e3c9b8f17eccda79bd8f5c Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:47:30 +0100 Subject: [PATCH 08/29] modify slightly --- bot/en_gb/standard/quarkEvents.json | 2 +- bot/en_pr/standard/quarkEvents.json | 2 +- bot/en_us/standard/quarkEvents.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/standard/quarkEvents.json b/bot/en_gb/standard/quarkEvents.json index 4dd02ac..febdca7 100644 --- a/bot/en_gb/standard/quarkEvents.json +++ b/bot/en_gb/standard/quarkEvents.json @@ -6,7 +6,7 @@ "description_unset": "{executor} unset the {type} logging channel" }, "serverlogIgnoreUpdate": { - "title": "Ignored Options Updated", + "title": "Ignore Options Updated", "description_set": "{executor} enabled {type}", "description_unset": "{executor} disabled {type}", "description_added": "{executor} added {target} to {type}", diff --git a/bot/en_pr/standard/quarkEvents.json b/bot/en_pr/standard/quarkEvents.json index 4dd02ac..febdca7 100644 --- a/bot/en_pr/standard/quarkEvents.json +++ b/bot/en_pr/standard/quarkEvents.json @@ -6,7 +6,7 @@ "description_unset": "{executor} unset the {type} logging channel" }, "serverlogIgnoreUpdate": { - "title": "Ignored Options Updated", + "title": "Ignore Options Updated", "description_set": "{executor} enabled {type}", "description_unset": "{executor} disabled {type}", "description_added": "{executor} added {target} to {type}", diff --git a/bot/en_us/standard/quarkEvents.json b/bot/en_us/standard/quarkEvents.json index 4dd02ac..febdca7 100644 --- a/bot/en_us/standard/quarkEvents.json +++ b/bot/en_us/standard/quarkEvents.json @@ -6,7 +6,7 @@ "description_unset": "{executor} unset the {type} logging channel" }, "serverlogIgnoreUpdate": { - "title": "Ignored Options Updated", + "title": "Ignore Options Updated", "description_set": "{executor} enabled {type}", "description_unset": "{executor} disabled {type}", "description_added": "{executor} added {target} to {type}", From ccdccc4c15d8d23b860548136f571c39482b9db6 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:51:09 +0100 Subject: [PATCH 09/29] add ignore option names --- bot/en_gb/ignore_options.json | 12 ++++++++++++ bot/en_pr/ignore_options.json | 12 ++++++++++++ bot/en_us/ignore_options.json | 12 ++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 bot/en_gb/ignore_options.json create mode 100644 bot/en_pr/ignore_options.json create mode 100644 bot/en_us/ignore_options.json diff --git a/bot/en_gb/ignore_options.json b/bot/en_gb/ignore_options.json new file mode 100644 index 0000000..197476a --- /dev/null +++ b/bot/en_gb/ignore_options.json @@ -0,0 +1,12 @@ +{ + "ignoreTargets": "Ignore Target Users", + "ignoreExecutors": "Ignore Target Executors", + "specificMessageContent": "Ignore Specific Message Content", + "ignoreChannels": "Ignore Channels", + "ignoreBotExecutors": "Ignore Bot Executors", + "ignoreBotTargets": "Ignore Bot Targets", + "ignoreExecutorRoles": "Ignore Executor Roles", + "ignoreTargetRoles": "Ignore Target Roles", + "ignoreCategories": "Ignore Categories", + "activeIgnore": "Active Ignore" +} \ No newline at end of file diff --git a/bot/en_pr/ignore_options.json b/bot/en_pr/ignore_options.json new file mode 100644 index 0000000..197476a --- /dev/null +++ b/bot/en_pr/ignore_options.json @@ -0,0 +1,12 @@ +{ + "ignoreTargets": "Ignore Target Users", + "ignoreExecutors": "Ignore Target Executors", + "specificMessageContent": "Ignore Specific Message Content", + "ignoreChannels": "Ignore Channels", + "ignoreBotExecutors": "Ignore Bot Executors", + "ignoreBotTargets": "Ignore Bot Targets", + "ignoreExecutorRoles": "Ignore Executor Roles", + "ignoreTargetRoles": "Ignore Target Roles", + "ignoreCategories": "Ignore Categories", + "activeIgnore": "Active Ignore" +} \ No newline at end of file diff --git a/bot/en_us/ignore_options.json b/bot/en_us/ignore_options.json new file mode 100644 index 0000000..197476a --- /dev/null +++ b/bot/en_us/ignore_options.json @@ -0,0 +1,12 @@ +{ + "ignoreTargets": "Ignore Target Users", + "ignoreExecutors": "Ignore Target Executors", + "specificMessageContent": "Ignore Specific Message Content", + "ignoreChannels": "Ignore Channels", + "ignoreBotExecutors": "Ignore Bot Executors", + "ignoreBotTargets": "Ignore Bot Targets", + "ignoreExecutorRoles": "Ignore Executor Roles", + "ignoreTargetRoles": "Ignore Target Roles", + "ignoreCategories": "Ignore Categories", + "activeIgnore": "Active Ignore" +} \ No newline at end of file From 171c3d674e2b88dcded21060460d62d1cc42fe41 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:57:23 +0100 Subject: [PATCH 10/29] add wording for main channel --- bot/en_gb/log_categories.json | 3 ++- bot/en_pr/log_categories.json | 3 ++- bot/en_us/log_categories.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/log_categories.json b/bot/en_gb/log_categories.json index bd90c4e..3279228 100644 --- a/bot/en_gb/log_categories.json +++ b/bot/en_gb/log_categories.json @@ -8,5 +8,6 @@ "roleEvents": "Roles", "channelEvents": "Channels", "quarkEvents": "Quark Config", - "modLog": "Modlogs" + "modLog": "Modlogs", + "main": "Main" } \ No newline at end of file diff --git a/bot/en_pr/log_categories.json b/bot/en_pr/log_categories.json index bd90c4e..3279228 100644 --- a/bot/en_pr/log_categories.json +++ b/bot/en_pr/log_categories.json @@ -8,5 +8,6 @@ "roleEvents": "Roles", "channelEvents": "Channels", "quarkEvents": "Quark Config", - "modLog": "Modlogs" + "modLog": "Modlogs", + "main": "Main" } \ No newline at end of file diff --git a/bot/en_us/log_categories.json b/bot/en_us/log_categories.json index bd90c4e..3279228 100644 --- a/bot/en_us/log_categories.json +++ b/bot/en_us/log_categories.json @@ -8,5 +8,6 @@ "roleEvents": "Roles", "channelEvents": "Channels", "quarkEvents": "Quark Config", - "modLog": "Modlogs" + "modLog": "Modlogs", + "main": "Main" } \ No newline at end of file From ce19933f10155ff68fbddd5de6042aa44576e371 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 23:19:33 +0100 Subject: [PATCH 11/29] add log update and logging options updated logs --- bot/en_gb/standard/quarkEvents.json | 19 +++++++++++++++++++ bot/en_pr/standard/quarkEvents.json | 19 +++++++++++++++++++ bot/en_us/standard/quarkEvents.json | 19 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/bot/en_gb/standard/quarkEvents.json b/bot/en_gb/standard/quarkEvents.json index febdca7..32cb7e0 100644 --- a/bot/en_gb/standard/quarkEvents.json +++ b/bot/en_gb/standard/quarkEvents.json @@ -5,6 +5,25 @@ "description_category_disable": "{executor} disabled the {type} logging channel", "description_unset": "{executor} unset the {type} logging channel" }, + "serverlogOptionsUpdate": { + "title": "Logging Options Updated", + "description": "{executor} updated {option} to {state}", + "pluralkitSupport": "PluralKit Support", + "spoilers": "Spoilers", + "buttons": "Buttons", + "formatType": "Format Type" + }, + "serverlogLogUpdate": { + "title": "Log Updated", + "description": "{executor} updated the {type} log", + "enabled": "Enabled", + "logFormat": "Format", + "logChannel": "Channel", + "colour": "Colour", + "ignoreBotExecutors": "Ignore Bot Executors", + "ignoreBotTargets": "Ignore Bot Targets", + "activeIgnore": "Active Ignore" + }, "serverlogIgnoreUpdate": { "title": "Ignore Options Updated", "description_set": "{executor} enabled {type}", diff --git a/bot/en_pr/standard/quarkEvents.json b/bot/en_pr/standard/quarkEvents.json index febdca7..32cb7e0 100644 --- a/bot/en_pr/standard/quarkEvents.json +++ b/bot/en_pr/standard/quarkEvents.json @@ -5,6 +5,25 @@ "description_category_disable": "{executor} disabled the {type} logging channel", "description_unset": "{executor} unset the {type} logging channel" }, + "serverlogOptionsUpdate": { + "title": "Logging Options Updated", + "description": "{executor} updated {option} to {state}", + "pluralkitSupport": "PluralKit Support", + "spoilers": "Spoilers", + "buttons": "Buttons", + "formatType": "Format Type" + }, + "serverlogLogUpdate": { + "title": "Log Updated", + "description": "{executor} updated the {type} log", + "enabled": "Enabled", + "logFormat": "Format", + "logChannel": "Channel", + "colour": "Colour", + "ignoreBotExecutors": "Ignore Bot Executors", + "ignoreBotTargets": "Ignore Bot Targets", + "activeIgnore": "Active Ignore" + }, "serverlogIgnoreUpdate": { "title": "Ignore Options Updated", "description_set": "{executor} enabled {type}", diff --git a/bot/en_us/standard/quarkEvents.json b/bot/en_us/standard/quarkEvents.json index febdca7..764aac5 100644 --- a/bot/en_us/standard/quarkEvents.json +++ b/bot/en_us/standard/quarkEvents.json @@ -5,6 +5,25 @@ "description_category_disable": "{executor} disabled the {type} logging channel", "description_unset": "{executor} unset the {type} logging channel" }, + "serverlogOptionsUpdate": { + "title": "Logging Options Updated", + "description": "{executor} updated {option} to {state}", + "pluralkitSupport": "PluralKit Support", + "spoilers": "Spoilers", + "buttons": "Buttons", + "formatType": "Format Type" + }, + "serverlogLogUpdate": { + "title": "Log Updated", + "description": "{executor} updated the {type} log", + "enabled": "Enabled", + "logFormat": "Format", + "logChannel": "Channel", + "colour": "Color", + "ignoreBotExecutors": "Ignore Bot Executors", + "ignoreBotTargets": "Ignore Bot Targets", + "activeIgnore": "Active Ignore" + }, "serverlogIgnoreUpdate": { "title": "Ignore Options Updated", "description_set": "{executor} enabled {type}", From ffbb4d6ec622015563af36396223606757acaea4 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Tue, 25 Jun 2024 23:36:01 +0100 Subject: [PATCH 12/29] reword --- bot/en_gb/standard/quarkEvents.json | 2 +- bot/en_pr/standard/quarkEvents.json | 2 +- bot/en_us/standard/quarkEvents.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/standard/quarkEvents.json b/bot/en_gb/standard/quarkEvents.json index 32cb7e0..32cd39d 100644 --- a/bot/en_gb/standard/quarkEvents.json +++ b/bot/en_gb/standard/quarkEvents.json @@ -7,7 +7,7 @@ }, "serverlogOptionsUpdate": { "title": "Logging Options Updated", - "description": "{executor} updated {option} to {state}", + "description": "{executor} set {option} to {state}", "pluralkitSupport": "PluralKit Support", "spoilers": "Spoilers", "buttons": "Buttons", diff --git a/bot/en_pr/standard/quarkEvents.json b/bot/en_pr/standard/quarkEvents.json index 32cb7e0..32cd39d 100644 --- a/bot/en_pr/standard/quarkEvents.json +++ b/bot/en_pr/standard/quarkEvents.json @@ -7,7 +7,7 @@ }, "serverlogOptionsUpdate": { "title": "Logging Options Updated", - "description": "{executor} updated {option} to {state}", + "description": "{executor} set {option} to {state}", "pluralkitSupport": "PluralKit Support", "spoilers": "Spoilers", "buttons": "Buttons", diff --git a/bot/en_us/standard/quarkEvents.json b/bot/en_us/standard/quarkEvents.json index 764aac5..9553f48 100644 --- a/bot/en_us/standard/quarkEvents.json +++ b/bot/en_us/standard/quarkEvents.json @@ -7,7 +7,7 @@ }, "serverlogOptionsUpdate": { "title": "Logging Options Updated", - "description": "{executor} updated {option} to {state}", + "description": "{executor} set {option} to {state}", "pluralkitSupport": "PluralKit Support", "spoilers": "Spoilers", "buttons": "Buttons", From 535bd573ac8d0ef7331f718770493f9b8b157c57 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 00:01:07 +0100 Subject: [PATCH 13/29] add log formats --- bot/en_gb/log_formats.json | 7 +++++++ bot/en_pr/log_formats.json | 7 +++++++ bot/en_us/log_formats.json | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 bot/en_gb/log_formats.json create mode 100644 bot/en_pr/log_formats.json create mode 100644 bot/en_us/log_formats.json diff --git a/bot/en_gb/log_formats.json b/bot/en_gb/log_formats.json new file mode 100644 index 0000000..7531cd0 --- /dev/null +++ b/bot/en_gb/log_formats.json @@ -0,0 +1,7 @@ +{ + "0": "Standard", + "1": "Compact", + "2": "Standard (no embed)", + "3": "Compact (no embed)", + "4": "json" +} \ No newline at end of file diff --git a/bot/en_pr/log_formats.json b/bot/en_pr/log_formats.json new file mode 100644 index 0000000..7531cd0 --- /dev/null +++ b/bot/en_pr/log_formats.json @@ -0,0 +1,7 @@ +{ + "0": "Standard", + "1": "Compact", + "2": "Standard (no embed)", + "3": "Compact (no embed)", + "4": "json" +} \ No newline at end of file diff --git a/bot/en_us/log_formats.json b/bot/en_us/log_formats.json new file mode 100644 index 0000000..7531cd0 --- /dev/null +++ b/bot/en_us/log_formats.json @@ -0,0 +1,7 @@ +{ + "0": "Standard", + "1": "Compact", + "2": "Standard (no embed)", + "3": "Compact (no embed)", + "4": "json" +} \ No newline at end of file From 19efa2187d5482e25e38dba530bca10abc14e113 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:30:53 +0100 Subject: [PATCH 14/29] add webhook events strings --- bot/en_gb/standard/channelEvents.json | 34 +++++++++++++++++++++++++++ bot/en_pr/standard/channelEvents.json | 34 +++++++++++++++++++++++++++ bot/en_us/standard/channelEvents.json | 34 +++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/bot/en_gb/standard/channelEvents.json b/bot/en_gb/standard/channelEvents.json index 2f1d621..8d6a9ee 100644 --- a/bot/en_gb/standard/channelEvents.json +++ b/bot/en_gb/standard/channelEvents.json @@ -26,5 +26,39 @@ "description": "{executor} updated permissions for {channel} for {special}", "newPermissions": "New Permissions", "viewFullNewPermissions": "View Full New Permissions" + }, + "webhookCreate": { + "title": "Webhook Created", + "description": "{executor} created a webhook {webhook} in {channel}" + }, + "webhookDelete": { + "title": "Webhook Deleted", + "description": "{executor} deleted the webhook {webhook}" + }, + "webhookUpdate": { + "title": "Webhook Modified", + "description": "{executor} modified the webhook {webhook}" + }, + "webhookAvatarUpdate": { + "title": "Webhook Avatar Updated", + "description": "{executor} updated the avatar for {webhook}", + "description_added": "{executor} added an avatar for {webhook}", + "description_removed": "{executor} removed the avatar for {webhook}", + "linkToOldAvatar": "Link to old avatar", + "linkToNewAvatar": "Link to new avatar" + }, + "statusChannelFollowed": { + "title": "Channel Followed", + "description": "{executor} followed the channel {name} in {channel}" + }, + "statusChannelUnfollowed": { + "title": "Channel Unfollowed", + "description": "{executor} unfollowed the channel {name}" + }, + "statusChannelUpdated": { + "title": "Followed Channel Updated", + "description": "{executor} updated the followed channel {name}", + "name": "New name", + "channel": "New channel" } } \ No newline at end of file diff --git a/bot/en_pr/standard/channelEvents.json b/bot/en_pr/standard/channelEvents.json index 2f1d621..8d6a9ee 100644 --- a/bot/en_pr/standard/channelEvents.json +++ b/bot/en_pr/standard/channelEvents.json @@ -26,5 +26,39 @@ "description": "{executor} updated permissions for {channel} for {special}", "newPermissions": "New Permissions", "viewFullNewPermissions": "View Full New Permissions" + }, + "webhookCreate": { + "title": "Webhook Created", + "description": "{executor} created a webhook {webhook} in {channel}" + }, + "webhookDelete": { + "title": "Webhook Deleted", + "description": "{executor} deleted the webhook {webhook}" + }, + "webhookUpdate": { + "title": "Webhook Modified", + "description": "{executor} modified the webhook {webhook}" + }, + "webhookAvatarUpdate": { + "title": "Webhook Avatar Updated", + "description": "{executor} updated the avatar for {webhook}", + "description_added": "{executor} added an avatar for {webhook}", + "description_removed": "{executor} removed the avatar for {webhook}", + "linkToOldAvatar": "Link to old avatar", + "linkToNewAvatar": "Link to new avatar" + }, + "statusChannelFollowed": { + "title": "Channel Followed", + "description": "{executor} followed the channel {name} in {channel}" + }, + "statusChannelUnfollowed": { + "title": "Channel Unfollowed", + "description": "{executor} unfollowed the channel {name}" + }, + "statusChannelUpdated": { + "title": "Followed Channel Updated", + "description": "{executor} updated the followed channel {name}", + "name": "New name", + "channel": "New channel" } } \ No newline at end of file diff --git a/bot/en_us/standard/channelEvents.json b/bot/en_us/standard/channelEvents.json index 2f1d621..8d6a9ee 100644 --- a/bot/en_us/standard/channelEvents.json +++ b/bot/en_us/standard/channelEvents.json @@ -26,5 +26,39 @@ "description": "{executor} updated permissions for {channel} for {special}", "newPermissions": "New Permissions", "viewFullNewPermissions": "View Full New Permissions" + }, + "webhookCreate": { + "title": "Webhook Created", + "description": "{executor} created a webhook {webhook} in {channel}" + }, + "webhookDelete": { + "title": "Webhook Deleted", + "description": "{executor} deleted the webhook {webhook}" + }, + "webhookUpdate": { + "title": "Webhook Modified", + "description": "{executor} modified the webhook {webhook}" + }, + "webhookAvatarUpdate": { + "title": "Webhook Avatar Updated", + "description": "{executor} updated the avatar for {webhook}", + "description_added": "{executor} added an avatar for {webhook}", + "description_removed": "{executor} removed the avatar for {webhook}", + "linkToOldAvatar": "Link to old avatar", + "linkToNewAvatar": "Link to new avatar" + }, + "statusChannelFollowed": { + "title": "Channel Followed", + "description": "{executor} followed the channel {name} in {channel}" + }, + "statusChannelUnfollowed": { + "title": "Channel Unfollowed", + "description": "{executor} unfollowed the channel {name}" + }, + "statusChannelUpdated": { + "title": "Followed Channel Updated", + "description": "{executor} updated the followed channel {name}", + "name": "New name", + "channel": "New channel" } } \ No newline at end of file From 7e1cf1bb1a68a676b266d7ea430a934db5d680e2 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:14:53 +0100 Subject: [PATCH 15/29] webhook update parameters --- bot/en_gb/standard/channelEvents.json | 4 +++- bot/en_pr/standard/channelEvents.json | 4 +++- bot/en_us/standard/channelEvents.json | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/standard/channelEvents.json b/bot/en_gb/standard/channelEvents.json index 8d6a9ee..c88a0e3 100644 --- a/bot/en_gb/standard/channelEvents.json +++ b/bot/en_gb/standard/channelEvents.json @@ -37,7 +37,9 @@ }, "webhookUpdate": { "title": "Webhook Modified", - "description": "{executor} modified the webhook {webhook}" + "description": "{executor} modified the webhook {webhook}", + "name": "Name", + "channel": "Channel" }, "webhookAvatarUpdate": { "title": "Webhook Avatar Updated", diff --git a/bot/en_pr/standard/channelEvents.json b/bot/en_pr/standard/channelEvents.json index 8d6a9ee..c88a0e3 100644 --- a/bot/en_pr/standard/channelEvents.json +++ b/bot/en_pr/standard/channelEvents.json @@ -37,7 +37,9 @@ }, "webhookUpdate": { "title": "Webhook Modified", - "description": "{executor} modified the webhook {webhook}" + "description": "{executor} modified the webhook {webhook}", + "name": "Name", + "channel": "Channel" }, "webhookAvatarUpdate": { "title": "Webhook Avatar Updated", diff --git a/bot/en_us/standard/channelEvents.json b/bot/en_us/standard/channelEvents.json index 8d6a9ee..c88a0e3 100644 --- a/bot/en_us/standard/channelEvents.json +++ b/bot/en_us/standard/channelEvents.json @@ -37,7 +37,9 @@ }, "webhookUpdate": { "title": "Webhook Modified", - "description": "{executor} modified the webhook {webhook}" + "description": "{executor} modified the webhook {webhook}", + "name": "Name", + "channel": "Channel" }, "webhookAvatarUpdate": { "title": "Webhook Avatar Updated", From d9322f8263d808189a6c9d0723ac2e8a79aa9fa8 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:50:10 +0100 Subject: [PATCH 16/29] move webhook modifications to gui constants --- bot/en_gb/gui_constants.json | 4 ++++ bot/en_gb/standard/channelEvents.json | 4 +--- bot/en_pr/standard/channelEvents.json | 4 +--- bot/en_us/gui_constants.json | 4 ++++ bot/en_us/standard/channelEvents.json | 4 +--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bot/en_gb/gui_constants.json b/bot/en_gb/gui_constants.json index 747102d..993c5e2 100644 --- a/bot/en_gb/gui_constants.json +++ b/bot/en_gb/gui_constants.json @@ -33,5 +33,9 @@ "explicit_content_filter": "Explicit Content Filter", "nsfw_level": "NSFW Level", "premium_progress_bar_enabled": "Progress Bar" + }, + "webhookModificationTypes": { + "name": "Name", + "channel_id": "Channel" } } \ No newline at end of file diff --git a/bot/en_gb/standard/channelEvents.json b/bot/en_gb/standard/channelEvents.json index c88a0e3..8d6a9ee 100644 --- a/bot/en_gb/standard/channelEvents.json +++ b/bot/en_gb/standard/channelEvents.json @@ -37,9 +37,7 @@ }, "webhookUpdate": { "title": "Webhook Modified", - "description": "{executor} modified the webhook {webhook}", - "name": "Name", - "channel": "Channel" + "description": "{executor} modified the webhook {webhook}" }, "webhookAvatarUpdate": { "title": "Webhook Avatar Updated", diff --git a/bot/en_pr/standard/channelEvents.json b/bot/en_pr/standard/channelEvents.json index c88a0e3..8d6a9ee 100644 --- a/bot/en_pr/standard/channelEvents.json +++ b/bot/en_pr/standard/channelEvents.json @@ -37,9 +37,7 @@ }, "webhookUpdate": { "title": "Webhook Modified", - "description": "{executor} modified the webhook {webhook}", - "name": "Name", - "channel": "Channel" + "description": "{executor} modified the webhook {webhook}" }, "webhookAvatarUpdate": { "title": "Webhook Avatar Updated", diff --git a/bot/en_us/gui_constants.json b/bot/en_us/gui_constants.json index 747102d..993c5e2 100644 --- a/bot/en_us/gui_constants.json +++ b/bot/en_us/gui_constants.json @@ -33,5 +33,9 @@ "explicit_content_filter": "Explicit Content Filter", "nsfw_level": "NSFW Level", "premium_progress_bar_enabled": "Progress Bar" + }, + "webhookModificationTypes": { + "name": "Name", + "channel_id": "Channel" } } \ No newline at end of file diff --git a/bot/en_us/standard/channelEvents.json b/bot/en_us/standard/channelEvents.json index c88a0e3..8d6a9ee 100644 --- a/bot/en_us/standard/channelEvents.json +++ b/bot/en_us/standard/channelEvents.json @@ -37,9 +37,7 @@ }, "webhookUpdate": { "title": "Webhook Modified", - "description": "{executor} modified the webhook {webhook}", - "name": "Name", - "channel": "Channel" + "description": "{executor} modified the webhook {webhook}" }, "webhookAvatarUpdate": { "title": "Webhook Avatar Updated", From 341f5e1fb02247370d8f7064339c31c245ad86db Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:55:22 +0100 Subject: [PATCH 17/29] remove fields --- bot/en_gb/standard/channelEvents.json | 4 +--- bot/en_pr/standard/channelEvents.json | 4 +--- bot/en_us/standard/channelEvents.json | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bot/en_gb/standard/channelEvents.json b/bot/en_gb/standard/channelEvents.json index 8d6a9ee..3ac3e9c 100644 --- a/bot/en_gb/standard/channelEvents.json +++ b/bot/en_gb/standard/channelEvents.json @@ -57,8 +57,6 @@ }, "statusChannelUpdated": { "title": "Followed Channel Updated", - "description": "{executor} updated the followed channel {name}", - "name": "New name", - "channel": "New channel" + "description": "{executor} updated the followed channel {name}" } } \ No newline at end of file diff --git a/bot/en_pr/standard/channelEvents.json b/bot/en_pr/standard/channelEvents.json index 8d6a9ee..3ac3e9c 100644 --- a/bot/en_pr/standard/channelEvents.json +++ b/bot/en_pr/standard/channelEvents.json @@ -57,8 +57,6 @@ }, "statusChannelUpdated": { "title": "Followed Channel Updated", - "description": "{executor} updated the followed channel {name}", - "name": "New name", - "channel": "New channel" + "description": "{executor} updated the followed channel {name}" } } \ No newline at end of file diff --git a/bot/en_us/standard/channelEvents.json b/bot/en_us/standard/channelEvents.json index 8d6a9ee..3ac3e9c 100644 --- a/bot/en_us/standard/channelEvents.json +++ b/bot/en_us/standard/channelEvents.json @@ -57,8 +57,6 @@ }, "statusChannelUpdated": { "title": "Followed Channel Updated", - "description": "{executor} updated the followed channel {name}", - "name": "New name", - "channel": "New channel" + "description": "{executor} updated the followed channel {name}" } } \ No newline at end of file From 4c1c25e7732c87e77215694da1e36a38ea8a5d62 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 21:09:43 +0100 Subject: [PATCH 18/29] add initial reactor string --- bot/en_gb/standard/textEvents.json | 3 ++- bot/en_pr/standard/textEvents.json | 3 ++- bot/en_us/standard/textEvents.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/standard/textEvents.json b/bot/en_gb/standard/textEvents.json index df695f2..5037d39 100644 --- a/bot/en_gb/standard/textEvents.json +++ b/bot/en_gb/standard/textEvents.json @@ -31,7 +31,8 @@ "sticker": "sticker", "noContent": "no content", "embed": "embed", - "thread": "Thread" + "thread": "Thread", + "initialReactor": "initial reactor" }, "messagesBulkDeleted": { "title": "Multiple Messages Deleted", diff --git a/bot/en_pr/standard/textEvents.json b/bot/en_pr/standard/textEvents.json index 1783334..a0b002d 100644 --- a/bot/en_pr/standard/textEvents.json +++ b/bot/en_pr/standard/textEvents.json @@ -31,7 +31,8 @@ "sticker": "sticker", "noContent": "nothin' t' see", "embed": "embed", - "thread": "Thread" + "thread": "Thread", + "initialReactor": "initial reactor" }, "messagesBulkDeleted": { "title": "Multiple Messages Scrubbed", diff --git a/bot/en_us/standard/textEvents.json b/bot/en_us/standard/textEvents.json index df695f2..5037d39 100644 --- a/bot/en_us/standard/textEvents.json +++ b/bot/en_us/standard/textEvents.json @@ -31,7 +31,8 @@ "sticker": "sticker", "noContent": "no content", "embed": "embed", - "thread": "Thread" + "thread": "Thread", + "initialReactor": "initial reactor" }, "messagesBulkDeleted": { "title": "Multiple Messages Deleted", From 4a555b233fe645a6ee4f675968fd474d4d51611f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:02:30 +0100 Subject: [PATCH 19/29] add missing file --- bot/en_gb/slash_commands/dashboard.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 bot/en_gb/slash_commands/dashboard.json diff --git a/bot/en_gb/slash_commands/dashboard.json b/bot/en_gb/slash_commands/dashboard.json new file mode 100644 index 0000000..36050cd --- /dev/null +++ b/bot/en_gb/slash_commands/dashboard.json @@ -0,0 +1,4 @@ +{ + "name": "dashboard", + "description": "Visit Quark's web dashboard" +} \ No newline at end of file From 945971141385571085b0856a18893f30852b2d70 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:10:13 +0100 Subject: [PATCH 20/29] initial reactors command --- bot/en_gb/command_responses.json | 3 +++ bot/en_gb/slash_commands/initialReactor.json | 3 +++ bot/en_pr/command_responses.json | 3 +++ bot/en_us/command_responses.json | 3 +++ bot/en_us/slash_commands/dashboard.json | 2 +- bot/en_us/slash_commands/initialReactor.json | 3 +++ 6 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 bot/en_gb/slash_commands/initialReactor.json create mode 100644 bot/en_us/slash_commands/initialReactor.json diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index 595277c..6898c7b 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -158,6 +158,9 @@ "need-to-vote": "Click here to vote", "need-to-vote-footer": "Votes take up to a minute to be registered", + "initialreactors-expired": "expired", + "initialreactors-notfound": "No reactions found", + "configCommand": { "title": "Serverlog Configuration", "selection": "Select a category in the menu to view configuration.", diff --git a/bot/en_gb/slash_commands/initialReactor.json b/bot/en_gb/slash_commands/initialReactor.json new file mode 100644 index 0000000..61bbbbb --- /dev/null +++ b/bot/en_gb/slash_commands/initialReactor.json @@ -0,0 +1,3 @@ +{ + "name": "See initial reactors" +} \ No newline at end of file diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index daecefd..26f8b9c 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -158,6 +158,9 @@ "need-to-vote": "Click here to vote", "need-to-vote-footer": "Votes take up to a minute to be registered", + "initialreactors-expired": "expired", + "initialreactors-notfound": "No reactions found", + "configCommand": { "title": "Serverlog Configuration", "selection": "Select a category in the menu to view configuration.", diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index cbe3b9d..09a7b29 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -158,6 +158,9 @@ "need-to-vote": "Click here to vote", "need-to-vote-footer": "Votes take up to a minute to be registered", + "initialreactors-expired": "expired", + "initialreactors-notfound": "No reactions found", + "configCommand": { "title": "Serverlog Configuration", "selection": "Select a category in the menu to view configuration.", diff --git a/bot/en_us/slash_commands/dashboard.json b/bot/en_us/slash_commands/dashboard.json index 60c9fb5..36050cd 100644 --- a/bot/en_us/slash_commands/dashboard.json +++ b/bot/en_us/slash_commands/dashboard.json @@ -1,4 +1,4 @@ { "name": "dashboard", "description": "Visit Quark's web dashboard" -} +} \ No newline at end of file diff --git a/bot/en_us/slash_commands/initialReactor.json b/bot/en_us/slash_commands/initialReactor.json new file mode 100644 index 0000000..61bbbbb --- /dev/null +++ b/bot/en_us/slash_commands/initialReactor.json @@ -0,0 +1,3 @@ +{ + "name": "See initial reactors" +} \ No newline at end of file From a2cb5d71369730f0b0723c76dce5111ac45e4b4f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:15:53 +0100 Subject: [PATCH 21/29] Update validate-slash_commands.js --- .github/scripts/validate-slash_commands.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 4ccfa75..4b7f7a8 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -6,6 +6,8 @@ const conversionFile = './bot/languages.json'; let foundErrors = false; +const nonChatInputCommands = ["initialReactor"]; + try { const conversionData = fs.readFileSync(conversionFile, 'utf8'); const languageMap = JSON.parse(conversionData); @@ -46,7 +48,7 @@ try { foundErrors = true; } - if (currentPath.endsWith('.name') && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { + if (currentPath.endsWith('.name') && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null && !nonChatInputCommands.includes(file.split('.')[0])) { console.error(`Validation error: ${directory}/${file}: Name does not match regex at '${currentPath}', VALUE: ${value}`); foundErrors = true; } From 1c21e89dff9ce03e1fd7aee2381db16ad2626b85 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:19:29 +0100 Subject: [PATCH 22/29] Update validate-slash_commands.js --- .github/scripts/validate-slash_commands.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 4b7f7a8..167f191 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -6,7 +6,7 @@ const conversionFile = './bot/languages.json'; let foundErrors = false; -const nonChatInputCommands = ["initialReactor"]; +const nonChatInputCommands = ["initialReactor.json"]; try { const conversionData = fs.readFileSync(conversionFile, 'utf8'); @@ -47,14 +47,15 @@ try { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at '${currentPath}'`); foundErrors = true; } - - if (currentPath.endsWith('.name') && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null && !nonChatInputCommands.includes(file.split('.')[0])) { - console.error(`Validation error: ${directory}/${file}: Name does not match regex at '${currentPath}', VALUE: ${value}`); - foundErrors = true; - } - if (value !== value.toLowerCase() && currentPath.endsWith('name')) { - console.error(`Validation error: ${directory}/${file}: Key '${currentPath}' must be lowercase`); - foundErrors = true; + if (!nonChatInputCommands.includes(file)) { + if (currentPath.endsWith('.name') && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { + console.error(`Validation error: ${directory}/${file}: Name does not match regex at '${currentPath}', VALUE: ${value}`); + foundErrors = true; + } + if (value !== value.toLowerCase() && currentPath.endsWith('name')) { + console.error(`Validation error: ${directory}/${file}: Key '${currentPath}' must be lowercase`); + foundErrors = true; + } } } else if (typeof value === 'object' && value !== null) { From 5403860a96d0cd00e0b8f3d17854ae3b884ff3f4 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:29:18 +0100 Subject: [PATCH 23/29] Update validate-slash_commands.js --- .github/scripts/validate-slash_commands.js | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 167f191..34c8cc1 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -43,37 +43,36 @@ try { const currentPath = path ? `${path}.${key}` : key; if (typeof value === 'string') { + if (currentPath.endsWith('.description') && value.length > 100) { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at '${currentPath}'`); foundErrors = true; } - if (!nonChatInputCommands.includes(file)) { - if (currentPath.endsWith('.name') && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { - console.error(`Validation error: ${directory}/${file}: Name does not match regex at '${currentPath}', VALUE: ${value}`); - foundErrors = true; - } - if (value !== value.toLowerCase() && currentPath.endsWith('name')) { - console.error(`Validation error: ${directory}/${file}: Key '${currentPath}' must be lowercase`); - foundErrors = true; - } + if (currentPath.endsWith('.name') && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { + console.error(`Validation error: ${directory}/${file}: Name does not match regex at '${currentPath}', VALUE: ${value}`); + foundErrors = true; + } + if (value !== value.toLowerCase() && currentPath.endsWith('name')) { + console.error(`Validation error: ${directory}/${file}: Key '${currentPath}' must be lowercase`); + foundErrors = true; } - + } else if (typeof value === 'object' && value !== null) { checkFields(value, currentPath); } }); } + if (!nonChatInputCommands.includes(file)) { + checkFields(jsonData); - checkFields(jsonData); - - if (jsonData.name && jsonData.name.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { - console.error(`Validation error: ${directory}/${file}: Name does not match regex, VALUE: ${jsonData.name}`); - foundErrors = true; - } else if (jsonData.description && jsonData.description.length > 100) { - console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at 'description'`); - foundErrors = true; + if (jsonData.name && jsonData.name.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { + console.error(`Validation error: ${directory}/${file}: Name does not match regex, VALUE: ${jsonData.name}`); + foundErrors = true; + } else if (jsonData.description && jsonData.description.length > 100) { + console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at 'description'`); + foundErrors = true; + } } - } catch (err) { console.error(`Error processing ${file}:`, err); foundErrors = true; From 6a4f4d714e63b1bc85679e66b7a17b7a7bad13cc Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:47:50 +0100 Subject: [PATCH 24/29] adjust wording --- bot/en_gb/command_responses.json | 6 +++--- bot/en_pr/command_responses.json | 4 ++-- bot/en_us/command_responses.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index 6898c7b..10513f2 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -50,10 +50,10 @@ "response-unban": "Unbanned", "response-purge": "Purged {count} messages", - "response-customise-dash": "Customisation settings have moved to our [web dashboard]!", - "response-customise-1": "Log messages up to 2 weeks old, customise logs, and so much more with Quark Pro...", + "response-customise-dash": "Customisation settings have moved to Quark's [web dashboard]!", + "response-customise-1": "Log messages up to 8 weeks old, customise logs, and so much more with Quark Pro...", "response-customise-2": "[UK, US, EU] Click onto my profile to upgrade!", - "response-customise-3": "Or... {proLink}", + "response-customise-3": "See subscriptions... {proLink}", "response-customise-4": "Try out colour customisation for free at {inventoryLink}", "response-case-updated": "Case updated!", diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index 26f8b9c..6a4b1df 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -50,10 +50,10 @@ "response-unban": "Unbanned", "response-purge": "Purged {count} messages", - "response-customise-dash": "Customisation settings have moved to our [web dashboard]!", + "response-customise-dash": "Customisation settings have moved to Quark's [web dashboard]!", "response-customise-1": "Log messages up to 2 weeks old, customise logs, and so much more with Quark Pro...", "response-customise-2": "[UK, US, EU] Click onto my profile to upgrade!", - "response-customise-3": "Or... {proLink}", + "response-customise-3": "See subscriptions... {proLink}", "response-customise-4": "Try out colour customisation for free at {inventoryLink}", "response-case-updated": "Case updated!", diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index 09a7b29..9e06ac7 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -50,10 +50,10 @@ "response-unban": "Unbanned", "response-purge": "Purged {count} messages", - "response-customise-dash": "Customization settings have moved to our [web dashboard]!", + "response-customise-dash": "Customization settings have moved to Quark's [web dashboard]!", "response-customise-1": "Log messages up to 2 weeks old, customise logs, and so much more with Quark Pro...", "response-customise-2": "[UK, US, EU] Click onto my profile to upgrade!", - "response-customise-3": "Or... {proLink}", + "response-customise-3": "See subscriptions... {proLink}", "response-customise-4": "Try out colour customisation for free at {inventoryLink}", "response-case-updated": "Case updated!", From e93fb35cd3d4c6f97f4f00f18a03488508ab105f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:48:01 +0100 Subject: [PATCH 25/29] add premium command data --- bot/en_gb/slash_commands/premium.json | 4 ++++ bot/en_us/slash_commands/premium.json | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 bot/en_gb/slash_commands/premium.json create mode 100644 bot/en_us/slash_commands/premium.json diff --git a/bot/en_gb/slash_commands/premium.json b/bot/en_gb/slash_commands/premium.json new file mode 100644 index 0000000..700c465 --- /dev/null +++ b/bot/en_gb/slash_commands/premium.json @@ -0,0 +1,4 @@ +{ + "name": "Premium", + "description": "Get information about the premium subscriptions Quark has" +} \ No newline at end of file diff --git a/bot/en_us/slash_commands/premium.json b/bot/en_us/slash_commands/premium.json new file mode 100644 index 0000000..700c465 --- /dev/null +++ b/bot/en_us/slash_commands/premium.json @@ -0,0 +1,4 @@ +{ + "name": "Premium", + "description": "Get information about the premium subscriptions Quark has" +} \ No newline at end of file From e23af604fb1c794c57a283254bcbd4fa73b15ac6 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:49:51 +0100 Subject: [PATCH 26/29] fix case --- bot/en_gb/slash_commands/premium.json | 2 +- bot/en_us/slash_commands/premium.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/en_gb/slash_commands/premium.json b/bot/en_gb/slash_commands/premium.json index 700c465..5ab0d12 100644 --- a/bot/en_gb/slash_commands/premium.json +++ b/bot/en_gb/slash_commands/premium.json @@ -1,4 +1,4 @@ { - "name": "Premium", + "name": "premium", "description": "Get information about the premium subscriptions Quark has" } \ No newline at end of file diff --git a/bot/en_us/slash_commands/premium.json b/bot/en_us/slash_commands/premium.json index 700c465..5ab0d12 100644 --- a/bot/en_us/slash_commands/premium.json +++ b/bot/en_us/slash_commands/premium.json @@ -1,4 +1,4 @@ { - "name": "Premium", + "name": "premium", "description": "Get information about the premium subscriptions Quark has" } \ No newline at end of file From 824cc9f53a248db195fb6d9576a93794444f63aa Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:52:57 +0100 Subject: [PATCH 27/29] Update command_responses.json --- bot/en_us/command_responses.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index 9e06ac7..4a543d4 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -51,10 +51,10 @@ "response-purge": "Purged {count} messages", "response-customise-dash": "Customization settings have moved to Quark's [web dashboard]!", - "response-customise-1": "Log messages up to 2 weeks old, customise logs, and so much more with Quark Pro...", + "response-customise-1": "Log messages up to 2 weeks old, customize logs, and so much more with Quark Pro...", "response-customise-2": "[UK, US, EU] Click onto my profile to upgrade!", "response-customise-3": "See subscriptions... {proLink}", - "response-customise-4": "Try out colour customisation for free at {inventoryLink}", + "response-customise-4": "Try out color customization for free at {inventoryLink}", "response-case-updated": "Case updated!", From 7508e853e07c2f1e3e4117701a08dd03cdf2cd6b Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sun, 30 Jun 2024 12:53:59 +0100 Subject: [PATCH 28/29] add quark events ui --- bot/en_gb/command_responses.json | 2 ++ bot/en_pr/command_responses.json | 2 ++ bot/en_us/command_responses.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index 10513f2..f23aa4c 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -104,6 +104,8 @@ "setserverlog-type-channels-1": "channel events", "setserverlog-type-modlogs-0": "Modlogs", "setserverlog-type-modlogs-1": "modlogs", + "setserverlog-type-quark-0": "Quark", + "setserverlog-type-quark-1": "quark", "setserverlog-spoilers": "Spoilers", "setserverlog-spoilers-0": "Serverlog spoilers set to {result}", "setserverlog-enable-status-updates": "Enable Status Updates!", diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index 6a4b1df..e891359 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -104,6 +104,8 @@ "setserverlog-type-channels-1": "channel events", "setserverlog-type-modlogs-0": "Modlogs", "setserverlog-type-modlogs-1": "modlogs", + "setserverlog-type-quark-0": "Quark", + "setserverlog-type-quark-1": "quark", "setserverlog-spoilers": "Spoilers", "setserverlog-spoilers-0": "Serverlog spoilers set to {result}", "setserverlog-enable-status-updates": "Enable Status Updates!", diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index 4a543d4..a2c471e 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -104,6 +104,8 @@ "setserverlog-type-channels-1": "channel events", "setserverlog-type-modlogs-0": "Modlogs", "setserverlog-type-modlogs-1": "modlogs", + "setserverlog-type-quark-0": "Quark", + "setserverlog-type-quark-1": "quark", "setserverlog-spoilers": "Spoilers", "setserverlog-spoilers-0": "Serverlog spoilers set to {result}", "setserverlog-enable-status-updates": "Enable Status Updates!", From 4cfb6b45d2265874e7d74af3749ada821655a44f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sun, 30 Jun 2024 13:03:10 +0100 Subject: [PATCH 29/29] fix wording --- bot/en_gb/command_responses.json | 4 ++-- bot/en_pr/command_responses.json | 4 ++-- bot/en_us/command_responses.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index f23aa4c..701a5f0 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -104,8 +104,8 @@ "setserverlog-type-channels-1": "channel events", "setserverlog-type-modlogs-0": "Modlogs", "setserverlog-type-modlogs-1": "modlogs", - "setserverlog-type-quark-0": "Quark", - "setserverlog-type-quark-1": "quark", + "setserverlog-type-quark-0": "Quark Events", + "setserverlog-type-quark-1": "quark events", "setserverlog-spoilers": "Spoilers", "setserverlog-spoilers-0": "Serverlog spoilers set to {result}", "setserverlog-enable-status-updates": "Enable Status Updates!", diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index e891359..fe883da 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -104,8 +104,8 @@ "setserverlog-type-channels-1": "channel events", "setserverlog-type-modlogs-0": "Modlogs", "setserverlog-type-modlogs-1": "modlogs", - "setserverlog-type-quark-0": "Quark", - "setserverlog-type-quark-1": "quark", + "setserverlog-type-quark-0": "Quark Events", + "setserverlog-type-quark-1": "quark events", "setserverlog-spoilers": "Spoilers", "setserverlog-spoilers-0": "Serverlog spoilers set to {result}", "setserverlog-enable-status-updates": "Enable Status Updates!", diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index a2c471e..1130fbc 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -104,8 +104,8 @@ "setserverlog-type-channels-1": "channel events", "setserverlog-type-modlogs-0": "Modlogs", "setserverlog-type-modlogs-1": "modlogs", - "setserverlog-type-quark-0": "Quark", - "setserverlog-type-quark-1": "quark", + "setserverlog-type-quark-0": "Quark Events", + "setserverlog-type-quark-1": "quark events", "setserverlog-spoilers": "Spoilers", "setserverlog-spoilers-0": "Serverlog spoilers set to {result}", "setserverlog-enable-status-updates": "Enable Status Updates!",