mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-15 00:43:59 +00:00
1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
148 lines
4 KiB
Rust
148 lines
4 KiB
Rust
use crate::structs::PrivateMessageView;
|
|
use diesel::{
|
|
debug_query,
|
|
pg::Pg,
|
|
result::Error,
|
|
BoolExpressionMethods,
|
|
ExpressionMethods,
|
|
JoinOnDsl,
|
|
QueryDsl,
|
|
};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_db_schema::{
|
|
newtypes::{PersonId, PrivateMessageId},
|
|
schema::{person, private_message},
|
|
source::{person::Person, private_message::PrivateMessage},
|
|
traits::JoinView,
|
|
utils::{get_conn, limit_and_offset, DbPool},
|
|
};
|
|
use tracing::debug;
|
|
use typed_builder::TypedBuilder;
|
|
|
|
type PrivateMessageViewTuple = (PrivateMessage, Person, Person);
|
|
|
|
impl PrivateMessageView {
|
|
pub async fn read(
|
|
pool: &mut DbPool<'_>,
|
|
private_message_id: PrivateMessageId,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let person_alias_1 = diesel::alias!(person as person1);
|
|
|
|
let (private_message, creator, recipient) = private_message::table
|
|
.find(private_message_id)
|
|
.inner_join(person::table.on(private_message::creator_id.eq(person::id)))
|
|
.inner_join(
|
|
person_alias_1.on(private_message::recipient_id.eq(person_alias_1.field(person::id))),
|
|
)
|
|
.order_by(private_message::published.desc())
|
|
.select((
|
|
private_message::all_columns,
|
|
person::all_columns,
|
|
person_alias_1.fields(person::all_columns),
|
|
))
|
|
.first::<PrivateMessageViewTuple>(conn)
|
|
.await?;
|
|
|
|
Ok(PrivateMessageView {
|
|
private_message,
|
|
creator,
|
|
recipient,
|
|
})
|
|
}
|
|
|
|
/// Gets the number of unread messages
|
|
pub async fn get_unread_messages(
|
|
pool: &mut DbPool<'_>,
|
|
my_person_id: PersonId,
|
|
) -> Result<i64, Error> {
|
|
use diesel::dsl::count;
|
|
let conn = &mut get_conn(pool).await?;
|
|
private_message::table
|
|
.filter(private_message::read.eq(false))
|
|
.filter(private_message::recipient_id.eq(my_person_id))
|
|
.filter(private_message::deleted.eq(false))
|
|
.select(count(private_message::id))
|
|
.first::<i64>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[derive(TypedBuilder)]
|
|
#[builder(field_defaults(default))]
|
|
pub struct PrivateMessageQuery<'a, 'b: 'a> {
|
|
#[builder(!default)]
|
|
pool: &'a mut DbPool<'b>,
|
|
#[builder(!default)]
|
|
recipient_id: PersonId,
|
|
unread_only: Option<bool>,
|
|
page: Option<i64>,
|
|
limit: Option<i64>,
|
|
}
|
|
|
|
impl<'a, 'b: 'a> PrivateMessageQuery<'a, 'b> {
|
|
pub async fn list(self) -> Result<Vec<PrivateMessageView>, Error> {
|
|
let conn = &mut get_conn(self.pool).await?;
|
|
let person_alias_1 = diesel::alias!(person as person1);
|
|
|
|
let mut query = private_message::table
|
|
.inner_join(person::table.on(private_message::creator_id.eq(person::id)))
|
|
.inner_join(
|
|
person_alias_1.on(private_message::recipient_id.eq(person_alias_1.field(person::id))),
|
|
)
|
|
.select((
|
|
private_message::all_columns,
|
|
person::all_columns,
|
|
person_alias_1.fields(person::all_columns),
|
|
))
|
|
.into_boxed();
|
|
|
|
// If its unread, I only want the ones to me
|
|
if self.unread_only.unwrap_or(false) {
|
|
query = query
|
|
.filter(private_message::read.eq(false))
|
|
.filter(private_message::recipient_id.eq(self.recipient_id));
|
|
}
|
|
// Otherwise, I want the ALL view to show both sent and received
|
|
else {
|
|
query = query.filter(
|
|
private_message::recipient_id
|
|
.eq(self.recipient_id)
|
|
.or(private_message::creator_id.eq(self.recipient_id)),
|
|
)
|
|
}
|
|
|
|
let (limit, offset) = limit_and_offset(self.page, self.limit)?;
|
|
|
|
query = query
|
|
.filter(private_message::deleted.eq(false))
|
|
.limit(limit)
|
|
.offset(offset)
|
|
.order_by(private_message::published.desc());
|
|
|
|
debug!(
|
|
"Private Message View Query: {:?}",
|
|
debug_query::<Pg, _>(&query)
|
|
);
|
|
|
|
let res = query.load::<PrivateMessageViewTuple>(conn).await?;
|
|
|
|
Ok(
|
|
res
|
|
.into_iter()
|
|
.map(PrivateMessageView::from_tuple)
|
|
.collect(),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl JoinView for PrivateMessageView {
|
|
type JoinTuple = PrivateMessageViewTuple;
|
|
fn from_tuple(a: Self::JoinTuple) -> Self {
|
|
Self {
|
|
private_message: a.0,
|
|
creator: a.1,
|
|
recipient: a.2,
|
|
}
|
|
}
|
|
}
|