From 6c3b8eaa920ed6c281b8364336920a09e166619f Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sun, 29 Sep 2024 17:03:02 +0100
Subject: [PATCH 1/4] chore(core/files): do not decrypt file if nonce
 unavailable

---
 crates/core/files/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/core/files/src/lib.rs b/crates/core/files/src/lib.rs
index 352ee0b0f..5d2bdbd64 100644
--- a/crates/core/files/src/lib.rs
+++ b/crates/core/files/src/lib.rs
@@ -62,6 +62,11 @@ pub async fn fetch_from_s3(bucket_id: &str, path: &str, nonce: &str) -> Result<V
         // we just want the Vec<u8>
     }
 
+    // File is not encrypted
+    if nonce.is_empty() {
+        return Ok(buf);
+    }
+
     // Recover nonce as bytes
     let nonce = &BASE64_STANDARD.decode(nonce).unwrap()[..];
     let nonce: &Nonce<typenum::consts::U12> = nonce.into();

From 7a061bb3c677aedaae19629df47bdf2c86ef5df8 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sun, 29 Sep 2024 17:05:20 +0100
Subject: [PATCH 2/4] ci: add january to build list

---
 .github/workflows/docker.yaml      |  6 +++++-
 crates/services/january/Dockerfile | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 crates/services/january/Dockerfile

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index b209b73fb..0d5a76042 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -61,7 +61,7 @@ jobs:
     if: github.event_name != 'pull_request'
     strategy:
       matrix:
-        project: [delta, bonfire, autumn]
+        project: [delta, bonfire, autumn, january]
     name: Build ${{ matrix.project }} image
     steps:
       # Configure build environment
@@ -102,6 +102,10 @@ jobs:
               "autumn": {
                 "path": "crates/services/autumn",
                 "tag": "${{ github.repository_owner }}/autumn"
+              },
+              "january": {
+                "path": "crates/services/january",
+                "tag": "${{ github.repository_owner }}/january"
               }
             }
           export_to: output
diff --git a/crates/services/january/Dockerfile b/crates/services/january/Dockerfile
new file mode 100644
index 000000000..0d61449db
--- /dev/null
+++ b/crates/services/january/Dockerfile
@@ -0,0 +1,12 @@
+# Build Stage
+FROM ghcr.io/revoltchat/base:latest AS builder
+
+# Bundle Stage
+FROM gcr.io/distroless/cc-debian12:nonroot
+COPY --from=builder /home/rust/src/target/release/revolt-january ./
+COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
+COPY --from=mwader/static-ffmpeg:7.0.2 /ffprobe /usr/local/bin/
+
+EXPOSE 14705
+USER nonroot
+CMD ["./revolt-january"]

From 1689ee5ddc024a33a5819a62d405f2933bc7b0b1 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sun, 29 Sep 2024 17:08:42 +0100
Subject: [PATCH 3/4] ci: use compose.yml file instead of deleted file

---
 .github/workflows/rust.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
index f72d4ab9b..4a33273c1 100644
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Run services in background
         run: |
-          docker compose -f docker-compose.db.yml up -d
+          docker compose -f compose.yml up -d
 
       - name: Copy .env.example
         run: |

From 8fc791f81a1a8cee4f62ab0e7327f4543576c30b Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sun, 29 Sep 2024 17:18:41 +0100
Subject: [PATCH 4/4] ci: remove .env file entry

---
 .github/workflows/rust.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
index 4a33273c1..8c8396fae 100644
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -43,10 +43,6 @@ jobs:
         run: |
           docker compose -f compose.yml up -d
 
-      - name: Copy .env.example
-        run: |
-          cp .env.example .env
-
       - name: Run cargo test
         env:
           TEST_DB: REFERENCE