From a68ea4a6158624092705378e741f149c18e823d8 Mon Sep 17 00:00:00 2001
From: Eric Zhang <ekzhang1@gmail.com>
Date: Sat, 7 Sep 2024 00:29:08 -0400
Subject: [PATCH] Update classes.wtf for 2024-2025 year

---
 Dockerfile              |  4 ++--
 README.md               |  2 +-
 datasource/myharvard.go |  2 ++
 frontend/src/App.svelte | 10 +++++-----
 package-lock.json       |  6 +++---
 server/server.go        |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f090b6b..70241dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,14 @@ RUN npm ci
 COPY . .
 RUN npm run build
 
-FROM golang:1.20-bookworm AS builder
+FROM golang:1.22-bookworm AS builder
 WORKDIR /go/app
 COPY . .
 RUN go build -buildvcs=false
 
 FROM redis/redis-stack-server:7.0.6-RC8 AS redis-stack
 
-FROM redis:7-bookworm
+FROM redis:7.0-bookworm
 RUN ln -sf /bin/bash /bin/sh
 RUN apt-get update && apt-get install -y ca-certificates procps && apt-get clean
 COPY --from=redis-stack /opt/redis-stack/lib/redisearch.so /opt/redis-stack/lib/redisearch.so
diff --git a/README.md b/README.md
index 783d940..9147edf 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ This loads data from Curricle for academic terms before Spring 2022 (AY 2022) an
 go run . download -year 2019  # -> data/courses-2019.json
 go run . download -year 2020  # -> data/courses-2020.json
 # ... and so on
-go run . download -year 2024  # -> data/courses-2024.json
+go run . download -year 2025  # -> data/courses-2025.json
 ```
 
 Unfortunately, My.Harvard does not allow you to view courses from previous academic years, so years between 2023 and the current one will probably not return any data. For those, you can download the appropriate preloaded datasets from our [public S3 bucket](https://s3.amazonaws.com/classes.wtf).
diff --git a/datasource/myharvard.go b/datasource/myharvard.go
index 4fd751a..5df7c03 100644
--- a/datasource/myharvard.go
+++ b/datasource/myharvard.go
@@ -179,6 +179,8 @@ func (s *SearchMh) request(page uint) (props map[string]any, results map[string]
 // Example: 2024 selects Fall 2023 and Spring 2024.
 func mhGetYearFilter(year int) (yearFilter string, err error) {
 	switch year {
+	case 2025:
+		yearFilter = `(STRM:"2248" | STRM:"2252")`
 	case 2024:
 		yearFilter = `(STRM:"2238" | STRM:"2242")`
 	case 2023:
diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 0364fd1..1334304 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -27,7 +27,7 @@
   let landing = query === "";
   $: if (query) landing = false;
 
-  let ay2024 = true;
+  let currentYear = true;
   let genEdChecks: boolean[] = new Array(4).fill(false);
   let genEdAreas: string[] = ["HSI", "STS", "EC", "AC"];
 
@@ -60,7 +60,7 @@
 
     // Add relevant year/gen-ed tags to query, if boxes checked.
     finalQuery =
-      (ay2024 ? "@academicYear:[2024 2024] " : "") +
+      (currentYear ? "@academicYear:[2025 2025] " : "") +
       normalizeText(query) +
       (genEdQuery ? genEdSearchQuery : "");
 
@@ -112,7 +112,7 @@
         <p>
           Filter by specific attributes like
           <QueryLink bind:query value={`@subject:compsci`} />,
-          <QueryLink bind:query value={`@semester:"fall 2023"`} />, and
+          <QueryLink bind:query value={`@semester:"fall 2024"`} />, and
           <QueryLink bind:query value={`@level:{graduate}`} />.
         </p>
         <p>
@@ -167,8 +167,8 @@
 
     {#if !landing}
       <label class="flex items-center text-sm mb-2">
-        <input class="mr-2" type="checkbox" bind:checked={ay2024} />
-        Only show AY 2023–2024 courses
+        <input class="mr-2" type="checkbox" bind:checked={currentYear} />
+        Only show AY 2024–2025 courses
       </label>
     {/if}
 
diff --git a/package-lock.json b/package-lock.json
index cf9697f..634fa25 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -723,9 +723,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001509",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz",
-      "integrity": "sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==",
+      "version": "1.0.30001658",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
+      "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
       "dev": true,
       "funding": [
         {
diff --git a/server/server.go b/server/server.go
index b3df920..7575795 100644
--- a/server/server.go
+++ b/server/server.go
@@ -120,7 +120,7 @@ func Run(uri string, static string, local bool) {
 	if local {
 		exec.Command("docker", "kill", "classes.wtf-redis").Run()
 		proc = exec.Command("docker", "run", "--name", "classes.wtf-redis",
-			"-i", "--rm", "-p", "7501:6379", "redis/redis-stack-server:latest",
+			"-i", "--rm", "-p", "7501:6379", "redis/redis-stack-server:7.0.6-RC8",
 			"redis-stack-server", "--save", "")
 	} else {
 		proc = exec.Command("redis-server",