From 5db0f6a37a7aaaf7b5c5a3322def960f9c3e480b Mon Sep 17 00:00:00 2001
From: April John <aprl@acab.dev>
Date: Thu, 9 May 2024 23:07:20 +0200
Subject: [PATCH] feat: oci image

---
 flake.nix             | 19 +++++++++++++++++++
 module.nix            | 10 +++++-----
 src/main.rs           |  1 +
 src/objects/person.rs |  7 +++++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index d8bb010..5ba93b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,6 +77,25 @@
               pkg-config
             ];
           };
+          packages.ociImage = pkgs.dockerTools.buildLayeredImage
+            {
+              name = "lysand-ap-layer";
+              contents = [
+                config.packages.lysand-ap-layer config.packages.ls-ap-migration pkgs.bash
+              ];
+              config = {
+                Cmd = [
+                  "${pkgs.bash}/bin/bash"
+                  "${config.packages.ls-ap-migration}/bin/ls-ap-migration"
+                  "up"
+                  "&&"
+                  "${config.packages.lysand-ap-layer}/bin/lysand-ap-layer"
+                ];
+                ExposedPorts = {
+                  "8080/tcp" = { };
+                };
+              };
+            };
 
           # Rust dev environment
           devShells.default = pkgs.mkShell {
diff --git a/module.nix b/module.nix
index 799cb40..041ea06 100644
--- a/module.nix
+++ b/module.nix
@@ -254,11 +254,11 @@ in
         script = "${cfg.package}/bin/lysandap";
         preStart = "${cfg.mig-package}/bin/ls-ap-migration up";
         environment = lib.mkDefault {
-            "PORT" = "${toString cfg.port}";
-            "ADDRESS" = "${cfg.address}:${toString cfg.port}";
-            "FEDERATED_DOMAIN" = cfg.domain;
-            "SERVICE_SCALE" = toString cfg.serviceScale;
-            "LOCAL_USER_NAME" = "example";
+          "PORT" = "${toString cfg.port}";
+          "ADDRESS" = "${cfg.address}:${toString cfg.port}";
+          "FEDERATED_DOMAIN" = cfg.domain;
+          "SERVICE_SCALE" = toString cfg.serviceScale;
+          "LOCAL_USER_NAME" = "example";
         };
         serviceConfig = {
           DynamicUser = true;
diff --git a/src/main.rs b/src/main.rs
index 1891266..5d3859b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,6 +44,7 @@ mod error;
 mod http;
 mod objects;
 mod utils;
+//mod lysand;
 
 #[derive(Debug, Serialize, Deserialize)]
 struct Response {
diff --git a/src/objects/person.rs b/src/objects/person.rs
index 9435872..304c32f 100644
--- a/src/objects/person.rs
+++ b/src/objects/person.rs
@@ -1,5 +1,8 @@
 use crate::{
-    activities::{create_post::CreatePost, follow::{self, Follow}},
+    activities::{
+        create_post::CreatePost,
+        follow::{self, Follow},
+    },
     database::{State, StateHandle},
     entities::{self, user},
     error::Error,
@@ -42,7 +45,7 @@ pub struct DbUser {
 pub enum PersonAcceptedActivities {
     CreateNote(CreatePost),
     Follow(Follow),
-    Accept(follow::Accept)
+    Accept(follow::Accept),
 }
 
 impl DbUser {