diff --git a/Cargo.lock b/Cargo.lock index 831f33d..92b6bab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2048,14 +2048,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "migration" -version = "0.1.0" -dependencies = [ - "async-std", - "sea-orm-migration", -] - [[package]] name = "mime" version = "0.3.17" @@ -3046,13 +3038,13 @@ dependencies = [ "futures-util", "image", "itertools 0.14.0", - "migration", "mime_guess", "password-auth", "pulldown-cmark", "rand 0.9.0", "rss", "rust-embed", + "samey-migration", "sea-orm", "serde", "serde_json", @@ -3063,6 +3055,14 @@ dependencies = [ "tower-sessions", ] +[[package]] +name = "samey-migration" +version = "0.1.0" +dependencies = [ + "async-std", + "sea-orm-migration", +] + [[package]] name = "scopeguard" version = "1.2.0" diff --git a/Cargo.toml b/Cargo.toml index ff273f5..4786c02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,9 +6,13 @@ rust-version = "1.85" license = "MIT" authors = ["Bad Manners "] readme = "README.md" +keywords = ["booru", "image-board", "gallery"] +categories = ["web-programming"] +description = "Sam's small image board" +repository = "https://github.com/BadMannersXYZ/samey" [workspace] -members = [".", "migration"] +members = ["migration"] [dependencies] askama = { version = "0.13.0", features = ["serde_json"] } @@ -21,7 +25,7 @@ clap = "4.5.35" futures-util = "0.3.31" image = "0.25.6" itertools = "0.14.0" -migration = { path = "migration" } +samey-migration = { path = "./migration", version = "0.1.0" } mime_guess = "2.0.5" password-auth = "1.0.0" pulldown-cmark = "0.13.0" diff --git a/README.md b/README.md index e445a16..a572284 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,13 @@ Still very much an early WIP. ### Known issues -- No way to close tag autocompletion on mobile +- No way to close tag autocompletion on mobile. ### Roadmap - [ ] Logging and improved error handling - [ ] Lossless compression +- [ ] Post selection - [ ] Caching - [ ] Text media - [ ] Improve CSS diff --git a/migration/Cargo.toml b/migration/Cargo.toml index cc2fe11..621dbd2 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -1,16 +1,19 @@ [package] -name = "migration" +name = "samey-migration" version = "0.1.0" -edition = "2021" -publish = false - -[lib] -name = "migration" -path = "src/lib.rs" +edition = "2024" +rust-version = "1.85" +license = "MIT" +authors = ["Bad Manners "] +readme = "README.md" +keywords = ["booru", "image-board", "gallery"] +categories = ["web-programming"] +description = "Migrations for Samey, Sam's small image board" +repository = "https://github.com/BadMannersXYZ/samey" [dependencies] -async-std = { version = "1", features = ["attributes", "tokio1"] } - -[dependencies.sea-orm-migration] -version = "1.1.8" -features = ["sqlx-sqlite", "runtime-tokio-rustls"] +async-std = { version = "1.13.1", features = ["attributes", "tokio1"] } +sea-orm-migration = { version = "1.1.8", features = [ + "sqlx-sqlite", + "runtime-tokio-rustls", +] } diff --git a/migration/src/main.rs b/migration/src/main.rs index c6b6e48..7c1e85c 100644 --- a/migration/src/main.rs +++ b/migration/src/main.rs @@ -2,5 +2,5 @@ use sea_orm_migration::prelude::*; #[async_std::main] async fn main() { - cli::run_cli(migration::Migrator).await; + cli::run_cli(samey_migration::Migrator).await; } diff --git a/src/auth.rs b/src/auth.rs index 975b075..dd1e034 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -1,8 +1,8 @@ use std::fmt::Debug; use axum_login::{AuthUser, AuthnBackend, UserId}; -use migration::Expr; use password_auth::verify_password; +use samey_migration::Expr; use sea_orm::{ActiveValue::Set, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter}; use serde::Deserialize; use time::OffsetDateTime; diff --git a/src/main.rs b/src/main.rs index cd5e95c..11ee87b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,8 +4,8 @@ use std::{ }; use clap::{Parser, Subcommand}; -use migration::{Migrator, MigratorTrait}; use samey::{create_user, get_router}; +use samey_migration::{Migrator, MigratorTrait}; use sea_orm::Database; #[derive(Parser)] diff --git a/src/query.rs b/src/query.rs index aad4521..21034b3 100644 --- a/src/query.rs +++ b/src/query.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; use chrono::NaiveDateTime; -use migration::{Expr, Query}; +use samey_migration::{Expr, Query}; use sea_orm::{ ColumnTrait, Condition, DatabaseConnection, EntityTrait, FromQueryResult, IntoSimpleExpr, QueryFilter, QueryOrder, QuerySelect, RelationTrait, Select, SelectColumns, SelectModel, diff --git a/src/views.rs b/src/views.rs index c8dd989..3ff886e 100644 --- a/src/views.rs +++ b/src/views.rs @@ -17,8 +17,8 @@ use axum_extra::extract::Form; use chrono::Utc; use image::{GenericImageView, ImageFormat, ImageReader}; use itertools::Itertools; -use migration::{Expr, OnConflict, Query as MigrationQuery}; use rand::Rng; +use samey_migration::{Expr, OnConflict, Query as MigrationQuery}; use sea_orm::{ ActiveValue::Set, ColumnTrait, Condition, EntityTrait, FromQueryResult, IntoSimpleExpr, ModelTrait, PaginatorTrait, QueryFilter, QuerySelect,