From a1d93a366c6e6dc457f0a7eda252944fcee7c488 Mon Sep 17 00:00:00 2001 From: ThatKev <65928584+thatkev@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:53:00 +0930 Subject: [PATCH 01/55] add strings --- bot/en_gb/command_responses.json | 4 ++++ bot/en_pr/command_responses.json | 4 ++++ bot/en_us/command_responses.json | 4 ++++ bot/pl/command_responses.json | 4 ++++ bot/tr/command_responses.json | 4 ++++ bot/vi/command_responses.json | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index d232e4a..749bf97 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index 205bd69..c94f083 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index 441780f..4bc3e8c 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/pl/command_responses.json b/bot/pl/command_responses.json index b87c1d0..fa2efae 100644 --- a/bot/pl/command_responses.json +++ b/bot/pl/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Włącz aktualizacje statusu!", "setserverlog-enable-status-updates-desc": "Otrzymuj powiadomienia o wszystkich najnowszych aktualizacjach, przestojach i innych ważnych komunikatach od deweloperów!", "setserverlog-enable-status-updates-desc-1": "Zalecamy włączenie tego w jednym z twoich kanałów!", + "setserverlog-check-permissions": "Proszę, upewnij się że Quark ma uprawnienia do wysyłania wiadomości na tym kanale, albo kanał nie będzie ustawiony.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Łatwo skonfiguruj i zarządzaj Quark z [web dashboard]!", "help-overview-inventory-description": "Zarządzaj swoimi subskrypcjami lub uzyskaj niektóre funkcje [Quark Pro] za darmo!", diff --git a/bot/tr/command_responses.json b/bot/tr/command_responses.json index 4da49a6..c23608a 100644 --- a/bot/tr/command_responses.json +++ b/bot/tr/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/vi/command_responses.json b/bot/vi/command_responses.json index 2231c1e..9140ace 100644 --- a/bot/vi/command_responses.json +++ b/bot/vi/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Bật Cập nhật Trạng thái!", "setserverlog-enable-status-updates-desc": "Nhận thông báo về tất cả các cập nhật mới nhất, thời gian chạy và các thông tin quan trọng khác từ các nhà phát triển!", "setserverlog-enable-status-updates-desc-1": "Chúng tôi rất khuyến nghị bạn bật tính năng này trong một trong các kênh của bạn!", + "setserverlog-check-permissions": "Vui lòng đảm bảo Quark có quyền gửi tin nhắn trong kênh này, hoặc kênh sẽ bị hủy đặt.", + + "festive-title": "Quà miễn phí trong mùa lễ!", + "festive-claim": "Nhận quà miễn phí của bạn!", "help-overview-website-description": "Dễ dàng thiết lập và quản lý Quark từ [bảng điều khiển web]!", "help-overview-inventory-description": "Quản lý các đăng ký của bạn hoặc nhận một số tính năng [Quark Pro] miễn phí!", From c2233339d52d3cae31fdb3aec39e513d0c9b015a Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 19 Jun 2024 11:24:32 +0100 Subject: [PATCH 02/55] add stage channel text --- bot/en_gb/standard/voiceEvents.json | 18 ++++++++++++++++++ bot/en_pr/standard/voiceEvents.json | 18 ++++++++++++++++++ bot/en_us/standard/voiceEvents.json | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/bot/en_gb/standard/voiceEvents.json b/bot/en_gb/standard/voiceEvents.json index 796433b..ec3afb9 100644 --- a/bot/en_gb/standard/voiceEvents.json +++ b/bot/en_gb/standard/voiceEvents.json @@ -67,5 +67,23 @@ "description": "{executor} set the status for {channel}", "status": "Status", "linksToEmojis": "Links to emojis" + }, + "stageStarted": { + "title": "Stage Started", + "description": "{executor} started a stage", + "topic": "Topic", + "channel": "Channel" + }, + "stageEnded": { + "title": "Stage Ended", + "description": "The stage was ended by {executor}", + "description_noExecutor": "The stage channel was ended", + "topic": "Topic" + }, + "stageUpdated": { + "title": "Stage Updated", + "description": "The stage was updated by {executor}", + "oldTopic": "Old Topic", + "newTopic": "New Topic" } } \ No newline at end of file diff --git a/bot/en_pr/standard/voiceEvents.json b/bot/en_pr/standard/voiceEvents.json index 8e6ed5f..0da6db7 100644 --- a/bot/en_pr/standard/voiceEvents.json +++ b/bot/en_pr/standard/voiceEvents.json @@ -67,5 +67,23 @@ "description": "{executor} set the status for {channel}", "status": "Status", "linksToEmojis": "Links to emojis" + }, + "stageStarted": { + "title": "Stage Started", + "description": "{executor} started a stage", + "topic": "Topic", + "channel": "Channel" + }, + "stageEnded": { + "title": "Stage Ended", + "description": "The stage was ended by {executor}", + "description_noExecutor": "The stage channel was ended", + "topic": "Topic" + }, + "stageUpdated": { + "title": "Stage Updated", + "description": "The stage was updated by {executor}", + "oldTopic": "Old Topic", + "newTopic": "New Topic" } } \ No newline at end of file diff --git a/bot/en_us/standard/voiceEvents.json b/bot/en_us/standard/voiceEvents.json index 796433b..ec3afb9 100644 --- a/bot/en_us/standard/voiceEvents.json +++ b/bot/en_us/standard/voiceEvents.json @@ -67,5 +67,23 @@ "description": "{executor} set the status for {channel}", "status": "Status", "linksToEmojis": "Links to emojis" + }, + "stageStarted": { + "title": "Stage Started", + "description": "{executor} started a stage", + "topic": "Topic", + "channel": "Channel" + }, + "stageEnded": { + "title": "Stage Ended", + "description": "The stage was ended by {executor}", + "description_noExecutor": "The stage channel was ended", + "topic": "Topic" + }, + "stageUpdated": { + "title": "Stage Updated", + "description": "The stage was updated by {executor}", + "oldTopic": "Old Topic", + "newTopic": "New Topic" } } \ No newline at end of file From ca0029c1ecc94c84352410eda6875c06274c14fe Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 19 Jun 2024 11:39:23 +0100 Subject: [PATCH 03/55] add "none" for when userid is not present --- bot/en_gb/standard/serverActions.json | 3 ++- bot/en_gb/standard/voiceEvents.json | 3 ++- bot/en_pr/standard/serverActions.json | 3 ++- bot/en_pr/standard/voiceEvents.json | 3 ++- bot/en_us/standard/serverActions.json | 3 ++- bot/en_us/standard/voiceEvents.json | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bot/en_gb/standard/serverActions.json b/bot/en_gb/standard/serverActions.json index 46a6c86..622b7b8 100644 --- a/bot/en_gb/standard/serverActions.json +++ b/bot/en_gb/standard/serverActions.json @@ -5,7 +5,8 @@ "description_withoutInviter": "An invite {invite} was created for {channel}", "expires": "Expires", "never": "Never", - "maxUses": "Max Uses" + "maxUses": "Max Uses", + "none": "none" }, "inviteDelete": { "title": "Invite Deleted", diff --git a/bot/en_gb/standard/voiceEvents.json b/bot/en_gb/standard/voiceEvents.json index ec3afb9..67dd946 100644 --- a/bot/en_gb/standard/voiceEvents.json +++ b/bot/en_gb/standard/voiceEvents.json @@ -78,7 +78,8 @@ "title": "Stage Ended", "description": "The stage was ended by {executor}", "description_noExecutor": "The stage channel was ended", - "topic": "Topic" + "topic": "Topic", + "none": "none" }, "stageUpdated": { "title": "Stage Updated", diff --git a/bot/en_pr/standard/serverActions.json b/bot/en_pr/standard/serverActions.json index 46a6c86..622b7b8 100644 --- a/bot/en_pr/standard/serverActions.json +++ b/bot/en_pr/standard/serverActions.json @@ -5,7 +5,8 @@ "description_withoutInviter": "An invite {invite} was created for {channel}", "expires": "Expires", "never": "Never", - "maxUses": "Max Uses" + "maxUses": "Max Uses", + "none": "none" }, "inviteDelete": { "title": "Invite Deleted", diff --git a/bot/en_pr/standard/voiceEvents.json b/bot/en_pr/standard/voiceEvents.json index 0da6db7..9d5f64f 100644 --- a/bot/en_pr/standard/voiceEvents.json +++ b/bot/en_pr/standard/voiceEvents.json @@ -78,7 +78,8 @@ "title": "Stage Ended", "description": "The stage was ended by {executor}", "description_noExecutor": "The stage channel was ended", - "topic": "Topic" + "topic": "Topic", + "none": "none" }, "stageUpdated": { "title": "Stage Updated", diff --git a/bot/en_us/standard/serverActions.json b/bot/en_us/standard/serverActions.json index 46a6c86..622b7b8 100644 --- a/bot/en_us/standard/serverActions.json +++ b/bot/en_us/standard/serverActions.json @@ -5,7 +5,8 @@ "description_withoutInviter": "An invite {invite} was created for {channel}", "expires": "Expires", "never": "Never", - "maxUses": "Max Uses" + "maxUses": "Max Uses", + "none": "none" }, "inviteDelete": { "title": "Invite Deleted", diff --git a/bot/en_us/standard/voiceEvents.json b/bot/en_us/standard/voiceEvents.json index ec3afb9..67dd946 100644 --- a/bot/en_us/standard/voiceEvents.json +++ b/bot/en_us/standard/voiceEvents.json @@ -78,7 +78,8 @@ "title": "Stage Ended", "description": "The stage was ended by {executor}", "description_noExecutor": "The stage channel was ended", - "topic": "Topic" + "topic": "Topic", + "none": "none" }, "stageUpdated": { "title": "Stage Updated", From 78a4c9a0303d252d759737f3d8997cf5a23c85ad Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 19 Jun 2024 11:45:02 +0100 Subject: [PATCH 04/55] reword --- bot/en_gb/standard/voiceEvents.json | 11 +++++------ bot/en_pr/standard/voiceEvents.json | 11 +++++------ bot/en_us/standard/voiceEvents.json | 11 +++++------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/bot/en_gb/standard/voiceEvents.json b/bot/en_gb/standard/voiceEvents.json index 67dd946..9cb7a85 100644 --- a/bot/en_gb/standard/voiceEvents.json +++ b/bot/en_gb/standard/voiceEvents.json @@ -70,20 +70,19 @@ }, "stageStarted": { "title": "Stage Started", - "description": "{executor} started a stage", - "topic": "Topic", - "channel": "Channel" + "description": "{executor} started a stage in {channel}", + "topic": "Topic" }, "stageEnded": { "title": "Stage Ended", - "description": "The stage was ended by {executor}", - "description_noExecutor": "The stage channel was ended", + "description": "The stage in {channel} was ended by {executor}", + "description_noExecutor": "The stage in {channel} was ended", "topic": "Topic", "none": "none" }, "stageUpdated": { "title": "Stage Updated", - "description": "The stage was updated by {executor}", + "description": "The stage in {channel} was updated by {executor}", "oldTopic": "Old Topic", "newTopic": "New Topic" } diff --git a/bot/en_pr/standard/voiceEvents.json b/bot/en_pr/standard/voiceEvents.json index 9d5f64f..3ff663d 100644 --- a/bot/en_pr/standard/voiceEvents.json +++ b/bot/en_pr/standard/voiceEvents.json @@ -70,20 +70,19 @@ }, "stageStarted": { "title": "Stage Started", - "description": "{executor} started a stage", - "topic": "Topic", - "channel": "Channel" + "description": "{executor} started a stage in {channel}", + "topic": "Topic" }, "stageEnded": { "title": "Stage Ended", - "description": "The stage was ended by {executor}", - "description_noExecutor": "The stage channel was ended", + "description": "The stage in {channel} was ended by {executor}", + "description_noExecutor": "The stage in {channel} was ended", "topic": "Topic", "none": "none" }, "stageUpdated": { "title": "Stage Updated", - "description": "The stage was updated by {executor}", + "description": "The stage in {channel} was updated by {executor}", "oldTopic": "Old Topic", "newTopic": "New Topic" } diff --git a/bot/en_us/standard/voiceEvents.json b/bot/en_us/standard/voiceEvents.json index 67dd946..9cb7a85 100644 --- a/bot/en_us/standard/voiceEvents.json +++ b/bot/en_us/standard/voiceEvents.json @@ -70,20 +70,19 @@ }, "stageStarted": { "title": "Stage Started", - "description": "{executor} started a stage", - "topic": "Topic", - "channel": "Channel" + "description": "{executor} started a stage in {channel}", + "topic": "Topic" }, "stageEnded": { "title": "Stage Ended", - "description": "The stage was ended by {executor}", - "description_noExecutor": "The stage channel was ended", + "description": "The stage in {channel} was ended by {executor}", + "description_noExecutor": "The stage in {channel} was ended", "topic": "Topic", "none": "none" }, "stageUpdated": { "title": "Stage Updated", - "description": "The stage was updated by {executor}", + "description": "The stage in {channel} was updated by {executor}", "oldTopic": "Old Topic", "newTopic": "New Topic" } From c628e52ac4544385c22272a60c85683955e5b4a3 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:17:13 +0100 Subject: [PATCH 05/55] add languages for stage speaker events --- bot/en_gb/standard/voiceEvents.json | 13 +++++++++++++ bot/en_pr/standard/voiceEvents.json | 13 +++++++++++++ bot/en_us/standard/voiceEvents.json | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/bot/en_gb/standard/voiceEvents.json b/bot/en_gb/standard/voiceEvents.json index 9cb7a85..0502b28 100644 --- a/bot/en_gb/standard/voiceEvents.json +++ b/bot/en_gb/standard/voiceEvents.json @@ -85,5 +85,18 @@ "description": "The stage in {channel} was updated by {executor}", "oldTopic": "Old Topic", "newTopic": "New Topic" + }, + "stageSpeakerAdd": { + "title": "New Stage Speaker", + "description": "{user} became a speaker in the {channel} stage channel", + "description_inviteAccepted": "{user} accepted the invite to become a speaker in the {channel} stage channel" + }, + "stageSpeakerRemove": { + "title": "Stopped Speaking", + "description": "{user} is no longer a speaker in the {channel} stage channel" + }, + "stageSpeakerInvited": { + "title": "Speaker Invited", + "description": "{user} was invited to speak in the {channel} stage channel" } } \ No newline at end of file diff --git a/bot/en_pr/standard/voiceEvents.json b/bot/en_pr/standard/voiceEvents.json index 3ff663d..f4ceed6 100644 --- a/bot/en_pr/standard/voiceEvents.json +++ b/bot/en_pr/standard/voiceEvents.json @@ -85,5 +85,18 @@ "description": "The stage in {channel} was updated by {executor}", "oldTopic": "Old Topic", "newTopic": "New Topic" + }, + "stageSpeakerAdd": { + "title": "New Stage Speaker", + "description": "{user} became a speaker in the {channel} stage channel", + "description_inviteAccepted": "{user} accepted the invite to become a speaker in the {channel} stage channel" + }, + "stageSpeakerRemove": { + "title": "Stopped Speaking", + "description": "{user} is no longer a speaker in the {channel} stage channel" + }, + "stageSpeakerInvited": { + "title": "Speaker Invited", + "description": "{user} was invited to speak in the {channel} stage channel" } } \ No newline at end of file diff --git a/bot/en_us/standard/voiceEvents.json b/bot/en_us/standard/voiceEvents.json index 9cb7a85..0502b28 100644 --- a/bot/en_us/standard/voiceEvents.json +++ b/bot/en_us/standard/voiceEvents.json @@ -85,5 +85,18 @@ "description": "The stage in {channel} was updated by {executor}", "oldTopic": "Old Topic", "newTopic": "New Topic" + }, + "stageSpeakerAdd": { + "title": "New Stage Speaker", + "description": "{user} became a speaker in the {channel} stage channel", + "description_inviteAccepted": "{user} accepted the invite to become a speaker in the {channel} stage channel" + }, + "stageSpeakerRemove": { + "title": "Stopped Speaking", + "description": "{user} is no longer a speaker in the {channel} stage channel" + }, + "stageSpeakerInvited": { + "title": "Speaker Invited", + "description": "{user} was invited to speak in the {channel} stage channel" } } \ No newline at end of file From f6346b2c3cc328d0c5d9e9a13b07048a5bf4444d Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Thu, 20 Jun 2024 21:14:37 +0100 Subject: [PATCH 06/55] add time interpretation and voice channel joined reformatting --- bot/en_gb/standard/voiceEvents.json | 4 +++- bot/en_gb/time.json | 16 ++++++++++++++++ bot/en_pr/standard/voiceEvents.json | 4 +++- bot/en_pr/time.json | 16 ++++++++++++++++ bot/en_us/standard/voiceEvents.json | 4 +++- bot/en_us/time.json | 16 ++++++++++++++++ 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 bot/en_gb/time.json create mode 100644 bot/en_pr/time.json create mode 100644 bot/en_us/time.json diff --git a/bot/en_gb/standard/voiceEvents.json b/bot/en_gb/standard/voiceEvents.json index 0502b28..f401b34 100644 --- a/bot/en_gb/standard/voiceEvents.json +++ b/bot/en_gb/standard/voiceEvents.json @@ -30,7 +30,9 @@ }, "voiceLeave": { "title": "Left Channel", - "description": "{user} left the {channel} voice channel" + "description": "{user} left the {channel} voice channel", + "joined": "Joined", + "joinedValue": "{relative} for {relative_fixed}" }, "voiceDisconnect": { "title": "Disconnected", diff --git a/bot/en_gb/time.json b/bot/en_gb/time.json new file mode 100644 index 0000000..ee6e28d --- /dev/null +++ b/bot/en_gb/time.json @@ -0,0 +1,16 @@ +{ + "second": "{time} second", + "second-plural": "{time} seconds", + "minute": "{time} minute", + "minute-plural": "{time} minutes", + "hour": "{time} hour", + "hour-plural": "{time} hours", + "day": "{time} day", + "day-plural": "{time} days", + "week": "{time} week", + "week-plural": "{time} weeks", + "month": "{time} month", + "month-plural": "{time} months", + "year": "{time} year", + "year-plural": "{time} years" +} \ No newline at end of file diff --git a/bot/en_pr/standard/voiceEvents.json b/bot/en_pr/standard/voiceEvents.json index f4ceed6..0719f89 100644 --- a/bot/en_pr/standard/voiceEvents.json +++ b/bot/en_pr/standard/voiceEvents.json @@ -30,7 +30,9 @@ }, "voiceLeave": { "title": "Exited Cabin", - "description": "{user} departed from the {channel} cabin" + "description": "{user} departed from the {channel} cabin", + "joined": "Present", + "joinedValue": "{relative} for {relative_fixed}" }, "voiceDisconnect": { "title": "Thrown Out", diff --git a/bot/en_pr/time.json b/bot/en_pr/time.json new file mode 100644 index 0000000..ee6e28d --- /dev/null +++ b/bot/en_pr/time.json @@ -0,0 +1,16 @@ +{ + "second": "{time} second", + "second-plural": "{time} seconds", + "minute": "{time} minute", + "minute-plural": "{time} minutes", + "hour": "{time} hour", + "hour-plural": "{time} hours", + "day": "{time} day", + "day-plural": "{time} days", + "week": "{time} week", + "week-plural": "{time} weeks", + "month": "{time} month", + "month-plural": "{time} months", + "year": "{time} year", + "year-plural": "{time} years" +} \ No newline at end of file diff --git a/bot/en_us/standard/voiceEvents.json b/bot/en_us/standard/voiceEvents.json index 0502b28..f401b34 100644 --- a/bot/en_us/standard/voiceEvents.json +++ b/bot/en_us/standard/voiceEvents.json @@ -30,7 +30,9 @@ }, "voiceLeave": { "title": "Left Channel", - "description": "{user} left the {channel} voice channel" + "description": "{user} left the {channel} voice channel", + "joined": "Joined", + "joinedValue": "{relative} for {relative_fixed}" }, "voiceDisconnect": { "title": "Disconnected", diff --git a/bot/en_us/time.json b/bot/en_us/time.json new file mode 100644 index 0000000..ee6e28d --- /dev/null +++ b/bot/en_us/time.json @@ -0,0 +1,16 @@ +{ + "second": "{time} second", + "second-plural": "{time} seconds", + "minute": "{time} minute", + "minute-plural": "{time} minutes", + "hour": "{time} hour", + "hour-plural": "{time} hours", + "day": "{time} day", + "day-plural": "{time} days", + "week": "{time} week", + "week-plural": "{time} weeks", + "month": "{time} month", + "month-plural": "{time} months", + "year": "{time} year", + "year-plural": "{time} years" +} \ No newline at end of file From 95517ed16a2ee30f72f1a5e4f76918e8529f4284 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Thu, 20 Jun 2024 21:38:47 +0100 Subject: [PATCH 07/55] added movable type parameter to channel events --- bot/en_gb/standard/channelEvents.json | 12 ++++++------ bot/en_pr/standard/channelEvents.json | 12 ++++++------ bot/en_us/standard/channelEvents.json | 12 ++++++------ bot/tr/standard/channelEvents.json | 20 +++++++++++++++++--- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/bot/en_gb/standard/channelEvents.json b/bot/en_gb/standard/channelEvents.json index b3b20ae..2f1d621 100644 --- a/bot/en_gb/standard/channelEvents.json +++ b/bot/en_gb/standard/channelEvents.json @@ -1,28 +1,28 @@ { "channelCreated": { - "title": "Channel Created", + "title": "{type} Channel Created", "description": "{channel} was created by {executor}", "descriptionWithCategory": "{channel} was created by {executor} under the {category} category." }, "channelDeleted": { - "title": "Channel Deleted", + "title": "{type} Channel Deleted", "description": "{channel_name} was deleted by {executor}", "channel": "Channel" }, "channelUpdated": { - "title": "Channel Modified", + "title": "{type} Channel Modified", "description": "{channel} was modified by {executor}" }, "channelOverwriteCreate": { - "title": "Channel Permissions Added", + "title": "{type} Channel Permissions Added", "description": "{executor} added permissions to {channel} for {special}" }, "channelOverwriteDelete": { - "title": "Channel Permissions Removed", + "title": "{type} Channel Permissions Removed", "description": "{executor} removed permissions from {channel} for {special}" }, "channelOverwriteUpdate": { - "title": "Channel Permissions Updated", + "title": "{type} Channel Permissions Updated", "description": "{executor} updated permissions for {channel} for {special}", "newPermissions": "New Permissions", "viewFullNewPermissions": "View Full New Permissions" diff --git a/bot/en_pr/standard/channelEvents.json b/bot/en_pr/standard/channelEvents.json index b3b20ae..2f1d621 100644 --- a/bot/en_pr/standard/channelEvents.json +++ b/bot/en_pr/standard/channelEvents.json @@ -1,28 +1,28 @@ { "channelCreated": { - "title": "Channel Created", + "title": "{type} Channel Created", "description": "{channel} was created by {executor}", "descriptionWithCategory": "{channel} was created by {executor} under the {category} category." }, "channelDeleted": { - "title": "Channel Deleted", + "title": "{type} Channel Deleted", "description": "{channel_name} was deleted by {executor}", "channel": "Channel" }, "channelUpdated": { - "title": "Channel Modified", + "title": "{type} Channel Modified", "description": "{channel} was modified by {executor}" }, "channelOverwriteCreate": { - "title": "Channel Permissions Added", + "title": "{type} Channel Permissions Added", "description": "{executor} added permissions to {channel} for {special}" }, "channelOverwriteDelete": { - "title": "Channel Permissions Removed", + "title": "{type} Channel Permissions Removed", "description": "{executor} removed permissions from {channel} for {special}" }, "channelOverwriteUpdate": { - "title": "Channel Permissions Updated", + "title": "{type} Channel Permissions Updated", "description": "{executor} updated permissions for {channel} for {special}", "newPermissions": "New Permissions", "viewFullNewPermissions": "View Full New Permissions" diff --git a/bot/en_us/standard/channelEvents.json b/bot/en_us/standard/channelEvents.json index b3b20ae..2f1d621 100644 --- a/bot/en_us/standard/channelEvents.json +++ b/bot/en_us/standard/channelEvents.json @@ -1,28 +1,28 @@ { "channelCreated": { - "title": "Channel Created", + "title": "{type} Channel Created", "description": "{channel} was created by {executor}", "descriptionWithCategory": "{channel} was created by {executor} under the {category} category." }, "channelDeleted": { - "title": "Channel Deleted", + "title": "{type} Channel Deleted", "description": "{channel_name} was deleted by {executor}", "channel": "Channel" }, "channelUpdated": { - "title": "Channel Modified", + "title": "{type} Channel Modified", "description": "{channel} was modified by {executor}" }, "channelOverwriteCreate": { - "title": "Channel Permissions Added", + "title": "{type} Channel Permissions Added", "description": "{executor} added permissions to {channel} for {special}" }, "channelOverwriteDelete": { - "title": "Channel Permissions Removed", + "title": "{type} Channel Permissions Removed", "description": "{executor} removed permissions from {channel} for {special}" }, "channelOverwriteUpdate": { - "title": "Channel Permissions Updated", + "title": "{type} Channel Permissions Updated", "description": "{executor} updated permissions for {channel} for {special}", "newPermissions": "New Permissions", "viewFullNewPermissions": "View Full New Permissions" diff --git a/bot/tr/standard/channelEvents.json b/bot/tr/standard/channelEvents.json index 0c0ff7c..2f1d621 100644 --- a/bot/tr/standard/channelEvents.json +++ b/bot/tr/standard/channelEvents.json @@ -1,16 +1,30 @@ { "channelCreated": { - "title": "Channel Created", + "title": "{type} Channel Created", "description": "{channel} was created by {executor}", "descriptionWithCategory": "{channel} was created by {executor} under the {category} category." }, "channelDeleted": { - "title": "Channel Deleted", + "title": "{type} Channel Deleted", "description": "{channel_name} was deleted by {executor}", "channel": "Channel" }, "channelUpdated": { - "title": "Channel Modified", + "title": "{type} Channel Modified", "description": "{channel} was modified by {executor}" + }, + "channelOverwriteCreate": { + "title": "{type} Channel Permissions Added", + "description": "{executor} added permissions to {channel} for {special}" + }, + "channelOverwriteDelete": { + "title": "{type} Channel Permissions Removed", + "description": "{executor} removed permissions from {channel} for {special}" + }, + "channelOverwriteUpdate": { + "title": "{type} Channel Permissions Updated", + "description": "{executor} updated permissions for {channel} for {special}", + "newPermissions": "New Permissions", + "viewFullNewPermissions": "View Full New Permissions" } } \ No newline at end of file From 38bf11b6daa270a1746dbe200eca1a7e87389655 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:12:24 +0100 Subject: [PATCH 08/55] add server event logs --- bot/en_gb/standard/serverActions.json | 17 +++++++++++++++++ bot/en_pr/standard/serverActions.json | 17 +++++++++++++++++ bot/en_us/standard/serverActions.json | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/bot/en_gb/standard/serverActions.json b/bot/en_gb/standard/serverActions.json index 622b7b8..7c18270 100644 --- a/bot/en_gb/standard/serverActions.json +++ b/bot/en_gb/standard/serverActions.json @@ -28,5 +28,22 @@ "emojiUpdated": { "title": "Emoji Edited", "description": "{emoji} was edited by {executor}" + }, + "serverEventCreate": { + "title": "Event Created", + "description_withChannel": "{executor} created an event {name} in {channel}", + "description_withoutChannel": "{executor} created an event {name}", + "location": "Location", + "starts": "Starts" + }, + "serverEventDelete": { + "title": "Event Deleted", + "description": "{executor} deleted an event {name}", + "eventDescription": "Description", + "linkToEventImage": "Link to event image" + }, + "serverEventUpdate": { + "title": "Event Updated", + "description": "{executor} updated an event {name}" } } \ No newline at end of file diff --git a/bot/en_pr/standard/serverActions.json b/bot/en_pr/standard/serverActions.json index 622b7b8..7c18270 100644 --- a/bot/en_pr/standard/serverActions.json +++ b/bot/en_pr/standard/serverActions.json @@ -28,5 +28,22 @@ "emojiUpdated": { "title": "Emoji Edited", "description": "{emoji} was edited by {executor}" + }, + "serverEventCreate": { + "title": "Event Created", + "description_withChannel": "{executor} created an event {name} in {channel}", + "description_withoutChannel": "{executor} created an event {name}", + "location": "Location", + "starts": "Starts" + }, + "serverEventDelete": { + "title": "Event Deleted", + "description": "{executor} deleted an event {name}", + "eventDescription": "Description", + "linkToEventImage": "Link to event image" + }, + "serverEventUpdate": { + "title": "Event Updated", + "description": "{executor} updated an event {name}" } } \ No newline at end of file diff --git a/bot/en_us/standard/serverActions.json b/bot/en_us/standard/serverActions.json index 622b7b8..7c18270 100644 --- a/bot/en_us/standard/serverActions.json +++ b/bot/en_us/standard/serverActions.json @@ -28,5 +28,22 @@ "emojiUpdated": { "title": "Emoji Edited", "description": "{emoji} was edited by {executor}" + }, + "serverEventCreate": { + "title": "Event Created", + "description_withChannel": "{executor} created an event {name} in {channel}", + "description_withoutChannel": "{executor} created an event {name}", + "location": "Location", + "starts": "Starts" + }, + "serverEventDelete": { + "title": "Event Deleted", + "description": "{executor} deleted an event {name}", + "eventDescription": "Description", + "linkToEventImage": "Link to event image" + }, + "serverEventUpdate": { + "title": "Event Updated", + "description": "{executor} updated an event {name}" } } \ No newline at end of file From b930826e6ac00db98fd9571f73e99949ac5cca68 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Fri, 21 Jun 2024 01:16:07 +0100 Subject: [PATCH 09/55] modify event strings --- bot/en_gb/standard/serverActions.json | 7 +++++-- bot/en_pr/standard/serverActions.json | 7 +++++-- bot/en_us/standard/serverActions.json | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bot/en_gb/standard/serverActions.json b/bot/en_gb/standard/serverActions.json index 7c18270..0959614 100644 --- a/bot/en_gb/standard/serverActions.json +++ b/bot/en_gb/standard/serverActions.json @@ -33,17 +33,20 @@ "title": "Event Created", "description_withChannel": "{executor} created an event {name} in {channel}", "description_withoutChannel": "{executor} created an event {name}", + "eventDescription": "Description", "location": "Location", "starts": "Starts" }, "serverEventDelete": { "title": "Event Deleted", "description": "{executor} deleted an event {name}", - "eventDescription": "Description", "linkToEventImage": "Link to event image" }, "serverEventUpdate": { "title": "Event Updated", - "description": "{executor} updated an event {name}" + "description": "{executor} updated an event {name}", + "newEventDescription": "New Description", + "newLocation": "New Location", + "newChannel": "New Channel" } } \ No newline at end of file diff --git a/bot/en_pr/standard/serverActions.json b/bot/en_pr/standard/serverActions.json index 7c18270..0959614 100644 --- a/bot/en_pr/standard/serverActions.json +++ b/bot/en_pr/standard/serverActions.json @@ -33,17 +33,20 @@ "title": "Event Created", "description_withChannel": "{executor} created an event {name} in {channel}", "description_withoutChannel": "{executor} created an event {name}", + "eventDescription": "Description", "location": "Location", "starts": "Starts" }, "serverEventDelete": { "title": "Event Deleted", "description": "{executor} deleted an event {name}", - "eventDescription": "Description", "linkToEventImage": "Link to event image" }, "serverEventUpdate": { "title": "Event Updated", - "description": "{executor} updated an event {name}" + "description": "{executor} updated an event {name}", + "newEventDescription": "New Description", + "newLocation": "New Location", + "newChannel": "New Channel" } } \ No newline at end of file diff --git a/bot/en_us/standard/serverActions.json b/bot/en_us/standard/serverActions.json index 7c18270..0959614 100644 --- a/bot/en_us/standard/serverActions.json +++ b/bot/en_us/standard/serverActions.json @@ -33,17 +33,20 @@ "title": "Event Created", "description_withChannel": "{executor} created an event {name} in {channel}", "description_withoutChannel": "{executor} created an event {name}", + "eventDescription": "Description", "location": "Location", "starts": "Starts" }, "serverEventDelete": { "title": "Event Deleted", "description": "{executor} deleted an event {name}", - "eventDescription": "Description", "linkToEventImage": "Link to event image" }, "serverEventUpdate": { "title": "Event Updated", - "description": "{executor} updated an event {name}" + "description": "{executor} updated an event {name}", + "newEventDescription": "New Description", + "newLocation": "New Location", + "newChannel": "New Channel" } } \ No newline at end of file From f19e88693f710e862d2b09b30b2ecec4f2146188 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Fri, 21 Jun 2024 01:24:33 +0100 Subject: [PATCH 10/55] add event image --- bot/en_gb/standard/serverActions.json | 3 ++- bot/en_pr/standard/serverActions.json | 3 ++- bot/en_us/standard/serverActions.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bot/en_gb/standard/serverActions.json b/bot/en_gb/standard/serverActions.json index 0959614..407fb37 100644 --- a/bot/en_gb/standard/serverActions.json +++ b/bot/en_gb/standard/serverActions.json @@ -47,6 +47,7 @@ "description": "{executor} updated an event {name}", "newEventDescription": "New Description", "newLocation": "New Location", - "newChannel": "New Channel" + "newChannel": "New Channel", + "linkToEventImage": "Link to old event image" } } \ No newline at end of file diff --git a/bot/en_pr/standard/serverActions.json b/bot/en_pr/standard/serverActions.json index 0959614..407fb37 100644 --- a/bot/en_pr/standard/serverActions.json +++ b/bot/en_pr/standard/serverActions.json @@ -47,6 +47,7 @@ "description": "{executor} updated an event {name}", "newEventDescription": "New Description", "newLocation": "New Location", - "newChannel": "New Channel" + "newChannel": "New Channel", + "linkToEventImage": "Link to old event image" } } \ No newline at end of file diff --git a/bot/en_us/standard/serverActions.json b/bot/en_us/standard/serverActions.json index 0959614..407fb37 100644 --- a/bot/en_us/standard/serverActions.json +++ b/bot/en_us/standard/serverActions.json @@ -47,6 +47,7 @@ "description": "{executor} updated an event {name}", "newEventDescription": "New Description", "newLocation": "New Location", - "newChannel": "New Channel" + "newChannel": "New Channel", + "linkToEventImage": "Link to old event image" } } \ No newline at end of file From 61f8e51a7d9baef4b3115140016516cb0255995e Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Fri, 21 Jun 2024 10:58:37 +0100 Subject: [PATCH 11/55] reword --- bot/en_gb/standard/serverActions.json | 4 ++-- bot/en_pr/standard/serverActions.json | 4 ++-- bot/en_us/standard/serverActions.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bot/en_gb/standard/serverActions.json b/bot/en_gb/standard/serverActions.json index 407fb37..334be6d 100644 --- a/bot/en_gb/standard/serverActions.json +++ b/bot/en_gb/standard/serverActions.json @@ -39,12 +39,12 @@ }, "serverEventDelete": { "title": "Event Deleted", - "description": "{executor} deleted an event {name}", + "description": "{executor} deleted the event {name}", "linkToEventImage": "Link to event image" }, "serverEventUpdate": { "title": "Event Updated", - "description": "{executor} updated an event {name}", + "description": "{executor} updated the event {name}", "newEventDescription": "New Description", "newLocation": "New Location", "newChannel": "New Channel", diff --git a/bot/en_pr/standard/serverActions.json b/bot/en_pr/standard/serverActions.json index 407fb37..334be6d 100644 --- a/bot/en_pr/standard/serverActions.json +++ b/bot/en_pr/standard/serverActions.json @@ -39,12 +39,12 @@ }, "serverEventDelete": { "title": "Event Deleted", - "description": "{executor} deleted an event {name}", + "description": "{executor} deleted the event {name}", "linkToEventImage": "Link to event image" }, "serverEventUpdate": { "title": "Event Updated", - "description": "{executor} updated an event {name}", + "description": "{executor} updated the event {name}", "newEventDescription": "New Description", "newLocation": "New Location", "newChannel": "New Channel", diff --git a/bot/en_us/standard/serverActions.json b/bot/en_us/standard/serverActions.json index 407fb37..334be6d 100644 --- a/bot/en_us/standard/serverActions.json +++ b/bot/en_us/standard/serverActions.json @@ -39,12 +39,12 @@ }, "serverEventDelete": { "title": "Event Deleted", - "description": "{executor} deleted an event {name}", + "description": "{executor} deleted the event {name}", "linkToEventImage": "Link to event image" }, "serverEventUpdate": { "title": "Event Updated", - "description": "{executor} updated an event {name}", + "description": "{executor} updated the event {name}", "newEventDescription": "New Description", "newLocation": "New Location", "newChannel": "New Channel", From 068c84ccf16f4e965cb61cfbd0dc5aeb610cec67 Mon Sep 17 00:00:00 2001 From: ThatKev <65928584+thatkev@users.noreply.github.com> Date: Fri, 21 Jun 2024 21:39:43 +0930 Subject: [PATCH 12/55] push nl to languages.json --- bot/languages.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bot/languages.json b/bot/languages.json index 487a5e4..9ea9c22 100644 --- a/bot/languages.json +++ b/bot/languages.json @@ -4,5 +4,6 @@ "tr": "tr", "vi": "vi", "en-PR": "en_pr", - "pl": "pl" + "pl": "pl", + "nl": "nl" } From f18129b0ef31af452e1f81fad340c1d851be8e35 Mon Sep 17 00:00:00 2001 From: ThatKev <65928584+thatkev@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:53:00 +0930 Subject: [PATCH 13/55] add strings --- bot/en_gb/command_responses.json | 4 ++++ bot/en_pr/command_responses.json | 4 ++++ bot/en_us/command_responses.json | 4 ++++ bot/pl/command_responses.json | 4 ++++ bot/tr/command_responses.json | 4 ++++ bot/vi/command_responses.json | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/bot/en_gb/command_responses.json b/bot/en_gb/command_responses.json index d232e4a..749bf97 100644 --- a/bot/en_gb/command_responses.json +++ b/bot/en_gb/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/en_pr/command_responses.json b/bot/en_pr/command_responses.json index 205bd69..c94f083 100644 --- a/bot/en_pr/command_responses.json +++ b/bot/en_pr/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/en_us/command_responses.json b/bot/en_us/command_responses.json index 441780f..4bc3e8c 100644 --- a/bot/en_us/command_responses.json +++ b/bot/en_us/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/pl/command_responses.json b/bot/pl/command_responses.json index b87c1d0..fa2efae 100644 --- a/bot/pl/command_responses.json +++ b/bot/pl/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Włącz aktualizacje statusu!", "setserverlog-enable-status-updates-desc": "Otrzymuj powiadomienia o wszystkich najnowszych aktualizacjach, przestojach i innych ważnych komunikatach od deweloperów!", "setserverlog-enable-status-updates-desc-1": "Zalecamy włączenie tego w jednym z twoich kanałów!", + "setserverlog-check-permissions": "Proszę, upewnij się że Quark ma uprawnienia do wysyłania wiadomości na tym kanale, albo kanał nie będzie ustawiony.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Łatwo skonfiguruj i zarządzaj Quark z [web dashboard]!", "help-overview-inventory-description": "Zarządzaj swoimi subskrypcjami lub uzyskaj niektóre funkcje [Quark Pro] za darmo!", diff --git a/bot/tr/command_responses.json b/bot/tr/command_responses.json index 4da49a6..c23608a 100644 --- a/bot/tr/command_responses.json +++ b/bot/tr/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Enable Status Updates!", "setserverlog-enable-status-updates-desc": "Get notified of all the latest updates, downtime, and other important communications from the developers!", "setserverlog-enable-status-updates-desc-1": "We highly recommend you enable this in one of your channels!", + "setserverlog-check-permissions": "Please ensure Quark has permission to send messages in this channel, or the channel will be unset.", + + "festive-title": "Free Festive Gift!", + "festive-claim": "Claim your free gift!", "help-overview-website-description": "Easily set up and manage Quark from the [web dashboard]!", "help-overview-inventory-description": "Manage your subscriptions or get some [Quark Pro] features for free!", diff --git a/bot/vi/command_responses.json b/bot/vi/command_responses.json index 2231c1e..9140ace 100644 --- a/bot/vi/command_responses.json +++ b/bot/vi/command_responses.json @@ -109,6 +109,10 @@ "setserverlog-enable-status-updates": "Bật Cập nhật Trạng thái!", "setserverlog-enable-status-updates-desc": "Nhận thông báo về tất cả các cập nhật mới nhất, thời gian chạy và các thông tin quan trọng khác từ các nhà phát triển!", "setserverlog-enable-status-updates-desc-1": "Chúng tôi rất khuyến nghị bạn bật tính năng này trong một trong các kênh của bạn!", + "setserverlog-check-permissions": "Vui lòng đảm bảo Quark có quyền gửi tin nhắn trong kênh này, hoặc kênh sẽ bị hủy đặt.", + + "festive-title": "Quà miễn phí trong mùa lễ!", + "festive-claim": "Nhận quà miễn phí của bạn!", "help-overview-website-description": "Dễ dàng thiết lập và quản lý Quark từ [bảng điều khiển web]!", "help-overview-inventory-description": "Quản lý các đăng ký của bạn hoặc nhận một số tính năng [Quark Pro] miễn phí!", From facbc2d1853de728f822e08ad47350cd94d0aec7 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Fri, 21 Jun 2024 22:37:55 +0100 Subject: [PATCH 14/55] fixes #5 --- activate.js | 131 ++++++++++++++++++++++++++------------------- bot/pl/read_me.txt | 1 - 2 files changed, 75 insertions(+), 57 deletions(-) delete mode 100644 bot/pl/read_me.txt diff --git a/activate.js b/activate.js index 42b7890..7bf8efe 100644 --- a/activate.js +++ b/activate.js @@ -3,74 +3,93 @@ const path = require('path'); const fallbackLanguage = "en_us"; const baseDirectory = "bot"; -const baseDirectoryActive = "active/bot"; const languages = require('./bot/languages.json'); +const languagesLocation = path.join(process.cwd(), "language", baseDirectory); +const activeLanguagesLocation = path.join(process.cwd(), "language", "active", baseDirectory); + +// relative file path is the path after the locale directory +function loadFile(locale, relativeFilePath) { + + const filePath = path.join(languagesLocation, locale, relativeFilePath); + + try { + let data; + if (!fs.existsSync(filePath)) + data = "{}"; + else + data = fs.readFileSync(filePath, 'utf8'); + const jsonData = JSON.parse(data); + const fallbackLanguageData = JSON.parse(fs.readFileSync(path.join(languagesLocation, fallbackLanguage, relativeFilePath), 'utf8')); + function checkFields(obj, path = '') { + Object.keys(obj).forEach(key => { + const value = obj[key]; + const currentPath = path ? `${path}.${key}` : key; + + if (typeof value === 'string') { + let pointer = fallbackLanguageData; + const structPath = currentPath.split("."); + for (let i = 0; i < structPath.length - 1; i++) { + pointer = pointer[structPath[i]]; + } + pointer[structPath[structPath.length - 1]] = value; + } else if (typeof value === 'object' && value !== null) { + checkFields(value, currentPath); + } + }); + } + + checkFields(jsonData); + + const absolutePathToActiveSubdirectory = path.join(activeLanguagesLocation, locale, relativeFilePath); + + if (!fs.existsSync(path.dirname(absolutePathToActiveSubdirectory))) + fs.mkdirSync(path.dirname(absolutePathToActiveSubdirectory), { recursive: true }); + + fs.writeFileSync(absolutePathToActiveSubdirectory, JSON.stringify(fallbackLanguageData), { recursive: true }); + + } catch (err) { + console.error(`Error processing ${filePath}:`, err); + foundErrors = true; + } + +} + +function loadSubdirectory(locale, relativePath) { + const absolutePath = path.join(languagesLocation, fallbackLanguage, relativePath); + const subdirectories = fs.readdirSync(absolutePath, { withFileTypes: true }) + .filter(dirent => dirent.isDirectory()) + .map(dirent => dirent.name); + const subfiles = fs.readdirSync(absolutePath, { withFileTypes: true }) + .filter(dirent => !dirent.isDirectory()) + .map(dirent => dirent.name); + for (let i = 0; i < subdirectories.length; i++) { + const subdirectoryPath = path.join(relativePath, subdirectories[i]); + loadSubdirectory(locale, subdirectoryPath); + } + for (let i = 0; i < subfiles.length; i++) { + const filePath = path.join(relativePath, subfiles[i]); + loadFile(locale, filePath); + } +} + function activate() { Object.entries(languages).forEach(([key, value]) => { - const directory = path.join(process.cwd(), "languages", baseDirectory, value, "standard"); - + const directory = path.join(process.cwd(), baseDirectory, value); + console.log(`Processing language code ${key}...`); if (!fs.existsSync(directory)) { console.log(`Skipping non-existent directory: ${directory} for language code ${key}`); return; } - const files = fs.readdirSync(directory); - if (files.length === 0) { - console.log(`No JSON files found in ${directory}.`); - return; - } - - const activeLanguageBotStandardDirectory = path.join(process.cwd(), "languages", baseDirectoryActive, value, "standard"); - - if (!fs.existsSync(activeLanguageBotStandardDirectory)) - fs.mkdirSync(activeLanguageBotStandardDirectory, { recursive: true }); - - files.forEach(file => { - if (!file.endsWith('.json')) { - console.log(`Skipping non-JSON file: ${file}`); - return; - } - - console.log(`Copying ${value}/${file}...`); - const filePath = path.join(directory, file); - try { - const data = fs.readFileSync(filePath, 'utf8'); - const jsonData = JSON.parse(data); - const fallbackLanguageData = require(`./${baseDirectory}/${fallbackLanguage}/standard/${file}`); - function checkFields(obj, path = '') { - Object.keys(obj).forEach(key => { - const value = obj[key]; - const currentPath = path ? `${path}.${key}` : key; - - if (typeof value === 'string') { - let pointer = fallbackLanguageData; - const structPath = currentPath.split("."); - for (let i = 0; i < structPath.length - 1; i++) { - pointer = pointer[structPath[i]]; - } - pointer[structPath[structPath.length - 1]] = value; - } else if (typeof value === 'object' && value !== null) { - checkFields(value, currentPath); - } - }); - } - - checkFields(jsonData); - - if (!fs.existsSync(activeLanguageBotStandardDirectory)) - fs.mkdirSync(activeLanguageBotStandardDirectory, { recursive: true }); - - fs.writeFileSync(path.join(activeLanguageBotStandardDirectory, file), JSON.stringify(fallbackLanguageData)); + if (!fs.existsSync(activeLanguagesLocation)) + fs.mkdirSync(activeLanguagesLocation, { recursive: true }); - } catch (err) { - console.error(`Error processing ${file}:`, err); - foundErrors = true; - } - }); + console.log(`Copying ${directory}...`); + loadSubdirectory(value, "/"); }); } -module.exports = activate; +module.exports = activate; \ No newline at end of file diff --git a/bot/pl/read_me.txt b/bot/pl/read_me.txt deleted file mode 100644 index 242d7a8..0000000 --- a/bot/pl/read_me.txt +++ /dev/null @@ -1 +0,0 @@ -Translations from English to Polish are 100% complete> ( You can delete this ) \ No newline at end of file From c406a62db7986c6388f4f3516cb4c32c18131190 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Fri, 21 Jun 2024 22:58:57 +0100 Subject: [PATCH 15/55] add missing languages --- bot/en_gb/channel_update_types.json | 3 +++ bot/en_gb/emoji_update_types.json | 3 +++ bot/en_pr/channel_update_types.json | 3 +++ bot/en_pr/emoji_update_types.json | 3 +++ bot/en_us/channel_update_types.json | 3 +++ bot/en_us/emoji_update_types.json | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 bot/en_gb/channel_update_types.json create mode 100644 bot/en_gb/emoji_update_types.json create mode 100644 bot/en_pr/channel_update_types.json create mode 100644 bot/en_pr/emoji_update_types.json create mode 100644 bot/en_us/channel_update_types.json create mode 100644 bot/en_us/emoji_update_types.json diff --git a/bot/en_gb/channel_update_types.json b/bot/en_gb/channel_update_types.json new file mode 100644 index 0000000..720ce9b --- /dev/null +++ b/bot/en_gb/channel_update_types.json @@ -0,0 +1,3 @@ +{ + "none": "none" +} \ No newline at end of file diff --git a/bot/en_gb/emoji_update_types.json b/bot/en_gb/emoji_update_types.json new file mode 100644 index 0000000..720ce9b --- /dev/null +++ b/bot/en_gb/emoji_update_types.json @@ -0,0 +1,3 @@ +{ + "none": "none" +} \ No newline at end of file diff --git a/bot/en_pr/channel_update_types.json b/bot/en_pr/channel_update_types.json new file mode 100644 index 0000000..720ce9b --- /dev/null +++ b/bot/en_pr/channel_update_types.json @@ -0,0 +1,3 @@ +{ + "none": "none" +} \ No newline at end of file diff --git a/bot/en_pr/emoji_update_types.json b/bot/en_pr/emoji_update_types.json new file mode 100644 index 0000000..720ce9b --- /dev/null +++ b/bot/en_pr/emoji_update_types.json @@ -0,0 +1,3 @@ +{ + "none": "none" +} \ No newline at end of file diff --git a/bot/en_us/channel_update_types.json b/bot/en_us/channel_update_types.json new file mode 100644 index 0000000..720ce9b --- /dev/null +++ b/bot/en_us/channel_update_types.json @@ -0,0 +1,3 @@ +{ + "none": "none" +} \ No newline at end of file diff --git a/bot/en_us/emoji_update_types.json b/bot/en_us/emoji_update_types.json new file mode 100644 index 0000000..720ce9b --- /dev/null +++ b/bot/en_us/emoji_update_types.json @@ -0,0 +1,3 @@ +{ + "none": "none" +} \ No newline at end of file From 547e47d4cfcc80609831887ff391ab1b08491bc6 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:19:17 +0100 Subject: [PATCH 16/55] fix command name check https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-naming --- .github/scripts/validate-slash_commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 37fa0ca..e14a426 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -45,7 +45,7 @@ try { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at '${currentPath}'`); foundErrors = true; } - if (currentPath.endsWith('.name') && value.includes(' ')) { + if (currentPath.endsWith('.name') && /^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/.test(value) == false) { console.error(`Validation error: ${directory}/${file}: Name contains space at '${currentPath}'`); foundErrors = true; } From 937080adbed814b8260464a40a74d6e0c6d03faa Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:23:56 +0100 Subject: [PATCH 17/55] Update validate-slash_commands.js --- .github/scripts/validate-slash_commands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index e14a426..e6f006c 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -45,8 +45,8 @@ try { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at '${currentPath}'`); foundErrors = true; } - if (currentPath.endsWith('.name') && /^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/.test(value) == false) { - console.error(`Validation error: ${directory}/${file}: Name contains space at '${currentPath}'`); + 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}'`); foundErrors = true; } if (value !== value.toLowerCase() && currentPath.endsWith('name')) { From e4c5481a63d43c057d637523b5fca8d340085688 Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:40:11 +0100 Subject: [PATCH 18/55] view value --- .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 e6f006c..3a056e9 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -45,8 +45,10 @@ try { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at '${currentPath}'`); foundErrors = true; } + if (currentPath.endsWith('.name')) + console.log(value); 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}'`); + console.error(`Validation error: ${directory}/${file}: Name does not match regex at '${currentPath}', VALUE: ${value}`); foundErrors = true; } if (value !== value.toLowerCase() && currentPath.endsWith('name')) { From 138b39c6ad808a968bc88c5837af5b2f88f66f8f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:43:50 +0100 Subject: [PATCH 19/55] Update validate-slash_commands.js --- .github/scripts/validate-slash_commands.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 3a056e9..09a8631 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -45,8 +45,7 @@ try { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at '${currentPath}'`); foundErrors = true; } - if (currentPath.endsWith('.name')) - console.log(value); + 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; @@ -64,8 +63,8 @@ try { checkFields(jsonData); - if (jsonData.name && jsonData.name.includes(' ')) { - console.error(`Validation error: ${directory}/${file}: Name contains space at 'name'`); + if (jsonData.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, VALUE: ${value}`); foundErrors = true; } else if (jsonData.description && jsonData.description.length > 100) { console.error(`Validation error: ${directory}/${file}: Description exceeds 100 characters at 'description'`); From 7d701f825792fb6974b2f0807fc6a40cd55c645f Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:45:48 +0100 Subject: [PATCH 20/55] lol --- .github/scripts/validate-slash_commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 09a8631..57f067f 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -63,7 +63,7 @@ try { checkFields(jsonData); - if (jsonData.name && value.match(/^[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai}]{1,32}$/gu) == null) { + 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: ${value}`); foundErrors = true; } else if (jsonData.description && jsonData.description.length > 100) { From 6ccffcbd83cc77f51da4f75becbcd51d42196b9c Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:46:49 +0100 Subject: [PATCH 21/55] Update validate-slash_commands.js --- .github/scripts/validate-slash_commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-slash_commands.js b/.github/scripts/validate-slash_commands.js index 57f067f..4ccfa75 100644 --- a/.github/scripts/validate-slash_commands.js +++ b/.github/scripts/validate-slash_commands.js @@ -64,7 +64,7 @@ try { 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: ${value}`); + 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'`); From d7c292a83e2698ec5ef8e2abc880d8bd918d433e Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:49:28 +0100 Subject: [PATCH 22/55] fix validation errors --- bot/nl/slash_commands/commands.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/nl/slash_commands/commands.json b/bot/nl/slash_commands/commands.json index cd39f11..ba995e9 100644 --- a/bot/nl/slash_commands/commands.json +++ b/bot/nl/slash_commands/commands.json @@ -1,4 +1,4 @@ { - "name": "commando's", - "description": "Bekijk een lijst van Quark's commando's" + "name": "commandos", + "description": "Bekijk een lijst van Quark's commandos" } \ No newline at end of file From 377bae6b9433ffb2add0c589a0277a200d72838a Mon Sep 17 00:00:00 2001 From: Starman <30315137+Starman3787@users.noreply.github.com> Date: Sat, 22 Jun 2024 13:25:45 +0100 Subject: [PATCH 23/55] Update activate.js --- activate.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/activate.js b/activate.js index 7bf8efe..381cd1b 100644 --- a/activate.js +++ b/activate.js @@ -5,8 +5,8 @@ const fallbackLanguage = "en_us"; const baseDirectory = "bot"; const languages = require('./bot/languages.json'); -const languagesLocation = path.join(process.cwd(), "language", baseDirectory); -const activeLanguagesLocation = path.join(process.cwd(), "language", "active", baseDirectory); +const languagesLocation = path.join(process.cwd(), "languages", baseDirectory); +const activeLanguagesLocation = path.join(process.cwd(), "languages", "active", baseDirectory); // relative file path is the path after the locale directory function loadFile(locale, relativeFilePath) { @@ -75,7 +75,7 @@ function loadSubdirectory(locale, relativePath) { function activate() { Object.entries(languages).forEach(([key, value]) => { - const directory = path.join(process.cwd(), baseDirectory, value); + const directory = path.join(process.cwd(), "languages", baseDirectory, value); console.log(`Processing language code ${key}...`); if (!fs.existsSync(directory)) { console.log(`Skipping non-existent directory: ${directory} for language code ${key}`); 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 24/55] 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 34b4476c7a4a5e430abd300811a09ed6d2fb629f Mon Sep 17 00:00:00 2001 From: lis0ownik <97831192+lis0ownik@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:19:50 +0200 Subject: [PATCH 25/55] Update channel_types.json --- bot/pl/channel_types.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/pl/channel_types.json b/bot/pl/channel_types.json index b35ef11..d7ffbc6 100644 --- a/bot/pl/channel_types.json +++ b/bot/pl/channel_types.json @@ -1,7 +1,7 @@ { "0": "Tekstowy", "2": "Głosowy", - "4": "Kategoria", + "4": "Kategorii", "5": "Ogłoszeniowy", "10": "Ogłoszeniowy Wątek", "11": "Publiczny Wątek", @@ -10,4 +10,4 @@ "14": "Informacyjny", "15": "Forum", "16": "Media" -} \ No newline at end of file +} 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 26/55] 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 27/55] 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 28/55] 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 29/55] 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 30/55] 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 31/55] 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 32/55] 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 33/55] 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 34/55] 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 35/55] 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 36/55] 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 37/55] 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 38/55] 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 39/55] 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 40/55] 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 41/55] 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 42/55] 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 43/55] 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 44/55] 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 45/55] 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 46/55] 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 47/55] 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 48/55] 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 49/55] 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 50/55] 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 51/55] 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 9ee492547179b6ba4183019eb0c7a56ede5bddd9 Mon Sep 17 00:00:00 2001 From: ThatKev <65928584+thatkev@users.noreply.github.com> Date: Fri, 28 Jun 2024 20:50:14 +0930 Subject: [PATCH 52/55] language comparison script + workflow (fixes #6) --- .github/scripts/compare-languages.js | 74 +++++++++++++++++++++++ .github/workflows/language-comparison.yml | 13 ++++ 2 files changed, 87 insertions(+) create mode 100644 .github/scripts/compare-languages.js create mode 100644 .github/workflows/language-comparison.yml diff --git a/.github/scripts/compare-languages.js b/.github/scripts/compare-languages.js new file mode 100644 index 0000000..1968fcb --- /dev/null +++ b/.github/scripts/compare-languages.js @@ -0,0 +1,74 @@ +const fs = require('fs'); +const path = require('path'); + +function readJson(filePath) { + const rawData = fs.readFileSync(filePath, 'utf8'); + return JSON.parse(rawData); +} + +function getAllJsonFiles(directory) { + let jsonFiles = []; + const files = fs.readdirSync(directory); + + files.forEach(file => { + const fullPath = path.join(directory, file); + if (fs.statSync(fullPath).isDirectory()) { + jsonFiles = jsonFiles.concat(getAllJsonFiles(fullPath)); + } else if (file.endsWith('.json')) { + jsonFiles.push(fullPath); + } + }); + + return jsonFiles; +} + +function compareJsonFiles(enUsDir, otherLangDir) { + const enUsFiles = getAllJsonFiles(enUsDir); + const otherLangFiles = getAllJsonFiles(otherLangDir); + + const enUsFilesRelative = enUsFiles.map(file => path.relative(enUsDir, file)); + const otherLangFilesRelative = otherLangFiles.map(file => path.relative(otherLangDir, file)); + + const missingFiles = enUsFilesRelative.filter(file => !otherLangFilesRelative.includes(file)); + + const missingKeys = {}; + + enUsFilesRelative.forEach(file => { + if (otherLangFilesRelative.includes(file)) { + const enUsJson = readJson(path.join(enUsDir, file)); + const otherLangJson = readJson(path.join(otherLangDir, file)); + + const missingKeysInFile = Object.keys(enUsJson).filter(key => !otherLangJson.hasOwnProperty(key)); + if (missingKeysInFile.length > 0) { + missingKeys[file] = missingKeysInFile; + } + } + }); + + return { missingFiles, missingKeys }; +} + +function compareAllLanguages(baseDir) { + const enUsDir = path.join(baseDir, 'en_us'); + const languages = fs.readdirSync(baseDir).filter(dir => fs.statSync(path.join(baseDir, dir)).isDirectory() && dir !== 'en_us'); + + const report = {}; + + languages.forEach(lang => { + const langDir = path.join(baseDir, lang); + const { missingFiles, missingKeys } = compareJsonFiles(enUsDir, langDir); + report[lang] = { missingFiles, missingKeys }; + }); + + return report; +} + +const baseDirectory = './bot/'; // Update with the actual path +const comparisonReport = compareAllLanguages(baseDirectory); + +for (const [lang, report] of Object.entries(comparisonReport)) { + console.log(`Language: ${lang}`); + console.log(` Missing files: ${report.missingFiles.length > 0 ? report.missingFiles.join(', ') : 'None'}`); + console.log(` Missing keys: ${Object.keys(report.missingKeys).length > 0 ? JSON.stringify(report.missingKeys, null, 2) : 'None'}`); + console.log(); +} diff --git a/.github/workflows/language-comparison.yml b/.github/workflows/language-comparison.yml new file mode 100644 index 0000000..292350a --- /dev/null +++ b/.github/workflows/language-comparison.yml @@ -0,0 +1,13 @@ +name: Language comparison + +on: [workflow_dispatch] + +jobs: + compare-languages: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Validate Slash Command files + run: node .github/scripts/compare-languages.js From 3c1ae26c535e97c85a729228fe6a8420e70739eb Mon Sep 17 00:00:00 2001 From: ThatKev <65928584+thatkev@users.noreply.github.com> Date: Fri, 28 Jun 2024 20:53:05 +0930 Subject: [PATCH 53/55] amend --- .github/scripts/compare-languages.js | 2 +- .github/workflows/language-comparison.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/compare-languages.js b/.github/scripts/compare-languages.js index 1968fcb..fcb1f4c 100644 --- a/.github/scripts/compare-languages.js +++ b/.github/scripts/compare-languages.js @@ -63,7 +63,7 @@ function compareAllLanguages(baseDir) { return report; } -const baseDirectory = './bot/'; // Update with the actual path +const baseDirectory = './bot/'; const comparisonReport = compareAllLanguages(baseDirectory); for (const [lang, report] of Object.entries(comparisonReport)) { diff --git a/.github/workflows/language-comparison.yml b/.github/workflows/language-comparison.yml index 292350a..357b0fa 100644 --- a/.github/workflows/language-comparison.yml +++ b/.github/workflows/language-comparison.yml @@ -9,5 +9,5 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Validate Slash Command files + - name: Compare language files run: node .github/scripts/compare-languages.js 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 54/55] 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 55/55] 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!",