From 61748e3c6eea7b8226496e4eae5d4442b42f5394 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 02:27:04 +0200
Subject: [PATCH 1/4] fixed linting mistake

---
 webclient/components/AppSearchBar.vue     | 2 +-
 webclient/components/SearchResultItem.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webclient/components/AppSearchBar.vue b/webclient/components/AppSearchBar.vue
index 935b7a3cb..3c753537e 100644
--- a/webclient/components/AppSearchBar.vue
+++ b/webclient/components/AppSearchBar.vue
@@ -128,9 +128,9 @@ watchEffect(() => {
     >
       <MagnifyingGlassIcon class="text-zinc-800 my-auto h-6 w-6 ps-2" />
       <textarea
-        cols="1"
         id="search"
         v-model="query"
+        cols="1"
         rows="1"
         :title="t('input.aria-searchlabel')"
         aria-autocomplete="both"
diff --git a/webclient/components/SearchResultItem.vue b/webclient/components/SearchResultItem.vue
index fae066074..ae612b403 100644
--- a/webclient/components/SearchResultItem.vue
+++ b/webclient/components/SearchResultItem.vue
@@ -43,8 +43,8 @@ type RoomEntry = components["schemas"]["RoomEntry"];
       <div class="text-zinc-600 flex flex-col gap-0.5">
         <div class="flex flex-col">
           <div
-            class="flex flex-row"
             v-if="(item.type === 'room' || item.type === 'virtual_room' || item.type === 'poi') && item.parsed_id"
+            class="flex flex-row"
           >
             <ChevronDownIcon class="mt-0.5 h-4 w-4" />
             <span v-html="item.parsed_id" />

From 4f26e24453d485708622a8c31bdcba811633b50f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 02:34:02 +0200
Subject: [PATCH 2/4] chore(formatting): Fixed formatting mistakes (#1153)

fixed formatting mistakes have sneaked into prod

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 server/Cargo.toml           | 2 +-
 server/main-api/src/main.rs | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 676581046..8f5c0209f 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -9,4 +9,4 @@ lto = "thin"
 # Enable max optimizations for dependencies, but not for our code
 # nessesary to get acceptable performance out of the image processing code
 [profile.dev.package."*"]
-opt-level = 3
\ No newline at end of file
+opt-level = 3
diff --git a/server/main-api/src/main.rs b/server/main-api/src/main.rs
index 2084fa411..c73822d33 100644
--- a/server/main-api/src/main.rs
+++ b/server/main-api/src/main.rs
@@ -2,12 +2,12 @@ use std::collections::HashMap;
 use std::error::Error;
 
 use actix_cors::Cors;
-use actix_web::{App, get, HttpResponse, HttpServer, middleware, web};
+use actix_web::{get, middleware, web, App, HttpResponse, HttpServer};
 use actix_web_prom::PrometheusMetricsBuilder;
 use log::{debug, error, info};
-use sqlx::PgPool;
 use sqlx::postgres::PgPoolOptions;
 use sqlx::prelude::*;
+use sqlx::PgPool;
 
 mod calendar;
 mod details;
@@ -57,8 +57,7 @@ fn connection_string() -> String {
 fn setup_logging() {
     #[cfg(debug_assertions)]
     {
-        let env = env_logger::Env::default()
-            .default_filter_or("trace");
+        let env = env_logger::Env::default().default_filter_or("trace");
         env_logger::Builder::from_env(env).init();
     }
     #[cfg(not(debug_assertions))]

From dcb14bf478e94a6164a6b95466d1ea635a5a2a6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 12:28:00 +0000
Subject: [PATCH 3/4] chore(deps): update all non-major dependencies (#1156)

* chore(deps): update all non-major dependencies

* Fixed a compilation error introduced by new types

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 .github/workflows/linting.yml                 |   2 +-
 .github/workflows/update-data.yml             |   2 +-
 .github/workflows/webclient-cicd.yml          |   2 +-
 deployment/k3s/values.yaml                    |   2 +-
 docker-compose.dev.yml                        |   2 +-
 docker-compose.yml                            |   2 +-
 server/Cargo.lock                             | 222 ++----------------
 server/main-api/Cargo.toml                    |   2 +-
 .../src/search/search_executor/query.rs       |  27 ++-
 server/main-api/src/setup/meilisearch.rs      |   9 +-
 webclient/package.json                        |   2 +-
 11 files changed, 57 insertions(+), 217 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 63106c27b..217ad39f7 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 9.1.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient
diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
index 3f8be801c..128e9f7be 100644
--- a/.github/workflows/update-data.yml
+++ b/.github/workflows/update-data.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 9.1.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient
diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml
index 0a577fb9b..ae504cdbf 100644
--- a/.github/workflows/webclient-cicd.yml
+++ b/.github/workflows/webclient-cicd.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
+          version: 9.1.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient
diff --git a/deployment/k3s/values.yaml b/deployment/k3s/values.yaml
index 29efeded5..2399a0bec 100644
--- a/deployment/k3s/values.yaml
+++ b/deployment/k3s/values.yaml
@@ -10,7 +10,7 @@ server:
 mielisearch:
   image:
     repository: 'getmeili/meilisearch'
-    tag: v1.7.6
+    tag: v1.8.0
 calendar:
   scrape_tasks:
     - name: refresh-calendar-slow # takes ~6m to complete
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 38355924a..58b634872 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -94,7 +94,7 @@ services:
       db:
         condition: service_healthy
   meilisearch:
-    image: getmeili/meilisearch:v1.7.6
+    image: getmeili/meilisearch:v1.8.0
     restart: unless-stopped
     ports:
       - "7700:7700"
diff --git a/docker-compose.yml b/docker-compose.yml
index 98940d183..cef6b737f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -146,7 +146,7 @@ services:
       db:
         condition: service_healthy
   meilisearch:
-    image: getmeili/meilisearch:v1.7.6
+    image: getmeili/meilisearch:v1.8.0
     restart: unless-stopped
     networks:
       - navigatum
diff --git a/server/Cargo.lock b/server/Cargo.lock
index a9793207c..ce7d6e988 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -395,17 +395,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
 [[package]]
 name = "async-compression"
 version = "0.4.9"
@@ -634,12 +623,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
-[[package]]
-name = "castaway"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
-
 [[package]]
 name = "cc"
 version = "1.0.95"
@@ -694,15 +677,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -843,37 +817,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "curl"
-version = "0.4.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
-dependencies = [
- "curl-sys",
- "libc",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "socket2",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "curl-sys"
-version = "0.4.72+curl-8.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
-dependencies = [
- "cc",
- "libc",
- "libnghttp2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "custom_derive"
 version = "0.1.7"
@@ -1124,15 +1067,6 @@ dependencies = [
  "zune-inflate",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.2"
@@ -1259,21 +1193,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
 [[package]]
 name = "futures-macro"
 version = "0.3.30"
@@ -1899,33 +1818,6 @@ version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
-[[package]]
-name = "isahc"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
-dependencies = [
- "async-channel",
- "castaway",
- "crossbeam-utils",
- "curl",
- "curl-sys",
- "encoding_rs",
- "event-listener",
- "futures-lite",
- "http 0.2.12",
- "log",
- "mime",
- "once_cell",
- "polling",
- "slab",
- "sluice",
- "tracing",
- "tracing-futures",
- "url",
- "waker-fn",
-]
-
 [[package]]
 name = "iso8601"
 version = "0.6.1"
@@ -2033,16 +1925,6 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
-[[package]]
-name = "libnghttp2-sys"
-version = "0.1.10+1.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "libredox"
 version = "0.1.3"
@@ -2064,18 +1946,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "libz-sys"
-version = "1.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -2214,9 +2084,9 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-index-setting-macro"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498e40a5e8be8cfc405bf4c99a093bca32df2e7ea21e041269aa906cfca673a4"
+checksum = "fb7f4b1ef00bd5c38160d5664595d2869d17cafad435e817af7befb4521c0485"
 dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
@@ -2227,26 +2097,26 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-sdk"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8977e156332d73545daea1187af11599a953f37b9fd22677d98a04cb965ed55e"
+checksum = "7443e8145e6f7047752f4983a97fccab01131947601825d95fe4088ad6d1feb9"
 dependencies = [
  "async-trait",
+ "bytes",
  "either",
  "futures",
  "futures-io",
- "isahc",
  "iso8601",
- "js-sys",
  "jsonwebtoken",
  "log",
  "meilisearch-index-setting-macro",
+ "pin-project-lite",
+ "reqwest 0.12.4",
  "serde",
  "serde_json",
  "thiserror",
  "time",
  "uuid",
- "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
  "yaup",
@@ -2576,18 +2446,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-sys"
-version = "0.9.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -2603,12 +2461,6 @@ dependencies = [
  "ttf-parser",
 ]
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -2760,22 +2612,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.6.0"
@@ -3165,6 +3001,7 @@ dependencies = [
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "webpki-roots 0.26.1",
  "winreg 0.52.0",
@@ -3641,17 +3478,6 @@ dependencies = [
  "parking_lot 0.11.2",
 ]
 
-[[package]]
-name = "sluice"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
-dependencies = [
- "async-channel",
- "futures-core",
- "futures-io",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -4153,7 +3979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.2",
+ "fastrand",
  "rustix",
  "windows-sys 0.52.0",
 ]
@@ -4423,16 +4249,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -4543,6 +4359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -4610,12 +4427,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "waker-fn"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
-
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -4703,6 +4514,19 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
+[[package]]
+name = "wasm-streams"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.69"
diff --git a/server/main-api/Cargo.toml b/server/main-api/Cargo.toml
index 3012af694..da492c2c3 100644
--- a/server/main-api/Cargo.toml
+++ b/server/main-api/Cargo.toml
@@ -41,7 +41,7 @@ sqlx = { version = "0.7.4", features = ["postgres", "runtime-tokio-rustls", "mig
 chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
 
 # search
-meilisearch-sdk = "0.25.0"
+meilisearch-sdk = "0.26.0"
 logos = "0.14.0"
 regex = "1.10.4"
 
diff --git a/server/main-api/src/search/search_executor/query.rs b/server/main-api/src/search/search_executor/query.rs
index 2d57c9bbd..95fb277ce 100644
--- a/server/main-api/src/search/search_executor/query.rs
+++ b/server/main-api/src/search/search_executor/query.rs
@@ -1,7 +1,7 @@
+use meilisearch_sdk::client::Client;
 use meilisearch_sdk::errors::Error;
 use meilisearch_sdk::indexes::Index;
 use meilisearch_sdk::search::{MultiSearchResponse, SearchQuery, Selectors};
-use meilisearch_sdk::Client;
 use serde::Deserialize;
 
 use crate::search::search_executor::parser::{Filter, ParsedQuery, TextToken};
@@ -67,7 +67,7 @@ impl GeoEntryQuery {
         let q_default = self.prompt_for_querying();
         let ms_url =
             std::env::var("MIELI_URL").unwrap_or_else(|_| "http://localhost:7700".to_string());
-        let client = Client::new(ms_url, std::env::var("MEILI_MASTER_KEY").ok());
+        let client = Client::new(ms_url, std::env::var("MEILI_MASTER_KEY").ok())?;
         let entries = client.index("entries");
 
         // due to lifetime shenanigans this is added here (I can't make it move down to the other statements)
@@ -129,7 +129,10 @@ impl GeoEntryQuery {
             .join(" ")
     }
 
-    fn common_query<'b: 'a, 'a>(&'b self, entries: &'a Index) -> SearchQuery<'a> {
+    fn common_query<'b: 'a, 'a>(
+        &'b self,
+        entries: &'a Index,
+    ) -> SearchQuery<'a, meilisearch_sdk::DefaultHttpClient> {
         SearchQuery::new(entries)
             .with_facets(Selectors::Some(&["facet"]))
             .with_highlight_pre_tag(&self.highlighting.0)
@@ -138,7 +141,11 @@ impl GeoEntryQuery {
             .build()
     }
 
-    fn merged_query<'a>(&'a self, entries: &'a Index, query: &'a str) -> SearchQuery<'a> {
+    fn merged_query<'a>(
+        &'a self,
+        entries: &'a Index,
+        query: &'a str,
+    ) -> SearchQuery<'a, meilisearch_sdk::DefaultHttpClient> {
         let mut s = self
             .common_query(entries)
             .with_query(query)
@@ -150,7 +157,11 @@ impl GeoEntryQuery {
         s
     }
 
-    fn buildings_query<'a>(&'a self, entries: &'a Index, query: &'a str) -> SearchQuery<'a> {
+    fn buildings_query<'a>(
+        &'a self,
+        entries: &'a Index,
+        query: &'a str,
+    ) -> SearchQuery<'a, meilisearch_sdk::DefaultHttpClient> {
         self.common_query(entries)
             .with_query(query)
             .with_limit(2 * self.args.limit_buildings) // we might do reordering later
@@ -158,7 +169,11 @@ impl GeoEntryQuery {
             .build()
     }
 
-    fn rooms_query<'a>(&'a self, entries: &'a Index, query: &'a str) -> SearchQuery<'a> {
+    fn rooms_query<'a>(
+        &'a self,
+        entries: &'a Index,
+        query: &'a str,
+    ) -> SearchQuery<'a, meilisearch_sdk::DefaultHttpClient> {
         self.common_query(entries)
             .with_query(query)
             .with_limit(self.args.limit_rooms)
diff --git a/server/main-api/src/setup/meilisearch.rs b/server/main-api/src/setup/meilisearch.rs
index 621f1cccf..beb1aae1e 100644
--- a/server/main-api/src/setup/meilisearch.rs
+++ b/server/main-api/src/setup/meilisearch.rs
@@ -1,10 +1,11 @@
+use std::collections::HashMap;
+use std::time::Duration;
+
 use log::{error, info};
+use meilisearch_sdk::client::Client;
 use meilisearch_sdk::settings::Settings;
 use meilisearch_sdk::tasks::Task;
-use meilisearch_sdk::Client;
 use serde_json::Value;
-use std::collections::HashMap;
-use std::time::Duration;
 
 const TIMEOUT: Option<Duration> = Some(Duration::from_secs(20));
 const POLLING_RATE: Option<Duration> = Some(Duration::from_millis(50));
@@ -48,7 +49,7 @@ pub(crate) async fn setup_meilisearch() -> Result<(), crate::BoxedError> {
     let start = std::time::Instant::now();
     let ms_url = std::env::var("MIELI_URL").unwrap_or_else(|_| "http://localhost:7700".to_string());
     info!("connecting to Meilisearch at {ms_url}", ms_url = ms_url);
-    let client = Client::new(ms_url, std::env::var("MEILI_MASTER_KEY").ok());
+    let client = Client::new(ms_url, std::env::var("MEILI_MASTER_KEY").ok())?;
     info!("waiting for Meilisearch to be healthy");
     wait_for_healthy(&client).await;
     info!("Meilisearch is healthy");
diff --git a/webclient/package.json b/webclient/package.json
index 5b58e0844..5e94552cc 100644
--- a/webclient/package.json
+++ b/webclient/package.json
@@ -49,5 +49,5 @@
     "vue-tsc": "1.8.27"
   },
   "type": "module",
-  "packageManager": "pnpm@9.0.6"
+  "packageManager": "pnpm@9.1.0"
 }

From a8eb3917e49cb9140155f482e8686476eb04a1f6 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 6 May 2024 14:32:45 +0200
Subject: [PATCH 4/4] Fixed the readme formating issues

---
 data/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/README.md b/data/README.md
index 48b5c1167..939099caa 100644
--- a/data/README.md
+++ b/data/README.md
@@ -141,8 +141,6 @@ Any rights in individual contents of the database are licensed under the Databas
 
 > [!WARNING]
 > The images in `sources/img/` are subject to their own licensing terms, which are stated in the file `sources/img/img-sources.yaml`.
-
-> [!WARNING]
 > The compiled database may contain contents from external sources (i.e. all files in `external/`) that do have different license terms.
 
 ---