mirror of https://github.com/LemmyNet/lemmy
Merge branch 'main' into reduce-pool-size
Nutomic
5 months ago
committed by
GitHub
commit
4a0d3a63a2
@ -0,0 +1,24 @@
|
||||
use actix_web::web::{Data, Json, Query};
|
||||
use lemmy_api_common::{
|
||||
comment::{ListCommentLikes, ListCommentLikesResponse},
|
||||
context::LemmyContext,
|
||||
utils::is_admin,
|
||||
};
|
||||
use lemmy_db_views::structs::{LocalUserView, VoteView};
|
||||
use lemmy_utils::error::LemmyError;
|
||||
|
||||
/// Lists likes for a comment
|
||||
#[tracing::instrument(skip(context))]
|
||||
pub async fn list_comment_likes(
|
||||
data: Query<ListCommentLikes>,
|
||||
context: Data<LemmyContext>,
|
||||
local_user_view: LocalUserView,
|
||||
) -> Result<Json<ListCommentLikesResponse>, LemmyError> {
|
||||
// Make sure user is an admin
|
||||
is_admin(&local_user_view)?;
|
||||
|
||||
let comment_likes =
|
||||
VoteView::list_for_comment(&mut context.pool(), data.comment_id, data.page, data.limit).await?;
|
||||
|
||||
Ok(Json(ListCommentLikesResponse { comment_likes }))
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
pub mod distinguish;
|
||||
pub mod like;
|
||||
pub mod list_comment_likes;
|
||||
pub mod save;
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
use actix_web::web::{Data, Json, Query};
|
||||
use lemmy_api_common::{
|
||||
context::LemmyContext,
|
||||
post::{ListPostLikes, ListPostLikesResponse},
|
||||
utils::is_admin,
|
||||
};
|
||||
use lemmy_db_views::structs::{LocalUserView, VoteView};
|
||||
use lemmy_utils::error::LemmyError;
|
||||
|
||||
/// Lists likes for a post
|
||||
#[tracing::instrument(skip(context))]
|
||||
pub async fn list_post_likes(
|
||||
data: Query<ListPostLikes>,
|
||||
context: Data<LemmyContext>,
|
||||
local_user_view: LocalUserView,
|
||||
) -> Result<Json<ListPostLikesResponse>, LemmyError> {
|
||||
// Make sure user is an admin
|
||||
is_admin(&local_user_view)?;
|
||||
|
||||
let post_likes =
|
||||
VoteView::list_for_post(&mut context.pool(), data.post_id, data.page, data.limit).await?;
|
||||
|
||||
Ok(Json(ListPostLikesResponse { post_likes }))
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
pub mod feature;
|
||||
pub mod get_link_metadata;
|
||||
pub mod like;
|
||||
pub mod list_post_likes;
|
||||
pub mod lock;
|
||||
pub mod mark_read;
|
||||
pub mod save;
|
||||
|
||||
@ -0,0 +1,195 @@
|
||||
use crate::structs::VoteView;
|
||||
use diesel::{result::Error, ExpressionMethods, QueryDsl};
|
||||
use diesel_async::RunQueryDsl;
|
||||
use lemmy_db_schema::{
|
||||
newtypes::{CommentId, PostId},
|
||||
schema::{comment_like, person, post_like},
|
||||
utils::{get_conn, limit_and_offset, DbPool},
|
||||
};
|
||||
|
||||
impl VoteView {
|
||||
pub async fn list_for_post(
|
||||
pool: &mut DbPool<'_>,
|
||||
post_id: PostId,
|
||||
page: Option<i64>,
|
||||
limit: Option<i64>,
|
||||
) -> Result<Vec<Self>, Error> {
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
let (limit, offset) = limit_and_offset(page, limit)?;
|
||||
|
||||
post_like::table
|
||||
.inner_join(person::table)
|
||||
.filter(post_like::post_id.eq(post_id))
|
||||
.select((person::all_columns, post_like::score))
|
||||
.order_by(post_like::score)
|
||||
.limit(limit)
|
||||
.offset(offset)
|
||||
.load::<Self>(conn)
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn list_for_comment(
|
||||
pool: &mut DbPool<'_>,
|
||||
comment_id: CommentId,
|
||||
page: Option<i64>,
|
||||
limit: Option<i64>,
|
||||
) -> Result<Vec<Self>, Error> {
|
||||
let conn = &mut get_conn(pool).await?;
|
||||
let (limit, offset) = limit_and_offset(page, limit)?;
|
||||
|
||||
comment_like::table
|
||||
.inner_join(person::table)
|
||||
.filter(comment_like::comment_id.eq(comment_id))
|
||||
.select((person::all_columns, comment_like::score))
|
||||
.order_by(comment_like::score)
|
||||
.limit(limit)
|
||||
.offset(offset)
|
||||
.load::<Self>(conn)
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#![allow(clippy::unwrap_used)]
|
||||
#![allow(clippy::indexing_slicing)]
|
||||
|
||||
use crate::structs::VoteView;
|
||||
use lemmy_db_schema::{
|
||||
source::{
|
||||
comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm},
|
||||
community::{Community, CommunityInsertForm},
|
||||
instance::Instance,
|
||||
person::{Person, PersonInsertForm},
|
||||
post::{Post, PostInsertForm, PostLike, PostLikeForm},
|
||||
},
|
||||
traits::{Crud, Likeable},
|
||||
utils::build_db_pool_for_tests,
|
||||
};
|
||||
use serial_test::serial;
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn post_and_comment_vote_views() {
|
||||
let pool = &build_db_pool_for_tests().await;
|
||||
let pool = &mut pool.into();
|
||||
|
||||
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let new_person = PersonInsertForm::builder()
|
||||
.name("timmy_vv".into())
|
||||
.public_key("pubkey".to_string())
|
||||
.instance_id(inserted_instance.id)
|
||||
.build();
|
||||
|
||||
let inserted_timmy = Person::create(pool, &new_person).await.unwrap();
|
||||
|
||||
let new_person_2 = PersonInsertForm::builder()
|
||||
.name("sara_vv".into())
|
||||
.public_key("pubkey".to_string())
|
||||
.instance_id(inserted_instance.id)
|
||||
.build();
|
||||
|
||||
let inserted_sara = Person::create(pool, &new_person_2).await.unwrap();
|
||||
|
||||
let new_community = CommunityInsertForm::builder()
|
||||
.name("test community vv".to_string())
|
||||
.title("nada".to_owned())
|
||||
.public_key("pubkey".to_string())
|
||||
.instance_id(inserted_instance.id)
|
||||
.build();
|
||||
|
||||
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
||||
|
||||
let new_post = PostInsertForm::builder()
|
||||
.name("A test post vv".into())
|
||||
.creator_id(inserted_timmy.id)
|
||||
.community_id(inserted_community.id)
|
||||
.build();
|
||||
|
||||
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
||||
|
||||
let comment_form = CommentInsertForm::builder()
|
||||
.content("A test comment vv".into())
|
||||
.creator_id(inserted_timmy.id)
|
||||
.post_id(inserted_post.id)
|
||||
.build();
|
||||
|
||||
let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
||||
|
||||
// Timmy upvotes his own post
|
||||
let timmy_post_vote_form = PostLikeForm {
|
||||
post_id: inserted_post.id,
|
||||
person_id: inserted_timmy.id,
|
||||
score: 1,
|
||||
};
|
||||
PostLike::like(pool, &timmy_post_vote_form).await.unwrap();
|
||||
|
||||
// Sara downvotes timmy's post
|
||||
let sara_post_vote_form = PostLikeForm {
|
||||
post_id: inserted_post.id,
|
||||
person_id: inserted_sara.id,
|
||||
score: -1,
|
||||
};
|
||||
PostLike::like(pool, &sara_post_vote_form).await.unwrap();
|
||||
|
||||
let expected_post_vote_views = [
|
||||
VoteView {
|
||||
creator: inserted_sara.clone(),
|
||||
score: -1,
|
||||
},
|
||||
VoteView {
|
||||
creator: inserted_timmy.clone(),
|
||||
score: 1,
|
||||
},
|
||||
];
|
||||
|
||||
let read_post_vote_views = VoteView::list_for_post(pool, inserted_post.id, None, None)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(read_post_vote_views, expected_post_vote_views);
|
||||
|
||||
// Timothy votes down his own comment
|
||||
let timmy_comment_vote_form = CommentLikeForm {
|
||||
post_id: inserted_post.id,
|
||||
comment_id: inserted_comment.id,
|
||||
person_id: inserted_timmy.id,
|
||||
score: -1,
|
||||
};
|
||||
CommentLike::like(pool, &timmy_comment_vote_form)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// Sara upvotes timmy's comment
|
||||
let sara_comment_vote_form = CommentLikeForm {
|
||||
post_id: inserted_post.id,
|
||||
comment_id: inserted_comment.id,
|
||||
person_id: inserted_sara.id,
|
||||
score: 1,
|
||||
};
|
||||
CommentLike::like(pool, &sara_comment_vote_form)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let expected_comment_vote_views = [
|
||||
VoteView {
|
||||
creator: inserted_timmy.clone(),
|
||||
score: -1,
|
||||
},
|
||||
VoteView {
|
||||
creator: inserted_sara.clone(),
|
||||
score: 1,
|
||||
},
|
||||
];
|
||||
|
||||
let read_comment_vote_views = VoteView::list_for_comment(pool, inserted_comment.id, None, None)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(read_comment_vote_views, expected_comment_vote_views);
|
||||
|
||||
// Cleanup
|
||||
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
ALTER TABLE site
|
||||
ADD CONSTRAINT site_name_key UNIQUE (name);
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
ALTER TABLE site
|
||||
DROP CONSTRAINT site_name_key;
|
||||
|
||||
Loading…
Reference in New Issue