mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-16 01:14:02 +00:00
c883a49a40
* First pass at invite-only migration. * Implement email verification (fixes #219) * remove unwrap * Adding views and functionality to registration application. #209 * Add private instance site column, and back end checks. * Adding some message fields to LoginResponse * Adding private instance to site setup. * A few additions: - Add a DeleteAccount response. - RegistrationApplicationView now has the safe LocalUserSettings. - Adding VerifyEmail to websocket API, added a proper response type. * Adding and reorganizing some email helpers. * A few fixes for private sites: - Added a check_registration_application function. - Only send a verification email if its been changed. - VerifyEmail now returns LoginResponse. - Deleting the old tokens after a successful email verify. - If port is missing on email config, display a better error message. * Version 0.15.0-rc.3 * Adding published to email_verification table. * Adding fixes from comments. * Version 0.15.0-rc.4 * Adding modlog private site check. * Version 0.15.0-rc.6 Co-authored-by: Felix Ableitner <me@nutomic.com>
73 lines
2.2 KiB
Rust
73 lines
2.2 KiB
Rust
use crate::{
|
|
newtypes::{LocalUserId, PersonId},
|
|
schema::local_user,
|
|
};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
#[table_name = "local_user"]
|
|
pub struct LocalUser {
|
|
pub id: LocalUserId,
|
|
pub person_id: PersonId,
|
|
pub password_encrypted: String,
|
|
pub email: Option<String>,
|
|
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 validator_time: chrono::NaiveDateTime,
|
|
pub show_bot_accounts: bool,
|
|
pub show_scores: bool,
|
|
pub show_read_posts: bool,
|
|
pub show_new_post_notifs: bool,
|
|
pub email_verified: bool,
|
|
pub accepted_application: bool,
|
|
}
|
|
|
|
// TODO redo these, check table defaults
|
|
#[derive(Insertable, AsChangeset, Clone, Default)]
|
|
#[table_name = "local_user"]
|
|
pub struct LocalUserForm {
|
|
pub person_id: Option<PersonId>,
|
|
pub password_encrypted: Option<String>,
|
|
pub email: Option<Option<String>>,
|
|
pub show_nsfw: Option<bool>,
|
|
pub theme: Option<String>,
|
|
pub default_sort_type: Option<i16>,
|
|
pub default_listing_type: Option<i16>,
|
|
pub lang: Option<String>,
|
|
pub show_avatars: Option<bool>,
|
|
pub send_notifications_to_email: Option<bool>,
|
|
pub show_bot_accounts: Option<bool>,
|
|
pub show_scores: Option<bool>,
|
|
pub show_read_posts: Option<bool>,
|
|
pub show_new_post_notifs: Option<bool>,
|
|
pub email_verified: Option<bool>,
|
|
pub accepted_application: Option<bool>,
|
|
}
|
|
|
|
/// A local user view that removes password encrypted
|
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
#[table_name = "local_user"]
|
|
pub struct LocalUserSettings {
|
|
pub id: LocalUserId,
|
|
pub person_id: PersonId,
|
|
pub email: Option<String>,
|
|
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 validator_time: chrono::NaiveDateTime,
|
|
pub show_bot_accounts: bool,
|
|
pub show_scores: bool,
|
|
pub show_read_posts: bool,
|
|
pub show_new_post_notifs: bool,
|
|
pub email_verified: bool,
|
|
pub accepted_application: bool,
|
|
}
|