use crate::structs::CommentView;
use diesel::{
- dsl::*,
+ dsl::now,
result::Error,
BoolExpressionMethods,
ExpressionMethods,
impl<'a> CommentQuery<'a> {
pub async fn list(self) -> Result<Vec<CommentView>, Error> {
- use diesel::dsl::*;
let conn = &mut get_conn(self.pool).await?;
// The left join below will return None in this case
}
if self.saved_only.unwrap_or(false) {
- query = query.filter(comment_saved::id.is_not_null());
+ query = query.filter(comment_saved::comment_id.is_not_null());
}
if !self.show_deleted_and_removed.unwrap_or(true) {
if self.local_user.is_some() {
// Filter out the rows with missing languages
- query = query.filter(local_user_language::id.is_not_null());
+ query = query.filter(local_user_language::language_id.is_not_null());
// Don't show blocked communities or persons
query = query.filter(community_block::person_id.is_null());
#[cfg(test)]
mod tests {
- use crate::comment_view::*;
+ use crate::comment_view::{
+ Comment,
+ CommentQuery,
+ CommentSortType,
+ CommentView,
+ Community,
+ CommunitySafe,
+ DbPool,
+ LocalUser,
+ Person,
+ PersonBlock,
+ PersonSafe,
+ Post,
+ };
use lemmy_db_schema::{
aggregates::structs::CommentAggregates,
newtypes::LanguageId,
source::{
actor_language::LocalUserLanguage,
- comment::*,
- community::*,
+ comment::{CommentInsertForm, CommentLike, CommentLikeForm},
+ community::CommunityInsertForm,
instance::Instance,
language::Language,
local_user::LocalUserInsertForm,
- person::*,
+ person::PersonInsertForm,
person_block::PersonBlockForm,
- post::*,
+ post::PostInsertForm,
},
traits::{Blockable, Crud, Likeable},
utils::build_db_pool_for_tests,
let inserted_person = Person::create(pool, &new_person).await.unwrap();
let local_user_form = LocalUserInsertForm::builder()
.person_id(inserted_person.id)
- .password_encrypted("".to_string())
+ .password_encrypted(String::new())
.build();
let inserted_local_user = LocalUser::create(pool, &local_user_form).await.unwrap();
.await
.unwrap();
- let finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap();
+ let finnish_id = Language::read_id_from_code(pool, Some("fi"))
+ .await
+ .unwrap()
+ .unwrap();
let comment_form_2 = CommentInsertForm::builder()
.content("Comment 2".into())
.creator_id(inserted_person.id)
.await
.unwrap();
- let polish_id = Language::read_id_from_code(pool, "pl").await.unwrap();
+ let polish_id = Language::read_id_from_code(pool, Some("pl"))
+ .await
+ .unwrap()
+ .unwrap();
let comment_form_4 = CommentInsertForm::builder()
.content("Comment 4".into())
.creator_id(inserted_person.id)
let expected_comment_view_no_person = expected_comment_view(&data, pool).await;
- let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
+ let mut expected_comment_view_with_person = expected_comment_view_no_person.clone();
expected_comment_view_with_person.my_vote = Some(1);
let read_comment_views_no_person = CommentQuery::builder()
assert_eq!(5, all_languages.len());
// change user lang to finnish, should only show single finnish comment
- let finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap();
+ let finnish_id = Language::read_id_from_code(pool, Some("fi"))
+ .await
+ .unwrap()
+ .unwrap();
LocalUserLanguage::update(pool, vec![finnish_id], data.inserted_local_user.id)
.await
.unwrap();
assert_eq!(finnish_id, finnish_comment[0].comment.language_id);
// now show all comments with undetermined language (which is the default value)
- let undetermined_id = Language::read_id_from_code(pool, "und").await.unwrap();
+ let undetermined_id = Language::read_id_from_code(pool, Some("und"))
+ .await
+ .unwrap()
+ .unwrap();
LocalUserLanguage::update(pool, vec![undetermined_id], data.inserted_local_user.id)
.await
.unwrap();
updated: None,
local: true,
distinguished: false,
- path: data.inserted_comment_0.to_owned().path,
+ path: data.inserted_comment_0.clone().path,
language_id: LanguageId(0),
},
creator: PersonSafe {
display_name: None,
published: data.inserted_person.published,
avatar: None,
- actor_id: data.inserted_person.actor_id.to_owned(),
+ actor_id: data.inserted_person.actor_id.clone(),
local: true,
banned: false,
deleted: false,
bio: None,
banner: None,
updated: None,
- inbox_url: data.inserted_person.inbox_url.to_owned(),
+ inbox_url: data.inserted_person.inbox_url.clone(),
shared_inbox_url: None,
matrix_user_id: None,
ban_expires: None,
},
post: Post {
id: data.inserted_post.id,
- name: data.inserted_post.name.to_owned(),
+ name: data.inserted_post.name.clone(),
creator_id: data.inserted_person.id,
url: None,
body: None,
removed: false,
deleted: false,
locked: false,
- stickied: false,
nsfw: false,
embed_title: None,
embed_description: None,
embed_video_url: None,
thumbnail_url: None,
- ap_id: data.inserted_post.ap_id.to_owned(),
+ ap_id: data.inserted_post.ap_id.clone(),
local: true,
language_id: Default::default(),
+ featured_community: false,
+ featured_local: false,
},
community: CommunitySafe {
id: data.inserted_community.id,
removed: false,
deleted: false,
nsfw: false,
- actor_id: data.inserted_community.actor_id.to_owned(),
+ actor_id: data.inserted_community.actor_id.clone(),
local: true,
title: "nada".to_owned(),
description: None,