};
use anyhow::Context;
use chrono::NaiveDateTime;
-use futures::try_join;
use lemmy_db_schema::{
impls::person::is_banned,
newtypes::{CommunityId, DbUrl, LocalUserId, PersonId, PostId},
#[tracing::instrument(skip_all)]
pub async fn is_mod_or_admin(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
person_id: PersonId,
community_id: CommunityId,
) -> Result<(), LemmyError> {
#[tracing::instrument(skip_all)]
pub async fn is_mod_or_admin_opt(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
local_user_view: Option<&LocalUserView>,
community_id: Option<CommunityId>,
) -> Result<(), LemmyError> {
}
#[tracing::instrument(skip_all)]
-pub async fn get_post(post_id: PostId, pool: &
DbPool) -> Result<Post, LemmyError> {
+pub async fn get_post(post_id: PostId, pool: &
mut DbPool<'_>) -> Result<Post, LemmyError> {
Post::read(pool, post_id)
.await
.with_lemmy_type(LemmyErrorType::CouldntFindPost)
pub async fn mark_post_as_read(
person_id: PersonId,
post_id: PostId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<PostRead, LemmyError> {
let post_read_form = PostReadForm { post_id, person_id };
pub async fn mark_post_as_unread(
person_id: PersonId,
post_id: PostId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<usize, LemmyError> {
let post_read_form = PostReadForm { post_id, person_id };
.with_lemmy_type(LemmyErrorType::NotLoggedIn)?
.claims;
let local_user_id = LocalUserId(claims.sub);
- let local_user_view = LocalUserView::read(context.pool(), local_user_id).await?;
+ let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id).await?;
check_user_valid(
local_user_view.person.banned,
local_user_view.person.ban_expires,
pub async fn check_community_ban(
person_id: PersonId,
community_id: CommunityId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<(), LemmyError> {
let is_banned = CommunityPersonBanView::get(pool, person_id, community_id)
.await
#[tracing::instrument(skip_all)]
pub async fn check_community_deleted_or_removed(
community_id: CommunityId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<(), LemmyError> {
let community = Community::read(pool, community_id)
.await
pub async fn check_person_block(
my_id: PersonId,
potential_blocker_id: PersonId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<(), LemmyError> {
let is_blocked = PersonBlock::read(pool, potential_blocker_id, my_id)
.await
#[tracing::instrument(skip_all)]
pub async fn build_federated_instances(
local_site: &LocalSite,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<Option<FederatedInstances>, LemmyError> {
if local_site.federation_enabled {
// TODO I hate that this requires 3 queries
- let (linked, allowed, blocked) = try_join!(
- Instance::linked(pool),
- Instance::allowlist(pool),
- Instance::blocklist(pool)
- )?;
+ let (linked, allowed, blocked) = lemmy_db_schema::try_join_with_pool!(pool => (
+ Instance::linked,
+ Instance::allowlist,
+ Instance::blocklist
+ ))?;
Ok(Some(FederatedInstances {
linked,
pub async fn send_password_reset_email(
user: &LocalUserView,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
) -> Result<(), LemmyError> {
// Generate a random token
pub async fn send_verification_email(
user: &LocalUserView,
new_email: &str,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
) -> Result<(), LemmyError> {
let form = EmailVerificationForm {
/// Send a new applicant email notification to all admins
pub async fn send_new_applicant_email_to_admins(
applicant_username: &str,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
) -> Result<(), LemmyError> {
// Collect the admins with emails
pub async fn send_new_report_email_to_admins(
reporter_username: &str,
reported_username: &str,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
) -> Result<(), LemmyError> {
// Collect the admins with emails
pub async fn check_registration_application(
local_user_view: &LocalUserView,
local_site: &LocalSite,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<(), LemmyError> {
if (local_site.registration_mode == RegistrationMode::RequireApplication
|| local_site.registration_mode == RegistrationMode::Closed)
pub async fn purge_image_posts_for_person(
banned_person_id: PersonId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
pub async fn purge_image_posts_for_community(
banned_community_id: CommunityId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
pub async fn remove_user_data(
banned_person_id: PersonId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
pub async fn remove_user_data_in_community(
community_id: CommunityId,
banned_person_id: PersonId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
) -> Result<(), LemmyError> {
// Posts
Post::update_removed_for_creator(pool, banned_person_id, Some(community_id), true).await?;
// Comments
// TODO Diesel doesn't allow updates with joins, so this has to be a loop
- let comments = CommentQuery::builder()
- .pool(pool)
- .creator_id(Some(banned_person_id))
- .community_id(Some(community_id))
- .build()
- .list()
- .await?;
+ let comments = CommentQuery {
+ creator_id: Some(banned_person_id),
+ community_id: Some(community_id),
+ ..Default::default()
+ }
+ .list(pool)
+ .await?;
for comment_view in &comments {
let comment_id = comment_view.comment.id;
pub async fn delete_user_account(
person_id: PersonId,
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
settings: &Settings,
client: &ClientWithMiddleware,
) -> Result<(), LemmyError> {
Ok(())
}
-#[cfg(test)]
-mod tests {
- use crate::utils::{honeypot_check, password_length_check};
-
- #[test]
- #[rustfmt::skip]
- fn password_length() {
- assert!(password_length_check("Õ¼¾°3yË,o¸ãtÌÈú|ÇÁÙAøüÒI©·¤(T]/ð>æºWæ[C¤bªWöaÃÎñ·{=û³&§½K/c").is_ok());
- assert!(password_length_check("1234567890").is_ok());
- assert!(password_length_check("short").is_err());
- assert!(password_length_check("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong").is_err());
- }
-
- #[test]
- fn honeypot() {
- assert!(honeypot_check(&None).is_ok());
- assert!(honeypot_check(&Some(String::new())).is_ok());
- assert!(honeypot_check(&Some("1".to_string())).is_err());
- assert!(honeypot_check(&Some("message".to_string())).is_err());
- }
-}
-
pub enum EndpointType {
Community,
Person,
pub fn generate_moderators_url(community_id: &DbUrl) -> Result<DbUrl, LemmyError> {
Ok(Url::parse(&format!("{community_id}/moderators"))?.into())
}
+
+/// Sanitize HTML with default options. Additionally, dont allow bypassing markdown
+/// links and images
+pub fn sanitize_html(data: &str) -> String {
+ ammonia::Builder::default()
+ .rm_tags(&["a", "img"])
+ .clean(data)
+ .to_string()
+}
+
+pub fn sanitize_html_opt(data: &Option<String>) -> Option<String> {
+ data.as_ref().map(|d| sanitize_html(d))
+}
+
+#[cfg(test)]
+mod tests {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
+ use crate::utils::{honeypot_check, password_length_check, sanitize_html};
+
+ #[test]
+ #[rustfmt::skip]
+ fn password_length() {
+ assert!(password_length_check("Õ¼¾°3yË,o¸ãtÌÈú|ÇÁÙAøüÒI©·¤(T]/ð>æºWæ[C¤bªWöaÃÎñ·{=û³&§½K/c").is_ok());
+ assert!(password_length_check("1234567890").is_ok());
+ assert!(password_length_check("short").is_err());
+ assert!(password_length_check("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong").is_err());
+ }
+
+ #[test]
+ fn honeypot() {
+ assert!(honeypot_check(&None).is_ok());
+ assert!(honeypot_check(&Some(String::new())).is_ok());
+ assert!(honeypot_check(&Some("1".to_string())).is_err());
+ assert!(honeypot_check(&Some("message".to_string())).is_err());
+ }
+
+ #[test]
+ fn test_sanitize_html() {
+ let sanitized = sanitize_html("<script>alert(1);</script> hello");
+ assert_eq!(sanitized, " hello");
+ let sanitized = sanitize_html("<img src='http://example.com'> test");
+ assert_eq!(sanitized, " test");
+ }
+}
projects / lemmy.git / blobdiff