gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use better logic for no-limit version.

delete-old-avatar
Dessalines 2024-03-14 15:19:47 -04:00
parent f4bf197518
commit e19ca1ec6e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/db_schema/src/impls/images.rs
View File

@ -2,7 +2,7 @@ use crate::{
newtypes::{DbUrl, LocalUserId}, newtypes::{DbUrl, LocalUserId},
schema::{local_image, remote_image}, schema::{local_image, remote_image},
source::images::{LocalImage, LocalImageForm, RemoteImage, RemoteImageForm}, source::images::{LocalImage, LocalImageForm, RemoteImage, RemoteImageForm},
utils::{get_conn, limit_and_offset, limit_and_offset_unlimited, DbPool}, utils::{get_conn, limit_and_offset, DbPool},
}; };
use diesel::{ use diesel::{
dsl::exists, dsl::exists,
@ -33,20 +33,18 @@ impl LocalImage {
ignore_page_limits: bool, ignore_page_limits: bool,
) -> Result<Vec<Self>, Error> { ) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?; let conn = &mut get_conn(pool).await?;
let (limit, offset) = if ignore_page_limits { let mut query = local_image::table
limit_and_offset_unlimited(page, limit)
} else {
limit_and_offset(page, limit)?
};
local_image::table
.filter(local_image::local_user_id.eq(user_id)) .filter(local_image::local_user_id.eq(user_id))
.select(local_image::all_columns) .select(local_image::all_columns)
.order_by(local_image::published.desc()) .order_by(local_image::published.desc())
.limit(limit) .into_boxed();
.offset(offset)
.load::<LocalImage>(conn) if !ignore_page_limits {
.await let (limit, offset) = limit_and_offset(page, limit)?;
query = query.limit(limit).offset(offset);
}
query.load::<LocalImage>(conn).await
} }
pub async fn get_all( pub async fn get_all(