mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-01 19:42:08 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
193 lines
5.4 KiB
Rust
193 lines
5.4 KiB
Rust
use crate::{
|
|
newtypes::{DbUrl, PersonId, PrivateMessageId},
|
|
schema::private_message::dsl::*,
|
|
source::private_message::*,
|
|
traits::{Crud, DeleteableOrRemoveable},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_utils::error::LemmyError;
|
|
use url::Url;
|
|
|
|
#[async_trait]
|
|
impl Crud for PrivateMessage {
|
|
type InsertForm = PrivateMessageInsertForm;
|
|
type UpdateForm = PrivateMessageUpdateForm;
|
|
type IdType = PrivateMessageId;
|
|
async fn read(pool: &DbPool, private_message_id: PrivateMessageId) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
private_message
|
|
.find(private_message_id)
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn create(pool: &DbPool, form: &Self::InsertForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(private_message)
|
|
.values(form)
|
|
.on_conflict(ap_id)
|
|
.do_update()
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn update(
|
|
pool: &DbPool,
|
|
private_message_id: PrivateMessageId,
|
|
form: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(private_message.find(private_message_id))
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn delete(pool: &DbPool, pm_id: Self::IdType) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(private_message.find(pm_id))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl PrivateMessage {
|
|
pub async fn mark_all_as_read(
|
|
pool: &DbPool,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Vec<PrivateMessage>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(
|
|
private_message
|
|
.filter(recipient_id.eq(for_recipient_id))
|
|
.filter(read.eq(false)),
|
|
)
|
|
.set(read.eq(true))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn read_from_apub_id(
|
|
pool: &DbPool,
|
|
object_id: Url,
|
|
) -> Result<Option<Self>, LemmyError> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let object_id: DbUrl = object_id.into();
|
|
Ok(
|
|
private_message
|
|
.filter(ap_id.eq(object_id))
|
|
.first::<PrivateMessage>(conn)
|
|
.await
|
|
.ok()
|
|
.map(Into::into),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl DeleteableOrRemoveable for PrivateMessage {
|
|
fn blank_out_deleted_or_removed_info(mut self) -> Self {
|
|
self.content = "".into();
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
source::{instance::Instance, person::*, private_message::*},
|
|
traits::Crud,
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
|
|
|
|
let creator_form = PersonInsertForm::builder()
|
|
.name("creator_pm".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_creator = Person::create(pool, &creator_form).await.unwrap();
|
|
|
|
let recipient_form = PersonInsertForm::builder()
|
|
.name("recipient_pm".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_recipient = Person::create(pool, &recipient_form).await.unwrap();
|
|
|
|
let private_message_form = PrivateMessageInsertForm::builder()
|
|
.content("A test private message".into())
|
|
.creator_id(inserted_creator.id)
|
|
.recipient_id(inserted_recipient.id)
|
|
.build();
|
|
|
|
let inserted_private_message = PrivateMessage::create(pool, &private_message_form)
|
|
.await
|
|
.unwrap();
|
|
|
|
let expected_private_message = PrivateMessage {
|
|
id: inserted_private_message.id,
|
|
content: "A test private message".into(),
|
|
creator_id: inserted_creator.id,
|
|
recipient_id: inserted_recipient.id,
|
|
deleted: false,
|
|
read: false,
|
|
updated: None,
|
|
published: inserted_private_message.published,
|
|
ap_id: inserted_private_message.ap_id.to_owned(),
|
|
local: true,
|
|
};
|
|
|
|
let read_private_message = PrivateMessage::read(pool, inserted_private_message.id)
|
|
.await
|
|
.unwrap();
|
|
|
|
let private_message_update_form = PrivateMessageUpdateForm::builder()
|
|
.content(Some("A test private message".into()))
|
|
.build();
|
|
let updated_private_message = PrivateMessage::update(
|
|
pool,
|
|
inserted_private_message.id,
|
|
&private_message_update_form,
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let deleted_private_message = PrivateMessage::update(
|
|
pool,
|
|
inserted_private_message.id,
|
|
&PrivateMessageUpdateForm::builder()
|
|
.deleted(Some(true))
|
|
.build(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
let marked_read_private_message = PrivateMessage::update(
|
|
pool,
|
|
inserted_private_message.id,
|
|
&PrivateMessageUpdateForm::builder().read(Some(true)).build(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
Person::delete(pool, inserted_creator.id).await.unwrap();
|
|
Person::delete(pool, inserted_recipient.id).await.unwrap();
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
|
|
|
assert_eq!(expected_private_message, read_private_message);
|
|
assert_eq!(expected_private_message, updated_private_message);
|
|
assert_eq!(expected_private_message, inserted_private_message);
|
|
assert!(deleted_private_message.deleted);
|
|
assert!(marked_read_private_message.read);
|
|
}
|
|
}
|