mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-16 12:20:32 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
115 lines
3.8 KiB
Rust
115 lines
3.8 KiB
Rust
use crate::newtypes::{CommentId, CommunityId, PersonId, PostId, SiteId};
|
|
#[cfg(feature = "full")]
|
|
use crate::schema::{
|
|
comment_aggregates,
|
|
community_aggregates,
|
|
person_aggregates,
|
|
person_post_aggregates,
|
|
post_aggregates,
|
|
site_aggregates,
|
|
};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = comment_aggregates))]
|
|
#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]
|
|
pub struct CommentAggregates {
|
|
pub id: i32,
|
|
pub comment_id: CommentId,
|
|
pub score: i64,
|
|
pub upvotes: i64,
|
|
pub downvotes: i64,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub child_count: i32,
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = community_aggregates))]
|
|
#[cfg_attr(
|
|
feature = "full",
|
|
diesel(belongs_to(crate::source::community::Community))
|
|
)]
|
|
pub struct CommunityAggregates {
|
|
pub id: i32,
|
|
pub community_id: CommunityId,
|
|
pub subscribers: i64,
|
|
pub posts: i64,
|
|
pub comments: i64,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub users_active_day: i64,
|
|
pub users_active_week: i64,
|
|
pub users_active_month: i64,
|
|
pub users_active_half_year: i64,
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Default)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = person_aggregates))]
|
|
#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::person::Person)))]
|
|
pub struct PersonAggregates {
|
|
pub id: i32,
|
|
pub person_id: PersonId,
|
|
pub post_count: i64,
|
|
pub post_score: i64,
|
|
pub comment_count: i64,
|
|
pub comment_score: i64,
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = post_aggregates))]
|
|
#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::post::Post)))]
|
|
pub struct PostAggregates {
|
|
pub id: i32,
|
|
pub post_id: PostId,
|
|
pub comments: i64,
|
|
pub score: i64,
|
|
pub upvotes: i64,
|
|
pub downvotes: i64,
|
|
pub stickied: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub newest_comment_time_necro: chrono::NaiveDateTime, // A newest comment time, limited to 2 days, to prevent necrobumping
|
|
pub newest_comment_time: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = person_post_aggregates))]
|
|
#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::person::Person)))]
|
|
pub struct PersonPostAggregates {
|
|
pub id: i32,
|
|
pub person_id: PersonId,
|
|
pub post_id: PostId,
|
|
pub read_comments: i64,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Clone, Default)]
|
|
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = person_post_aggregates))]
|
|
pub struct PersonPostAggregatesForm {
|
|
pub person_id: PersonId,
|
|
pub post_id: PostId,
|
|
pub read_comments: i64,
|
|
pub published: Option<chrono::NaiveDateTime>,
|
|
}
|
|
|
|
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]
|
|
#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
|
|
#[cfg_attr(feature = "full", diesel(table_name = site_aggregates))]
|
|
#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::site::Site)))]
|
|
pub struct SiteAggregates {
|
|
pub id: i32,
|
|
pub site_id: SiteId,
|
|
pub users: i64,
|
|
pub posts: i64,
|
|
pub comments: i64,
|
|
pub communities: i64,
|
|
pub users_active_day: i64,
|
|
pub users_active_week: i64,
|
|
pub users_active_month: i64,
|
|
pub users_active_half_year: i64,
|
|
}
|