mirror of
https://github.com/LemmyNet/lemmy
synced 2024-10-30 15:21:20 +00:00
80aef61aed
More fixes - fixed docker builds - fixed mentions regex test - fixed DATABASE_URL stuff - change schema path in diesel.toml Address review comments - add jsonb column back into activity table - remove authors field from cargo.toml - adjust LEMMY_DATABASE_URL env var usage - rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL Decouple utils and db Split code into cargo workspaces Co-authored-by: Felix Ableitner <me@nutomic.com> Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
418 lines
11 KiB
Rust
418 lines
11 KiB
Rust
use crate::{
|
|
naive_now,
|
|
schema::{post, post_like, post_read, post_saved},
|
|
Crud,
|
|
Likeable,
|
|
Readable,
|
|
Saveable,
|
|
};
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
#[table_name = "post"]
|
|
pub struct Post {
|
|
pub id: i32,
|
|
pub name: String,
|
|
pub url: Option<String>,
|
|
pub body: Option<String>,
|
|
pub creator_id: i32,
|
|
pub community_id: i32,
|
|
pub removed: bool,
|
|
pub locked: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: bool,
|
|
pub nsfw: bool,
|
|
pub stickied: bool,
|
|
pub embed_title: Option<String>,
|
|
pub embed_description: Option<String>,
|
|
pub embed_html: Option<String>,
|
|
pub thumbnail_url: Option<String>,
|
|
pub ap_id: String,
|
|
pub local: bool,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone, Debug)]
|
|
#[table_name = "post"]
|
|
pub struct PostForm {
|
|
pub name: String,
|
|
pub url: Option<String>,
|
|
pub body: Option<String>,
|
|
pub creator_id: i32,
|
|
pub community_id: i32,
|
|
pub removed: Option<bool>,
|
|
pub locked: Option<bool>,
|
|
pub published: Option<chrono::NaiveDateTime>,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: Option<bool>,
|
|
pub nsfw: bool,
|
|
pub stickied: Option<bool>,
|
|
pub embed_title: Option<String>,
|
|
pub embed_description: Option<String>,
|
|
pub embed_html: Option<String>,
|
|
pub thumbnail_url: Option<String>,
|
|
pub ap_id: String,
|
|
pub local: bool,
|
|
}
|
|
|
|
impl Post {
|
|
pub fn read(conn: &PgConnection, post_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
post.filter(id.eq(post_id)).first::<Self>(conn)
|
|
}
|
|
|
|
pub fn list_for_community(
|
|
conn: &PgConnection,
|
|
the_community_id: i32,
|
|
) -> Result<Vec<Self>, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
post
|
|
.filter(community_id.eq(the_community_id))
|
|
.load::<Self>(conn)
|
|
}
|
|
|
|
pub fn read_from_apub_id(conn: &PgConnection, object_id: &str) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
post.filter(ap_id.eq(object_id)).first::<Self>(conn)
|
|
}
|
|
|
|
pub fn update_ap_id(conn: &PgConnection, post_id: i32, apub_id: String) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
|
|
diesel::update(post.find(post_id))
|
|
.set(ap_id.eq(apub_id))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
pub fn permadelete(conn: &PgConnection, post_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
|
|
let perma_deleted = "*Permananently Deleted*";
|
|
let perma_deleted_url = "https://deleted.com";
|
|
|
|
diesel::update(post.find(post_id))
|
|
.set((
|
|
name.eq(perma_deleted),
|
|
url.eq(perma_deleted_url),
|
|
body.eq(perma_deleted),
|
|
deleted.eq(true),
|
|
updated.eq(naive_now()),
|
|
))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud<PostForm> for Post {
|
|
fn read(conn: &PgConnection, post_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
post.find(post_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn delete(conn: &PgConnection, post_id: i32) -> Result<usize, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
diesel::delete(post.find(post_id)).execute(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, new_post: &PostForm) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
insert_into(post).values(new_post).get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(conn: &PgConnection, post_id: i32, new_post: &PostForm) -> Result<Self, Error> {
|
|
use crate::schema::post::dsl::*;
|
|
diesel::update(post.find(post_id))
|
|
.set(new_post)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Post)]
|
|
#[table_name = "post_like"]
|
|
pub struct PostLike {
|
|
pub id: i32,
|
|
pub post_id: i32,
|
|
pub user_id: i32,
|
|
pub score: i16,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "post_like"]
|
|
pub struct PostLikeForm {
|
|
pub post_id: i32,
|
|
pub user_id: i32,
|
|
pub score: i16,
|
|
}
|
|
|
|
impl Likeable<PostLikeForm> for PostLike {
|
|
fn read(conn: &PgConnection, post_id_from: i32) -> Result<Vec<Self>, Error> {
|
|
use crate::schema::post_like::dsl::*;
|
|
post_like
|
|
.filter(post_id.eq(post_id_from))
|
|
.load::<Self>(conn)
|
|
}
|
|
fn like(conn: &PgConnection, post_like_form: &PostLikeForm) -> Result<Self, Error> {
|
|
use crate::schema::post_like::dsl::*;
|
|
insert_into(post_like)
|
|
.values(post_like_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn remove(conn: &PgConnection, post_like_form: &PostLikeForm) -> Result<usize, Error> {
|
|
use crate::schema::post_like::dsl::*;
|
|
diesel::delete(
|
|
post_like
|
|
.filter(post_id.eq(post_like_form.post_id))
|
|
.filter(user_id.eq(post_like_form.user_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Post)]
|
|
#[table_name = "post_saved"]
|
|
pub struct PostSaved {
|
|
pub id: i32,
|
|
pub post_id: i32,
|
|
pub user_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "post_saved"]
|
|
pub struct PostSavedForm {
|
|
pub post_id: i32,
|
|
pub user_id: i32,
|
|
}
|
|
|
|
impl Saveable<PostSavedForm> for PostSaved {
|
|
fn save(conn: &PgConnection, post_saved_form: &PostSavedForm) -> Result<Self, Error> {
|
|
use crate::schema::post_saved::dsl::*;
|
|
insert_into(post_saved)
|
|
.values(post_saved_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn unsave(conn: &PgConnection, post_saved_form: &PostSavedForm) -> Result<usize, Error> {
|
|
use crate::schema::post_saved::dsl::*;
|
|
diesel::delete(
|
|
post_saved
|
|
.filter(post_id.eq(post_saved_form.post_id))
|
|
.filter(user_id.eq(post_saved_form.user_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Post)]
|
|
#[table_name = "post_read"]
|
|
pub struct PostRead {
|
|
pub id: i32,
|
|
pub post_id: i32,
|
|
pub user_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "post_read"]
|
|
pub struct PostReadForm {
|
|
pub post_id: i32,
|
|
pub user_id: i32,
|
|
}
|
|
|
|
impl Readable<PostReadForm> for PostRead {
|
|
fn mark_as_read(conn: &PgConnection, post_read_form: &PostReadForm) -> Result<Self, Error> {
|
|
use crate::schema::post_read::dsl::*;
|
|
insert_into(post_read)
|
|
.values(post_read_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn mark_as_unread(conn: &PgConnection, post_read_form: &PostReadForm) -> Result<usize, Error> {
|
|
use crate::schema::post_read::dsl::*;
|
|
diesel::delete(
|
|
post_read
|
|
.filter(post_id.eq(post_read_form.post_id))
|
|
.filter(user_id.eq(post_read_form.user_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
community::*,
|
|
post::*,
|
|
tests::establish_unpooled_connection,
|
|
user::*,
|
|
ListingType,
|
|
SortType,
|
|
};
|
|
|
|
#[test]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let new_user = UserForm {
|
|
name: "jim".into(),
|
|
preferred_username: None,
|
|
password_encrypted: "nope".into(),
|
|
email: None,
|
|
matrix_user_id: None,
|
|
avatar: None,
|
|
admin: false,
|
|
banned: false,
|
|
updated: None,
|
|
show_nsfw: false,
|
|
theme: "darkly".into(),
|
|
default_sort_type: SortType::Hot as i16,
|
|
default_listing_type: ListingType::Subscribed as i16,
|
|
lang: "browser".into(),
|
|
show_avatars: true,
|
|
send_notifications_to_email: false,
|
|
actor_id: "http://fake.com".into(),
|
|
bio: None,
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
};
|
|
|
|
let inserted_user = User_::create(&conn, &new_user).unwrap();
|
|
|
|
let new_community = CommunityForm {
|
|
name: "test community_3".to_string(),
|
|
title: "nada".to_owned(),
|
|
description: None,
|
|
category_id: 1,
|
|
creator_id: inserted_user.id,
|
|
removed: None,
|
|
deleted: None,
|
|
updated: None,
|
|
nsfw: false,
|
|
actor_id: "http://fake.com".into(),
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
published: None,
|
|
};
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
|
|
|
let new_post = PostForm {
|
|
name: "A test post".into(),
|
|
url: None,
|
|
body: None,
|
|
creator_id: inserted_user.id,
|
|
community_id: inserted_community.id,
|
|
removed: None,
|
|
deleted: None,
|
|
locked: None,
|
|
stickied: None,
|
|
nsfw: false,
|
|
updated: None,
|
|
embed_title: None,
|
|
embed_description: None,
|
|
embed_html: None,
|
|
thumbnail_url: None,
|
|
ap_id: "http://fake.com".into(),
|
|
local: true,
|
|
published: None,
|
|
};
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
let expected_post = Post {
|
|
id: inserted_post.id,
|
|
name: "A test post".into(),
|
|
url: None,
|
|
body: None,
|
|
creator_id: inserted_user.id,
|
|
community_id: inserted_community.id,
|
|
published: inserted_post.published,
|
|
removed: false,
|
|
locked: false,
|
|
stickied: false,
|
|
nsfw: false,
|
|
deleted: false,
|
|
updated: None,
|
|
embed_title: None,
|
|
embed_description: None,
|
|
embed_html: None,
|
|
thumbnail_url: None,
|
|
ap_id: "http://fake.com".into(),
|
|
local: true,
|
|
};
|
|
|
|
// Post Like
|
|
let post_like_form = PostLikeForm {
|
|
post_id: inserted_post.id,
|
|
user_id: inserted_user.id,
|
|
score: 1,
|
|
};
|
|
|
|
let inserted_post_like = PostLike::like(&conn, &post_like_form).unwrap();
|
|
|
|
let expected_post_like = PostLike {
|
|
id: inserted_post_like.id,
|
|
post_id: inserted_post.id,
|
|
user_id: inserted_user.id,
|
|
published: inserted_post_like.published,
|
|
score: 1,
|
|
};
|
|
|
|
// Post Save
|
|
let post_saved_form = PostSavedForm {
|
|
post_id: inserted_post.id,
|
|
user_id: inserted_user.id,
|
|
};
|
|
|
|
let inserted_post_saved = PostSaved::save(&conn, &post_saved_form).unwrap();
|
|
|
|
let expected_post_saved = PostSaved {
|
|
id: inserted_post_saved.id,
|
|
post_id: inserted_post.id,
|
|
user_id: inserted_user.id,
|
|
published: inserted_post_saved.published,
|
|
};
|
|
|
|
// Post Read
|
|
let post_read_form = PostReadForm {
|
|
post_id: inserted_post.id,
|
|
user_id: inserted_user.id,
|
|
};
|
|
|
|
let inserted_post_read = PostRead::mark_as_read(&conn, &post_read_form).unwrap();
|
|
|
|
let expected_post_read = PostRead {
|
|
id: inserted_post_read.id,
|
|
post_id: inserted_post.id,
|
|
user_id: inserted_user.id,
|
|
published: inserted_post_read.published,
|
|
};
|
|
|
|
let read_post = Post::read(&conn, inserted_post.id).unwrap();
|
|
let updated_post = Post::update(&conn, inserted_post.id, &new_post).unwrap();
|
|
let like_removed = PostLike::remove(&conn, &post_like_form).unwrap();
|
|
let saved_removed = PostSaved::unsave(&conn, &post_saved_form).unwrap();
|
|
let read_removed = PostRead::mark_as_unread(&conn, &post_read_form).unwrap();
|
|
let num_deleted = Post::delete(&conn, inserted_post.id).unwrap();
|
|
Community::delete(&conn, inserted_community.id).unwrap();
|
|
User_::delete(&conn, inserted_user.id).unwrap();
|
|
|
|
assert_eq!(expected_post, read_post);
|
|
assert_eq!(expected_post, inserted_post);
|
|
assert_eq!(expected_post, updated_post);
|
|
assert_eq!(expected_post_like, inserted_post_like);
|
|
assert_eq!(expected_post_saved, inserted_post_saved);
|
|
assert_eq!(expected_post_read, inserted_post_read);
|
|
assert_eq!(1, like_removed);
|
|
assert_eq!(1, saved_removed);
|
|
assert_eq!(1, read_removed);
|
|
assert_eq!(1, num_deleted);
|
|
}
|
|
}
|