2020-07-07 14:54:44 +00:00
|
|
|
// TODO, remove the cross join here, just join to user directly
|
2020-07-10 18:15:41 +00:00
|
|
|
use crate::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
2020-05-16 14:04:08 +00:00
|
|
|
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
|
|
|
use serde::{Deserialize, Serialize};
|
2019-04-03 20:59:37 +00:00
|
|
|
|
|
|
|
// The faked schema since diesel doesn't do views
|
|
|
|
table! {
|
|
|
|
comment_view (id) {
|
|
|
|
id -> Int4,
|
|
|
|
creator_id -> Int4,
|
|
|
|
post_id -> Int4,
|
2020-07-12 15:26:10 +00:00
|
|
|
post_name -> Varchar,
|
2019-04-03 20:59:37 +00:00
|
|
|
parent_id -> Nullable<Int4>,
|
|
|
|
content -> Text,
|
2019-04-20 04:06:25 +00:00
|
|
|
removed -> Bool,
|
|
|
|
read -> Bool,
|
2019-04-03 20:59:37 +00:00
|
|
|
published -> Timestamp,
|
|
|
|
updated -> Nullable<Timestamp>,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted -> Bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
ap_id -> Text,
|
|
|
|
local -> Bool,
|
2019-04-15 23:12:06 +00:00
|
|
|
community_id -> Int4,
|
2020-04-14 19:12:19 +00:00
|
|
|
community_actor_id -> Text,
|
|
|
|
community_local -> Bool,
|
2020-02-08 04:05:15 +00:00
|
|
|
community_name -> Varchar,
|
2020-08-05 16:03:46 +00:00
|
|
|
community_icon -> Nullable<Text>,
|
2019-04-20 04:06:25 +00:00
|
|
|
banned -> Bool,
|
|
|
|
banned_from_community -> Bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
creator_actor_id -> Text,
|
|
|
|
creator_local -> Bool,
|
2019-04-03 20:59:37 +00:00
|
|
|
creator_name -> Varchar,
|
2020-08-05 16:03:46 +00:00
|
|
|
creator_preferred_username -> Nullable<Varchar>,
|
2020-07-08 00:28:47 +00:00
|
|
|
creator_published -> Timestamp,
|
2020-07-09 23:59:02 +00:00
|
|
|
creator_avatar -> Nullable<Text>,
|
2019-04-03 20:59:37 +00:00
|
|
|
score -> BigInt,
|
|
|
|
upvotes -> BigInt,
|
|
|
|
downvotes -> BigInt,
|
2020-02-08 04:05:15 +00:00
|
|
|
hot_rank -> Int4,
|
2020-08-05 16:03:46 +00:00
|
|
|
hot_rank_active -> Int4,
|
2019-04-03 20:59:37 +00:00
|
|
|
user_id -> Nullable<Int4>,
|
|
|
|
my_vote -> Nullable<Int4>,
|
2020-02-08 04:05:15 +00:00
|
|
|
subscribed -> Nullable<Bool>,
|
2019-04-20 04:06:25 +00:00
|
|
|
saved -> Nullable<Bool>,
|
2019-04-03 20:59:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-30 01:00:28 +00:00
|
|
|
table! {
|
2020-07-07 14:54:44 +00:00
|
|
|
comment_fast_view (id) {
|
2020-06-30 01:00:28 +00:00
|
|
|
id -> Int4,
|
|
|
|
creator_id -> Int4,
|
|
|
|
post_id -> Int4,
|
2020-07-12 15:26:10 +00:00
|
|
|
post_name -> Varchar,
|
2020-06-30 01:00:28 +00:00
|
|
|
parent_id -> Nullable<Int4>,
|
|
|
|
content -> Text,
|
|
|
|
removed -> Bool,
|
|
|
|
read -> Bool,
|
|
|
|
published -> Timestamp,
|
|
|
|
updated -> Nullable<Timestamp>,
|
|
|
|
deleted -> Bool,
|
|
|
|
ap_id -> Text,
|
|
|
|
local -> Bool,
|
|
|
|
community_id -> Int4,
|
|
|
|
community_actor_id -> Text,
|
|
|
|
community_local -> Bool,
|
|
|
|
community_name -> Varchar,
|
2020-08-05 16:03:46 +00:00
|
|
|
community_icon -> Nullable<Text>,
|
2020-06-30 01:00:28 +00:00
|
|
|
banned -> Bool,
|
|
|
|
banned_from_community -> Bool,
|
|
|
|
creator_actor_id -> Text,
|
|
|
|
creator_local -> Bool,
|
|
|
|
creator_name -> Varchar,
|
2020-08-05 16:03:46 +00:00
|
|
|
creator_preferred_username -> Nullable<Varchar>,
|
2020-07-08 00:28:47 +00:00
|
|
|
creator_published -> Timestamp,
|
2020-07-09 23:59:02 +00:00
|
|
|
creator_avatar -> Nullable<Text>,
|
2020-06-30 01:00:28 +00:00
|
|
|
score -> BigInt,
|
|
|
|
upvotes -> BigInt,
|
|
|
|
downvotes -> BigInt,
|
|
|
|
hot_rank -> Int4,
|
2020-08-05 16:03:46 +00:00
|
|
|
hot_rank_active -> Int4,
|
2020-06-30 01:00:28 +00:00
|
|
|
user_id -> Nullable<Int4>,
|
|
|
|
my_vote -> Nullable<Int4>,
|
|
|
|
subscribed -> Nullable<Bool>,
|
|
|
|
saved -> Nullable<Bool>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-07 15:35:05 +00:00
|
|
|
#[derive(
|
|
|
|
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
|
|
|
|
)]
|
2020-07-07 14:54:44 +00:00
|
|
|
#[table_name = "comment_fast_view"]
|
2019-04-03 20:59:37 +00:00
|
|
|
pub struct CommentView {
|
|
|
|
pub id: i32,
|
|
|
|
pub creator_id: i32,
|
|
|
|
pub post_id: i32,
|
2020-07-12 15:26:10 +00:00
|
|
|
pub post_name: String,
|
2019-04-03 20:59:37 +00:00
|
|
|
pub parent_id: Option<i32>,
|
|
|
|
pub content: String,
|
2019-04-20 04:06:25 +00:00
|
|
|
pub removed: bool,
|
|
|
|
pub read: bool,
|
2019-04-03 20:59:37 +00:00
|
|
|
pub published: chrono::NaiveDateTime,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
2019-04-29 19:14:54 +00:00
|
|
|
pub deleted: bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
pub ap_id: String,
|
|
|
|
pub local: bool,
|
2019-04-15 23:12:06 +00:00
|
|
|
pub community_id: i32,
|
2020-04-14 19:12:19 +00:00
|
|
|
pub community_actor_id: String,
|
|
|
|
pub community_local: bool,
|
2020-02-08 04:05:15 +00:00
|
|
|
pub community_name: String,
|
2020-08-05 16:03:46 +00:00
|
|
|
pub community_icon: Option<String>,
|
2019-04-20 04:06:25 +00:00
|
|
|
pub banned: bool,
|
|
|
|
pub banned_from_community: bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
pub creator_actor_id: String,
|
|
|
|
pub creator_local: bool,
|
2019-04-03 20:59:37 +00:00
|
|
|
pub creator_name: String,
|
2020-08-05 16:03:46 +00:00
|
|
|
pub creator_preferred_username: Option<String>,
|
2020-07-08 00:28:47 +00:00
|
|
|
pub creator_published: chrono::NaiveDateTime,
|
2020-07-09 23:59:02 +00:00
|
|
|
pub creator_avatar: Option<String>,
|
2019-04-03 20:59:37 +00:00
|
|
|
pub score: i64,
|
|
|
|
pub upvotes: i64,
|
|
|
|
pub downvotes: i64,
|
2020-02-08 04:05:15 +00:00
|
|
|
pub hot_rank: i32,
|
2020-08-05 16:03:46 +00:00
|
|
|
pub hot_rank_active: i32,
|
2019-04-03 20:59:37 +00:00
|
|
|
pub user_id: Option<i32>,
|
|
|
|
pub my_vote: Option<i32>,
|
2020-02-08 04:05:15 +00:00
|
|
|
pub subscribed: Option<bool>,
|
2019-04-20 04:06:25 +00:00
|
|
|
pub saved: Option<bool>,
|
2019-04-03 20:59:37 +00:00
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
pub struct CommentQueryBuilder<'a> {
|
|
|
|
conn: &'a PgConnection,
|
2020-07-07 14:54:44 +00:00
|
|
|
query: super::comment_view::comment_fast_view::BoxedQuery<'a, Pg>,
|
2020-02-08 04:05:15 +00:00
|
|
|
listing_type: ListingType,
|
2019-12-08 20:39:54 +00:00
|
|
|
sort: &'a SortType,
|
2020-02-08 04:05:15 +00:00
|
|
|
for_community_id: Option<i32>,
|
2019-12-08 20:39:54 +00:00
|
|
|
for_post_id: Option<i32>,
|
|
|
|
for_creator_id: Option<i32>,
|
|
|
|
search_term: Option<String>,
|
|
|
|
my_user_id: Option<i32>,
|
|
|
|
saved_only: bool,
|
|
|
|
page: Option<i64>,
|
|
|
|
limit: Option<i64>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommentQueryBuilder<'a> {
|
|
|
|
pub fn create(conn: &'a PgConnection) -> Self {
|
2020-07-07 14:54:44 +00:00
|
|
|
use super::comment_view::comment_fast_view::dsl::*;
|
2019-04-03 20:59:37 +00:00
|
|
|
|
2020-07-07 14:54:44 +00:00
|
|
|
let query = comment_fast_view.into_boxed();
|
2019-12-08 20:39:54 +00:00
|
|
|
|
|
|
|
CommentQueryBuilder {
|
|
|
|
conn,
|
|
|
|
query,
|
2020-02-08 04:05:15 +00:00
|
|
|
listing_type: ListingType::All,
|
2019-12-08 20:39:54 +00:00
|
|
|
sort: &SortType::New,
|
2020-02-08 04:05:15 +00:00
|
|
|
for_community_id: None,
|
2019-12-08 20:39:54 +00:00
|
|
|
for_post_id: None,
|
|
|
|
for_creator_id: None,
|
|
|
|
search_term: None,
|
|
|
|
my_user_id: None,
|
|
|
|
saved_only: false,
|
|
|
|
page: None,
|
|
|
|
limit: None,
|
|
|
|
}
|
|
|
|
}
|
2019-04-17 18:30:13 +00:00
|
|
|
|
2020-02-08 04:05:15 +00:00
|
|
|
pub fn listing_type(mut self, listing_type: ListingType) -> Self {
|
|
|
|
self.listing_type = listing_type;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
pub fn sort(mut self, sort: &'a SortType) -> Self {
|
|
|
|
self.sort = sort;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn for_post_id<T: MaybeOptional<i32>>(mut self, for_post_id: T) -> Self {
|
|
|
|
self.for_post_id = for_post_id.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn for_creator_id<T: MaybeOptional<i32>>(mut self, for_creator_id: T) -> Self {
|
|
|
|
self.for_creator_id = for_creator_id.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-02-08 04:05:15 +00:00
|
|
|
pub fn for_community_id<T: MaybeOptional<i32>>(mut self, for_community_id: T) -> Self {
|
|
|
|
self.for_community_id = for_community_id.get_optional();
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn search_term<T: MaybeOptional<String>>(mut self, search_term: T) -> Self {
|
|
|
|
self.search_term = search_term.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn my_user_id<T: MaybeOptional<i32>>(mut self, my_user_id: T) -> Self {
|
|
|
|
self.my_user_id = my_user_id.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn saved_only(mut self, saved_only: bool) -> Self {
|
|
|
|
self.saved_only = saved_only;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn page<T: MaybeOptional<i64>>(mut self, page: T) -> Self {
|
|
|
|
self.page = page.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn limit<T: MaybeOptional<i64>>(mut self, limit: T) -> Self {
|
|
|
|
self.limit = limit.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn list(self) -> Result<Vec<CommentView>, Error> {
|
2020-07-07 14:54:44 +00:00
|
|
|
use super::comment_view::comment_fast_view::dsl::*;
|
2019-12-08 20:39:54 +00:00
|
|
|
|
|
|
|
let mut query = self.query;
|
2019-04-03 20:59:37 +00:00
|
|
|
|
|
|
|
// The view lets you pass a null user_id, if you're not logged in
|
2019-12-08 20:39:54 +00:00
|
|
|
if let Some(my_user_id) = self.my_user_id {
|
2019-04-08 05:19:02 +00:00
|
|
|
query = query.filter(user_id.eq(my_user_id));
|
2019-04-03 20:59:37 +00:00
|
|
|
} else {
|
|
|
|
query = query.filter(user_id.is_null());
|
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
if let Some(for_creator_id) = self.for_creator_id {
|
2019-04-08 05:19:02 +00:00
|
|
|
query = query.filter(creator_id.eq(for_creator_id));
|
|
|
|
};
|
|
|
|
|
2020-02-08 04:05:15 +00:00
|
|
|
if let Some(for_community_id) = self.for_community_id {
|
|
|
|
query = query.filter(community_id.eq(for_community_id));
|
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
if let Some(for_post_id) = self.for_post_id {
|
2019-04-08 05:19:02 +00:00
|
|
|
query = query.filter(post_id.eq(for_post_id));
|
|
|
|
};
|
2019-04-23 22:05:50 +00:00
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
if let Some(search_term) = self.search_term {
|
2019-04-23 22:05:50 +00:00
|
|
|
query = query.filter(content.ilike(fuzzy_search(&search_term)));
|
|
|
|
};
|
2019-09-07 15:35:05 +00:00
|
|
|
|
2020-02-08 04:05:15 +00:00
|
|
|
if let ListingType::Subscribed = self.listing_type {
|
|
|
|
query = query.filter(subscribed.eq(true));
|
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
if self.saved_only {
|
2019-04-20 04:06:25 +00:00
|
|
|
query = query.filter(saved.eq(true));
|
|
|
|
}
|
2019-04-08 05:19:02 +00:00
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
query = match self.sort {
|
2020-02-08 04:05:15 +00:00
|
|
|
SortType::Hot => query
|
|
|
|
.order_by(hot_rank.desc())
|
|
|
|
.then_order_by(published.desc()),
|
2020-08-05 16:03:46 +00:00
|
|
|
SortType::Active => query
|
|
|
|
.order_by(hot_rank_active.desc())
|
|
|
|
.then_order_by(published.desc()),
|
2019-04-08 05:19:02 +00:00
|
|
|
SortType::New => query.order_by(published.desc()),
|
|
|
|
SortType::TopAll => query.order_by(score.desc()),
|
|
|
|
SortType::TopYear => query
|
|
|
|
.filter(published.gt(now - 1.years()))
|
|
|
|
.order_by(score.desc()),
|
2019-09-07 15:35:05 +00:00
|
|
|
SortType::TopMonth => query
|
|
|
|
.filter(published.gt(now - 1.months()))
|
|
|
|
.order_by(score.desc()),
|
|
|
|
SortType::TopWeek => query
|
|
|
|
.filter(published.gt(now - 1.weeks()))
|
|
|
|
.order_by(score.desc()),
|
|
|
|
SortType::TopDay => query
|
|
|
|
.filter(published.gt(now - 1.days()))
|
|
|
|
.order_by(score.desc()),
|
2020-02-08 04:05:15 +00:00
|
|
|
// _ => query.order_by(published.desc()),
|
2019-04-08 05:19:02 +00:00
|
|
|
};
|
2019-04-03 20:59:37 +00:00
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
let (limit, offset) = limit_and_offset(self.page, self.limit);
|
|
|
|
|
2019-04-29 19:14:54 +00:00
|
|
|
// Note: deleted and removed comments are done on the front side
|
2019-12-08 20:39:54 +00:00
|
|
|
query
|
|
|
|
.limit(limit)
|
|
|
|
.offset(offset)
|
|
|
|
.load::<CommentView>(self.conn)
|
2019-04-03 20:59:37 +00:00
|
|
|
}
|
2019-12-08 20:39:54 +00:00
|
|
|
}
|
2019-04-03 20:59:37 +00:00
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
impl CommentView {
|
2019-09-07 15:35:05 +00:00
|
|
|
pub fn read(
|
|
|
|
conn: &PgConnection,
|
|
|
|
from_comment_id: i32,
|
|
|
|
my_user_id: Option<i32>,
|
|
|
|
) -> Result<Self, Error> {
|
2020-07-07 14:54:44 +00:00
|
|
|
use super::comment_view::comment_fast_view::dsl::*;
|
|
|
|
let mut query = comment_fast_view.into_boxed();
|
2019-04-03 20:59:37 +00:00
|
|
|
|
|
|
|
// The view lets you pass a null user_id, if you're not logged in
|
2019-04-08 05:19:02 +00:00
|
|
|
if let Some(my_user_id) = my_user_id {
|
|
|
|
query = query.filter(user_id.eq(my_user_id));
|
2019-04-03 20:59:37 +00:00
|
|
|
} else {
|
|
|
|
query = query.filter(user_id.is_null());
|
|
|
|
}
|
|
|
|
|
2019-09-07 15:35:05 +00:00
|
|
|
query = query
|
|
|
|
.filter(id.eq(from_comment_id))
|
|
|
|
.order_by(published.desc());
|
2019-04-03 20:59:37 +00:00
|
|
|
|
2019-09-07 15:35:05 +00:00
|
|
|
query.first::<Self>(conn)
|
2019-04-03 20:59:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-20 18:17:00 +00:00
|
|
|
// The faked schema since diesel doesn't do views
|
|
|
|
table! {
|
2020-07-07 14:54:44 +00:00
|
|
|
reply_fast_view (id) {
|
2019-04-20 18:17:00 +00:00
|
|
|
id -> Int4,
|
|
|
|
creator_id -> Int4,
|
|
|
|
post_id -> Int4,
|
2020-07-13 06:18:11 +00:00
|
|
|
post_name -> Varchar,
|
2019-04-20 18:17:00 +00:00
|
|
|
parent_id -> Nullable<Int4>,
|
|
|
|
content -> Text,
|
|
|
|
removed -> Bool,
|
|
|
|
read -> Bool,
|
|
|
|
published -> Timestamp,
|
|
|
|
updated -> Nullable<Timestamp>,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted -> Bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
ap_id -> Text,
|
|
|
|
local -> Bool,
|
2019-04-20 18:17:00 +00:00
|
|
|
community_id -> Int4,
|
2020-04-14 19:12:19 +00:00
|
|
|
community_actor_id -> Text,
|
|
|
|
community_local -> Bool,
|
2020-02-08 04:05:15 +00:00
|
|
|
community_name -> Varchar,
|
2020-08-05 16:03:46 +00:00
|
|
|
community_icon -> Nullable<Varchar>,
|
2019-04-20 18:17:00 +00:00
|
|
|
banned -> Bool,
|
|
|
|
banned_from_community -> Bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
creator_actor_id -> Text,
|
|
|
|
creator_local -> Bool,
|
2019-04-20 18:17:00 +00:00
|
|
|
creator_name -> Varchar,
|
2020-08-05 16:03:46 +00:00
|
|
|
creator_preferred_username -> Nullable<Varchar>,
|
2019-12-29 20:39:48 +00:00
|
|
|
creator_avatar -> Nullable<Text>,
|
2020-07-08 00:28:47 +00:00
|
|
|
creator_published -> Timestamp,
|
2019-04-20 18:17:00 +00:00
|
|
|
score -> BigInt,
|
|
|
|
upvotes -> BigInt,
|
|
|
|
downvotes -> BigInt,
|
2020-02-08 04:05:15 +00:00
|
|
|
hot_rank -> Int4,
|
2020-08-05 16:03:46 +00:00
|
|
|
hot_rank_active -> Int4,
|
2019-04-20 18:17:00 +00:00
|
|
|
user_id -> Nullable<Int4>,
|
|
|
|
my_vote -> Nullable<Int4>,
|
2020-02-08 04:05:15 +00:00
|
|
|
subscribed -> Nullable<Bool>,
|
2019-04-20 18:17:00 +00:00
|
|
|
saved -> Nullable<Bool>,
|
|
|
|
recipient_id -> Int4,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-07 15:35:05 +00:00
|
|
|
#[derive(
|
|
|
|
Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
|
|
|
|
)]
|
2020-07-07 14:54:44 +00:00
|
|
|
#[table_name = "reply_fast_view"]
|
2019-04-20 18:17:00 +00:00
|
|
|
pub struct ReplyView {
|
|
|
|
pub id: i32,
|
|
|
|
pub creator_id: i32,
|
|
|
|
pub post_id: i32,
|
2020-07-13 06:18:11 +00:00
|
|
|
pub post_name: String,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub parent_id: Option<i32>,
|
|
|
|
pub content: String,
|
|
|
|
pub removed: bool,
|
|
|
|
pub read: bool,
|
|
|
|
pub published: chrono::NaiveDateTime,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
2019-04-29 19:14:54 +00:00
|
|
|
pub deleted: bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
pub ap_id: String,
|
|
|
|
pub local: bool,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub community_id: i32,
|
2020-04-14 19:12:19 +00:00
|
|
|
pub community_actor_id: String,
|
|
|
|
pub community_local: bool,
|
2020-02-08 04:05:15 +00:00
|
|
|
pub community_name: String,
|
2020-08-05 16:03:46 +00:00
|
|
|
pub community_icon: Option<String>,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub banned: bool,
|
|
|
|
pub banned_from_community: bool,
|
2020-04-14 19:12:19 +00:00
|
|
|
pub creator_actor_id: String,
|
|
|
|
pub creator_local: bool,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub creator_name: String,
|
2020-08-05 16:03:46 +00:00
|
|
|
pub creator_preferred_username: Option<String>,
|
2019-12-29 20:39:48 +00:00
|
|
|
pub creator_avatar: Option<String>,
|
2020-07-08 00:28:47 +00:00
|
|
|
pub creator_published: chrono::NaiveDateTime,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub score: i64,
|
|
|
|
pub upvotes: i64,
|
|
|
|
pub downvotes: i64,
|
2020-02-08 04:05:15 +00:00
|
|
|
pub hot_rank: i32,
|
2020-08-05 16:03:46 +00:00
|
|
|
pub hot_rank_active: i32,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub user_id: Option<i32>,
|
|
|
|
pub my_vote: Option<i32>,
|
2020-02-08 04:05:15 +00:00
|
|
|
pub subscribed: Option<bool>,
|
2019-04-20 18:17:00 +00:00
|
|
|
pub saved: Option<bool>,
|
|
|
|
pub recipient_id: i32,
|
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
pub struct ReplyQueryBuilder<'a> {
|
|
|
|
conn: &'a PgConnection,
|
2020-07-07 14:54:44 +00:00
|
|
|
query: super::comment_view::reply_fast_view::BoxedQuery<'a, Pg>,
|
2019-12-08 20:39:54 +00:00
|
|
|
for_user_id: i32,
|
|
|
|
sort: &'a SortType,
|
|
|
|
unread_only: bool,
|
|
|
|
page: Option<i64>,
|
|
|
|
limit: Option<i64>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> ReplyQueryBuilder<'a> {
|
|
|
|
pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self {
|
2020-07-07 14:54:44 +00:00
|
|
|
use super::comment_view::reply_fast_view::dsl::*;
|
2019-04-20 18:17:00 +00:00
|
|
|
|
2020-07-07 14:54:44 +00:00
|
|
|
let query = reply_fast_view.into_boxed();
|
2019-04-20 18:17:00 +00:00
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
ReplyQueryBuilder {
|
|
|
|
conn,
|
|
|
|
query,
|
2019-12-09 19:08:19 +00:00
|
|
|
for_user_id,
|
2019-12-08 20:39:54 +00:00
|
|
|
sort: &SortType::New,
|
|
|
|
unread_only: false,
|
|
|
|
page: None,
|
|
|
|
limit: None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn sort(mut self, sort: &'a SortType) -> Self {
|
|
|
|
self.sort = sort;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn unread_only(mut self, unread_only: bool) -> Self {
|
|
|
|
self.unread_only = unread_only;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn page<T: MaybeOptional<i64>>(mut self, page: T) -> Self {
|
|
|
|
self.page = page.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2019-12-10 23:10:39 +00:00
|
|
|
pub fn limit<T: MaybeOptional<i64>>(mut self, limit: T) -> Self {
|
|
|
|
self.limit = limit.get_optional();
|
2019-12-08 20:39:54 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn list(self) -> Result<Vec<ReplyView>, Error> {
|
2020-07-07 14:54:44 +00:00
|
|
|
use super::comment_view::reply_fast_view::dsl::*;
|
2019-12-08 20:39:54 +00:00
|
|
|
|
|
|
|
let mut query = self.query;
|
2019-04-20 18:17:00 +00:00
|
|
|
|
|
|
|
query = query
|
2019-12-08 20:39:54 +00:00
|
|
|
.filter(user_id.eq(self.for_user_id))
|
2020-02-02 22:07:16 +00:00
|
|
|
.filter(recipient_id.eq(self.for_user_id))
|
|
|
|
.filter(deleted.eq(false))
|
|
|
|
.filter(removed.eq(false));
|
2019-04-20 18:17:00 +00:00
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
if self.unread_only {
|
2019-04-20 18:17:00 +00:00
|
|
|
query = query.filter(read.eq(false));
|
|
|
|
}
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
query = match self.sort {
|
2020-08-05 16:03:46 +00:00
|
|
|
// SortType::Hot => query.order_by(hot_rank.desc()), // TODO why is this commented
|
2019-04-20 18:17:00 +00:00
|
|
|
SortType::New => query.order_by(published.desc()),
|
|
|
|
SortType::TopAll => query.order_by(score.desc()),
|
|
|
|
SortType::TopYear => query
|
|
|
|
.filter(published.gt(now - 1.years()))
|
|
|
|
.order_by(score.desc()),
|
2019-09-07 15:35:05 +00:00
|
|
|
SortType::TopMonth => query
|
|
|
|
.filter(published.gt(now - 1.months()))
|
|
|
|
.order_by(score.desc()),
|
|
|
|
SortType::TopWeek => query
|
|
|
|
.filter(published.gt(now - 1.weeks()))
|
|
|
|
.order_by(score.desc()),
|
|
|
|
SortType::TopDay => query
|
|
|
|
.filter(published.gt(now - 1.days()))
|
|
|
|
.order_by(score.desc()),
|
|
|
|
_ => query.order_by(published.desc()),
|
2019-04-20 18:17:00 +00:00
|
|
|
};
|
|
|
|
|
2019-12-08 20:39:54 +00:00
|
|
|
let (limit, offset) = limit_and_offset(self.page, self.limit);
|
|
|
|
query
|
|
|
|
.limit(limit)
|
|
|
|
.offset(offset)
|
|
|
|
.load::<ReplyView>(self.conn)
|
2019-04-20 18:17:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-03 20:59:37 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2020-07-10 18:15:41 +00:00
|
|
|
use crate::{
|
|
|
|
comment::*,
|
|
|
|
comment_view::*,
|
|
|
|
community::*,
|
|
|
|
post::*,
|
|
|
|
tests::establish_unpooled_connection,
|
|
|
|
user::*,
|
|
|
|
Crud,
|
|
|
|
Likeable,
|
2020-05-16 14:04:08 +00:00
|
|
|
*,
|
|
|
|
};
|
|
|
|
|
2019-09-07 15:35:05 +00:00
|
|
|
#[test]
|
2019-04-03 20:59:37 +00:00
|
|
|
fn test_crud() {
|
2020-01-12 15:31:51 +00:00
|
|
|
let conn = establish_unpooled_connection();
|
2019-04-03 20:59:37 +00:00
|
|
|
|
|
|
|
let new_user = UserForm {
|
|
|
|
name: "timmy".into(),
|
|
|
|
preferred_username: None,
|
|
|
|
password_encrypted: "nope".into(),
|
|
|
|
email: None,
|
2020-01-22 21:35:29 +00:00
|
|
|
matrix_user_id: None,
|
2019-12-29 20:39:48 +00:00
|
|
|
avatar: None,
|
2020-08-05 16:03:46 +00:00
|
|
|
banner: None,
|
2019-04-16 23:04:23 +00:00
|
|
|
admin: false,
|
|
|
|
banned: false,
|
2019-08-14 03:15:52 +00:00
|
|
|
updated: None,
|
|
|
|
show_nsfw: false,
|
2019-10-15 19:21:27 +00:00
|
|
|
theme: "darkly".into(),
|
2019-10-21 04:21:54 +00:00
|
|
|
default_sort_type: SortType::Hot as i16,
|
|
|
|
default_listing_type: ListingType::Subscribed as i16,
|
2019-12-09 08:24:53 +00:00
|
|
|
lang: "browser".into(),
|
2020-01-02 21:55:54 +00:00
|
|
|
show_avatars: true,
|
|
|
|
send_notifications_to_email: false,
|
2020-08-31 13:48:02 +00:00
|
|
|
actor_id: None,
|
2020-04-03 04:12:05 +00:00
|
|
|
bio: None,
|
|
|
|
local: true,
|
|
|
|
private_key: None,
|
|
|
|
public_key: None,
|
|
|
|
last_refreshed_at: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let inserted_user = User_::create(&conn, &new_user).unwrap();
|
|
|
|
|
|
|
|
let new_community = CommunityForm {
|
|
|
|
name: "test community 5".to_string(),
|
|
|
|
title: "nada".to_owned(),
|
|
|
|
description: None,
|
|
|
|
category_id: 1,
|
|
|
|
creator_id: inserted_user.id,
|
2019-04-20 07:24:59 +00:00
|
|
|
removed: None,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted: None,
|
2019-08-14 03:15:52 +00:00
|
|
|
updated: None,
|
|
|
|
nsfw: false,
|
2020-08-31 13:48:02 +00:00
|
|
|
actor_id: None,
|
2020-04-03 04:12:05 +00:00
|
|
|
local: true,
|
|
|
|
private_key: None,
|
|
|
|
public_key: None,
|
|
|
|
last_refreshed_at: None,
|
2020-04-07 16:47:19 +00:00
|
|
|
published: None,
|
2020-08-05 16:03:46 +00:00
|
|
|
icon: None,
|
|
|
|
banner: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
2019-09-07 15:35:05 +00:00
|
|
|
|
2019-04-03 20:59:37 +00:00
|
|
|
let new_post = PostForm {
|
|
|
|
name: "A test post 2".into(),
|
|
|
|
creator_id: inserted_user.id,
|
|
|
|
url: None,
|
|
|
|
body: None,
|
|
|
|
community_id: inserted_community.id,
|
2019-04-20 07:24:59 +00:00
|
|
|
removed: None,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted: None,
|
2019-04-20 07:24:59 +00:00
|
|
|
locked: None,
|
2019-09-09 06:14:13 +00:00
|
|
|
stickied: None,
|
2019-08-14 03:15:52 +00:00
|
|
|
updated: None,
|
|
|
|
nsfw: false,
|
2020-03-07 23:31:13 +00:00
|
|
|
embed_title: None,
|
|
|
|
embed_description: None,
|
|
|
|
embed_html: None,
|
|
|
|
thumbnail_url: None,
|
2020-08-31 13:48:02 +00:00
|
|
|
ap_id: None,
|
2020-04-04 00:04:57 +00:00
|
|
|
local: true,
|
2020-04-07 16:47:19 +00:00
|
|
|
published: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
|
|
|
|
let comment_form = CommentForm {
|
|
|
|
content: "A test comment 32".into(),
|
|
|
|
creator_id: inserted_user.id,
|
|
|
|
post_id: inserted_post.id,
|
|
|
|
parent_id: None,
|
2019-04-15 23:12:06 +00:00
|
|
|
removed: None,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted: None,
|
2019-04-20 23:47:23 +00:00
|
|
|
read: None,
|
2020-04-27 16:57:00 +00:00
|
|
|
published: None,
|
2019-09-07 15:35:05 +00:00
|
|
|
updated: None,
|
2020-08-31 13:48:02 +00:00
|
|
|
ap_id: None,
|
2020-04-04 00:04:57 +00:00
|
|
|
local: true,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
|
|
|
|
|
|
|
|
let comment_like_form = CommentLikeForm {
|
|
|
|
comment_id: inserted_comment.id,
|
|
|
|
post_id: inserted_post.id,
|
|
|
|
user_id: inserted_user.id,
|
2019-09-07 15:35:05 +00:00
|
|
|
score: 1,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let _inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap();
|
|
|
|
|
|
|
|
let expected_comment_view_no_user = CommentView {
|
|
|
|
id: inserted_comment.id,
|
|
|
|
content: "A test comment 32".into(),
|
|
|
|
creator_id: inserted_user.id,
|
|
|
|
post_id: inserted_post.id,
|
2020-07-12 15:26:10 +00:00
|
|
|
post_name: inserted_post.name.to_owned(),
|
2019-04-15 23:12:06 +00:00
|
|
|
community_id: inserted_community.id,
|
2020-02-08 04:05:15 +00:00
|
|
|
community_name: inserted_community.name.to_owned(),
|
2020-08-05 16:03:46 +00:00
|
|
|
community_icon: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
parent_id: None,
|
2019-04-20 04:06:25 +00:00
|
|
|
removed: false,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted: false,
|
2019-04-20 04:06:25 +00:00
|
|
|
read: false,
|
|
|
|
banned: false,
|
|
|
|
banned_from_community: false,
|
2019-04-03 20:59:37 +00:00
|
|
|
published: inserted_comment.published,
|
|
|
|
updated: None,
|
|
|
|
creator_name: inserted_user.name.to_owned(),
|
2020-08-05 16:03:46 +00:00
|
|
|
creator_preferred_username: None,
|
2020-07-08 00:28:47 +00:00
|
|
|
creator_published: inserted_user.published,
|
2019-12-29 20:39:48 +00:00
|
|
|
creator_avatar: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
score: 1,
|
|
|
|
downvotes: 0,
|
2020-02-08 04:05:15 +00:00
|
|
|
hot_rank: 0,
|
2020-08-05 16:03:46 +00:00
|
|
|
hot_rank_active: 0,
|
2019-04-03 20:59:37 +00:00
|
|
|
upvotes: 1,
|
|
|
|
user_id: None,
|
2019-04-15 23:12:06 +00:00
|
|
|
my_vote: None,
|
2020-02-08 04:05:15 +00:00
|
|
|
subscribed: None,
|
2019-04-20 04:06:25 +00:00
|
|
|
saved: None,
|
2020-08-31 13:48:02 +00:00
|
|
|
ap_id: inserted_comment.ap_id.to_owned(),
|
2020-04-14 19:12:19 +00:00
|
|
|
local: true,
|
|
|
|
community_actor_id: inserted_community.actor_id.to_owned(),
|
|
|
|
community_local: true,
|
|
|
|
creator_actor_id: inserted_user.actor_id.to_owned(),
|
|
|
|
creator_local: true,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let expected_comment_view_with_user = CommentView {
|
|
|
|
id: inserted_comment.id,
|
|
|
|
content: "A test comment 32".into(),
|
|
|
|
creator_id: inserted_user.id,
|
|
|
|
post_id: inserted_post.id,
|
2020-07-12 15:26:10 +00:00
|
|
|
post_name: inserted_post.name.to_owned(),
|
2019-04-15 23:12:06 +00:00
|
|
|
community_id: inserted_community.id,
|
2020-02-08 04:05:15 +00:00
|
|
|
community_name: inserted_community.name.to_owned(),
|
2020-08-05 16:03:46 +00:00
|
|
|
community_icon: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
parent_id: None,
|
2019-04-20 04:06:25 +00:00
|
|
|
removed: false,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted: false,
|
2019-04-20 04:06:25 +00:00
|
|
|
read: false,
|
|
|
|
banned: false,
|
|
|
|
banned_from_community: false,
|
2019-04-03 20:59:37 +00:00
|
|
|
published: inserted_comment.published,
|
|
|
|
updated: None,
|
|
|
|
creator_name: inserted_user.name.to_owned(),
|
2020-08-05 16:03:46 +00:00
|
|
|
creator_preferred_username: None,
|
2020-07-08 00:28:47 +00:00
|
|
|
creator_published: inserted_user.published,
|
2019-12-29 20:39:48 +00:00
|
|
|
creator_avatar: None,
|
2019-04-03 20:59:37 +00:00
|
|
|
score: 1,
|
|
|
|
downvotes: 0,
|
2020-02-08 04:05:15 +00:00
|
|
|
hot_rank: 0,
|
2020-08-05 16:03:46 +00:00
|
|
|
hot_rank_active: 0,
|
2019-04-03 20:59:37 +00:00
|
|
|
upvotes: 1,
|
|
|
|
user_id: Some(inserted_user.id),
|
|
|
|
my_vote: Some(1),
|
2020-07-07 14:54:44 +00:00
|
|
|
subscribed: Some(false),
|
|
|
|
saved: Some(false),
|
2020-08-31 13:48:02 +00:00
|
|
|
ap_id: inserted_comment.ap_id.to_owned(),
|
2020-04-14 19:12:19 +00:00
|
|
|
local: true,
|
|
|
|
community_actor_id: inserted_community.actor_id.to_owned(),
|
|
|
|
community_local: true,
|
|
|
|
creator_actor_id: inserted_user.actor_id.to_owned(),
|
|
|
|
creator_local: true,
|
2019-04-03 20:59:37 +00:00
|
|
|
};
|
|
|
|
|
2020-02-08 04:05:15 +00:00
|
|
|
let mut read_comment_views_no_user = CommentQueryBuilder::create(&conn)
|
2019-12-08 20:39:54 +00:00
|
|
|
.for_post_id(inserted_post.id)
|
|
|
|
.list()
|
|
|
|
.unwrap();
|
2020-02-08 04:05:15 +00:00
|
|
|
read_comment_views_no_user[0].hot_rank = 0;
|
2020-08-05 16:03:46 +00:00
|
|
|
read_comment_views_no_user[0].hot_rank_active = 0;
|
2020-02-08 04:05:15 +00:00
|
|
|
|
|
|
|
let mut read_comment_views_with_user = CommentQueryBuilder::create(&conn)
|
2019-12-08 20:39:54 +00:00
|
|
|
.for_post_id(inserted_post.id)
|
2019-12-08 20:56:10 +00:00
|
|
|
.my_user_id(inserted_user.id)
|
2019-12-08 20:39:54 +00:00
|
|
|
.list()
|
|
|
|
.unwrap();
|
2020-02-08 04:05:15 +00:00
|
|
|
read_comment_views_with_user[0].hot_rank = 0;
|
2020-08-05 16:03:46 +00:00
|
|
|
read_comment_views_with_user[0].hot_rank_active = 0;
|
2019-12-08 20:39:54 +00:00
|
|
|
|
2020-08-12 14:43:45 +00:00
|
|
|
let like_removed = CommentLike::remove(&conn, inserted_user.id, inserted_comment.id).unwrap();
|
2019-04-03 20:59:37 +00:00
|
|
|
let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap();
|
|
|
|
Post::delete(&conn, inserted_post.id).unwrap();
|
|
|
|
Community::delete(&conn, inserted_community.id).unwrap();
|
|
|
|
User_::delete(&conn, inserted_user.id).unwrap();
|
|
|
|
|
|
|
|
assert_eq!(expected_comment_view_no_user, read_comment_views_no_user[0]);
|
2019-09-07 15:35:05 +00:00
|
|
|
assert_eq!(
|
|
|
|
expected_comment_view_with_user,
|
|
|
|
read_comment_views_with_user[0]
|
|
|
|
);
|
2019-04-03 20:59:37 +00:00
|
|
|
assert_eq!(1, num_deleted);
|
|
|
|
assert_eq!(1, like_removed);
|
|
|
|
}
|
|
|
|
}
|