Add new config option to working hours field

ralphkb · Apr 27, 2024 · 2a874d5 · 2a874d5
1 parent df35750
commit 2a874d5
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 35 deletions.
diff --git a/config.yml.example b/config.yml.example
@@ -302,10 +302,11 @@ workingHours:
     - day: "sunday"
       min: "09:00"
       max: "12:00"
-      blockTicketCreation: true						   
+      blockTicketCreation: true
   addField: true # If working hours is enabled, this option will enable or disable the addition of the working hours field to the ticket creation embed
   fieldTitle: "Working Hours" # The title of the working hours field
-  fieldValue: "> {day}: {openingTime} to {closingTime}" # The value of "each" working hours field (depending on how many days you configured above), use {day} for today's day of the week, {openingTime} for the opening time and {closingTime} for the closing time
+  valueDays: "TODAY" # Options are: "TODAY" which will only show today's working hours or "ALL" which will show the configured working hours for each day
+  fieldValue: "> {day}: {openingTime} to {closingTime}" # The value of each working hours field, use {day} for today's day of the week, {openingTime} for the opening time and {closingTime} for the closing time
 
 # The embed that is sent when the ticket creation is blocked due to being outside the working hours
 workingHoursEmbed:

diff --git a/events/interactionCreate.js b/events/interactionCreate.js
@@ -1885,42 +1885,59 @@ module.exports = {
 
           if (config.workingHours.enabled && config.workingHours.addField) {
             let workingHoursText = "";
-            const currentDay = userCurrentTime.format("dddd").toLowerCase();
-            for (const day in workingHours) {
-              const { min, max } = workingHours[day];
-              const isCurrentDay = day === currentDay;
-              const dayText = isCurrentDay
-                ? `**${day.charAt(0).toUpperCase() + day.slice(1)}**`
-                : day.charAt(0).toUpperCase() + day.slice(1);
-              let openTime = min || config.workingHours.default.min;
-              let closeTime = max || config.workingHours.default.max;
-
-              const openTimeToday = userCurrentTime
-                .clone()
-                .startOf("day")
-                .set({
-                  hour: openTime.split(":")[0],
-                  minute: openTime.split(":")[1],
-                });
+            if (config.workingHours.valueDays === "ALL") {
+              const currentDay = userCurrentTime.format("dddd").toLowerCase();
+              for (const day in workingHours) {
+                const { min, max } = workingHours[day];
+                const isCurrentDay = day === currentDay;
+                const dayText = isCurrentDay
+                  ? `**${day.charAt(0).toUpperCase() + day.slice(1)}**`
+                  : day.charAt(0).toUpperCase() + day.slice(1);
+                let openTime = min || config.workingHours.default.min;
+                let closeTime = max || config.workingHours.default.max;
+
+                const openTimeToday = userCurrentTime
+                  .clone()
+                  .startOf("day")
+                  .set({
+                    hour: openTime.split(":")[0],
+                    minute: openTime.split(":")[1],
+                  });
 
-              const closeTimeToday = userCurrentTime
-                .clone()
-                .startOf("day")
-                .set({
-                  hour: closeTime.split(":")[0],
-                  minute: closeTime.split(":")[1],
-                });
+                const closeTimeToday = userCurrentTime
+                  .clone()
+                  .startOf("day")
+                  .set({
+                    hour: closeTime.split(":")[0],
+                    minute: closeTime.split(":")[1],
+                  });
 
-              const openingTimestamp = `<t:${openTimeToday.unix()}:t>`;
-              const closingTimestamp = `<t:${closeTimeToday.unix()}:t>`;
+                const openingTimestamp = `<t:${openTimeToday.unix()}:t>`;
+                const closingTimestamp = `<t:${closeTimeToday.unix()}:t>`;
 
-              const workingHoursField = config.workingHours.fieldValue
-                ? `${config.workingHours.fieldValue}\n`
-                : `> {day}: {openingTime} to {closingTime}\n`;
-              workingHoursText += workingHoursField
-                .replace(/\{day\}/g, dayText)
-                .replace(/\{openingTime\}/g, openingTimestamp)
-                .replace(/\{closingTime\}/g, closingTimestamp);
+                const workingHoursField = config.workingHours.fieldValue
+                  ? `${config.workingHours.fieldValue}\n`
+                  : `> {day}: {openingTime} to {closingTime}\n`;
+                workingHoursText += workingHoursField
+                  .replace(/\{day\}/g, dayText)
+                  .replace(/\{openingTime\}/g, openingTimestamp)
+                  .replace(/\{closingTime\}/g, closingTimestamp);
+              }
+            } else if (config.workingHours.valueDays === "TODAY") {
+              workingHoursText +=
+                `${config.workingHours.fieldValue || "> {day}: {openingTime} to {closingTime}"}`
+                  .replace(
+                    /\{day\}/g,
+                    dayToday.charAt(0).toUpperCase() + dayToday.slice(1),
+                  )
+                  .replace(
+                    /\{openingTime\}/g,
+                    `<t:${openingTimeToday.unix()}:t>`,
+                  )
+                  .replace(
+                    /\{closingTime\}/g,
+                    `<t:${closingTimeToday.unix()}:t>`,
+                  );
             }
             ticketOpenEmbed.addFields({
               name: config.workingHours.fieldTitle || "Working Hours",