mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-29 07:08:05 +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>
128 lines
3.2 KiB
Rust
128 lines
3.2 KiB
Rust
use diesel::{
|
|
backend::Backend,
|
|
deserialize::FromSql,
|
|
serialize::{Output, ToSql},
|
|
sql_types::Text,
|
|
};
|
|
use lemmy_apub_lib::{object_id::ObjectId, traits::ApubObject};
|
|
use serde::{Deserialize, Serialize};
|
|
use std::{
|
|
fmt,
|
|
fmt::{Display, Formatter},
|
|
io::Write,
|
|
};
|
|
use url::Url;
|
|
|
|
#[derive(
|
|
Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize, DieselNewType,
|
|
)]
|
|
pub struct PostId(pub i32);
|
|
|
|
impl fmt::Display for PostId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(
|
|
Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize, DieselNewType,
|
|
)]
|
|
pub struct PersonId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct CommentId(pub i32);
|
|
|
|
impl fmt::Display for CommentId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(
|
|
Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize, DieselNewType,
|
|
)]
|
|
pub struct CommunityId(pub i32);
|
|
|
|
#[derive(
|
|
Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize, DieselNewType,
|
|
)]
|
|
pub struct LocalUserId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct PrivateMessageId(i32);
|
|
|
|
impl fmt::Display for PrivateMessageId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct PersonMentionId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct PersonBlockId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct CommunityBlockId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct CommentReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
|
|
pub struct PostReportId(i32);
|
|
|
|
#[repr(transparent)]
|
|
#[derive(Clone, PartialEq, Serialize, Deserialize, Debug, AsExpression, FromSqlRow)]
|
|
#[sql_type = "Text"]
|
|
pub struct DbUrl(Url);
|
|
|
|
impl<DB: Backend> ToSql<Text, DB> for DbUrl
|
|
where
|
|
String: ToSql<Text, DB>,
|
|
{
|
|
fn to_sql<W: Write>(&self, out: &mut Output<W, DB>) -> diesel::serialize::Result {
|
|
self.0.to_string().to_sql(out)
|
|
}
|
|
}
|
|
|
|
impl<DB: Backend> FromSql<Text, DB> for DbUrl
|
|
where
|
|
String: FromSql<Text, DB>,
|
|
{
|
|
fn from_sql(bytes: Option<&DB::RawValue>) -> diesel::deserialize::Result<Self> {
|
|
let str = String::from_sql(bytes)?;
|
|
Ok(DbUrl(Url::parse(&str)?))
|
|
}
|
|
}
|
|
|
|
impl Display for DbUrl {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
self.to_owned().0.fmt(f)
|
|
}
|
|
}
|
|
|
|
// the project doesnt compile with From
|
|
#[allow(clippy::from_over_into)]
|
|
impl Into<DbUrl> for Url {
|
|
fn into(self) -> DbUrl {
|
|
DbUrl(self)
|
|
}
|
|
}
|
|
#[allow(clippy::from_over_into)]
|
|
impl Into<Url> for DbUrl {
|
|
fn into(self) -> Url {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl<Kind> From<ObjectId<Kind>> for DbUrl
|
|
where
|
|
Kind: ApubObject + Send + 'static,
|
|
for<'de2> <Kind as ApubObject>::ApubType: serde::Deserialize<'de2>,
|
|
{
|
|
fn from(id: ObjectId<Kind>) -> Self {
|
|
DbUrl(id.into())
|
|
}
|
|
}
|