diff --git a/app/features/api-public/routes/tournament.$id.ts b/app/features/api-public/routes/tournament.$id.ts index 817b8492a..dcdf36d30 100644 --- a/app/features/api-public/routes/tournament.$id.ts +++ b/app/features/api-public/routes/tournament.$id.ts @@ -50,7 +50,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => { name: tournament.name, startTime: databaseTimestampToDate(tournament.startTime).toISOString(), url: `https://sendou.ink/to/${id}/brackets`, - logoUrl: HACKY_resolvePicture(tournament), + logoUrl: `https://sendou.ink${HACKY_resolvePicture(tournament)}`, teams: { checkedInCount: tournament.teams.filter((team) => team.checkedInAt) .length, diff --git a/app/features/api-public/schema.ts b/app/features/api-public/schema.ts index 2d57795ca..26aaf9be9 100644 --- a/app/features/api-public/schema.ts +++ b/app/features/api-public/schema.ts @@ -52,7 +52,7 @@ export interface GetTournamentResponse { */ url: string; /** - * @example "https://abload.de/img/screenshot2023-04-19a2bfv0.png" + * @example "https://sendou.ink/static-assets/img/tournament-logos/itz.png" */ logoUrl: string | null; /** diff --git a/app/features/tournament/tournament-utils.ts b/app/features/tournament/tournament-utils.ts index a2743c438..fa34d8b96 100644 --- a/app/features/tournament/tournament-utils.ts +++ b/app/features/tournament/tournament-utils.ts @@ -12,6 +12,7 @@ import type { import { TOURNAMENT } from "./tournament-constants"; import { validate } from "~/utils/remix"; import type { PlayedSet } from "./core/sets.server"; +import { tournamentLogoUrl } from "~/utils/urls"; export function resolveOwnedTeam({ teams, @@ -78,13 +79,27 @@ export function isOneModeTournamentOf( } export function HACKY_resolvePicture(event: { name: string }) { - if (HACKY_isInviteOnlyEvent(event)) - return "https://abload.de/img/screenshot2023-11-25ay1fbc.png"; + if (HACKY_isInviteOnlyEvent(event)) { + return tournamentLogoUrl("sf"); + } - if (event.name.includes("In The Zone")) - return "https://abload.de/img/screenshot2023-04-19a2bfv0.png"; + if (event.name.includes("Paddling Pool")) { + return tournamentLogoUrl("pp"); + } - return "https://abload.de/img/screenshot2022-12-15ap0ca1.png"; + if (event.name.includes("In The Zone")) { + return tournamentLogoUrl("itz"); + } + + if (event.name.includes("PICNIC")) { + return tournamentLogoUrl("pn"); + } + + if (event.name.includes("Proving Grounds")) { + return tournamentLogoUrl("pg"); + } + + return tournamentLogoUrl("default"); } // hacky because db query not taking in account possibility of many start times diff --git a/app/utils/urls.ts b/app/utils/urls.ts index 7a93599d1..f09e5198c 100644 --- a/app/utils/urls.ts +++ b/app/utils/urls.ts @@ -357,6 +357,8 @@ export const preferenceEmojiUrl = (preference?: Preference) => { return `/static-assets/img/emoji/${emoji}.svg`; }; +export const tournamentLogoUrl = (identifier: string) => + `/static-assets/img/tournament-logos/${identifier}.png`; export const TIER_PLUS_URL = `/static-assets/img/tiers/plus`; export const winnersImageUrl = ({ diff --git a/public/static-assets/img/tournament-logos/default.png b/public/static-assets/img/tournament-logos/default.png new file mode 100644 index 000000000..354030f13 Binary files /dev/null and b/public/static-assets/img/tournament-logos/default.png differ diff --git a/public/static-assets/img/tournament-logos/itz.png b/public/static-assets/img/tournament-logos/itz.png new file mode 100644 index 000000000..90f49ca6f Binary files /dev/null and b/public/static-assets/img/tournament-logos/itz.png differ diff --git a/public/static-assets/img/tournament-logos/pg.png b/public/static-assets/img/tournament-logos/pg.png new file mode 100644 index 000000000..db85ad39a Binary files /dev/null and b/public/static-assets/img/tournament-logos/pg.png differ diff --git a/public/static-assets/img/tournament-logos/pn.png b/public/static-assets/img/tournament-logos/pn.png new file mode 100644 index 000000000..f08ae37a5 Binary files /dev/null and b/public/static-assets/img/tournament-logos/pn.png differ diff --git a/public/static-assets/img/tournament-logos/pp.png b/public/static-assets/img/tournament-logos/pp.png new file mode 100644 index 000000000..3f6c5b2da Binary files /dev/null and b/public/static-assets/img/tournament-logos/pp.png differ diff --git a/public/static-assets/img/tournament-logos/sf.png b/public/static-assets/img/tournament-logos/sf.png new file mode 100644 index 000000000..e6c531164 Binary files /dev/null and b/public/static-assets/img/tournament-logos/sf.png differ