mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-15 20:00: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
128 lines
3.4 KiB
Rust
128 lines
3.4 KiB
Rust
use crate::{
|
|
schema::{community, community_follower, community_moderator, community_user_ban},
|
|
DbUrl,
|
|
};
|
|
use serde::Serialize;
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "community"]
|
|
pub struct Community {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub title: String,
|
|
pub description: Option<String>,
|
|
pub creator_id: i32,
|
|
pub removed: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: bool,
|
|
pub nsfw: bool,
|
|
pub actor_id: DbUrl,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: chrono::NaiveDateTime,
|
|
pub icon: Option<DbUrl>,
|
|
pub banner: Option<DbUrl>,
|
|
pub followers_url: DbUrl,
|
|
pub inbox_url: DbUrl,
|
|
pub shared_inbox_url: Option<DbUrl>,
|
|
}
|
|
|
|
/// A safe representation of community, without the sensitive info
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
|
|
#[table_name = "community"]
|
|
pub struct CommunitySafe {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub title: String,
|
|
pub description: Option<String>,
|
|
pub creator_id: i32,
|
|
pub removed: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: bool,
|
|
pub nsfw: bool,
|
|
pub actor_id: DbUrl,
|
|
pub local: bool,
|
|
pub icon: Option<DbUrl>,
|
|
pub banner: Option<DbUrl>,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Debug)]
|
|
#[table_name = "community"]
|
|
pub struct CommunityForm {
|
|
pub name: String,
|
|
pub title: String,
|
|
pub description: Option<String>,
|
|
pub creator_id: i32,
|
|
pub removed: Option<bool>,
|
|
pub published: Option<chrono::NaiveDateTime>,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: Option<bool>,
|
|
pub nsfw: bool,
|
|
pub actor_id: Option<DbUrl>,
|
|
pub local: bool,
|
|
pub private_key: Option<String>,
|
|
pub public_key: Option<String>,
|
|
pub last_refreshed_at: Option<chrono::NaiveDateTime>,
|
|
pub icon: Option<Option<DbUrl>>,
|
|
pub banner: Option<Option<DbUrl>>,
|
|
pub followers_url: Option<DbUrl>,
|
|
pub inbox_url: Option<DbUrl>,
|
|
pub shared_inbox_url: Option<Option<DbUrl>>,
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Community)]
|
|
#[table_name = "community_moderator"]
|
|
pub struct CommunityModerator {
|
|
pub id: i32,
|
|
pub community_id: i32,
|
|
pub user_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "community_moderator"]
|
|
pub struct CommunityModeratorForm {
|
|
pub community_id: i32,
|
|
pub user_id: i32,
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Community)]
|
|
#[table_name = "community_user_ban"]
|
|
pub struct CommunityUserBan {
|
|
pub id: i32,
|
|
pub community_id: i32,
|
|
pub user_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "community_user_ban"]
|
|
pub struct CommunityUserBanForm {
|
|
pub community_id: i32,
|
|
pub user_id: i32,
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Community)]
|
|
#[table_name = "community_follower"]
|
|
pub struct CommunityFollower {
|
|
pub id: i32,
|
|
pub community_id: i32,
|
|
pub user_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub pending: Option<bool>,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "community_follower"]
|
|
pub struct CommunityFollowerForm {
|
|
pub community_id: i32,
|
|
pub user_id: i32,
|
|
pub pending: bool,
|
|
}
|