Rename to Fedimovies

Cargo.lock

@@ -930,6 +930,121 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fedimovies"
+version = "1.22.0"
+dependencies = [
+ "actix-cors",
+ "actix-files",
+ "actix-web",
+ "actix-web-httpauth",
+ "anyhow",
+ "base64 0.13.1",
+ "blake2",
+ "chrono",
+ "ed25519",
+ "ed25519-dalek",
+ "env_logger",
+ "fedimovies-config",
+ "fedimovies-models",
+ "fedimovies-utils",
+ "hex",
+ "log",
+ "num_cpus",
+ "regex",
+ "reqwest",
+ "rsa",
+ "serde",
+ "serde_json",
+ "serial_test",
+ "sha2 0.9.9",
+ "siwe",
+ "thiserror",
+ "tokio",
+ "url 2.3.1",
+ "uuid",
+]
+
+[[package]]
+name = "fedimovies-cli"
+version = "1.22.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "fedimovies",
+ "fedimovies-config",
+ "fedimovies-models",
+ "fedimovies-utils",
+ "log",
+ "tokio",
+ "uuid",
+]
+
+[[package]]
+name = "fedimovies-config"
+version = "1.22.0"
+dependencies = [
+ "dotenv",
+ "fedimovies-utils",
+ "log",
+ "regex",
+ "rsa",
+ "serde",
+ "serde_yaml",
+ "thiserror",
+ "url 2.3.1",
+]
+
+[[package]]
+name = "fedimovies-models"
+version = "1.22.0"
+dependencies = [
+ "chrono",
+ "deadpool",
+ "deadpool-postgres",
+ "fedimovies-utils",
+ "hex",
+ "log",
+ "postgres-protocol",
+ "postgres-types",
+ "postgres_query",
+ "postgres_query_macro",
+ "refinery",
+ "serde",
+ "serde_json",
+ "serial_test",
+ "thiserror",
+ "tokio",
+ "tokio-postgres",
+ "uuid",
+]
+
+[[package]]
+name = "fedimovies-utils"
+version = "1.22.0"
+dependencies = [
+ "ammonia",
+ "base64 0.13.1",
+ "bs58",
+ "chrono",
+ "comrak",
+ "mime-sniffer",
+ "mime_guess",
+ "pem",
+ "rand 0.8.5",
+ "regex",
+ "rsa",
+ "rust-argon2",
+ "serde",
+ "serde_jcs",
+ "serde_json",
+ "sha2 0.9.9",
+ "thiserror",
+ "ulid",
+ "url 2.3.1",
+ "uuid",
+]
+
 [[package]]
 name = "ff"
 version = "0.10.1"
@@ -1608,121 +1723,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "mitra"
-version = "1.22.0"
-dependencies = [
- "actix-cors",
- "actix-files",
- "actix-web",
- "actix-web-httpauth",
- "anyhow",
- "base64 0.13.1",
- "blake2",
- "chrono",
- "ed25519",
- "ed25519-dalek",
- "env_logger",
- "hex",
- "log",
- "mitra-config",
- "mitra-models",
- "mitra-utils",
- "num_cpus",
- "regex",
- "reqwest",
- "rsa",
- "serde",
- "serde_json",
- "serial_test",
- "sha2 0.9.9",
- "siwe",
- "thiserror",
- "tokio",
- "url 2.3.1",
- "uuid",
-]
-
-[[package]]
-name = "mitra-cli"
-version = "1.22.0"
-dependencies = [
- "anyhow",
- "clap",
- "log",
- "mitra",
- "mitra-config",
- "mitra-models",
- "mitra-utils",
- "tokio",
- "uuid",
-]
-
-[[package]]
-name = "mitra-config"
-version = "1.22.0"
-dependencies = [
- "dotenv",
- "log",
- "mitra-utils",
- "regex",
- "rsa",
- "serde",
- "serde_yaml",
- "thiserror",
- "url 2.3.1",
-]
-
-[[package]]
-name = "mitra-models"
-version = "1.22.0"
-dependencies = [
- "chrono",
- "deadpool",
- "deadpool-postgres",
- "hex",
- "log",
- "mitra-utils",
- "postgres-protocol",
- "postgres-types",
- "postgres_query",
- "postgres_query_macro",
- "refinery",
- "serde",
- "serde_json",
- "serial_test",
- "thiserror",
- "tokio",
- "tokio-postgres",
- "uuid",
-]
-
-[[package]]
-name = "mitra-utils"
-version = "1.22.0"
-dependencies = [
- "ammonia",
- "base64 0.13.1",
- "bs58",
- "chrono",
- "comrak",
- "mime-sniffer",
- "mime_guess",
- "pem",
- "rand 0.8.5",
- "regex",
- "rsa",
- "rust-argon2",
- "serde",
- "serde_jcs",
- "serde_json",
- "sha2 0.9.9",
- "thiserror",
- "ulid",
- "url 2.3.1",
- "uuid",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.11"

Cargo.toml

@@ -1,34 +1,34 @@
 [package]
-name = "mitra"
+name = "fedimovies"
 version = "1.22.0"
-description = "Federated micro-blogging platform and content subscription service"
+description = "Movies reviews and ratings for the fediverse"
 license = "AGPL-3.0"
 
 edition = "2021"
 rust-version = "1.68"
 publish = false
-default-run = "mitra"
+default-run = "fedimovies"
 
 [workspace]
 members = [
   ".",
-  "mitra-cli",
-  "mitra-config",
-  "mitra-models",
-  "mitra-utils",
+  "fedimovies-cli",
+  "fedimovies-config",
+  "fedimovies-models",
+  "fedimovies-utils",
 ]
 default-members = [
   ".",
-  "mitra-cli",
-  "mitra-config",
-  "mitra-models",
-  "mitra-utils",
+  "fedimovies-cli",
+  "fedimovies-config",
+  "fedimovies-models",
+  "fedimovies-utils",
 ]
 
 [dependencies]
-mitra-config = { path = "mitra-config" }
-mitra-models = { path = "mitra-models" }
-mitra-utils = { path = "mitra-utils" }
+fedimovies-config = { path = "fedimovies-config" }
+fedimovies-models = { path = "fedimovies-models" }
+fedimovies-utils = { path = "fedimovies-utils" }
 
 # Used to handle incoming HTTP requests
 actix-cors = "0.6.4"
@@ -75,11 +75,11 @@ url = "2.2.2"
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 
 [dev-dependencies]
-mitra-config = { path = "mitra-config", features = ["test-utils"] }
-mitra-models = { path = "mitra-models", features = ["test-utils"] }
-mitra-utils = { path = "mitra-utils", features = ["test-utils"] }
+fedimovies-config = { path = "fedimovies-config", features = ["test-utils"] }
+fedimovies-models = { path = "fedimovies-models", features = ["test-utils"] }
+fedimovies-utils = { path = "fedimovies-utils", features = ["test-utils"] }
 
 serial_test = "0.7.0"
 
 [features]
-production = ["mitra-config/production"]
+production = ["fedimovies-config/production"]

fedimovies-cli/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "mitra-cli"
+name = "fedimovies-cli"
 version = "1.22.0"
 license = "AGPL-3.0"
 edition = "2021"
@@ -10,10 +10,10 @@ name = "mitractl"
 path = "src/main.rs"
 
 [dependencies]
-mitra-config = { path = "../mitra-config" }
-mitra-models = { path = "../mitra-models" }
-mitra-utils = { path = "../mitra-utils" }
-mitra = { path = ".." }
+fedimovies-config = { path = "../fedimovies-config" }
+fedimovies-models = { path = "../fedimovies-models" }
+fedimovies-utils = { path = "../fedimovies-utils" }
+fedimovies = { path = ".." }
 
 # Used for catching errors
 anyhow = "1.0.58"

fedimovies-cli/src/cli.rs

@@ -2,16 +2,16 @@ use anyhow::Error;
 use clap::Parser;
 use uuid::Uuid;
 
-use mitra::activitypub::{
+use fedimovies::activitypub::{
     actors::helpers::update_remote_profile, builders::delete_note::prepare_delete_note,
     builders::delete_person::prepare_delete_person, fetcher::fetchers::fetch_actor,
     fetcher::helpers::import_from_outbox,
 };
-use mitra::admin::roles::{role_from_str, ALLOWED_ROLES};
-use mitra::media::{remove_files, remove_media, MediaStorage};
-use mitra::validators::{emojis::EMOJI_LOCAL_MAX_SIZE, users::validate_local_username};
-use mitra_config::Config;
-use mitra_models::{
+use fedimovies::admin::roles::{role_from_str, ALLOWED_ROLES};
+use fedimovies::media::{remove_files, remove_media, MediaStorage};
+use fedimovies::validators::{emojis::EMOJI_LOCAL_MAX_SIZE, users::validate_local_username};
+use fedimovies_config::Config;
+use fedimovies_models::{
     attachments::queries::delete_unused_attachments,
     cleanup::find_orphaned_files,
     database::DatabaseClient,
@@ -32,7 +32,7 @@ use mitra_models::{
     },
     users::types::UserCreateData,
 };
-use mitra_utils::{
+use fedimovies_utils::{
     crypto_rsa::{generate_rsa_key, serialize_private_key},
     datetime::{days_before_now, get_min_datetime},
     passwords::hash_password,

fedimovies-cli/src/main.rs

@@ -1,9 +1,9 @@
 use clap::Parser;
 
-use mitra::logger::configure_logger;
-use mitra_config::parse_config;
-use mitra_models::database::create_database_client;
-use mitra_models::database::migrate::apply_migrations;
+use fedimovies::logger::configure_logger;
+use fedimovies_config::parse_config;
+use fedimovies_models::database::create_database_client;
+use fedimovies_models::database::migrate::apply_migrations;
 
 mod cli;
 use cli::{Opts, SubCommand};

fedimovies-config/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "mitra-config"
+name = "fedimovies-config"
 version = "1.22.0"
 license = "AGPL-3.0"
 edition = "2021"
 rust-version = "1.68"
 
 [dependencies]
-mitra-utils = { path = "../mitra-utils" }
+fedimovies-utils = { path = "../fedimovies-utils" }
 
 # Used to read .env files
 dotenv = "0.15.0"

fedimovies-config/src/config.rs

@@ -5,7 +5,7 @@ use rsa::RsaPrivateKey;
 use serde::Deserialize;
 use url::Url;
 
-use mitra_utils::urls::normalize_url;
+use fedimovies_utils::urls::normalize_url;
 
 use super::environment::Environment;
 use super::federation::FederationConfig;
@@ -156,7 +156,7 @@ impl Instance {
 #[cfg(feature = "test-utils")]
 impl Instance {
     pub fn for_test(url: &str) -> Self {
-        use mitra_utils::crypto_rsa::generate_weak_rsa_key;
+        use fedimovies_utils::crypto_rsa::generate_weak_rsa_key;
         Self {
             _url: Url::parse(url).unwrap(),
             actor_key: generate_weak_rsa_key().unwrap(),
@@ -173,7 +173,7 @@ impl Instance {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use mitra_utils::crypto_rsa::generate_weak_rsa_key;
+    use fedimovies_utils::crypto_rsa::generate_weak_rsa_key;
 
     #[test]
     fn test_instance_url_https_dns() {

fedimovies-config/src/loader.rs

@@ -4,7 +4,7 @@ use std::str::FromStr;
 
 use rsa::RsaPrivateKey;
 
-use mitra_utils::{
+use fedimovies_utils::{
     crypto_rsa::{deserialize_private_key, generate_rsa_key, serialize_private_key},
     files::{set_file_permissions, write_file},
 };
@@ -19,7 +19,7 @@ struct EnvConfig {
 }
 
 #[cfg(feature = "production")]
-const DEFAULT_CONFIG_PATH: &str = "/etc/mitra/config.yaml";
+const DEFAULT_CONFIG_PATH: &str = "/etc/fedimovies/config.yaml";
 #[cfg(not(feature = "production"))]
 const DEFAULT_CONFIG_PATH: &str = "config.yaml";
 

fedimovies-models/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "mitra-models"
+name = "fedimovies-models"
 version = "1.22.0"
 license = "AGPL-3.0"
 edition = "2021"
 rust-version = "1.68"
 
 [dependencies]
-mitra-utils = { path = "../mitra-utils" }
+fedimovies-utils = { path = "../fedimovies-utils" }
 
 # Used for working with dates
 chrono = { version = "0.4.23", default-features = false, features = ["std", "serde"] }
@@ -37,7 +37,7 @@ postgres_query_macro = { git = "https://github.com/nolanderc/rust-postgres-query
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 
 [dev-dependencies]
-mitra-utils = { path = "../mitra-utils", features = ["test-utils"] }
+fedimovies-utils = { path = "../fedimovies-utils", features = ["test-utils"] }
 
 serial_test = "0.7.0"
 

fedimovies-models/src/attachments/queries.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use uuid::Uuid;
 
-use mitra_utils::id::generate_ulid;
+use fedimovies_utils::id::generate_ulid;
 
 use crate::cleanup::{find_orphaned_files, find_orphaned_ipfs_objects, DeletionQueue};
 use crate::database::{DatabaseClient, DatabaseError};

fedimovies-models/src/database/test_utils.rs

@@ -3,7 +3,7 @@ use super::migrate::apply_migrations;
 use tokio_postgres::config::Config;
 use tokio_postgres::Client;
 
-const DEFAULT_CONNECTION_URL: &str = "postgres://mitra:mitra@127.0.0.1:55432/mitra-test";
+const DEFAULT_CONNECTION_URL: &str = "postgres://fedimovies:fedimovies@127.0.0.1:55432/fedimovies-test";
 
 pub async fn create_test_database() -> Client {
     let connection_url =

fedimovies-models/src/emojis/queries.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use uuid::Uuid;
 
-use mitra_utils::id::generate_ulid;
+use fedimovies_utils::id::generate_ulid;
 
 use crate::cleanup::{find_orphaned_files, DeletionQueue};
 use crate::database::{catch_unique_violation, DatabaseClient, DatabaseError};

fedimovies-models/src/invoices/queries.rs

@@ -1,6 +1,6 @@
 use uuid::Uuid;
 
-use mitra_utils::{caip2::ChainId, id::generate_ulid};
+use fedimovies_utils::{caip2::ChainId, id::generate_ulid};
 
 use crate::database::{catch_unique_violation, DatabaseClient, DatabaseError};
 

fedimovies-models/src/invoices/types.rs

@@ -3,7 +3,7 @@ use postgres_protocol::types::{text_from_sql, text_to_sql};
 use postgres_types::{accepts, private::BytesMut, to_sql_checked, FromSql, IsNull, ToSql, Type};
 use uuid::Uuid;
 
-use mitra_utils::caip2::ChainId;
+use fedimovies_utils::caip2::ChainId;
 
 use crate::database::{
     int_enum::{int_enum_from_sql, int_enum_to_sql},

fedimovies-models/src/notifications/queries.rs

@@ -263,7 +263,7 @@ pub async fn get_mention_notifications(
             ],
         )
         .await?;
-    let mut notifications: Vec<Notification> = rows
+    let notifications: Vec<Notification> = rows
         .iter()
         .map(Notification::try_from)
         .collect::<Result<_, _>>()?;