-use crate::{captcha_espeak_wav_base64, Perform};
+use crate::{captcha_as_wav_base64, Perform};
use actix_web::web::Data;
-use anyhow::Context;
use bcrypt::verify;
use captcha::{gen, Difficulty};
use chrono::Duration;
use lemmy_api_common::{
blocking,
- collect_moderated_communities,
- community::{GetFollowedCommunities, GetFollowedCommunitiesResponse},
+ check_registration_application,
get_local_user_view_from_jwt,
is_admin,
password_length_check,
person::*,
+ remove_user_data,
+ send_email_verification_success,
+ send_password_reset_email,
+ send_verification_email,
};
-use lemmy_db_queries::{
- diesel_option_overwrite,
- diesel_option_overwrite_to_url,
- source::{
- comment::Comment_,
- community::Community_,
- local_user::LocalUser_,
- password_reset_request::PasswordResetRequest_,
- person::Person_,
- person_mention::PersonMention_,
- post::Post_,
- private_message::PrivateMessage_,
- },
- Crud,
- SortType,
+use lemmy_apub::{
+ activities::block::SiteOrCommunity,
+ protocol::activities::block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
};
use lemmy_db_schema::{
+ diesel_option_overwrite,
+ diesel_option_overwrite_to_url,
+ from_opt_str_to_opt_enum,
naive_now,
source::{
comment::Comment,
- community::*,
+ email_verification::EmailVerification,
local_user::{LocalUser, LocalUserForm},
moderator::*,
password_reset_request::*,
person::*,
+ person_block::{PersonBlock, PersonBlockForm},
person_mention::*,
- post::Post,
private_message::PrivateMessage,
site::*,
},
+ traits::{Blockable, Crud},
+ SortType,
};
use lemmy_db_views::{
comment_report_view::CommentReportView,
- comment_view::CommentQueryBuilder,
+ comment_view::{CommentQueryBuilder, CommentView},
local_user_view::LocalUserView,
post_report_view::PostReportView,
+ private_message_view::PrivateMessageView,
};
use lemmy_db_views_actor::{
- community_follower_view::CommunityFollowerView,
person_mention_view::{PersonMentionQueryBuilder, PersonMentionView},
person_view::PersonViewSafe,
};
use lemmy_utils::{
claims::Claims,
- email::send_email,
- location_info,
- settings::structs::Settings,
- utils::{generate_random_string, is_valid_preferred_username, naive_from_unix},
- ApiError,
+ utils::{is_valid_display_name, is_valid_matrix_id, naive_from_unix},
ConnectionId,
LemmyError,
};
use lemmy_websocket::{
- messages::{CaptchaItem, SendAllMessage, SendUserRoomMessage},
+ messages::{CaptchaItem, SendAllMessage},
LemmyContext,
UserOperation,
};
-use std::str::FromStr;
#[async_trait::async_trait(?Send)]
impl Perform for Login {
type Response = LoginResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<LoginResponse, LemmyError> {
- let data: &Login = &self;
+ let data: &Login = self;
// Fetch that username / email
let username_or_email = data.username_or_email.clone();
- let local_user_view = match blocking(context.pool(), move |conn| {
+ let local_user_view = blocking(context.pool(), move |conn| {
LocalUserView::find_by_email_or_name(conn, &username_or_email)
})
.await?
- {
- Ok(uv) => uv,
- Err(_e) => return Err(ApiError::err("couldnt_find_that_username_or_email").into()),
- };
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_find_that_username_or_email"))?;
// Verify the password
let valid: bool = verify(
)
.unwrap_or(false);
if !valid {
- return Err(ApiError::err("password_incorrect").into());
+ return Err(LemmyError::from_message("password_incorrect"));
+ }
+
+ let site = blocking(context.pool(), Site::read_local_site).await??;
+ if site.require_email_verification && !local_user_view.local_user.email_verified {
+ return Err(LemmyError::from_message("email_not_verified"));
}
+ check_registration_application(&site, &local_user_view, context.pool()).await?;
+
// Return the jwt
Ok(LoginResponse {
- jwt: Claims::jwt(local_user_view.local_user.id.0)?,
+ jwt: Some(
+ Claims::jwt(
+ local_user_view.local_user.id.0,
+ &context.secret().jwt_secret,
+ &context.settings().hostname,
+ )?
+ .into(),
+ ),
+ verify_email_sent: false,
+ registration_created: false,
})
}
}
impl Perform for GetCaptcha {
type Response = GetCaptchaResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<Self::Response, LemmyError> {
- let captcha_settings = Settings::get().captcha();
+ let captcha_settings = context.settings().captcha;
if !captcha_settings.enabled {
return Ok(GetCaptchaResponse { ok: None });
let answer = captcha.chars_as_string();
- let png_byte_array = captcha.as_png().expect("failed to generate captcha");
-
- let png = base64::encode(png_byte_array);
+ let png = captcha.as_base64().expect("failed to generate captcha");
let uuid = uuid::Uuid::new_v4().to_string();
- let wav = captcha_espeak_wav_base64(&answer).ok();
+ let wav = captcha_as_wav_base64(&captcha);
let captcha_item = CaptchaItem {
answer,
impl Perform for SaveUserSettings {
type Response = LoginResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<LoginResponse, LemmyError> {
- let data: &SaveUserSettings = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &SaveUserSettings = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let avatar = diesel_option_overwrite_to_url(&data.avatar)?;
let banner = diesel_option_overwrite_to_url(&data.banner)?;
- let email = diesel_option_overwrite(&data.email);
let bio = diesel_option_overwrite(&data.bio);
- let preferred_username = diesel_option_overwrite(&data.preferred_username);
+ let display_name = diesel_option_overwrite(&data.display_name);
let matrix_user_id = diesel_option_overwrite(&data.matrix_user_id);
+ let bot_account = data.bot_account;
+ let email_deref = data.email.as_deref().map(|e| e.to_owned());
+ let email = diesel_option_overwrite(&email_deref);
+
+ if let Some(Some(email)) = &email {
+ let previous_email = local_user_view.local_user.email.unwrap_or_default();
+ // Only send the verification email if there was an email change
+ if previous_email.ne(email) {
+ send_verification_email(
+ local_user_view.local_user.id,
+ email,
+ &local_user_view.person.name,
+ context.pool(),
+ &context.settings(),
+ )
+ .await?;
+ }
+ }
+
+ // When the site requires email, make sure email is not Some(None). IE, an overwrite to a None value
+ if let Some(email) = &email {
+ let site_fut = blocking(context.pool(), Site::read_local_site);
+ if email.is_none() && site_fut.await??.require_email_verification {
+ return Err(LemmyError::from_message("email_required"));
+ }
+ }
if let Some(Some(bio)) = &bio {
if bio.chars().count() > 300 {
- return Err(ApiError::err("bio_length_overflow").into());
+ return Err(LemmyError::from_message("bio_length_overflow"));
+ }
+ }
+
+ if let Some(Some(display_name)) = &display_name {
+ if !is_valid_display_name(
+ display_name.trim(),
+ context.settings().actor_name_max_length,
+ ) {
+ return Err(LemmyError::from_message("invalid_username"));
}
}
- if let Some(Some(preferred_username)) = &preferred_username {
- if !is_valid_preferred_username(preferred_username.trim()) {
- return Err(ApiError::err("invalid_username").into());
+ if let Some(Some(matrix_user_id)) = &matrix_user_id {
+ if !is_valid_matrix_id(matrix_user_id) {
+ return Err(LemmyError::from_message("invalid_matrix_id"));
}
}
let default_listing_type = data.default_listing_type;
let default_sort_type = data.default_sort_type;
let password_encrypted = local_user_view.local_user.password_encrypted;
+ let public_key = local_user_view.person.public_key;
let person_form = PersonForm {
name: local_user_view.person.name,
avatar,
banner,
inbox_url: None,
- preferred_username,
+ display_name,
published: None,
updated: Some(naive_now()),
banned: None,
local: None,
admin: None,
private_key: None,
- public_key: None,
+ public_key,
last_refreshed_at: None,
shared_inbox_url: None,
matrix_user_id,
+ bot_account,
+ ban_expires: None,
};
- let person_res = blocking(context.pool(), move |conn| {
+ blocking(context.pool(), move |conn| {
Person::update(conn, person_id, &person_form)
})
- .await?;
- let _updated_person: Person = match person_res {
- Ok(p) => p,
- Err(_) => {
- return Err(ApiError::err("user_already_exists").into());
- }
- };
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("user_already_exists"))?;
let local_user_form = LocalUserForm {
- person_id,
+ person_id: Some(person_id),
email,
- password_encrypted,
+ password_encrypted: Some(password_encrypted),
show_nsfw: data.show_nsfw,
+ show_bot_accounts: data.show_bot_accounts,
+ show_scores: data.show_scores,
theme: data.theme.to_owned(),
default_sort_type,
default_listing_type,
lang: data.lang.to_owned(),
show_avatars: data.show_avatars,
+ show_read_posts: data.show_read_posts,
+ show_new_post_notifs: data.show_new_post_notifs,
send_notifications_to_email: data.send_notifications_to_email,
+ email_verified: None,
+ accepted_application: None,
};
let local_user_res = blocking(context.pool(), move |conn| {
"user_already_exists"
};
- return Err(ApiError::err(err_type).into());
+ return Err(LemmyError::from(e).with_message(err_type));
}
};
// Return the jwt
Ok(LoginResponse {
- jwt: Claims::jwt(updated_local_user.id.0)?,
+ jwt: Some(
+ Claims::jwt(
+ updated_local_user.id.0,
+ &context.secret().jwt_secret,
+ &context.settings().hostname,
+ )?
+ .into(),
+ ),
+ verify_email_sent: false,
+ registration_created: false,
})
}
}
impl Perform for ChangePassword {
type Response = LoginResponse;
+ #[tracing::instrument(skip(self, context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<LoginResponse, LemmyError> {
- let data: &ChangePassword = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &ChangePassword = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(data.auth.as_ref(), context.pool(), context.secret()).await?;
password_length_check(&data.new_password)?;
// Make sure passwords match
if data.new_password != data.new_password_verify {
- return Err(ApiError::err("passwords_dont_match").into());
+ return Err(LemmyError::from_message("passwords_dont_match"));
}
// Check the old password
)
.unwrap_or(false);
if !valid {
- return Err(ApiError::err("password_incorrect").into());
+ return Err(LemmyError::from_message("password_incorrect"));
}
let local_user_id = local_user_view.local_user.id;
// Return the jwt
Ok(LoginResponse {
- jwt: Claims::jwt(updated_local_user.id.0)?,
+ jwt: Some(
+ Claims::jwt(
+ updated_local_user.id.0,
+ &context.secret().jwt_secret,
+ &context.settings().hostname,
+ )?
+ .into(),
+ ),
+ verify_email_sent: false,
+ registration_created: false,
})
}
}
impl Perform for AddAdmin {
type Response = AddAdminResponse;
+ #[tracing::instrument(skip(context, websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
websocket_id: Option<ConnectionId>,
) -> Result<AddAdminResponse, LemmyError> {
- let data: &AddAdmin = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &AddAdmin = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
// Make sure user is an admin
is_admin(&local_user_view)?;
let added = data.added;
let added_person_id = data.person_id;
- let added_admin = match blocking(context.pool(), move |conn| {
+ let added_admin = blocking(context.pool(), move |conn| {
Person::add_admin(conn, added_person_id, added)
})
.await?
- {
- Ok(a) => a,
- Err(_) => {
- return Err(ApiError::err("couldnt_update_user").into());
- }
- };
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_user"))?;
// Mod tables
let form = ModAddForm {
blocking(context.pool(), move |conn| ModAdd::create(conn, &form)).await??;
- let site_creator_id = blocking(context.pool(), move |conn| {
- Site::read(conn, 1).map(|s| s.creator_id)
- })
- .await??;
-
- let mut admins = blocking(context.pool(), move |conn| PersonViewSafe::admins(conn)).await??;
- let creator_index = admins
- .iter()
- .position(|r| r.person.id == site_creator_id)
- .context(location_info!())?;
- let creator_person = admins.remove(creator_index);
- admins.insert(0, creator_person);
+ let admins = blocking(context.pool(), PersonViewSafe::admins).await??;
let res = AddAdminResponse { admins };
impl Perform for BanPerson {
type Response = BanPersonResponse;
+ #[tracing::instrument(skip(context, websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
websocket_id: Option<ConnectionId>,
) -> Result<BanPersonResponse, LemmyError> {
- let data: &BanPerson = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &BanPerson = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
// Make sure user is an admin
is_admin(&local_user_view)?;
let ban = data.ban;
let banned_person_id = data.person_id;
- let ban_person = move |conn: &'_ _| Person::ban_person(conn, banned_person_id, ban);
- if blocking(context.pool(), ban_person).await?.is_err() {
- return Err(ApiError::err("couldnt_update_user").into());
- }
+ let expires = data.expires.map(naive_from_unix);
+
+ let ban_person = move |conn: &'_ _| Person::ban_person(conn, banned_person_id, ban, expires);
+ let person = blocking(context.pool(), ban_person)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_user"))?;
// Remove their data if that's desired
- if data.remove_data {
- // Posts
- blocking(context.pool(), move |conn: &'_ _| {
- Post::update_removed_for_creator(conn, banned_person_id, None, true)
- })
- .await??;
-
- // Communities
- blocking(context.pool(), move |conn: &'_ _| {
- Community::update_removed_for_creator(conn, banned_person_id, true)
- })
- .await??;
-
- // Comments
- blocking(context.pool(), move |conn: &'_ _| {
- Comment::update_removed_for_creator(conn, banned_person_id, true)
- })
- .await??;
+ let remove_data = data.remove_data.unwrap_or(false);
+ if remove_data {
+ remove_user_data(person.id, context.pool()).await?;
}
// Mod tables
- let expires = data.expires.map(naive_from_unix);
-
let form = ModBanForm {
mod_person_id: local_user_view.person.id,
other_person_id: data.person_id,
})
.await??;
+ let site = SiteOrCommunity::Site(
+ blocking(context.pool(), Site::read_local_site)
+ .await??
+ .into(),
+ );
+ // if the action affects a local user, federate to other instances
+ if person.local {
+ if ban {
+ BlockUser::send(
+ &site,
+ &person.into(),
+ &local_user_view.person.into(),
+ remove_data,
+ data.reason.clone(),
+ expires,
+ context,
+ )
+ .await?;
+ } else {
+ UndoBlockUser::send(
+ &site,
+ &person.into(),
+ &local_user_view.person.into(),
+ data.reason.clone(),
+ context,
+ )
+ .await?;
+ }
+ }
+
let res = BanPersonResponse {
person_view,
banned: data.ban,
}
}
+#[async_trait::async_trait(?Send)]
+impl Perform for GetBannedPersons {
+ type Response = BannedPersonsResponse;
+
+ async fn perform(
+ &self,
+ context: &Data<LemmyContext>,
+ _websocket_id: Option<ConnectionId>,
+ ) -> Result<Self::Response, LemmyError> {
+ let data: &GetBannedPersons = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+
+ // Make sure user is an admin
+ is_admin(&local_user_view)?;
+
+ let banned = blocking(context.pool(), PersonViewSafe::banned).await??;
+
+ let res = Self::Response { banned };
+
+ Ok(res)
+ }
+}
+
+#[async_trait::async_trait(?Send)]
+impl Perform for BlockPerson {
+ type Response = BlockPersonResponse;
+
+ #[tracing::instrument(skip(context, _websocket_id))]
+ async fn perform(
+ &self,
+ context: &Data<LemmyContext>,
+ _websocket_id: Option<ConnectionId>,
+ ) -> Result<BlockPersonResponse, LemmyError> {
+ let data: &BlockPerson = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+
+ let target_id = data.person_id;
+ let person_id = local_user_view.person.id;
+
+ // Don't let a person block themselves
+ if target_id == person_id {
+ return Err(LemmyError::from_message("cant_block_yourself"));
+ }
+
+ let person_block_form = PersonBlockForm {
+ person_id,
+ target_id,
+ };
+
+ if data.block {
+ let block = move |conn: &'_ _| PersonBlock::block(conn, &person_block_form);
+ blocking(context.pool(), block)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("person_block_already_exists"))?;
+ } else {
+ let unblock = move |conn: &'_ _| PersonBlock::unblock(conn, &person_block_form);
+ blocking(context.pool(), unblock)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("person_block_already_exists"))?;
+ }
+
+ // TODO does any federated stuff need to be done here?
+
+ let person_view = blocking(context.pool(), move |conn| {
+ PersonViewSafe::read(conn, target_id)
+ })
+ .await??;
+
+ let res = BlockPersonResponse {
+ person_view,
+ blocked: data.block,
+ };
+
+ Ok(res)
+ }
+}
+
#[async_trait::async_trait(?Send)]
impl Perform for GetReplies {
type Response = GetRepliesResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<GetRepliesResponse, LemmyError> {
- let data: &GetReplies = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &GetReplies = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
- let sort = SortType::from_str(&data.sort)?;
+ let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
let page = data.page;
let limit = data.limit;
let unread_only = data.unread_only;
let person_id = local_user_view.person.id;
+ let show_bot_accounts = local_user_view.local_user.show_bot_accounts;
+
let replies = blocking(context.pool(), move |conn| {
CommentQueryBuilder::create(conn)
- .sort(&sort)
+ .sort(sort)
.unread_only(unread_only)
.recipient_id(person_id)
+ .show_bot_accounts(show_bot_accounts)
.my_person_id(person_id)
.page(page)
.limit(limit)
impl Perform for GetPersonMentions {
type Response = GetPersonMentionsResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<GetPersonMentionsResponse, LemmyError> {
- let data: &GetPersonMentions = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &GetPersonMentions = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
- let sort = SortType::from_str(&data.sort)?;
+ let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
let page = data.page;
let limit = data.limit;
PersonMentionQueryBuilder::create(conn)
.recipient_id(person_id)
.my_person_id(person_id)
- .sort(&sort)
+ .sort(sort)
.unread_only(unread_only)
.page(page)
.limit(limit)
impl Perform for MarkPersonMentionAsRead {
type Response = PersonMentionResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<PersonMentionResponse, LemmyError> {
- let data: &MarkPersonMentionAsRead = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &MarkPersonMentionAsRead = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let person_mention_id = data.person_mention_id;
let read_person_mention = blocking(context.pool(), move |conn| {
.await??;
if local_user_view.person.id != read_person_mention.recipient_id {
- return Err(ApiError::err("couldnt_update_comment").into());
+ return Err(LemmyError::from_message("couldnt_update_comment"));
}
let person_mention_id = read_person_mention.id;
let read = data.read;
let update_mention =
move |conn: &'_ _| PersonMention::update_read(conn, person_mention_id, read);
- if blocking(context.pool(), update_mention).await?.is_err() {
- return Err(ApiError::err("couldnt_update_comment").into());
- };
+ blocking(context.pool(), update_mention)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_comment"))?;
let person_mention_id = read_person_mention.id;
let person_id = local_user_view.person.id;
impl Perform for MarkAllAsRead {
type Response = GetRepliesResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<GetRepliesResponse, LemmyError> {
- let data: &MarkAllAsRead = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &MarkAllAsRead = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let person_id = local_user_view.person.id;
let replies = blocking(context.pool(), move |conn| {
for comment_view in &replies {
let reply_id = comment_view.comment.id;
let mark_as_read = move |conn: &'_ _| Comment::update_read(conn, reply_id, true);
- if blocking(context.pool(), mark_as_read).await?.is_err() {
- return Err(ApiError::err("couldnt_update_comment").into());
- }
+ blocking(context.pool(), mark_as_read)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_comment"))?;
}
// Mark all user mentions as read
let update_person_mentions =
move |conn: &'_ _| PersonMention::mark_all_as_read(conn, person_id);
- if blocking(context.pool(), update_person_mentions)
+ blocking(context.pool(), update_person_mentions)
.await?
- .is_err()
- {
- return Err(ApiError::err("couldnt_update_comment").into());
- }
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_comment"))?;
// Mark all private_messages as read
let update_pm = move |conn: &'_ _| PrivateMessage::mark_all_as_read(conn, person_id);
- if blocking(context.pool(), update_pm).await?.is_err() {
- return Err(ApiError::err("couldnt_update_private_message").into());
- }
+ blocking(context.pool(), update_pm)
+ .await?
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_private_message"))?;
Ok(GetRepliesResponse { replies: vec![] })
}
impl Perform for PasswordReset {
type Response = PasswordResetResponse;
+ #[tracing::instrument(skip(self, context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<PasswordResetResponse, LemmyError> {
- let data: &PasswordReset = &self;
+ let data: &PasswordReset = self;
// Fetch that email
let email = data.email.clone();
- let local_user_view = match blocking(context.pool(), move |conn| {
+ let local_user_view = blocking(context.pool(), move |conn| {
LocalUserView::find_by_email(conn, &email)
})
.await?
- {
- Ok(lu) => lu,
- Err(_e) => return Err(ApiError::err("couldnt_find_that_username_or_email").into()),
- };
-
- // Generate a random token
- let token = generate_random_string();
-
- // Insert the row
- let token2 = token.clone();
- let local_user_id = local_user_view.local_user.id;
- blocking(context.pool(), move |conn| {
- PasswordResetRequest::create_token(conn, local_user_id, &token2)
- })
- .await??;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_find_that_username_or_email"))?;
// Email the pure token to the user.
- // TODO no i18n support here.
- let email = &local_user_view.local_user.email.expect("email");
- let subject = &format!("Password reset for {}", local_user_view.person.name);
- let hostname = &Settings::get().get_protocol_and_hostname();
- let html = &format!("<h1>Password Reset Request for {}</h1><br><a href={}/password_change/{}>Click here to reset your password</a>", local_user_view.person.name, hostname, &token);
- match send_email(subject, email, &local_user_view.person.name, html) {
- Ok(_o) => _o,
- Err(_e) => return Err(ApiError::err(&_e).into()),
- };
-
+ send_password_reset_email(&local_user_view, context.pool(), &context.settings()).await?;
Ok(PasswordResetResponse {})
}
}
impl Perform for PasswordChange {
type Response = LoginResponse;
+ #[tracing::instrument(skip(self, context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<LoginResponse, LemmyError> {
- let data: &PasswordChange = &self;
+ let data: &PasswordChange = self;
// Fetch the user_id from the token
let token = data.token.clone();
// Make sure passwords match
if data.password != data.password_verify {
- return Err(ApiError::err("passwords_dont_match").into());
+ return Err(LemmyError::from_message("passwords_dont_match"));
}
// Update the user with the new password
let password = data.password.clone();
- let updated_local_user = match blocking(context.pool(), move |conn| {
+ let updated_local_user = blocking(context.pool(), move |conn| {
LocalUser::update_password(conn, local_user_id, &password)
})
.await?
- {
- Ok(u) => u,
- Err(_e) => return Err(ApiError::err("couldnt_update_user").into()),
- };
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_update_user"))?;
// Return the jwt
Ok(LoginResponse {
- jwt: Claims::jwt(updated_local_user.id.0)?,
+ jwt: Some(
+ Claims::jwt(
+ updated_local_user.id.0,
+ &context.secret().jwt_secret,
+ &context.settings().hostname,
+ )?
+ .into(),
+ ),
+ verify_email_sent: false,
+ registration_created: false,
})
}
}
impl Perform for GetReportCount {
type Response = GetReportCountResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
+ _websocket_id: Option<ConnectionId>,
) -> Result<GetReportCountResponse, LemmyError> {
- let data: &GetReportCount = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &GetReportCount = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let person_id = local_user_view.person.id;
- let community_id = data.community;
- let community_ids =
- collect_moderated_communities(person_id, community_id, context.pool()).await?;
-
- let res = {
- if community_ids.is_empty() {
- GetReportCountResponse {
- community: None,
- comment_reports: 0,
- post_reports: 0,
- }
- } else {
- let ids = community_ids.clone();
- let comment_reports = blocking(context.pool(), move |conn| {
- CommentReportView::get_report_count(conn, &ids)
- })
- .await??;
-
- let ids = community_ids.clone();
- let post_reports = blocking(context.pool(), move |conn| {
- PostReportView::get_report_count(conn, &ids)
- })
- .await??;
-
- GetReportCountResponse {
- community: data.community,
- comment_reports,
- post_reports,
- }
- }
- };
+ let admin = local_user_view.person.admin;
+ let community_id = data.community_id;
- context.chat_server().do_send(SendUserRoomMessage {
- op: UserOperation::GetReportCount,
- response: res.clone(),
- local_recipient_id: local_user_view.local_user.id,
- websocket_id,
- });
+ let comment_reports = blocking(context.pool(), move |conn| {
+ CommentReportView::get_report_count(conn, person_id, admin, community_id)
+ })
+ .await??;
+
+ let post_reports = blocking(context.pool(), move |conn| {
+ PostReportView::get_report_count(conn, person_id, admin, community_id)
+ })
+ .await??;
+
+ let res = GetReportCountResponse {
+ community_id,
+ comment_reports,
+ post_reports,
+ };
Ok(res)
}
}
#[async_trait::async_trait(?Send)]
-impl Perform for GetFollowedCommunities {
- type Response = GetFollowedCommunitiesResponse;
+impl Perform for GetUnreadCount {
+ type Response = GetUnreadCountResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
- ) -> Result<GetFollowedCommunitiesResponse, LemmyError> {
- let data: &GetFollowedCommunities = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ ) -> Result<Self::Response, LemmyError> {
+ let data = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let person_id = local_user_view.person.id;
- let communities = match blocking(context.pool(), move |conn| {
- CommunityFollowerView::for_person(conn, person_id)
+
+ let replies = blocking(context.pool(), move |conn| {
+ CommentView::get_unread_replies(conn, person_id)
+ })
+ .await??;
+
+ let mentions = blocking(context.pool(), move |conn| {
+ PersonMentionView::get_unread_mentions(conn, person_id)
+ })
+ .await??;
+
+ let private_messages = blocking(context.pool(), move |conn| {
+ PrivateMessageView::get_unread_messages(conn, person_id)
+ })
+ .await??;
+
+ let res = Self::Response {
+ replies,
+ mentions,
+ private_messages,
+ };
+
+ Ok(res)
+ }
+}
+
+#[async_trait::async_trait(?Send)]
+impl Perform for VerifyEmail {
+ type Response = VerifyEmailResponse;
+
+ async fn perform(
+ &self,
+ context: &Data<LemmyContext>,
+ _websocket_id: Option<usize>,
+ ) -> Result<Self::Response, LemmyError> {
+ let token = self.token.clone();
+ let verification = blocking(context.pool(), move |conn| {
+ EmailVerification::read_for_token(conn, &token)
})
.await?
- {
- Ok(communities) => communities,
- _ => return Err(ApiError::err("system_err_login").into()),
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("token_not_found"))?;
+
+ let form = LocalUserForm {
+ // necessary in case this is a new signup
+ email_verified: Some(true),
+ // necessary in case email of an existing user was changed
+ email: Some(Some(verification.email)),
+ ..LocalUserForm::default()
};
+ let local_user_id = verification.local_user_id;
+ blocking(context.pool(), move |conn| {
+ LocalUser::update(conn, local_user_id, &form)
+ })
+ .await??;
- // Return the jwt
- Ok(GetFollowedCommunitiesResponse { communities })
+ let local_user_view = blocking(context.pool(), move |conn| {
+ LocalUserView::read(conn, local_user_id)
+ })
+ .await??;
+
+ send_email_verification_success(&local_user_view, &context.settings())?;
+
+ blocking(context.pool(), move |conn| {
+ EmailVerification::delete_old_tokens_for_local_user(conn, local_user_id)
+ })
+ .await??;
+
+ Ok(VerifyEmailResponse {})
}
}
projects / lemmy.git / blobdiff