mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-28 10:10:33 +00:00
e78ba38e94
* Use URL type in most outstanding struct fields This fixes all known remaining cases where url fields are stored as plain strings, with the exception of form fields where empty strings are used as sentinels (see `diesel_option_overwrite_to_url`). Tested for regressions in the federated docker setup attempting to exercise all changed fields, including through apub federation. Fixes #1385 * Add migration to fix blank-string post.url values to be null This also then fixes #602 * Address review feedback - Fixed some unwraps and err message formatting - Bumped the `url` library to 2.2.1 to fix a bug with serde error messages - Add unit tests for the two diesel option override functions - Fix migration teardown by adding a no-op * Rename lemmy_db_queries::Url to lemmy_db_queries::DbUrl * fix compile error * box PostOrComment variants
34 lines
996 B
Rust
34 lines
996 B
Rust
use crate::{schema::site, DbUrl};
|
|
use serde::Serialize;
|
|
|
|
#[derive(Queryable, Identifiable, PartialEq, Debug, Clone, Serialize)]
|
|
#[table_name = "site"]
|
|
pub struct Site {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub description: Option<String>,
|
|
pub creator_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub enable_downvotes: bool,
|
|
pub open_registration: bool,
|
|
pub enable_nsfw: bool,
|
|
pub icon: Option<DbUrl>,
|
|
pub banner: Option<DbUrl>,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset)]
|
|
#[table_name = "site"]
|
|
pub struct SiteForm {
|
|
pub name: String,
|
|
pub description: Option<String>,
|
|
pub creator_id: i32,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub enable_downvotes: bool,
|
|
pub open_registration: bool,
|
|
pub enable_nsfw: bool,
|
|
// when you want to null out a column, you have to send Some(None)), since sending None means you just don't want to update that column.
|
|
pub icon: Option<Option<DbUrl>>,
|
|
pub banner: Option<Option<DbUrl>>,
|
|
}
|