add: timelines, homepage
This commit is contained in:
parent
619184d02e
commit
de53eec0e8
24 changed files with 440 additions and 40 deletions
|
@ -139,7 +139,7 @@ impl DataManager {
|
|||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = execute!(&conn, "DELETE FROM users WHERE id = $1", &[&(id as i64)]);
|
||||
let res = execute!(&conn, "DELETE FROM users WHERE id = $1", &[&(id as isize)]);
|
||||
|
||||
if let Err(e) = res {
|
||||
return Err(Error::DatabaseError(e.to_string()));
|
||||
|
|
|
@ -36,7 +36,7 @@ macro_rules! auto_method {
|
|||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = query_row!(&conn, $query, &[&(id as i64)], |x| {
|
||||
let res = query_row!(&conn, $query, &[&(id as isize)], |x| {
|
||||
Ok(Self::$select_fn(x))
|
||||
});
|
||||
|
||||
|
@ -59,7 +59,7 @@ macro_rules! auto_method {
|
|||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = query_row!(&conn, $query, &[&(id as i64)], |x| {
|
||||
let res = query_row!(&conn, $query, &[&(id as isize)], |x| {
|
||||
Ok(Self::$select_fn(x))
|
||||
});
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ impl DataManager {
|
|||
let res = query_row!(
|
||||
&conn,
|
||||
"SELECT * FROM memberships WHERE owner = $1 AND community = $2",
|
||||
&[&(owner as i64), &(community as i64)],
|
||||
&[&(owner as isize), &(community as isize)],
|
||||
|x| { Ok(Self::get_membership_from_row(x)) }
|
||||
);
|
||||
|
||||
|
@ -74,7 +74,7 @@ impl DataManager {
|
|||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM memberships WHERE owner = $1 AND role IS NOT 33",
|
||||
&[&(owner as i64)],
|
||||
&[&(owner as isize)],
|
||||
|x| { Self::get_membership_from_row(x) }
|
||||
);
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ impl DataManager {
|
|||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM notifications WHERE owner = $1",
|
||||
&[&(owner as i64)],
|
||||
&[&(owner as isize)],
|
||||
|x| { Self::get_notification_from_row(x) }
|
||||
);
|
||||
|
||||
|
|
|
@ -62,7 +62,11 @@ impl DataManager {
|
|||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM posts WHERE replying_to = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||
&[&(id as i64), &(batch as i64), &((page * batch) as i64)],
|
||||
&[
|
||||
&(id as isize),
|
||||
&(batch as isize),
|
||||
&((page * batch) as isize)
|
||||
],
|
||||
|x| { Self::get_post_from_row(x) }
|
||||
);
|
||||
|
||||
|
@ -125,7 +129,11 @@ impl DataManager {
|
|||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM posts WHERE owner = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||
&[&(id as i64), &(batch as i64), &((page * batch) as i64)],
|
||||
&[
|
||||
&(id as isize),
|
||||
&(batch as isize),
|
||||
&((page * batch) as isize)
|
||||
],
|
||||
|x| { Self::get_post_from_row(x) }
|
||||
);
|
||||
|
||||
|
@ -156,7 +164,83 @@ impl DataManager {
|
|||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM posts WHERE community = $1 AND replying_to IS NULL ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||
&[&(id as i64), &(batch as i64), &((page * batch) as i64)],
|
||||
&[
|
||||
&(id as isize),
|
||||
&(batch as isize),
|
||||
&((page * batch) as isize)
|
||||
],
|
||||
|x| { Self::get_post_from_row(x) }
|
||||
);
|
||||
|
||||
if res.is_err() {
|
||||
return Err(Error::GeneralNotFound("post".to_string()));
|
||||
}
|
||||
|
||||
Ok(res.unwrap())
|
||||
}
|
||||
|
||||
/// Get posts from all communities, sorted by likes.
|
||||
///
|
||||
/// # Arguments
|
||||
/// * `batch` - the limit of posts in each page
|
||||
/// * `page` - the page number
|
||||
pub async fn get_popular_posts(&self, batch: usize, page: usize) -> Result<Vec<Post>> {
|
||||
let conn = match self.connect().await {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM posts ORDER BY likes DESC, created ASC LIMIT $2 OFFSET $3",
|
||||
&[&(batch as isize), &((page * batch) as isize)],
|
||||
|x| { Self::get_post_from_row(x) }
|
||||
);
|
||||
|
||||
if res.is_err() {
|
||||
return Err(Error::GeneralNotFound("post".to_string()));
|
||||
}
|
||||
|
||||
Ok(res.unwrap())
|
||||
}
|
||||
|
||||
/// Get posts from all communities the given user is in.
|
||||
///
|
||||
/// # Arguments
|
||||
/// * `id` - the ID of the user
|
||||
/// * `batch` - the limit of posts in each page
|
||||
/// * `page` - the page number
|
||||
pub async fn get_posts_from_user_communities(
|
||||
&self,
|
||||
id: usize,
|
||||
batch: usize,
|
||||
page: usize,
|
||||
) -> Result<Vec<Post>> {
|
||||
let memberships = self.get_memberships_by_owner(id).await?;
|
||||
let mut memberships = memberships.iter();
|
||||
let first = match memberships.next() {
|
||||
Some(f) => f,
|
||||
None => return Ok(Vec::new()),
|
||||
};
|
||||
|
||||
let mut query_string: String = String::new();
|
||||
|
||||
for membership in memberships {
|
||||
query_string.push_str(&format!(" OR community = {}", membership.community));
|
||||
}
|
||||
|
||||
let conn = match self.connect().await {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = query_rows!(
|
||||
&conn,
|
||||
&format!(
|
||||
"SELECT * FROM posts WHERE community = {} {query_string} ORDER BY created DESC LIMIT $1 OFFSET $2",
|
||||
first.community
|
||||
),
|
||||
&[&(batch as isize), &((page * batch) as isize)],
|
||||
|x| { Self::get_post_from_row(x) }
|
||||
);
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ impl DataManager {
|
|||
let res = query_row!(
|
||||
&conn,
|
||||
"SELECT * FROM reactions WHERE owner = $1 AND asset = $2",
|
||||
&[&(owner as i64), &(asset as i64)],
|
||||
&[&(owner as isize), &(asset as isize)],
|
||||
|x| { Ok(Self::get_reaction_from_row(x)) }
|
||||
);
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ impl DataManager {
|
|||
let res = query_row!(
|
||||
&conn,
|
||||
"SELECT * FROM userblocks WHERE initiator = $1 AND receiver = $2",
|
||||
&[&(initiator as i64), &(receiver as i64)],
|
||||
&[&(initiator as isize), &(receiver as isize)],
|
||||
|x| { Ok(Self::get_userblock_from_row(x)) }
|
||||
);
|
||||
|
||||
|
@ -64,7 +64,7 @@ impl DataManager {
|
|||
let res = query_row!(
|
||||
&conn,
|
||||
"SELECT * FROM userblocks WHERE receiver = $1 AND initiator = $2",
|
||||
&[&(receiver as i64), &(initiator as i64)],
|
||||
&[&(receiver as isize), &(initiator as isize)],
|
||||
|x| { Ok(Self::get_userblock_from_row(x)) }
|
||||
);
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use super::*;
|
||||
use crate::cache::Cache;
|
||||
use crate::model::{Error, Result, auth::User, auth::UserFollow, permissions::FinePermission};
|
||||
use crate::{auto_method, execute, get, query_row};
|
||||
use crate::{auto_method, execute, get, query_row, query_rows};
|
||||
|
||||
#[cfg(feature = "sqlite")]
|
||||
use rusqlite::Row;
|
||||
|
@ -39,7 +39,7 @@ impl DataManager {
|
|||
let res = query_row!(
|
||||
&conn,
|
||||
"SELECT * FROM userfollows WHERE initiator = $1 AND receiver = $2",
|
||||
&[&(initiator as i64), &(receiver as i64)],
|
||||
&[&(initiator as isize), &(receiver as isize)],
|
||||
|x| { Ok(Self::get_userfollow_from_row(x)) }
|
||||
);
|
||||
|
||||
|
@ -64,7 +64,7 @@ impl DataManager {
|
|||
let res = query_row!(
|
||||
&conn,
|
||||
"SELECT * FROM userfollows WHERE receiver = $1 AND initiator = $2",
|
||||
&[&(receiver as i64), &(initiator as i64)],
|
||||
&[&(receiver as isize), &(initiator as isize)],
|
||||
|x| { Ok(Self::get_userfollow_from_row(x)) }
|
||||
);
|
||||
|
||||
|
@ -75,6 +75,76 @@ impl DataManager {
|
|||
Ok(res.unwrap())
|
||||
}
|
||||
|
||||
/// Get users the given user is following.
|
||||
///
|
||||
/// # Arguments
|
||||
/// * `id` - the ID of the user
|
||||
/// * `batch` - the limit of userfollows in each page
|
||||
/// * `page` - the page number
|
||||
pub async fn get_userfollows_by_initiator(
|
||||
&self,
|
||||
id: usize,
|
||||
batch: usize,
|
||||
page: usize,
|
||||
) -> Result<Vec<UserFollow>> {
|
||||
let conn = match self.connect().await {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM userfollows WHERE initiator = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||
&[
|
||||
&(id as isize),
|
||||
&(batch as isize),
|
||||
&((page * batch) as isize)
|
||||
],
|
||||
|x| { Self::get_userfollow_from_row(x) }
|
||||
);
|
||||
|
||||
if res.is_err() {
|
||||
return Err(Error::GeneralNotFound("user follow".to_string()));
|
||||
}
|
||||
|
||||
Ok(res.unwrap())
|
||||
}
|
||||
|
||||
/// Get users following the given user.
|
||||
///
|
||||
/// # Arguments
|
||||
/// * `id` - the ID of the user
|
||||
/// * `batch` - the limit of userfollows in each page
|
||||
/// * `page` - the page number
|
||||
pub async fn get_userfollows_by_receiver(
|
||||
&self,
|
||||
id: usize,
|
||||
batch: usize,
|
||||
page: usize,
|
||||
) -> Result<Vec<UserFollow>> {
|
||||
let conn = match self.connect().await {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||
};
|
||||
|
||||
let res = query_rows!(
|
||||
&conn,
|
||||
"SELECT * FROM userfollows WHERE receiver = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||
&[
|
||||
&(id as isize),
|
||||
&(batch as isize),
|
||||
&((page * batch) as isize)
|
||||
],
|
||||
|x| { Self::get_userfollow_from_row(x) }
|
||||
);
|
||||
|
||||
if res.is_err() {
|
||||
return Err(Error::GeneralNotFound("user follow".to_string()));
|
||||
}
|
||||
|
||||
Ok(res.unwrap())
|
||||
}
|
||||
|
||||
/// Create a new user follow in the database.
|
||||
///
|
||||
/// # Arguments
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue