listmonk: remove

Author: MarcelCoding

Cargo.lock

@@ -4,19 +4,18 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-tokio = { version = "1.37", default-features = false, features = ["macros", "rt-multi-thread", "net", "fs", "sync", "time"] }
+tokio = { version = "1.39", default-features = false, features = ["macros", "rt-multi-thread", "net", "fs", "sync", "time"] }
 reqwest = { version = "0.12", features = ["json", "rustls-tls-webpki-roots"], default-features = false }
 axum = { version = "0.7", default-features = false, features = ["tokio", "http1", "json", "query","macros"] }
 time = { version = "0.3", default-features = false, features = ["serde", "std", "formatting", "parsing"] }
 tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "ansi"] }
 tower-http = { version = "0.5", default-features = false, features = ["cors", "fs"] }
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_yaml = { version = "0.9", default-features = false }
-clap = { version = "=4.4.18", features = ["derive", "env"] }
+clap = { version = "4.5", features = ["derive", "env"] }
 url = { version = "2.5", features = ["serde"], default-features = false }
 serde_json = { version = "1.0" }
-markdown = "1.0.0-alpha.17"
-email_address = "0.2"
+markdown = "1.0.0-alpha.19"
 async-trait = "0.1"
 tracing = "0.1"
 anyhow = "1.0"

Cargo.toml

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

flake.lock

@@ -30,42 +30,6 @@ in
         '';
       };
     };
-    listmonk = {
-      host = lib.mkOption {
-        type = lib.types.str;
-        default = "http://127.0.0.1";
-        description = ''
-          At which host is listmonk listening
-        '';
-      };
-      port = lib.mkOption {
-        type = lib.types.port;
-        default = 8081;
-        description = ''
-          At which port is listmonk listening
-        '';
-      };
-      user = lib.mkOption {
-        type = lib.types.str;
-        default = "admin";
-        description = ''
-          username of listmonk user
-        '';
-      };
-      passwordFile = lib.mkOption {
-        type = lib.types.path;
-        description = ''
-          path from where the user password can be read
-        '';
-      };
-      allowed_lists = lib.mkOption {
-        type = lib.types.listOf lib.types.int;
-        default = [ ];
-        description = ''
-          list of allowed mailing list ids
-        '';
-      };
-    };
     logLevel = lib.mkOption {
       type = lib.types.str;
       default = "info";
@@ -96,10 +60,6 @@ in
         WEBSITE_CONTENT_API_LISTEN_ADDR = "${cfg.http.host}:${toString cfg.http.port}";
         WEBSITE_CONTENT_API_CONTENT_DIRECTORY = "${pkgs.website-content}/content/";
         WEBSITE_CONTENT_API_BASE_URL = cfg.url;
-        WEBSITE_CONTENT_API_LISTMONK_URL = "${cfg.listmonk.host}:${toString cfg.listmonk.port}";
-        WEBSITE_CONTENT_API_LISTMONK_USER = cfg.listmonk.user;
-        WEBSITE_CONTENT_API_LISTMONK_PASSWORD_FILE = "%d/listmonk_pw";
-        WEBSITE_CONTENT_API_LISTMONK_LISTS = "${builtins.toJSON cfg.listmonk.allowed_lists}";
         WEBSITE_CONTENT_API_PROMETHEUS_URL = cfg.prometheusUrl;
         WEBSITE_CONTENT_API_IXP_MANAGER_URL = cfg.ixpManagerUrl;
       };

flake.nix

@@ -30,30 +30,6 @@ pub(crate) struct Args {
   )]
   pub(crate) base_url: Url,
 
-  #[clap(
-    long,
-    env = "WEBSITE_CONTENT_API_LISTMONK_URL",
-    default_value = "http://localhost:8090/"
-  )]
-  pub(crate) listmonk_url: Url,
-
-  #[clap(
-    long,
-    env = "WEBSITE_CONTENT_API_LISTMONK_USER",
-    default_value = "listmonk"
-  )]
-  pub(crate) listmonk_user: String,
-
-  #[clap(
-    long,
-    env = "WEBSITE_CONTENT_API_LISTMONK_PASSWORD_FILE",
-    default_value = "/run/secret/listmonk"
-  )]
-  pub(crate) listmonk_password_file: PathBuf,
-
-  #[clap(long, env = "WEBSITE_CONTENT_API_LISTMONK_LISTS", default_value = "[]")]
-  pub(crate) listmonk_lists: String,
-
   #[clap(
     long,
     env = "WEBSITE_CONTENT_API_PROMETHEUS_URL",

module.nix

@@ -89,7 +89,7 @@ impl Blog {
 
       let body = if is_rst_file {
         let mut buffer: Vec<u8> = Vec::new();
-        let parsed_rst = parse(&text)
+        let parsed_rst = parse(text)
           .map_err(|e| {
             eprintln!("cannot parse rst file {} with error {}", &file_name, e);
           })

src/args.rs

@@ -3,10 +3,7 @@ use std::sync::Arc;
 
 use crate::lang::Language;
 use serde::{Deserialize, Serialize};
-use time::{Date, OffsetDateTime};
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-struct MyDate(Date);
+use time::OffsetDateTime;
 
 #[derive(Debug, Clone)]
 pub(crate) struct EventHandler {

src/blog.rs

@@ -11,7 +11,6 @@ use crate::bird::Bird;
 use crate::blog::Blog;
 use crate::documents::Documents;
 use crate::event::EventHandler;
-use crate::lists::MailingLists;
 use crate::peers::NetworkService;
 use crate::routes::{route, ContentPaths};
 use crate::state::FoundationState;
@@ -26,7 +25,6 @@ mod cache;
 mod documents;
 mod event;
 mod lang;
-mod lists;
 mod peers;
 mod routes;
 mod state;
@@ -59,13 +57,6 @@ async fn main() -> anyhow::Result<()> {
       .await?,
     documents: Documents::load(&args.content_directory.join("documents")).await?,
     team: Team::load(&args.content_directory.join("team")).await?,
-    lists: MailingLists::load(
-      &args.listmonk_url,
-      &args.listmonk_user,
-      &args.listmonk_password_file,
-      &args.listmonk_lists,
-    )
-    .await?,
     stats: Stats::new(args.prometheus_url),
     peers: NetworkService::new(
       &args.content_directory.join("supporter"),