mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 21:49:22 +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
221 lines
6.1 KiB
Rust
221 lines
6.1 KiB
Rust
use crate::{
|
|
schema::{user_, user_alias_1, user_alias_2},
|
|
DbUrl,
|
|
};
|
|
use serde::Serialize;
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_"]
|
|
pub struct User_ {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub password_encrypted: String,
|
|
pub email: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub show_nsfw: bool,
|
|
pub theme: String,
|
|
pub default_sort_type: i16,
|
|
pub default_listing_type: i16,
|
|
pub lang: String,
|
|
pub show_avatars: bool,
|
|
pub send_notifications_to_email: bool,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: chrono::NaiveDateTime,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
pub inbox_url: DbUrl,
|
|
pub shared_inbox_url: Option<DbUrl>,
|
|
}
|
|
|
|
/// A safe representation of user, without the sensitive info
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_"]
|
|
pub struct UserSafe {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
pub inbox_url: DbUrl,
|
|
pub shared_inbox_url: Option<DbUrl>,
|
|
}
|
|
|
|
/// A safe user view with only settings
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_"]
|
|
pub struct UserSafeSettings {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub email: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub show_nsfw: bool,
|
|
pub theme: String,
|
|
pub default_sort_type: i16,
|
|
pub default_listing_type: i16,
|
|
pub lang: String,
|
|
pub show_avatars: bool,
|
|
pub send_notifications_to_email: bool,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub last_refreshed_at: chrono::NaiveDateTime,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
}
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_alias_1"]
|
|
pub struct UserAlias1 {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub password_encrypted: String,
|
|
pub email: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub show_nsfw: bool,
|
|
pub theme: String,
|
|
pub default_sort_type: i16,
|
|
pub default_listing_type: i16,
|
|
pub lang: String,
|
|
pub show_avatars: bool,
|
|
pub send_notifications_to_email: bool,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: chrono::NaiveDateTime,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
}
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_alias_1"]
|
|
pub struct UserSafeAlias1 {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
}
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_alias_2"]
|
|
pub struct UserAlias2 {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub password_encrypted: String,
|
|
pub email: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub show_nsfw: bool,
|
|
pub theme: String,
|
|
pub default_sort_type: i16,
|
|
pub default_listing_type: i16,
|
|
pub lang: String,
|
|
pub show_avatars: bool,
|
|
pub send_notifications_to_email: bool,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: chrono::NaiveDateTime,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
}
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "user_alias_2"]
|
|
pub struct UserSafeAlias2 {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub preferred_username: Option<String>,
|
|
pub avatar: Option<DbUrl>,
|
|
pub admin: bool,
|
|
pub banned: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub matrix_user_id: Option<String>,
|
|
pub actor_id: DbUrl,
|
|
pub bio: Option<String>,
|
|
pub local: bool,
|
|
pub banner: Option<DbUrl>,
|
|
pub deleted: bool,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "user_"]
|
|
pub struct UserForm {
|
|
pub name: String,
|
|
pub preferred_username: Option<Option<String>>,
|
|
pub password_encrypted: String,
|
|
pub admin: bool,
|
|
pub banned: Option<bool>,
|
|
pub email: Option<Option<String>>,
|
|
pub avatar: Option<Option<DbUrl>>,
|
|
pub published: Option<chrono::NaiveDateTime>,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub show_nsfw: bool,
|
|
pub theme: String,
|
|
pub default_sort_type: i16,
|
|
pub default_listing_type: i16,
|
|
pub lang: String,
|
|
pub show_avatars: bool,
|
|
pub send_notifications_to_email: bool,
|
|
pub matrix_user_id: Option<Option<String>>,
|
|
pub actor_id: Option<DbUrl>,
|
|
pub bio: Option<Option<String>>,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: Option<chrono::NaiveDateTime>,
|
|
pub banner: Option<Option<DbUrl>>,
|
|
pub inbox_url: Option<DbUrl>,
|
|
pub shared_inbox_url: Option<Option<DbUrl>>,
|
|
}
|