Merge pull request 'Fix moderation issues #1156(#1157)' (#1) from fix-moderation-issues into main

Reviewed-on: #1

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -20,3 +20,5 @@ search_index
 __pycache__
 .vscode/
 *-journal
+.direnv/
+build.log*

CHANGELOG.md

@@ -8,11 +8,16 @@
 
 - Add 'My feed' to i18n timeline name (#1084)
 - Bidirectional support for user page header (#1092)
+- Add non anonymous bind to LDAP server, taken from https://git.joinplu.me/Plume/Plume/src/branch/ldap-non-anon PR
 
 ### Changed
 
 - Use blog title as slug (#1094, #1126, #1127)
 - Bump Rust to nightly 2022-07-19 (#1119)
+- Force LDAP simple bind with *cn* rdn instead of *uid*
+- Update rust-toolchain to nightly-2023-04-14
+- Update chrono from 0.4.0 to 0.4.31
+- Update scheduled-thread-pool from 0.2.6 to 0.2.7
 
 ### Fixed
 
@@ -22,6 +27,12 @@
 - Allow empty avatar for remote users (#1129)
 - Percent encode blog FQN for federation interoperability (#1129)
 - The same to `preferredUsername` (#1129)
+- Deprecation warnings during build process(see rust crate updates)
+- Server error 500 creating new blog with white spaces inside title. Bug reported on https://git.joinplu.me/Plume/Plume/issues/1152
+- Show _Subscribe_ button in column format instead of row format in screen smaller than 600px. https://git.lainoa.eus/aitzol/Plume/commit/db8cc6e7e8351a5d74f7ce0399126e13493c62d9
+### To do
+
+- Choose rdn via environment variables for LDAP simple bind
 
 ## [[0.7.2]] - 2022-05-11
 

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.7.3-dev"
-repository = "https://github.com/Plume-org/Plume"
-edition = "2018"
+version = "0.7.3-dev-fork"
+repository = "https://git.lainoa.eus/aitzol/Plume"
+edition = "2021"
 
 [dependencies]
 atom_syndication = "0.12.0"
@@ -14,12 +14,11 @@ gettext-macros = "0.6.1"
 gettext-utils = "0.1.0"
 guid-create = "0.2"
 lettre_email = "0.9.2"
-num_cpus = "1.10"
+num_cpus = "1.16.0"
 rocket = "0.4.11"
 rocket_contrib = { version = "0.4.11", features = ["json"] }
 rocket_i18n = "0.4.1"
-scheduled-thread-pool = "0.2.6"
-rust-s3 = { version = "0.29.0", no-default-features = true, features = ["blocking"], optional = true}
+scheduled-thread-pool = "0.2.7"
 serde = "1.0.137"
 serde_json = "1.0.81"
 shrinkwraprs = "0.3.0"
@@ -36,7 +35,7 @@ path = "src/main.rs"
 
 [dependencies.chrono]
 features = ["serde"]
-version = "0.4"
+version = "0.4.31"
 
 [dependencies.ctrlc]
 features = ["termination"]
@@ -69,13 +68,13 @@ ructe = "0.15.0"
 rsass = "0.26"
 
 [features]
-default = ["postgres"]
+default = ["postgres", "s3"]
 postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
 debug-mailer = []
 test = []
 search-lindera = ["plume-models/search-lindera"]
-s3 = ["rust-s3"]
+s3 = ["plume-models/s3"]
 
 [workspace]
 members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front", "plume-macro"]

Dockerfile

@@ -30,8 +30,7 @@ FROM debian:stable-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
-    libpq5 \
-    libssl1.1
+    libpq5
 
 WORKDIR /app
 

assets/themes/default/_article.scss

@@ -228,7 +228,7 @@ main .article-meta {
       fill: currentColor;
     }
     .action.liked:hover svg.feather {
-      background: transparentize($red, 0.75)
+      background: transparentize($red, 0.75);
       color: $red;
     }
   }
@@ -252,7 +252,7 @@ main .article-meta {
       background: $primary;
     }
     .action.reshared:hover svg.feather {
-      background: transparentize($primary, 0.75)
+      background: transparentize($primary, 0.75);
       color: $primary;
     }
   }

flake.lock

@@ -0,0 +1,116 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1683408522,
+        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683857898,
+        "narHash": "sha256-pyVY4UxM6zUX97g6bk6UyCbZGCWZb2Zykrne8YxacRA=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "4e7fba3f37f5e184ada0ef3cf1e4d8ef450f240b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,60 @@
+{
+  description = "Developpment shell for Plume including nightly Rust compiler";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.rust-overlay = {
+    url = "github:oxalica/rust-overlay";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, nixpkgs, flake-utils, rust-overlay, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
+    let
+      overlays = [ (import rust-overlay) ];
+      pkgs = import nixpkgs { inherit system overlays; };
+      inputs = with pkgs; [
+            (rust-bin.nightly.latest.default.override {
+              targets = [ "wasm32-unknown-unknown" ];
+            })
+            wasm-pack
+            openssl
+            pkg-config
+            gettext
+            postgresql
+            sqlite
+          ];
+      in {
+        packages.default = pkgs.rustPlatform.buildRustPackage {
+          pname = "plume";
+          version = "0.7.3-dev";
+
+          src = ./.;
+
+          cargoLock = {
+            lockFile = ./Cargo.lock;
+            outputHashes = {
+              "pulldown-cmark-0.8.0" = "sha256-lpfoRDuY3zJ3QmUqJ5k9OL0MEdGDpwmpJ+u5BCj2kIA=";
+              "rocket_csrf-0.1.2" = "sha256-WywZfMiwZqTPfSDcAE7ivTSYSaFX+N9fjnRsLSLb9wE=";
+            };
+          };
+          buildNoDefaultFeatures = true;
+          buildFeatures = ["postgresql" "s3"];
+
+          nativeBuildInputs = inputs;
+
+          buildPhase = ''
+			wasm-pack build --target web --release plume-front
+			cargo build --no-default-features --features postgresql,s3 --path .
+			cargo build --no-default-features --features postgresql,s3 --path plume-cli
+          '';
+          installPhase = ''
+			cargo install --no-default-features --features postgresql,s3 --path . --target-dir $out
+			cargo install --no-default-features --features postgresql,s3 --path plume-cli --target-dir $out
+		  '';
+        };
+        devShells.default = pkgs.mkShell {
+          packages = inputs;
+        };
+      });
+}

plume-cli/Cargo.toml

@@ -24,3 +24,4 @@ path = "../plume-models"
 postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
 search-lindera = ["plume-models/search-lindera"]
+s3 = ["plume-models/s3"]

plume-common/Cargo.toml

@@ -28,7 +28,7 @@ futures = "0.3.25"
 
 [dependencies.chrono]
 features = ["serde"]
-version = "0.4"
+version = "0.4.31"
 
 [dependencies.pulldown-cmark]
 default-features = false

plume-models/Cargo.toml

@@ -16,9 +16,9 @@ openssl = "0.10.40"
 rocket = "0.4.11"
 rocket_i18n = "0.4.1"
 reqwest = "0.11.11"
-scheduled-thread-pool = "0.2.6"
+scheduled-thread-pool = "0.2.7"
 serde = "1.0.137"
-rust-s3 = { version = "0.29.0", no-default-features = true, features = ["blocking"] }
+rust-s3 = { version = "0.33.0", optional = true, features = ["blocking"] }
 serde_derive = "1.0"
 serde_json = "1.0.81"
 tantivy = "0.13.3"
@@ -36,10 +36,12 @@ once_cell = "1.12.0"
 lettre = "0.9.6"
 native-tls = "0.2.10"
 activitystreams = "=0.7.0-alpha.20"
+ahash = "=0.8.6"
+heck = "0.4.1"
 
 [dependencies.chrono]
 features = ["serde"]
-version = "0.4"
+version = "0.4.31"
 
 [dependencies.diesel]
 features = ["r2d2", "chrono"]
@@ -62,3 +64,4 @@ diesel_migrations = "1.3.0"
 postgres = ["diesel/postgres", "plume-macro/postgres" ]
 sqlite = ["diesel/sqlite", "plume-macro/sqlite" ]
 search-lindera = ["lindera-tantivy"]
+s3 = ["rust-s3"]

plume-models/src/admin.rs

@@ -5,7 +5,7 @@ use rocket::{
     Outcome,
 };
 
-/// Wrapper around User to use as a request guard on pages reserved to admins.
+/// Wrapper around User to use as a request guard on pages exclusively reserved to admins.
 pub struct Admin(pub User);
 
 impl<'a, 'r> FromRequest<'a, 'r> for Admin {
@@ -21,6 +21,23 @@ impl<'a, 'r> FromRequest<'a, 'r> for Admin {
     }
 }
 
+/// Same as `Admin` but it forwards to next guard if the user is not an admin.
+/// It's useful when there are multiple implementations of routes for admin and moderator.
+pub struct InclusiveAdmin(pub User);
+
+impl<'a, 'r> FromRequest<'a, 'r> for InclusiveAdmin {
+    type Error = ();
+
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<InclusiveAdmin, ()> {
+        let user = request.guard::<User>()?;
+        if user.is_admin() {
+            Outcome::Success(InclusiveAdmin(user))
+        } else {
+            Outcome::Forward(())
+        }
+    }
+}
+
 /// Same as `Admin` but for moderators.
 pub struct Moderator(pub User);
 

plume-models/src/blogs.rs

@@ -1,3 +1,4 @@
+use heck::ToUpperCamelCase;
 use crate::{
     instance::*, medias::Media, posts::Post, safe_string::SafeString, schema::blogs, users::User,
     Connection, Error, PlumeRocket, Result, CONFIG, ITEMS_PER_PAGE,
@@ -102,9 +103,18 @@ impl Blog {
     find_by!(blogs, find_by_ap_url, ap_url as &str);
     find_by!(blogs, find_by_name, actor_id as &str, instance_id as i32);
 
+/// Remove non alphanumeric characters and CamelCase a string
+	pub fn slug(title: &str) -> String {
+	    title.to_upper_camel_case()
+	        .chars()
+	        .filter(|c| c.is_alphanumeric())
+	        .collect()
+	}
+    /*
     pub fn slug(title: &str) -> &str {
         title
     }
+    */
 
     pub fn get_instance(&self, conn: &Connection) -> Result<Instance> {
         Instance::get(conn, self.instance_id)

plume-models/src/comments.rs

@@ -73,6 +73,7 @@ impl Comment {
     });
     get!(comments);
     list_by!(comments, list_by_post, post_id as i32);
+    list_by!(comments, list_by_author, author_id as i32);
     find_by!(comments, find_by_ap_url, ap_url as &str);
 
     pub fn get_author(&self, conn: &Connection) -> Result<User> {
@@ -135,7 +136,7 @@ impl Comment {
             |id| Comment::get(conn, id).map(|comment| comment.ap_url.unwrap_or_default()),
         )?);
         note.set_published(
-            OffsetDateTime::from_unix_timestamp_nanos(self.creation_date.timestamp_nanos().into())
+            OffsetDateTime::from_unix_timestamp_nanos(self.creation_date.timestamp_nanos_opt().unwrap().into())
                 .expect("OffsetDateTime"),
         );
         note.set_attributed_to(author.into_id().parse::<IriString>()?);

plume-models/src/config.rs

@@ -6,9 +6,8 @@ use rocket::Config as RocketConfig;
 use std::collections::HashSet;
 use std::env::{self, var};
 
-use s3::{Bucket, Region};
-use s3::creds::Credentials;
-
+#[cfg(feature = "s3")]
+use s3::{Bucket, Region, creds::Credentials};
 
 #[cfg(not(test))]
 const DB_NAME: &str = "plume";
@@ -294,6 +293,7 @@ pub struct LdapConfig {
     pub tls: bool,
     pub user_name_attr: String,
     pub mail_attr: String,
+    pub user: Option<(String, String)>,
 }
 
 fn get_ldap_config() -> Option<LdapConfig> {
@@ -305,16 +305,26 @@ fn get_ldap_config() -> Option<LdapConfig> {
             let tls = string_to_bool(&tls, "LDAP_TLS");
             let user_name_attr = var("LDAP_USER_NAME_ATTR").unwrap_or_else(|_| "cn".to_owned());
             let mail_attr = var("LDAP_USER_MAIL_ATTR").unwrap_or_else(|_| "mail".to_owned());
+            //2023-12-30
+            let user = var("LDAP_USER").ok();
+            let password = var("LDAP_PASSWORD").ok();
+            let user = match (user, password) {
+                (Some(user), Some(password)) => Some((user, password)),
+                (None, None) => None,
+                _ => panic!("Invalid LDAP configuration both or neither of LDAP_USER and LDAP_PASSWORD must be set")           
+            };
+            //
             Some(LdapConfig {
                 addr,
                 base_dn,
                 tls,
                 user_name_attr,
                 mail_attr,
+                user,
             })
         }
         (None, None) => None,
-        (_, _) => {
+        _ => {
             panic!("Invalid LDAP configuration : both LDAP_ADDR and LDAP_BASE_DN must be set")
         }
     }
@@ -370,18 +380,18 @@ pub struct S3Config {
     pub hostname: String,
     // may be useful when using self hosted s3. Won't work with recent AWS buckets
     pub path_style: bool,
+    // http or https
     pub protocol: String,
 
-    // options below this comment are not used yet
-    // upload directly from user to S3, without going through Plume. Uses PostObject endpoint
-    pub direct_upload: bool,
     // download directly from s3 to user, wihout going through Plume. Require public read on bucket
     pub direct_download: bool,
-    // use this hostname for downloads, can be used with caching proxy in front of s3
+    // use this hostname for downloads, can be used with caching proxy in front of s3 (expected to
+    // be reachable through https)
     pub alias: Option<String>,
 }
 
 impl S3Config {
+    #[cfg(feature = "s3")]
     pub fn get_bucket(&self) -> Bucket {
         let region = Region::Custom {
             region: self.region.clone(),
@@ -392,13 +402,15 @@ impl S3Config {
             secret_key: Some(self.access_key_secret.clone()),
             security_token: None,
             session_token: None,
+            expiration: None,
         };
 
+        let bucket = Bucket::new(&self.bucket, region, credentials).unwrap();
         if self.path_style {
-            Bucket::new_with_path_style(&self.bucket, region, credentials)
+            bucket.with_path_style()
         } else {
-            Bucket::new(&self.bucket, region, credentials)
-        }.unwrap()
+            bucket
+        }
     }
 }
 
@@ -409,41 +421,50 @@ fn get_s3_config() -> Option<S3Config> {
     if bucket.is_none() && access_key_id.is_none() && access_key_secret.is_none() {
         return None;
     }
-    if bucket.is_none() || access_key_id.is_none() || access_key_secret.is_none() {
-        panic!("Invalid S3 configuration: some required values are set, but not others");
+
+    #[cfg(not(feature = "s3"))]
+    panic!("S3 support is not enabled in this build");
+
+    #[cfg(feature = "s3")]
+    {
+        if bucket.is_none() || access_key_id.is_none() || access_key_secret.is_none() {
+            panic!("Invalid S3 configuration: some required values are set, but not others");
+        }
+        let bucket = bucket.unwrap();
+        let access_key_id = access_key_id.unwrap();
+        let access_key_secret = access_key_secret.unwrap();
+
+        let region = var("S3_REGION").unwrap_or_else(|_| "us-east-1".to_owned());
+        let hostname = var("S3_HOSTNAME").unwrap_or_else(|_| format!("{}.amazonaws.com", region));
+
+        let protocol = var("S3_PROTOCOL").unwrap_or_else(|_| "https".to_owned());
+        if protocol != "http" && protocol != "https" {
+            panic!("Invalid S3 configuration: invalid protocol {}", protocol);
+        }
+
+        let path_style = var("S3_PATH_STYLE").unwrap_or_else(|_| "false".to_owned());
+        let path_style = string_to_bool(&path_style, "S3_PATH_STYLE");
+        let direct_download = var("S3_DIRECT_DOWNLOAD").unwrap_or_else(|_| "false".to_owned());
+        let direct_download = string_to_bool(&direct_download, "S3_DIRECT_DOWNLOAD");
+
+        let alias = var("S3_ALIAS_HOST").ok();
+
+        if direct_download && protocol == "http" && alias.is_none() {
+            panic!("S3 direct download is disabled because bucket is accessed through plain HTTP. Use HTTPS or set an alias hostname (S3_ALIAS_HOST).");
+        }
+
+        Some(S3Config {
+            bucket,
+            access_key_id,
+            access_key_secret,
+            region,
+            hostname,
+            protocol,
+            path_style,
+            direct_download,
+            alias,
+        })
     }
-    let bucket = bucket.unwrap();
-    let access_key_id = access_key_id.unwrap();
-    let access_key_secret = access_key_secret.unwrap();
-
-    let region = var("S3_REGION").unwrap_or_else(|_| "us-east-1".to_owned());
-    let hostname = var("S3_HOSTNAME").unwrap_or_else(|_| format!("{}.amazonaws.com", region));
-
-    let protocol = var("S3_PROTOCOL").unwrap_or_else(|_| "https".to_owned());
-    if protocol != "http" && protocol != "https" {
-        panic!("Invalid S3 configuration: invalid protocol {}", protocol);
-    }
-
-    let path_style = var("S3_PATH_STYLE").unwrap_or_else(|_| "false".to_owned());
-    let path_style = string_to_bool(&path_style, "S3_PATH_STYLE");
-    let direct_upload = var("S3_DIRECT_UPLOAD").unwrap_or_else(|_| "false".to_owned());
-    let direct_upload = string_to_bool(&direct_upload, "S3_DIRECT_UPLOAD");
-    let direct_download = var("S3_DIRECT_DOWNLOAD").unwrap_or_else(|_| "false".to_owned());
-    let direct_download = string_to_bool(&direct_download, "S3_DIRECT_DOWNLOAD");
-
-    let alias = var("S3_ALIAS_HOST").ok();
-    Some(S3Config {
-        bucket,
-        access_key_id,
-        access_key_secret,
-        region,
-        hostname,
-        protocol,
-        path_style,
-        direct_upload,
-        direct_download,
-        alias,
-    })
 }
 
 lazy_static! {

plume-models/src/inbox.rs

@@ -2,12 +2,11 @@ use activitystreams::activity::{Announce, Create, Delete, Follow, Like, Undo, Up
 
 use crate::{
     comments::Comment,
-    db_conn::DbConn,
     follows, likes,
     posts::{Post, PostUpdate},
     reshares::Reshare,
     users::User,
-    Error, CONFIG,
+    Connection, Error, CONFIG,
 };
 use plume_common::activity_pub::inbox::Inbox;
 
@@ -46,8 +45,8 @@ impl_into_inbox_result! {
     Reshare => Reshared
 }
 
-pub fn inbox(conn: &DbConn, act: serde_json::Value) -> Result<InboxResult, Error> {
-    Inbox::handle(&**conn, act)
+pub fn inbox(conn: &Connection, act: serde_json::Value) -> Result<InboxResult, Error> {
+    Inbox::handle(conn, act)
         .with::<User, Announce, Post>(CONFIG.proxy())
         .with::<User, Create, Comment>(CONFIG.proxy())
         .with::<User, Create, Post>(CONFIG.proxy())

plume-models/src/lib.rs

@@ -69,7 +69,8 @@ pub enum Error {
     Webfinger,
     Expired,
     UserAlreadyExists,
-    Anyhow(anyhow::Error),
+    #[cfg(feature = "s3")]
+    S3(s3::error::S3Error),
 }
 
 impl From<bcrypt::BcryptError> for Error {
@@ -171,9 +172,10 @@ impl From<request::Error> for Error {
     }
 }
 
-impl From<anyhow::Error> for Error {
-    fn from(err: anyhow::Error) -> Error {
-        Error::Anyhow(err)
+#[cfg(feature = "s3")]
+impl From<s3::error::S3Error> for Error {
+    fn from(err: s3::error::S3Error) -> Error {
+        Error::S3(err)
     }
 }
 

plume-models/src/medias.rs

@@ -16,6 +16,9 @@ use std::{
 use tracing::warn;
 use url::Url;
 
+#[cfg(feature = "s3")]
+use crate::config::S3Config;
+
 const REMOTE_MEDIA_DIRECTORY: &str = "remote";
 
 #[derive(Clone, Identifiable, Queryable, AsChangeset)]
@@ -105,7 +108,7 @@ impl Media {
             .file_path
             .rsplit_once('.')
             .map(|x| x.1)
-            .expect("Media::category: extension error")
+            .unwrap_or("")
             .to_lowercase()
         {
             "png" | "jpg" | "jpeg" | "gif" | "svg" => MediaCategory::Image,
@@ -151,30 +154,98 @@ impl Media {
         })
     }
 
+    /// Returns full file path for medias stored in the local media directory.
+    pub fn local_path(&self) -> Option<PathBuf> {
+        if self.file_path.is_empty() {
+            return None;
+        }
+
+        if CONFIG.s3.is_some() {
+            #[cfg(feature="s3")]
+            unreachable!("Called Media::local_path() but media are stored on S3");
+            #[cfg(not(feature="s3"))]
+            unreachable!();
+        }
+
+        let relative_path = self
+            .file_path
+            .trim_start_matches(&CONFIG.media_directory)
+            .trim_start_matches(path::MAIN_SEPARATOR)
+            .trim_start_matches("static/media/");
+
+        Some(Path::new(&CONFIG.media_directory).join(relative_path))
+    }
+
+    /// Returns the relative URL to access this file, which is also the key at which
+    /// it is stored in the S3 bucket if we are using S3 storage.
+    /// Does not start with a '/', it is of the form "static/media/<...>"
+    pub fn relative_url(&self) -> Option<String> {
+        if self.file_path.is_empty() {
+            return None;
+        }
+
+        let relative_path = self
+            .file_path
+            .trim_start_matches(&CONFIG.media_directory)
+            .replace(path::MAIN_SEPARATOR, "/");
+
+        let relative_path = relative_path
+            .trim_start_matches('/')
+            .trim_start_matches("static/media/");
+
+        Some(format!("static/media/{}", relative_path))
+    }
+
+    /// Returns a public URL through which this media file can be accessed
     pub fn url(&self) -> Result<String> {
         if self.is_remote {
             Ok(self.remote_url.clone().unwrap_or_default())
         } else {
-            let file_path = self.file_path.replace(path::MAIN_SEPARATOR, "/").replacen(
-                &CONFIG.media_directory,
-                "static/media",
-                1,
-            ); // "static/media" from plume::routs::plume_media_files()
+            let relative_url = self.relative_url().unwrap_or_default();
+
+            #[cfg(feature="s3")]
+            if CONFIG.s3.as_ref().map(|x| x.direct_download).unwrap_or(false) {
+                let s3_url = match CONFIG.s3.as_ref().unwrap() {
+                    S3Config { alias: Some(alias), .. } => {
+                        format!("https://{}/{}", alias, relative_url)
+                    }
+                    S3Config { path_style: true, hostname, bucket, .. } => {
+                        format!("https://{}/{}/{}",
+                            hostname,
+                            bucket,
+                            relative_url
+                        )
+                    }
+                    S3Config { path_style: false, hostname, bucket, .. } => {
+                        format!("https://{}.{}/{}",
+                            bucket,
+                            hostname,
+                            relative_url
+                        )
+                    }
+                };
+                return Ok(s3_url);
+            }
+
             Ok(ap_url(&format!(
                 "{}/{}",
                 Instance::get_local()?.public_domain,
-                &file_path
+                relative_url
             )))
         }
     }
 
     pub fn delete(&self, conn: &Connection) -> Result<()> {
         if !self.is_remote {
-            if let Some(config) = &CONFIG.s3 {
-                config.get_bucket()
-                    .delete_object_blocking(&self.file_path)?;
+            if CONFIG.s3.is_some() {
+                #[cfg(not(feature="s3"))]
+                unreachable!();
+
+                #[cfg(feature = "s3")]
+                CONFIG.s3.as_ref().unwrap().get_bucket()
+                    .delete_object_blocking(&self.relative_url().ok_or(Error::NotFound)?)?;
             } else {
-                fs::remove_file(self.file_path.as_str())?;
+                fs::remove_file(self.local_path().ok_or(Error::NotFound)?)?;
             }
         }
         diesel::delete(self)
@@ -216,22 +287,60 @@ impl Media {
             .url()
             .and_then(|url| url.to_as_uri())
             .ok_or(Error::MissingApProperty)?;
-        let path = determine_mirror_file_path(&remote_url);
-        let parent = path.parent().ok_or(Error::InvalidValue)?;
-        if !parent.is_dir() {
-            DirBuilder::new().recursive(true).create(parent)?;
-        }
 
-        let mut dest = fs::File::create(path.clone())?;
-        // TODO: conditional GET
-        request::get(
-            remote_url.as_str(),
-            User::get_sender(),
-            CONFIG.proxy().cloned(),
-        )?
-        .copy_to(&mut dest)?;
+        let file_path = if CONFIG.s3.is_some() {
+            #[cfg(not(feature="s3"))]
+            unreachable!();
 
-        Media::find_by_file_path(conn, path.to_str().ok_or(Error::InvalidValue)?)
+            #[cfg(feature = "s3")]
+            {
+                use rocket::http::ContentType;
+
+                let dest = determine_mirror_s3_path(&remote_url);
+
+                let media = request::get(
+                    remote_url.as_str(),
+                    User::get_sender(),
+                    CONFIG.proxy().cloned(),
+                )?;
+
+                let content_type = media
+                    .headers()
+                    .get(reqwest::header::CONTENT_TYPE)
+                    .and_then(|x| x.to_str().ok())
+                    .and_then(ContentType::parse_flexible)
+                    .unwrap_or(ContentType::Binary);
+
+                let bytes = media.bytes()?;
+
+                let bucket = CONFIG.s3.as_ref().unwrap().get_bucket();
+                bucket.put_object_with_content_type_blocking(
+                    &dest,
+                    &bytes,
+                    &content_type.to_string()
+                )?;
+
+                dest
+            }
+        } else {
+            let path = determine_mirror_file_path(&remote_url);
+            let parent = path.parent().ok_or(Error::InvalidValue)?;
+            if !parent.is_dir() {
+                DirBuilder::new().recursive(true).create(parent)?;
+            }
+
+            let mut dest = fs::File::create(path.clone())?;
+            // TODO: conditional GET
+            request::get(
+                remote_url.as_str(),
+                User::get_sender(),
+                CONFIG.proxy().cloned(),
+            )?
+            .copy_to(&mut dest)?;
+            path.to_str().ok_or(Error::InvalidValue)?.to_string()
+        };
+
+        Media::find_by_file_path(conn, &file_path)
             .and_then(|mut media| {
                 let mut updated = false;
 
@@ -272,7 +381,7 @@ impl Media {
                 Media::insert(
                     conn,
                     NewMedia {
-                        file_path: path.to_str().ok_or(Error::InvalidValue)?.to_string(),
+                        file_path,
                         alt_text: image
                             .content()
                             .and_then(|content| content.to_as_string())
@@ -312,12 +421,10 @@ impl Media {
 }
 
 fn determine_mirror_file_path(url: &str) -> PathBuf {
-    let mut file_path = Path::new(&super::CONFIG.media_directory).join(REMOTE_MEDIA_DIRECTORY);
-    Url::parse(url)
-        .map(|url| {
-            if !url.has_host() {
-                return;
-            }
+    let mut file_path = Path::new(&CONFIG.media_directory).join(REMOTE_MEDIA_DIRECTORY);
+
+    match Url::parse(url) {
+        Ok(url) if url.has_host() => {
             file_path.push(url.host_str().unwrap());
             for segment in url.path_segments().expect("FIXME") {
                 file_path.push(segment);
@@ -325,19 +432,54 @@ fn determine_mirror_file_path(url: &str) -> PathBuf {
             // TODO: handle query
             // HINT: Use characters which must be percent-encoded in path as separator between path and query
             // HINT: handle extension
-        })
-        .unwrap_or_else(|err| {
-            warn!("Failed to parse url: {} {}", &url, err);
+        }
+        other => {
+            if let Err(err) = other {
+                warn!("Failed to parse url: {} {}", &url, err);
+            } else {
+                warn!("Error without a host: {}", &url);
+            }
             let ext = url
                 .rsplit('.')
                 .next()
                 .map(ToOwned::to_owned)
                 .unwrap_or_else(|| String::from("png"));
             file_path.push(format!("{}.{}", GUID::rand(), ext));
-        });
+        }
+    }
     file_path
 }
 
+#[cfg(feature="s3")]
+fn determine_mirror_s3_path(url: &str) -> String {
+    match Url::parse(url) {
+        Ok(url) if url.has_host() => {
+            format!("static/media/{}/{}/{}",
+                REMOTE_MEDIA_DIRECTORY,
+                url.host_str().unwrap(),
+                url.path().trim_start_matches('/'),
+            )
+        }
+        other => {
+            if let Err(err) = other {
+                warn!("Failed to parse url: {} {}", &url, err);
+            } else {
+                warn!("Error without a host: {}", &url);
+            }
+            let ext = url
+                .rsplit('.')
+                .next()
+                .map(ToOwned::to_owned)
+                .unwrap_or_else(|| String::from("png"));
+            format!("static/media/{}/{}.{}",
+                REMOTE_MEDIA_DIRECTORY,
+                GUID::rand(),
+                ext,
+            )
+        }
+    }
+}
+
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;

plume-models/src/posts.rs

@@ -373,7 +373,7 @@ impl Post {
         }))?;
         article.set_source(source);
         article.set_published(
-            OffsetDateTime::from_unix_timestamp_nanos(self.creation_date.timestamp_nanos().into())
+            OffsetDateTime::from_unix_timestamp_nanos(self.creation_date.timestamp_nanos_opt().unwrap().into())
                 .expect("OffsetDateTime"),
         );
         article.set_summary(&*self.subtitle);

plume-models/src/timeline/mod.rs

@@ -221,7 +221,8 @@ impl Timeline {
 
     pub fn add_to_all_timelines(conn: &Connection, post: &Post, kind: Kind<'_>) -> Result<()> {
         let timelines = timeline_definition::table
-            .load::<Self>(conn.deref())
+            //.load::<Self>(conn.deref())
+            .load::<Self>(conn)
             .map_err(Error::from)?;
 
         for t in timelines {

plume-models/src/users.rs

@@ -1,8 +1,8 @@
 use crate::{
-    ap_url, blocklisted_emails::BlocklistedEmail, blogs::Blog, db_conn::DbConn, follows::Follow,
-    instance::*, medias::Media, notifications::Notification, post_authors::PostAuthor, posts::Post,
-    safe_string::SafeString, schema::users, timeline::Timeline, Connection, Error, Result,
-    UserEvent::*, CONFIG, ITEMS_PER_PAGE, USER_CHAN,
+    ap_url, blocklisted_emails::BlocklistedEmail, blogs::Blog, comments::Comment, db_conn::DbConn,
+    follows::Follow, instance::*, medias::Media, notifications::Notification,
+    post_authors::PostAuthor, posts::Post, safe_string::SafeString, schema::users,
+    timeline::Timeline, Connection, Error, Result, UserEvent::*, CONFIG, ITEMS_PER_PAGE, USER_CHAN,
 };
 use activitystreams::{
     activity::Delete,
@@ -168,6 +168,14 @@ impl User {
             notif.delete(conn)?
         }
 
+        for comment in Comment::list_by_author(conn, self.id)? {
+            let delete_activity = comment.build_delete(conn)?;
+            crate::inbox::inbox(
+                conn,
+                serde_json::to_value(&delete_activity).map_err(Error::from)?,
+            )?;
+        }
+
         diesel::delete(self)
             .execute(conn)
             .map(|_| ())
@@ -334,6 +342,42 @@ impl User {
         bcrypt::hash(pass, 10).map_err(Error::from)
     }
 
+    // [[ LDAP non anonymous bind copied from ....
+    fn ldap_preconn(ldap_conn: &mut LdapConn) -> Result<()> {
+        let ldap = CONFIG.ldap.as_ref().unwrap();
+
+        if let Some((user, password)) = ldap.user.as_ref() {
+            let bind = ldap_conn
+                .simple_bind(user, password)
+                .map_err(|_| Error::NotFound)?;
+
+            if bind.success().is_err() {
+                return Err(Error::NotFound);
+            }
+        }
+        Ok(())
+    }
+
+    fn search_dn(ldap_conn: &mut LdapConn, fil: &str) -> Result<String> {
+        let mut cn: String = String::new();
+        let ldap = CONFIG.ldap.as_ref().unwrap();
+            let (rs, _res) = ldap_conn.search(
+                &ldap.base_dn,
+                Scope::Subtree,
+                fil,
+                vec!["cn"]
+            )
+            .map_err(|_| Error::NotFound)?
+            .success()
+            .map_err(|_| Error::NotFound)?;
+            for entry in rs {
+                println!("{:?}", SearchEntry::construct(entry.clone()).dn);
+                cn = SearchEntry::construct(entry).dn;
+            }
+
+        Ok(cn.to_owned())
+    }
+
     fn ldap_register(conn: &Connection, name: &str, password: &str) -> Result<User> {
         if CONFIG.ldap.is_none() {
             return Err(Error::NotFound);
@@ -341,7 +385,12 @@ impl User {
         let ldap = CONFIG.ldap.as_ref().unwrap();
 
         let mut ldap_conn = LdapConn::new(&ldap.addr).map_err(|_| Error::NotFound)?;
-        let ldap_name = format!("{}={},{}", ldap.user_name_attr, name, ldap.base_dn);
+
+        User::ldap_preconn(&mut ldap_conn)?;
+
+        let _filter = format!("(&(objectClass=*)(uid={}))", name).to_owned(); 
+        let ldap_name = User::search_dn(&mut ldap_conn, &_filter).unwrap();
+        //let ldap_name = format!("{}={},{}", ldap.user_name_attr, name, ldap.base_dn);
         let bind = ldap_conn
             .simple_bind(&ldap_name, password)
             .map_err(|_| Error::NotFound)?;
@@ -387,10 +436,18 @@ impl User {
             } else {
                 return false;
             };
+            if User::ldap_preconn(&mut conn).is_err() {
+                return false;
+            }
+            //
+            let _filter = format!("(&(objectClass=*)(uid={}))", &self.username).to_owned(); 
+            let name = User::search_dn(&mut conn, &_filter).unwrap();
+            /*
             let name = format!(
                 "{}={},{}",
                 ldap.user_name_attr, &self.username, ldap.base_dn
             );
+            */
             if let Ok(bind) = conn.simple_bind(&name, password) {
                 bind.success().is_ok()
             } else {
@@ -437,7 +494,7 @@ impl User {
                 }
                 // if no user was found, and we were unable to auto-register from ldap
                 // fake-verify a password, and return an error.
-                let other = User::get(conn, 1)
+                let other = User::get(&*conn, 1)
                     .expect("No user is registered")
                     .hashed_password;
                 other.map(|pass| bcrypt::verify(password, &pass));
@@ -445,7 +502,7 @@ impl User {
             }
         }
     }
-
+    // ... ldap-non-anon PR https://git.joinplu.me/Plume/Plume/src/branch/ldap-non-anon ]].
     pub fn reset_password(&self, conn: &Connection, pass: &str) -> Result<()> {
         diesel::update(self)
             .set(users::hashed_password.eq(User::hash_pass(pass)?))

po/plume/plume.pot

@@ -33,6 +33,9 @@ msgstr ""
 msgid "Your feed"
 msgstr ""
 
+msgid "My feed"
+msgstr ""
+
 msgid "Local feed"
 msgstr ""
 
@@ -222,139 +225,19 @@ msgstr ""
 msgid "You can't delete someone else's account."
 msgstr ""
 
-msgid "Create your account"
-msgstr ""
-
-msgid "Create an account"
-msgstr ""
-
-msgid "Email"
-msgstr ""
-
-msgid "Email confirmation"
-msgstr ""
-
-msgid "An email will be sent to provided email. You can continue signing-up via the email."
-msgstr ""
-
-msgid "Apologies, but registrations are closed on this particular instance. You can, however, find a different one."
-msgstr ""
-
-msgid "Registration"
-msgstr ""
-
-msgid "Check your inbox!"
-msgstr ""
-
-msgid "We sent a mail to the address you gave us, with a link for registration."
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Password confirmation"
-msgstr ""
-
-msgid "Media upload"
-msgstr ""
-
-msgid "Description"
-msgstr ""
-
-msgid "Useful for visually impaired people, as well as licensing information"
-msgstr ""
-
-msgid "Content warning"
-msgstr ""
-
-msgid "Leave it empty, if none is needed"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
-msgid "Send"
-msgstr ""
-
-msgid "Your media"
-msgstr ""
-
-msgid "Upload"
-msgstr ""
-
-msgid "You don't have any media yet."
-msgstr ""
-
-msgid "Content warning: {0}"
-msgstr ""
-
-msgid "Delete"
-msgstr ""
-
-msgid "Details"
-msgstr ""
-
-msgid "Media details"
-msgstr ""
-
-msgid "Go back to the gallery"
-msgstr ""
-
-msgid "Markdown syntax"
-msgstr ""
-
-msgid "Copy it into your articles, to insert this media:"
-msgstr ""
-
-msgid "Use as an avatar"
-msgstr ""
-
-msgid "Plume"
-msgstr ""
-
-msgid "Menu"
-msgstr ""
-
-msgid "Search"
-msgstr ""
-
-msgid "Dashboard"
-msgstr ""
-
 msgid "Notifications"
 msgstr ""
 
-msgid "Log Out"
+msgid "{0}'s subscriptions"
 msgstr ""
 
-msgid "My account"
+msgid "Articles"
 msgstr ""
 
-msgid "Log In"
+msgid "Subscribers"
 msgstr ""
 
-msgid "Register"
-msgstr ""
-
-msgid "About this instance"
-msgstr ""
-
-msgid "Privacy policy"
-msgstr ""
-
-msgid "Administration"
-msgstr ""
-
-msgid "Documentation"
-msgstr ""
-
-msgid "Source code"
-msgstr ""
-
-msgid "Matrix room"
+msgid "Subscriptions"
 msgstr ""
 
 msgid "Admin"
@@ -375,30 +258,30 @@ msgstr ""
 msgid "Subscribe"
 msgstr ""
 
-msgid "Follow {}"
+msgid "Create your account"
 msgstr ""
 
-msgid "Log in to follow"
+msgid "Create an account"
 msgstr ""
 
-msgid "Enter your full username handle to follow"
+msgid "Username"
+msgstr ""
+
+msgid "Email"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password confirmation"
+msgstr ""
+
+msgid "Apologies, but registrations are closed on this particular instance. You can, however, find a different one."
 msgstr ""
 
 msgid "{0}'s subscribers"
 msgstr ""
 
-msgid "Articles"
-msgstr ""
-
-msgid "Subscribers"
-msgstr ""
-
-msgid "Subscriptions"
-msgstr ""
-
-msgid "{0}'s subscriptions"
-msgstr ""
-
 msgid "Your Dashboard"
 msgstr ""
 
@@ -414,9 +297,21 @@ msgstr ""
 msgid "Your Drafts"
 msgstr ""
 
+msgid "Your media"
+msgstr ""
+
 msgid "Go to your gallery"
 msgstr ""
 
+msgid "Follow {}"
+msgstr ""
+
+msgid "Log in to follow"
+msgstr ""
+
+msgid "Enter your full username handle to follow"
+msgstr ""
+
 msgid "Edit your account"
 msgstr ""
 
@@ -471,10 +366,81 @@ msgstr ""
 msgid "Recently boosted"
 msgstr ""
 
-msgid "Articles tagged \"{0}\""
+msgid "Nothing to see here yet."
 msgstr ""
 
-msgid "There are currently no articles with such a tag"
+msgid "Edit"
+msgstr ""
+
+msgid "By {0}"
+msgstr ""
+
+msgid "Draft"
+msgstr ""
+
+msgid "One like"
+msgid_plural "{0} likes"
+msgstr[0] ""
+
+msgid "One boost"
+msgid_plural "{0} boosts"
+msgstr[0] ""
+
+msgid "What is Plume?"
+msgstr ""
+
+msgid "Plume is a decentralized blogging engine."
+msgstr ""
+
+msgid "Authors can manage multiple blogs, each as its own website."
+msgstr ""
+
+msgid "Articles are also visible on other Plume instances, and you can interact with them directly from other platforms like Mastodon."
+msgstr ""
+
+msgid "About {0}"
+msgstr ""
+
+msgid "Home to <em>{0}</em> people"
+msgstr ""
+
+msgid "Who wrote <em>{0}</em> articles"
+msgstr ""
+
+msgid "Read the detailed rules"
+msgstr ""
+
+msgid "Respond"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "Delete this comment"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "No description"
+msgstr ""
+
+msgid "You are not authorized."
+msgstr ""
+
+msgid "Invalid CSRF token"
+msgstr ""
+
+msgid "Something is wrong with your CSRF token. Make sure cookies are enabled in you browser, and try reloading this page. If you continue to see this error message, please report it."
+msgstr ""
+
+msgid "Page not found"
+msgstr ""
+
+msgid "We couldn't find this page."
+msgstr ""
+
+msgid "The link that led you here may be broken."
 msgstr ""
 
 msgid "The content you sent can't be processed."
@@ -492,72 +458,172 @@ msgstr ""
 msgid "Sorry about that. If you think this is a bug, please report it."
 msgstr ""
 
-msgid "Invalid CSRF token"
+msgid "Articles tagged \"{0}\""
 msgstr ""
 
-msgid "Something is wrong with your CSRF token. Make sure cookies are enabled in you browser, and try reloading this page. If you continue to see this error message, please report it."
+msgid "There are currently no articles with such a tag"
 msgstr ""
 
-msgid "You are not authorized."
+msgid "New Blog"
 msgstr ""
 
-msgid "Page not found"
+msgid "Create a blog"
 msgstr ""
 
-msgid "We couldn't find this page."
+msgid "Title"
 msgstr ""
 
-msgid "The link that led you here may be broken."
+msgid "Create blog"
 msgstr ""
 
-msgid "Users"
+msgid "Edit \"{}\""
 msgstr ""
 
-msgid "Configuration"
+msgid "Description"
+msgstr ""
+
+msgid "Markdown syntax is supported"
+msgstr ""
+
+msgid "You can upload images to your gallery, to use them as blog icons, or banners."
+msgstr ""
+
+msgid "Upload images"
+msgstr ""
+
+msgid "Blog icon"
+msgstr ""
+
+msgid "Blog banner"
+msgstr ""
+
+msgid "Custom theme"
+msgstr ""
+
+msgid "Update blog"
+msgstr ""
+
+msgid "Be very careful, any action taken here can't be reversed."
+msgstr ""
+
+msgid "Are you sure that you want to permanently delete this blog?"
+msgstr ""
+
+msgid "Permanently delete this blog"
+msgstr ""
+
+msgid "{}'s icon"
+msgstr ""
+
+msgid "There's one author on this blog: "
+msgid_plural "There are {0} authors on this blog: "
+msgstr[0] ""
+
+msgid "No posts to see here yet."
+msgstr ""
+
+msgid "Media upload"
+msgstr ""
+
+msgid "Useful for visually impaired people, as well as licensing information"
+msgstr ""
+
+msgid "Content warning"
+msgstr ""
+
+msgid "Leave it empty, if none is needed"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Send"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "You don't have any media yet."
+msgstr ""
+
+msgid "Content warning: {0}"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "Media details"
+msgstr ""
+
+msgid "Go back to the gallery"
+msgstr ""
+
+msgid "Markdown syntax"
+msgstr ""
+
+msgid "Copy it into your articles, to insert this media:"
+msgstr ""
+
+msgid "Use as an avatar"
+msgstr ""
+
+msgid "I'm from this instance"
+msgstr ""
+
+msgid "Username, or email"
+msgstr ""
+
+msgid "Log in"
+msgstr ""
+
+msgid "I'm from another instance"
+msgstr ""
+
+msgid "Continue to your instance"
+msgstr ""
+
+msgid "Email confirmation"
+msgstr ""
+
+msgid "An email will be sent to provided email. You can continue signing-up via the email."
+msgstr ""
+
+msgid "Registration"
+msgstr ""
+
+msgid "Check your inbox!"
+msgstr ""
+
+msgid "We sent a mail to the address you gave us, with a link for registration."
+msgstr ""
+
+msgid "Administration of {0}"
 msgstr ""
 
 msgid "Instances"
 msgstr ""
 
+msgid "Configuration"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
 msgid "Email blocklist"
 msgstr ""
 
-msgid "Grant admin rights"
-msgstr ""
-
-msgid "Revoke admin rights"
-msgstr ""
-
-msgid "Grant moderator rights"
-msgstr ""
-
-msgid "Revoke moderator rights"
-msgstr ""
-
-msgid "Ban"
-msgstr ""
-
-msgid "Run on selected users"
-msgstr ""
-
-msgid "Moderator"
-msgstr ""
-
-msgid "Moderation"
-msgstr ""
-
-msgid "Home"
-msgstr ""
-
-msgid "Administration of {0}"
-msgstr ""
-
 msgid "Unblock"
 msgstr ""
 
 msgid "Block"
 msgstr ""
 
+msgid "Administration"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
@@ -567,9 +633,6 @@ msgstr ""
 msgid "Short description"
 msgstr ""
 
-msgid "Markdown syntax is supported"
-msgstr ""
-
 msgid "Long description"
 msgstr ""
 
@@ -579,13 +642,22 @@ msgstr ""
 msgid "Save these settings"
 msgstr ""
 
-msgid "If you are browsing this site as a visitor, no data about you is collected."
+msgid "Welcome to {}"
 msgstr ""
 
-msgid "As a registered user, you have to provide your username (which does not have to be your real name), your functional email address and a password, in order to be able to log in, write articles and comment. The content you submit is stored until you delete it."
+msgid "Runs Plume {0}"
 msgstr ""
 
-msgid "When you log in, we store two cookies, one to keep your session open, the second to prevent other people to act on your behalf. We don't store any other cookies."
+msgid "And are connected to <em>{0}</em> other instances"
+msgstr ""
+
+msgid "Administred by"
+msgstr ""
+
+msgid "Moderation"
+msgstr ""
+
+msgid "Home"
 msgstr ""
 
 msgid "Blocklisted Emails"
@@ -633,37 +705,100 @@ msgstr ""
 msgid "The user will be silently prevented from making an account"
 msgstr ""
 
-msgid "Welcome to {}"
+msgid "Search users"
 msgstr ""
 
-msgid "Nothing to see here yet."
+msgid "Grant admin rights"
 msgstr ""
 
-msgid "About {0}"
+msgid "Revoke admin rights"
 msgstr ""
 
-msgid "Runs Plume {0}"
+msgid "Grant moderator rights"
 msgstr ""
 
-msgid "Home to <em>{0}</em> people"
+msgid "Revoke moderator rights"
 msgstr ""
 
-msgid "Who wrote <em>{0}</em> articles"
+msgid "Ban"
 msgstr ""
 
-msgid "And are connected to <em>{0}</em> other instances"
+msgid "Run on selected users"
 msgstr ""
 
-msgid "Administred by"
+msgid "Moderator"
 msgstr ""
 
-msgid "Interact with {}"
+msgid "Privacy policy"
 msgstr ""
 
-msgid "Log in to interact"
+msgid "If you are browsing this site as a visitor, no data about you is collected."
 msgstr ""
 
-msgid "Enter your full username to interact"
+msgid "As a registered user, you have to provide your username (which does not have to be your real name), your functional email address and a password, in order to be able to log in, write articles and comment. The content you submit is stored until you delete it."
+msgstr ""
+
+msgid "When you log in, we store two cookies, one to keep your session open, the second to prevent other people to act on your behalf. We don't store any other cookies."
+msgstr ""
+
+msgid "This token has expired"
+msgstr ""
+
+msgid "Please start the process again by clicking <a href=\"/password-reset\">here</a>."
+msgstr ""
+
+msgid "Reset your password"
+msgstr ""
+
+msgid "New password"
+msgstr ""
+
+msgid "Confirmation"
+msgstr ""
+
+msgid "Update password"
+msgstr ""
+
+msgid "Send password reset link"
+msgstr ""
+
+msgid "We sent a mail to the address you gave us, with a link to reset your password."
+msgstr ""
+
+msgid "Plume"
+msgstr ""
+
+msgid "Menu"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Dashboard"
+msgstr ""
+
+msgid "Log Out"
+msgstr ""
+
+msgid "My account"
+msgstr ""
+
+msgid "Log In"
+msgstr ""
+
+msgid "Register"
+msgstr ""
+
+msgid "About this instance"
+msgstr ""
+
+msgid "Documentation"
+msgstr ""
+
+msgid "Source code"
+msgstr ""
+
+msgid "Matrix room"
 msgstr ""
 
 msgid "Publish"
@@ -672,9 +807,6 @@ msgstr ""
 msgid "Classic editor (any changes will be lost)"
 msgstr ""
 
-msgid "Title"
-msgstr ""
-
 msgid "Subtitle"
 msgstr ""
 
@@ -708,6 +840,15 @@ msgstr ""
 msgid "Publish your post"
 msgstr ""
 
+msgid "Interact with {}"
+msgstr ""
+
+msgid "Log in to interact"
+msgstr ""
+
+msgid "Enter your full username to interact"
+msgstr ""
+
 msgid "Written by {0}"
 msgstr ""
 
@@ -717,20 +858,12 @@ msgstr ""
 msgid "This article is under the {0} license."
 msgstr ""
 
-msgid "One like"
-msgid_plural "{0} likes"
-msgstr[0] ""
-
 msgid "I don't like this anymore"
 msgstr ""
 
 msgid "Add yours"
 msgstr ""
 
-msgid "One boost"
-msgid_plural "{0} boosts"
-msgstr[0] ""
-
 msgid "I don't want to boost this anymore"
 msgstr ""
 
@@ -752,151 +885,12 @@ msgstr ""
 msgid "No comments yet. Be the first to react!"
 msgstr ""
 
-msgid "Are you sure?"
-msgstr ""
-
 msgid "This article is still a draft. Only you and other authors can see it."
 msgstr ""
 
 msgid "Only you and other authors can edit this article."
 msgstr ""
 
-msgid "Edit"
-msgstr ""
-
-msgid "I'm from this instance"
-msgstr ""
-
-msgid "Username, or email"
-msgstr ""
-
-msgid "Log in"
-msgstr ""
-
-msgid "I'm from another instance"
-msgstr ""
-
-msgid "Continue to your instance"
-msgstr ""
-
-msgid "Reset your password"
-msgstr ""
-
-msgid "New password"
-msgstr ""
-
-msgid "Confirmation"
-msgstr ""
-
-msgid "Update password"
-msgstr ""
-
-msgid "We sent a mail to the address you gave us, with a link to reset your password."
-msgstr ""
-
-msgid "Send password reset link"
-msgstr ""
-
-msgid "This token has expired"
-msgstr ""
-
-msgid "Please start the process again by clicking <a href=\"/password-reset\">here</a>."
-msgstr ""
-
-msgid "New Blog"
-msgstr ""
-
-msgid "Create a blog"
-msgstr ""
-
-msgid "Create blog"
-msgstr ""
-
-msgid "Edit \"{}\""
-msgstr ""
-
-msgid "You can upload images to your gallery, to use them as blog icons, or banners."
-msgstr ""
-
-msgid "Upload images"
-msgstr ""
-
-msgid "Blog icon"
-msgstr ""
-
-msgid "Blog banner"
-msgstr ""
-
-msgid "Custom theme"
-msgstr ""
-
-msgid "Update blog"
-msgstr ""
-
-msgid "Be very careful, any action taken here can't be reversed."
-msgstr ""
-
-msgid "Are you sure that you want to permanently delete this blog?"
-msgstr ""
-
-msgid "Permanently delete this blog"
-msgstr ""
-
-msgid "{}'s icon"
-msgstr ""
-
-msgid "There's one author on this blog: "
-msgid_plural "There are {0} authors on this blog: "
-msgstr[0] ""
-
-msgid "No posts to see here yet."
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "No description"
-msgstr ""
-
-msgid "Respond"
-msgstr ""
-
-msgid "Delete this comment"
-msgstr ""
-
-msgid "What is Plume?"
-msgstr ""
-
-msgid "Plume is a decentralized blogging engine."
-msgstr ""
-
-msgid "Authors can manage multiple blogs, each as its own website."
-msgstr ""
-
-msgid "Articles are also visible on other Plume instances, and you can interact with them directly from other platforms like Mastodon."
-msgstr ""
-
-msgid "Read the detailed rules"
-msgstr ""
-
-msgid "By {0}"
-msgstr ""
-
-msgid "Draft"
-msgstr ""
-
-msgid "Search result(s) for \"{0}\""
-msgstr ""
-
-msgid "Search result(s)"
-msgstr ""
-
-msgid "No results for your query"
-msgstr ""
-
-msgid "No more results for your query"
-msgstr ""
-
 msgid "Advanced search"
 msgstr ""
 
@@ -953,3 +947,15 @@ msgstr ""
 
 msgid "Article license"
 msgstr ""
+
+msgid "Search result(s) for \"{0}\""
+msgstr ""
+
+msgid "Search result(s)"
+msgstr ""
+
+msgid "No results for your query"
+msgstr ""
+
+msgid "No more results for your query"
+msgstr ""

rust-toolchain

@@ -1 +1 @@
-nightly-2022-07-19
+nightly-2023-11-10

src/main.rs

@@ -101,7 +101,8 @@ Then try to restart Plume.
 "#
         )
     }
-    let workpool = ScheduledThreadPool::with_name("worker {}", num_cpus::get());
+    //let workpool = ScheduledThreadPool::with_name("worker {}", num_cpus::get());
+    let workpool = ScheduledThreadPool::new(num_cpus::get());
     // we want a fast exit here, so
     let searcher = Arc::new(UnmanagedSearcher::open_or_recreate(
         &CONFIG.search_index,

src/routes/blogs.rs

@@ -101,7 +101,7 @@ pub fn create(
         Ok(_) => ValidationErrors::new(),
         Err(e) => e,
     };
-    if Blog::find_by_fqn(&conn, slug).is_ok() {
+    if Blog::find_by_fqn(&conn, &slug).is_ok() {
         errors.add(
             "title",
             ValidationError {
@@ -122,7 +122,7 @@ pub fn create(
     let blog = Blog::insert(
         &conn,
         NewBlog::new_local(
-            slug.into(),
+            slug.clone().into(),
             form.title.to_string(),
             String::from(""),
             Instance::get_local()

src/routes/instance.rs

@@ -51,7 +51,7 @@ pub fn index(conn: DbConn, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
 }
 
 #[get("/admin")]
-pub fn admin(_admin: Admin, conn: DbConn, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
+pub fn admin(_admin: InclusiveAdmin, conn: DbConn, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
     let local_inst = Instance::get_local()?;
     Ok(render!(instance::admin(
         &(&conn, &rockets).to_context(),

src/routes/medias.rs

@@ -2,7 +2,7 @@ use crate::routes::{errors::ErrorPage, Page};
 use crate::template_utils::{IntoContext, Ructe};
 use guid_create::GUID;
 use multipart::server::{
-    save::{SaveResult, SavedData},
+    save::{SaveResult, SavedField, SavedData},
     Multipart,
 };
 use plume_models::{db_conn::DbConn, medias::*, users::User, Error, PlumeRocket, CONFIG};
@@ -55,41 +55,16 @@ pub fn upload(
     if let SaveResult::Full(entries) = Multipart::with_body(data.open(), boundary).save().temp() {
         let fields = entries.fields;
 
-        let filename = fields
+        let file = fields
             .get("file")
             .and_then(|v| v.iter().next())
-            .ok_or(status::BadRequest(Some("No file uploaded")))?
-            .headers
-            .filename
-            .clone();
-        // Remove extension if it contains something else than just letters and numbers
-        let ext = filename
-            .and_then(|f| {
-                f.rsplit('.')
-                    .next()
-                    .and_then(|ext| {
-                        if ext.chars().any(|c| !c.is_alphanumeric()) {
-                            None
-                        } else {
-                            Some(ext.to_lowercase())
-                        }
-                    })
-                    .map(|ext| format!(".{}", ext))
-            })
-            .unwrap_or_default();
-        let dest = format!("{}/{}{}", CONFIG.media_directory, GUID::rand(), ext);
+            .ok_or(status::BadRequest(Some("No file uploaded")))?;
 
-        match fields["file"][0].data {
-            SavedData::Bytes(ref bytes) => fs::write(&dest, bytes)
-                .map_err(|_| status::BadRequest(Some("Couldn't save upload")))?,
-            SavedData::File(ref path, _) => {
-                fs::copy(path, &dest)
-                    .map_err(|_| status::BadRequest(Some("Couldn't copy upload")))?;
-            }
-            _ => {
-                return Ok(Redirect::to(uri!(new)));
-            }
-        }
+        let file_path = match save_uploaded_file(file) {
+            Ok(Some(file_path)) => file_path,
+            Ok(None) => return Ok(Redirect::to(uri!(new))),
+            Err(_) => return Err(status::BadRequest(Some("Couldn't save uploaded media: {}"))),
+        };
 
         let has_cw = !read(&fields["cw"][0].data)
             .map(|cw| cw.is_empty())
@@ -97,7 +72,7 @@ pub fn upload(
         let media = Media::insert(
             &conn,
             NewMedia {
-                file_path: dest,
+                file_path,
                 alt_text: read(&fields["alt"][0].data)?,
                 is_remote: false,
                 remote_url: None,
@@ -117,6 +92,74 @@ pub fn upload(
     }
 }
 
+fn save_uploaded_file(file: &SavedField) -> Result<Option<String>, plume_models::Error> {
+    // Remove extension if it contains something else than just letters and numbers
+    let ext = file
+        .headers
+        .filename
+        .as_ref()
+        .and_then(|f| {
+            f.rsplit('.')
+                .next()
+                .and_then(|ext| {
+                    if ext.chars().any(|c| !c.is_alphanumeric()) {
+                        None
+                    } else {
+                        Some(ext.to_lowercase())
+                    }
+                })
+        })
+        .unwrap_or_default();
+
+    if CONFIG.s3.is_some() {
+        #[cfg(not(feature="s3"))]
+        unreachable!();
+
+        #[cfg(feature="s3")]
+        {
+            use std::borrow::Cow;
+
+            let dest = format!("static/media/{}.{}", GUID::rand(), ext);
+
+            let bytes = match file.data {
+                SavedData::Bytes(ref bytes) => Cow::from(bytes),
+                SavedData::File(ref path, _) => Cow::from(fs::read(path)?),
+                _ => {
+                    return Ok(None);
+                }
+            };
+
+            let bucket = CONFIG.s3.as_ref().unwrap().get_bucket();
+            let content_type = match &file.headers.content_type {
+                Some(ct) => ct.to_string(),
+                None => ContentType::from_extension(&ext)
+                    .unwrap_or(ContentType::Binary)
+                    .to_string(),
+            };
+
+            bucket.put_object_with_content_type_blocking(&dest, &bytes, &content_type)?;
+
+            Ok(Some(dest))
+        }
+    } else {
+        let dest = format!("{}/{}.{}", CONFIG.media_directory, GUID::rand(), ext);
+
+        match file.data {
+            SavedData::Bytes(ref bytes) => {
+                fs::write(&dest, bytes)?;
+            }
+            SavedData::File(ref path, _) => {
+                fs::copy(path, &dest)?;
+            }
+            _ => {
+                return Ok(None);
+            }
+        }
+
+        Ok(Some(dest))
+    }
+}
+
 fn read(data: &SavedData) -> Result<String, status::BadRequest<&'static str>> {
     if let SavedData::Text(s) = data {
         Ok(s.clone())

src/routes/mod.rs

@@ -9,7 +9,7 @@ use rocket::{
     http::{
         hyper::header::{CacheControl, CacheDirective, ETag, EntityTag},
         uri::{FromUriParam, Query},
-        ContentType, RawStr, Status,
+        RawStr, Status,
     },
     request::{self, FromFormValue, FromRequest, Request},
     response::{self, Flash, NamedFile, Redirect, Responder, Response},
@@ -21,6 +21,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
+#[cfg(feature = "s3")]
+use rocket::http::ContentType;
+
 /// Special return type used for routes that "cannot fail", and instead
 /// `Redirect`, or `Flash<Redirect>`, when we cannot deliver a `Ructe` Response
 #[allow(clippy::large_enum_variant)]
@@ -140,7 +143,7 @@ pub fn build_atom_feed(
     FeedBuilder::default()
         .title(title)
         .id(uri)
-        .updated(DateTime::<Utc>::from_utc(*updated, Utc))
+        .updated(DateTime::<Utc>::from_naive_utc_and_offset(*updated, Utc))
         .entries(
             entries
                 .into_iter()
@@ -179,9 +182,9 @@ fn post_to_atom(post: Post, conn: &Connection) -> Entry {
         // Using RFC 4287 format, see https://tools.ietf.org/html/rfc4287#section-3.3 for dates
         // eg: 2003-12-13T18:30:02Z (Z is here because there is no timezone support with the NaiveDateTime crate)
         .published(Some(
-            DateTime::<Utc>::from_utc(post.creation_date, Utc).into(),
+            DateTime::<Utc>::from_naive_utc_and_offset(post.creation_date, Utc).into(),
         ))
-        .updated(DateTime::<Utc>::from_utc(post.creation_date, Utc))
+        .updated(DateTime::<Utc>::from_naive_utc_and_offset(post.creation_date, Utc))
         .id(post.ap_url.clone())
         .links(vec![LinkBuilder::default().href(post.ap_url).build()])
         .build()
@@ -207,6 +210,7 @@ pub mod well_known;
 #[derive(Responder)]
 enum FileKind {
     Local(NamedFile),
+    #[cfg(feature = "s3")]
     S3(Vec<u8>, ContentType),
 }
 
@@ -259,21 +263,26 @@ pub fn plume_static_files(file: PathBuf, build_id: &RawStr) -> Option<CachedFile
 }
 #[get("/static/media/<file..>")]
 pub fn plume_media_files(file: PathBuf) -> Option<CachedFile> {
-    if let Some(config) = &CONFIG.s3 {
-        let ct = file.extension()
-            .and_then(|ext| ContentType::from_extension(&ext.to_string_lossy()))
-            .unwrap_or(ContentType::Binary);
+    if CONFIG.s3.is_some() {
+        #[cfg(not(feature="s3"))]
+        unreachable!();
 
-        let (data, code) = config.get_bucket()
-            .get_object_blocking(format!("plume-media/{}", file.to_string_lossy())).ok()?;
-        if code != 200 {
-            return None;
+        #[cfg(feature="s3")]
+        {
+            let data = CONFIG.s3.as_ref().unwrap().get_bucket()
+                .get_object_blocking(format!("static/media/{}", file.to_string_lossy())).ok()?;
+
+            let ct = data.headers().get("content-type")
+                .and_then(|x| ContentType::parse_flexible(&x))
+                .or_else(|| file.extension()
+                    .and_then(|ext| ContentType::from_extension(&ext.to_string_lossy())))
+                .unwrap_or(ContentType::Binary);
+
+            Some(CachedFile {
+                inner: FileKind::S3(data.to_vec(), ct),
+                cache_control: CacheControl(vec![CacheDirective::MaxAge(60 * 60 * 24 * 30)]),
+            })
         }
-
-        Some(CachedFile {
-            inner: FileKind::S3 ( data, ct),
-            cache_control: CacheControl(vec![CacheDirective::MaxAge(60 * 60 * 24 * 30)]),
-        })
     } else {
         NamedFile::open(Path::new(&CONFIG.media_directory).join(file))
             .ok()

templates/base.rs.html

@@ -87,6 +87,8 @@
                 <a href="@uri!(instance::privacy)">@i18n!(ctx.1, "Privacy policy")</a>
                 @if ctx.2.clone().map(|u| u.is_admin()).unwrap_or(false) {
                     <a href="@uri!(instance::admin)">@i18n!(ctx.1, "Administration")</a>
+                } else if ctx.2.clone().map(|u| u.is_moderator()).unwrap_or(false) {
+                    <a href="@uri!(instance::admin_mod)">@i18n!(ctx.1, "Moderation")</a>
                 }
             </div>
             <div>

templates/instance/admin.rs.html

@@ -1,6 +1,6 @@
 @use plume_models::instance::Instance;
 @use validator::ValidationErrors;
-@use crate::templates::base;
+@use crate::templates::{base, instance::admin_header};
 @use crate::template_utils::*;
 @use crate::routes::instance::InstanceSettingsForm;
 @use crate::routes::*;
@@ -8,15 +8,7 @@
 @(ctx: BaseContext, instance: Instance, form: InstanceSettingsForm, errors: ValidationErrors)
 
 @:base(ctx, i18n!(ctx.1, "Administration of {0}"; instance.name.clone()), {}, {}, {
-  <h1>@i18n!(ctx.1, "Administration")</h1>
-
-  @tabs(&[
-    (&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), true),
-    (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), false),
-    (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
-    (&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), false)
-  ])
-
+  @:admin_header(ctx, "Administration", 1)
   <form method="post" action="@uri!(instance::update_settings)">
     @(Input::new("name", i18n!(ctx.1, "Name"))
         .default(&form.name)

templates/instance/admin_header.rs.html

@@ -0,0 +1,22 @@
+@use crate::template_utils::*;
+@use crate::routes::*;
+
+@(ctx: BaseContext, title: &str, selected_tab: u8)
+
+<h1>@i18n!(ctx.1, title)</h1>
+
+@if ctx.2.clone().map(|u| u.is_admin()).unwrap_or(false) {
+    @tabs(&[
+        (&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), selected_tab == 1),
+        (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), selected_tab == 2),
+        (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), selected_tab == 3),
+        (&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), selected_tab == 4)
+    ])
+} else {
+    @tabs(&[
+        (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), selected_tab == 2),
+        (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), selected_tab == 3),
+        (&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), selected_tab == 4)
+    ])
+}
+

templates/instance/admin_mod.rs.html

@@ -1,15 +1,8 @@
-@use crate::templates::base;
+@use crate::templates::{base, instance::admin_header};
 @use crate::template_utils::*;
-@use crate::routes::*;
 
 @(ctx: BaseContext)
 
 @:base(ctx, i18n!(ctx.1, "Moderation"), {}, {}, {
-  <h1>@i18n!(ctx.1, "Moderation")</h1>
-
-  @tabs(&[
-    (&uri!(instance::admin).to_string(), i18n!(ctx.1, "Home"), true),
-    (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), false),
-    (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
-  ])
+  @:admin_header(ctx, "Moderation", 0)
 })

templates/instance/emailblocklist.rs.html

@@ -1,17 +1,11 @@
 @use plume_models::blocklisted_emails::BlocklistedEmail;
-@use crate::templates::base;
+@use crate::templates::{base, instance::admin_header};
 @use crate::template_utils::*;
 @use crate::routes::*;
 
 @(ctx:BaseContext, emails: Vec<BlocklistedEmail>, page:i32, n_pages:i32)
-    @:base(ctx, i18n!(ctx.1, "Blocklisted Emails"), {}, {}, {
-    <h1>@i18n!(ctx.1,"Blocklisted Emails")</h1>
-    @tabs(&[
-        (&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), false),
-        (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), false),
-        (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
-        (&uri!(instance::admin_email_blocklist:page=_).to_string(), i18n!(ctx.1, "Email blocklist"), true),
-    ])
+@:base(ctx, i18n!(ctx.1, "Blocklisted Emails"), {}, {}, {
+    @:admin_header(ctx, "Blocklisted Emails", 4)
     <form method="post" action="@uri!(instance::add_email_blocklist)">
         @(Input::new("email_address", i18n!(ctx.1, "Email address"))
         .details(i18n!(ctx.1, "The email address you wish to block. In order to block domains, you can use globbing syntax, for example '*@example.com' blocks all addresses from example.com"))

templates/instance/list.rs.html

@@ -1,19 +1,12 @@
 @use plume_models::instance::Instance;
-@use crate::templates::base;
+@use crate::templates::{base, instance::admin_header};
 @use crate::template_utils::*;
 @use crate::routes::*;
 
 @(ctx: BaseContext, instance: Instance, instances: Vec<Instance>, page: i32, n_pages: i32)
 
 @:base(ctx, i18n!(ctx.1, "Administration of {0}"; instance.name), {}, {}, {
-    <h1>@i18n!(ctx.1, "Instances")</h1>
-
-    @tabs(&[
-    (&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), false),
-    (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), true),
-    (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
-    (&uri!(instance::admin_email_blocklist:page=_).to_string(), i18n!(ctx.1, "Email blocklist"), false),
-    ])
+    @:admin_header(ctx, "Instances", 2))
 
     <div class="list">
         @for instance in instances {

templates/instance/users.rs.html

@@ -1,19 +1,12 @@
 @use plume_models::users::User;
-@use crate::templates::base;
+@use crate::templates::{base, instance::admin_header};
 @use crate::template_utils::*;
 @use crate::routes::*;
 
 @(ctx: BaseContext, users: Vec<User>, user: Option<&str>, page: i32, n_pages: i32)
 
 @:base(ctx, i18n!(ctx.1, "Users"), {}, {}, {
-    <h1>@i18n!(ctx.1, "Users")</h1>
-
-    @tabs(&[
-        (&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), false),
-        (&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), false),
-        (&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), true),
-        (&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), false)
-    ])
+    @:admin_header(ctx, "Users", 3))
 
     <form method="get" action="@uri!(instance::admin_search_users: page = _, user = user.unwrap_or_default())">
         <header>

templates/posts/details.rs.html

@@ -124,7 +124,7 @@
             </section>
         }
         <section class="banner">
-            <div class="flex p-author h-card user" dir="auto">
+            <div class="flex wrap p-author h-card user" dir="auto">
                 @avatar(ctx.0, &author, Size::Medium, true, ctx.1)
                 <div class="grow">
                     <h2 class="p-name">