From d6b0f9f769513733308ffe9e928dd58acb665680 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Thu, 9 May 2024 14:18:52 +0300
Subject: [PATCH] Remove "hosted on sendou ink" tag and add ranked/unranked
 tags

---
 .../calendar/CalendarRepository.server.ts      |  6 +++++-
 app/features/calendar/calendar-constants.ts    |  3 ---
 app/features/calendar/components/Tags.tsx      |  8 ++++++++
 .../calendar/loaders/calendar.new.server.ts    |  4 +---
 app/features/calendar/routes/calendar.new.tsx  |  3 +--
 app/features/calendar/routes/calendar.tsx      | 18 +++++++++++++++---
 app/styles/common.css                          | 11 +++++++++++
 locales/da/calendar.json                       |  3 +--
 locales/da/common.json                         |  1 -
 locales/en/calendar.json                       |  3 +--
 locales/en/common.json                         |  1 -
 locales/fr/calendar.json                       |  3 +--
 locales/fr/common.json                         |  1 -
 locales/he/calendar.json                       |  3 +--
 locales/he/common.json                         |  1 -
 locales/ja/calendar.json                       |  3 +--
 locales/ja/common.json                         |  1 -
 locales/ko/common.json                         |  1 -
 locales/pt-BR/calendar.json                    |  3 +--
 locales/pt-BR/common.json                      |  1 -
 locales/ru/calendar.json                       |  3 +--
 locales/ru/common.json                         |  1 -
 locales/zh/calendar.json                       |  3 +--
 locales/zh/common.json                         |  1 -
 24 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/app/features/calendar/CalendarRepository.server.ts b/app/features/calendar/CalendarRepository.server.ts
index ddd8bec97..b87bd3bd6 100644
--- a/app/features/calendar/CalendarRepository.server.ts
+++ b/app/features/calendar/CalendarRepository.server.ts
@@ -153,6 +153,11 @@ export async function findAllBetweenTwoTimestamps({
       "User.discordName",
       "User.discordDiscriminator",
       "CalendarEventRanks.nthAppearance",
+      eb
+        .selectFrom("Tournament")
+        .select("Tournament.settings")
+        .whereRef("Tournament.id", "=", "CalendarEvent.tournamentId")
+        .as("tournamentSettings"),
       hasBadge,
       jsonArrayFrom(
         eb
@@ -227,7 +232,6 @@ function tagsArray(args: {
   ) as Array<CalendarEventTag>;
 
   if (args.hasBadge) tags.unshift("BADGE");
-  if (args.tournamentId) tags.unshift("FULL_TOURNAMENT");
 
   return tags;
 }
diff --git a/app/features/calendar/calendar-constants.ts b/app/features/calendar/calendar-constants.ts
index 9f4b4a860..ed69d8de3 100644
--- a/app/features/calendar/calendar-constants.ts
+++ b/app/features/calendar/calendar-constants.ts
@@ -47,9 +47,6 @@ export const tags = {
   CARDS: {
     color: "#E4D00A",
   },
-  FULL_TOURNAMENT: {
-    color: "#FFC0CB",
-  },
 };
 
 export const REG_CLOSES_AT_OPTIONS = [
diff --git a/app/features/calendar/components/Tags.tsx b/app/features/calendar/components/Tags.tsx
index 47f5a4f13..0aab426d4 100644
--- a/app/features/calendar/components/Tags.tsx
+++ b/app/features/calendar/components/Tags.tsx
@@ -12,9 +12,11 @@ export function Tags({
   tags,
   badges,
   onDelete,
+  tournamentRankedStatus,
 }: {
   tags: Array<CalendarEventTag>;
   badges?: CalendarRepository.FindAllBetweenTwoTimestampsItem["badgePrizes"];
+  tournamentRankedStatus?: "RANKED" | "UNRANKED";
 
   /** Called when tag delete button clicked. If undefined delete buttons won't be shown. */
   onDelete?: (tag: CalendarEventTag) => void;
@@ -25,6 +27,12 @@ export function Tags({
 
   return (
     <ul className="calendar__event__tags">
+      {tournamentRankedStatus === "RANKED" ? (
+        <li className="calendar__event__ranked-tag">Ranked</li>
+      ) : null}
+      {tournamentRankedStatus === "UNRANKED" ? (
+        <li className="calendar__event__unranked-tag">Unranked</li>
+      ) : null}
       {tags.map((tag) => (
         <React.Fragment key={tag}>
           <li
diff --git a/app/features/calendar/loaders/calendar.new.server.ts b/app/features/calendar/loaders/calendar.new.server.ts
index 7c454fa7d..84646cf9e 100644
--- a/app/features/calendar/loaders/calendar.new.server.ts
+++ b/app/features/calendar/loaders/calendar.new.server.ts
@@ -33,9 +33,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
     if (!event) return;
 
     // special tags that are added automatically
-    const tags = event?.tags?.filter(
-      (tag) => tag !== "BADGE" && tag !== "FULL_TOURNAMENT",
-    );
+    const tags = event?.tags?.filter((tag) => tag !== "BADGE");
 
     if (!event?.tournamentId) return { ...event, tags, tournamentCtx: null };
 
diff --git a/app/features/calendar/routes/calendar.new.tsx b/app/features/calendar/routes/calendar.new.tsx
index e583892fd..ed07d0253 100644
--- a/app/features/calendar/routes/calendar.new.tsx
+++ b/app/features/calendar/routes/calendar.new.tsx
@@ -449,8 +449,7 @@ function TagsAdder() {
   const id = React.useId();
 
   const tagsForSelect = CALENDAR_EVENT.TAGS.filter(
-    (tag) =>
-      !tags.includes(tag) && tag !== "BADGE" && tag !== "FULL_TOURNAMENT",
+    (tag) => !tags.includes(tag) && tag !== "BADGE",
   );
 
   return (
diff --git a/app/features/calendar/routes/calendar.tsx b/app/features/calendar/routes/calendar.tsx
index 9fd8eb627..b83dc4cd4 100644
--- a/app/features/calendar/routes/calendar.tsx
+++ b/app/features/calendar/routes/calendar.tsx
@@ -47,6 +47,7 @@ import { Tags } from "../components/Tags";
 import { Image } from "~/components/Image";
 import { Toggle } from "~/components/Toggle";
 import { Label } from "~/components/Label";
+import { currentSeason } from "~/features/mmr/season";
 
 import "~/styles/calendar.css";
 
@@ -418,6 +419,18 @@ function EventsList({
                   weekday: "long",
                 });
 
+                const startTimeDate = databaseTimestampToDate(
+                  calendarEvent.startTime,
+                );
+                const tournamentRankedStatus = () => {
+                  if (!calendarEvent.tournamentSettings) return undefined;
+                  if (!currentSeason(startTimeDate)) return undefined;
+
+                  return calendarEvent.tournamentSettings.isRanked
+                    ? "RANKED"
+                    : "UNRANKED";
+                };
+
                 return (
                   <section
                     key={calendarEvent.eventDateId}
@@ -431,9 +444,7 @@ function EventsList({
                           ).toISOString()}
                           className="calendar__event__time"
                         >
-                          {databaseTimestampToDate(
-                            calendarEvent.startTime,
-                          ).toLocaleTimeString(i18n.language, {
+                          {startTimeDate.toLocaleTimeString(i18n.language, {
                             hour: "numeric",
                             minute: "numeric",
                           })}
@@ -499,6 +510,7 @@ function EventsList({
                         <Tags
                           tags={calendarEvent.tags}
                           badges={calendarEvent.badgePrizes}
+                          tournamentRankedStatus={tournamentRankedStatus()}
                         />
                       </div>
                     </div>
diff --git a/app/styles/common.css b/app/styles/common.css
index ba6bfc11e..ca38f5035 100644
--- a/app/styles/common.css
+++ b/app/styles/common.css
@@ -765,6 +765,7 @@ dialog::backdrop {
   align-items: center;
   border-radius: var(--rounded);
   padding-inline: var(--s-1-5);
+  min-height: 20px;
 }
 
 .calendar__event__tag {
@@ -775,6 +776,16 @@ dialog::backdrop {
   color: var(--badge-text);
 }
 
+.calendar__event__ranked-tag {
+  background-color: var(--theme-info-transparent);
+  color: var(--theme-info);
+}
+
+.calendar__event__unranked-tag {
+  background-color: var(--theme-success-transparent);
+  color: var(--theme-success);
+}
+
 .calendar__event__tag-delete-button {
   margin-left: auto;
 }
diff --git a/locales/da/calendar.json b/locales/da/calendar.json
index 0c35ccf33..2b0f62993 100644
--- a/locales/da/calendar.json
+++ b/locales/da/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "Spilles i Splatoon 1.",
   "tag.desc.S2": "Spilles i Splatoon 2.",
   "tag.desc.SR": "Salmon Run begivenhed.",
-  "tag.desc.CARDS": "Tableturf Battle begivenhed.",
-  "tag.desc.FULL_TOURNAMENT": "Sendou.ink er værten for turneringen."
+  "tag.desc.CARDS": "Tableturf Battle begivenhed."
 }
diff --git a/locales/da/common.json b/locales/da/common.json
index ea337b222..3e03aea31 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -107,7 +107,6 @@
   "tag.name.S2": "Splatoon 2",
   "tag.name.SR": "Salmon Run",
   "tag.name.CARDS": "Tableturf Battle",
-  "tag.name.FULL_TOURNAMENT": "Hosted på sendou.ink",
 
   "weapon.category.SHOOTERS": "Skydere",
   "weapon.category.BLASTERS": "Blastere",
diff --git a/locales/en/calendar.json b/locales/en/calendar.json
index 543e1be5c..0e099c6a5 100644
--- a/locales/en/calendar.json
+++ b/locales/en/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "The game played is Splatoon 1.",
   "tag.desc.S2": "The game played is Splatoon 2.",
   "tag.desc.SR": "Salmon Run event.",
-  "tag.desc.CARDS": "Tableturf Battle event.",
-  "tag.desc.FULL_TOURNAMENT": "Tournament is hosted on sendou.ink"
+  "tag.desc.CARDS": "Tableturf Battle event."
 }
diff --git a/locales/en/common.json b/locales/en/common.json
index b61c22abf..484f33446 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -115,7 +115,6 @@
   "tag.name.S2": "Splatoon 2",
   "tag.name.SR": "Salmon Run",
   "tag.name.CARDS": "Tableturf Battle",
-  "tag.name.FULL_TOURNAMENT": "Hosted on sendou.ink",
 
   "weapon.category.SHOOTERS": "Shooters",
   "weapon.category.BLASTERS": "Blasters",
diff --git a/locales/fr/calendar.json b/locales/fr/calendar.json
index 0bad1d2bf..c6d9ac787 100644
--- a/locales/fr/calendar.json
+++ b/locales/fr/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "Le jeu joué est Splatoon 1.",
   "tag.desc.S2": "Le jeu joué est Splatoon 2.",
   "tag.desc.SR": "Événement Salmon Run.",
-  "tag.desc.CARDS": "Événement Cartes & Territoire.",
-  "tag.desc.FULL_TOURNAMENT": "Ce tournoi est hébergé sur sendou.ink"
+  "tag.desc.CARDS": "Événement Cartes & Territoire."
 }
diff --git a/locales/fr/common.json b/locales/fr/common.json
index e8c0710b9..277efe3a5 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -110,7 +110,6 @@
   "tag.name.S2": "Splatoon 2",
   "tag.name.SR": "Salmon Run",
   "tag.name.CARDS": "Cartes & Territoire",
-  "tag.name.FULL_TOURNAMENT": "Hébergé sur sendou.ink",
 
   "weapon.category.SHOOTERS": "Lanceurs",
   "weapon.category.BLASTERS": "Blasters",
diff --git a/locales/he/calendar.json b/locales/he/calendar.json
index 659168d9a..23bfc2e7a 100644
--- a/locales/he/calendar.json
+++ b/locales/he/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "המשחק המשוחק הוא Splatoon 1.",
   "tag.desc.S2": "המשחק המשוחק הוא Splatoon 2.",
   "tag.desc.SR": "אירוע Salmon Run.",
-  "tag.desc.CARDS": "אירוע Tableturf Battle.",
-  "tag.desc.FULL_TOURNAMENT": "הטורניר מתארח ב- sendou.ink"
+  "tag.desc.CARDS": "אירוע Tableturf Battle."
 }
diff --git a/locales/he/common.json b/locales/he/common.json
index ac1944cab..99159ddc4 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -110,7 +110,6 @@
   "tag.name.S2": "Splatoon 2",
   "tag.name.SR": "Salmon Run",
   "tag.name.CARDS": "Tableturf Battle",
-  "tag.name.FULL_TOURNAMENT": "מתארח ב-sendou.ink",
 
   "weapon.category.SHOOTERS": "Shooters",
   "weapon.category.BLASTERS": "Blasters",
diff --git a/locales/ja/calendar.json b/locales/ja/calendar.json
index 8458e1d6f..9d9f8e43f 100644
--- a/locales/ja/calendar.json
+++ b/locales/ja/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "スプラトゥーン1でプレイされます",
   "tag.desc.S2": "スプラトゥーン2でプレイされます",
   "tag.desc.SR": "サーモンランイベント",
-  "tag.desc.CARDS": "ナワバリバトルイベント",
-  "tag.desc.FULL_TOURNAMENT": "sendou.ink がホストのトーナメント"
+  "tag.desc.CARDS": "ナワバリバトルイベント"
 }
diff --git a/locales/ja/common.json b/locales/ja/common.json
index a01acc2d5..312bd8e25 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -110,7 +110,6 @@
   "tag.name.S2": "スプラトゥーン 2",
   "tag.name.SR": "サーモンラン",
   "tag.name.CARDS": "ナワバトラー",
-  "tag.name.FULL_TOURNAMENT": "sendou.ink 主催",
 
   "weapon.category.SHOOTERS": "シューター",
   "weapon.category.BLASTERS": "ブラスター",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 59f5230ff..5aa728d0f 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -109,7 +109,6 @@
   "tag.name.S2": "스플래툰 2",
   "tag.name.SR": "새먼런",
   "tag.name.CARDS": "영역 배틀러",
-  "tag.name.FULL_TOURNAMENT": "sendou.ink에서 개최됨",
 
   "weapon.category.SHOOTERS": "슈터",
   "weapon.category.BLASTERS": "블래스터",
diff --git a/locales/pt-BR/calendar.json b/locales/pt-BR/calendar.json
index b6c24aaf6..894b914ba 100644
--- a/locales/pt-BR/calendar.json
+++ b/locales/pt-BR/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "O jogo jogado é o Splatoon 1.",
   "tag.desc.S2": "O jogo jogado é o Splatoon 2.",
   "tag.desc.SR": "Evento de Salmon Run.",
-  "tag.desc.CARDS": "Evento de Tableturf Battle.",
-  "tag.desc.FULL_TOURNAMENT": "O torneio é hospedado no sendou.ink"
+  "tag.desc.CARDS": "Evento de Tableturf Battle."
 }
diff --git a/locales/pt-BR/common.json b/locales/pt-BR/common.json
index 955ea220b..9e2766ef9 100644
--- a/locales/pt-BR/common.json
+++ b/locales/pt-BR/common.json
@@ -110,7 +110,6 @@
   "tag.name.S2": "Splatoon 2",
   "tag.name.SR": "Salmon Run",
   "tag.name.CARDS": "Tableturf Battle",
-  "tag.name.FULL_TOURNAMENT": "Hospedado no sendou.ink",
 
   "weapon.category.SHOOTERS": "Shooters",
   "weapon.category.BLASTERS": "Blasters",
diff --git a/locales/ru/calendar.json b/locales/ru/calendar.json
index a52e1f261..f2d10a6e6 100644
--- a/locales/ru/calendar.json
+++ b/locales/ru/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "Игра — Splatoon 1.",
   "tag.desc.S2": "Игра — Splatoon 2.",
   "tag.desc.SR": "Событие по Salmon Run.",
-  "tag.desc.CARDS": "Событие по \"Карты и район\".",
-  "tag.desc.FULL_TOURNAMENT": "Турнир проводится на sendou.ink"
+  "tag.desc.CARDS": "Событие по \"Карты и район\"."
 }
diff --git a/locales/ru/common.json b/locales/ru/common.json
index eb151d79d..71ba3654d 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -112,7 +112,6 @@
   "tag.name.S2": "Splatoon 2",
   "tag.name.SR": "Salmon Run",
   "tag.name.CARDS": "Карты и район",
-  "tag.name.FULL_TOURNAMENT": "Проводится на sendou.ink",
 
   "weapon.category.SHOOTERS": "Каплестрелы",
   "weapon.category.BLASTERS": "Бластеры",
diff --git a/locales/zh/calendar.json b/locales/zh/calendar.json
index 311854a53..2ea79eeff 100644
--- a/locales/zh/calendar.json
+++ b/locales/zh/calendar.json
@@ -65,6 +65,5 @@
   "tag.desc.S1": "本次比赛为斯普拉遁1的比赛。",
   "tag.desc.S2": "本次比赛为斯普拉遁2的比赛。",
   "tag.desc.SR": "鲑鱼跑活动。",
-  "tag.desc.CARDS": "占地斗士活动。",
-  "tag.desc.FULL_TOURNAMENT": "本次比赛由sendou.ink举办"
+  "tag.desc.CARDS": "占地斗士活动。"
 }
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 545aad30e..9e86f0a6d 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -110,7 +110,6 @@
   "tag.name.S2": "斯普拉遁2",
   "tag.name.SR": "鲑鱼跑",
   "tag.name.CARDS": "占地斗士",
-  "tag.name.FULL_TOURNAMENT": "由sendou.ink举办",
 
   "weapon.category.SHOOTERS": "射击枪",
   "weapon.category.BLASTERS": "爆破枪",