ConfrerieDuKassoulait/Botanique
ConfrerieDuKassoulait/Botanique
2
0
Fork 0
Code Issues 22 Pull requests 3 Projects 1 Releases Packages 1 Activity Actions

chore: merge dev to main #181

Merged
Anri merged 40 commits from dev into main 2024-09-27 20:49:36 +02:00
Conversation 1 Commits 40 Files changed 15 +4 -5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 78a84faca4 - Show all commits

7
src/utils/reminder.ts
View file

@ -52,14 +52,13 @@ export const splitTime = (time: string) => {
[OptionReminder.Mention]: "@", [OptionReminder.Mention]: "@",
}; };
const lowered = time.toLowerCase(); const trimmed = time.replaceAll(
const trimmed = lowered.replaceAll( RegexC(Object.values(mapping).join("|"), RegExpFlags.Global | RegExpFlags.Insensitive),
RegexC(Object.values(mapping).join("|"), RegExpFlags.Global),
"", "",
); );
// Depending of the last character of the string // Depending of the last character of the string
switch (lowered.slice(-1)) { switch (time.toLowerCase().slice(-1)) {
case mapping[OptionReminder.Mention]: case mapping[OptionReminder.Mention]:
return { time: trimmed, option: OptionReminder.Mention }; return { time: trimmed, option: OptionReminder.Mention };
case mapping[OptionReminder.DirectMessage]: case mapping[OptionReminder.DirectMessage]:

2
src/utils/time.ts
View file

@ -53,7 +53,7 @@ export const strToSeconds = (time: string) => {
RegExpFlags.Global | RegExpFlags.Insensitive, RegExpFlags.Global | RegExpFlags.Insensitive,
); );
const data = Object.assign({}, regex.exec(time.toLowerCase())?.groups); const data = Object.assign({}, regex.exec(time)?.groups);
if (Object.keys(data).length === 0) { if (Object.keys(data).length === 0) {
// Regex returned an invalid time // Regex returned an invalid time