006b44f580
* Begin adding support for timeline * fix some bugs with parser * fmt * add error reporting for parser * add tests for timeline query parser * add rejection tests for parse * begin adding support for lists also run migration before compiling, so schema.rs is up to date * add sqlite migration * end adding lists still miss tests and query integration * cargo fmt * try to add some tests * Add some constraint to db, and fix list test and refactor other tests to use begin_transaction * add more tests for lists * add support for lists in query executor * add keywords for including/excluding boosts and likes * cargo fmt * add function to list lists used by query will make it easier to warn users when creating timeline with unknown lists * add lang support * add timeline creation error message when using unexisting lists * Update .po files * WIP: interface for timelines * don't use diesel for migrations not sure how it passed the ci on the other branch * add some tests for timeline add an int representing the order of timelines (first one will be on top, second just under...) use first() instead of limit(1).get().into_iter().nth(0) remove migrations from build artifacts as they are now compiled in * cargo fmt * remove timeline order * fix tests * add tests for timeline creation failure * cargo fmt * add tests for timelines * add test for matching direct lists and keywords * add test for language filtering * Add a more complex test for Timeline::matches, and fix TQ::matches for TQ::Or * Make the main crate compile + FMT * Use the new timeline system - Replace the old "feed" system with timelines - Display all timelines someone can access on their home page (either their personal ones, or instance timelines) - Remove functions that were used to get user/local/federated feed - Add new posts to timelines - Create a default timeline called "My feed" for everyone, and "Local feed"/"Federated feed" with timelines @fdb-hiroshima I don't know if that's how you pictured it? If you imagined it differently I can of course make changes. I hope I didn't forgot anything… * Cargo fmt * Try to fix the migration * Fix tests * Fix the test (for real this time ?) * Fix the tests ? + fmt * Use Kind::Like and Kind::Reshare when needed * Forgot to run cargo fmt once again * revert translations * fix reviewed stuff * reduce code duplication by macros * cargo fmt
166 lines
4.8 KiB
Rust
166 lines
4.8 KiB
Rust
use activitypub::activity;
|
|
use chrono::NaiveDateTime;
|
|
use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
|
|
|
|
use notifications::*;
|
|
use plume_common::activity_pub::{
|
|
inbox::{AsActor, AsObject, FromId},
|
|
Id, IntoId, PUBLIC_VISIBILITY,
|
|
};
|
|
use posts::Post;
|
|
use schema::likes;
|
|
use timeline::*;
|
|
use users::User;
|
|
use {Connection, Error, PlumeRocket, Result};
|
|
|
|
#[derive(Clone, Queryable, Identifiable)]
|
|
pub struct Like {
|
|
pub id: i32,
|
|
pub user_id: i32,
|
|
pub post_id: i32,
|
|
pub creation_date: NaiveDateTime,
|
|
pub ap_url: String,
|
|
}
|
|
|
|
#[derive(Default, Insertable)]
|
|
#[table_name = "likes"]
|
|
pub struct NewLike {
|
|
pub user_id: i32,
|
|
pub post_id: i32,
|
|
pub ap_url: String,
|
|
}
|
|
|
|
impl Like {
|
|
insert!(likes, NewLike);
|
|
get!(likes);
|
|
find_by!(likes, find_by_ap_url, ap_url as &str);
|
|
find_by!(likes, find_by_user_on_post, user_id as i32, post_id as i32);
|
|
|
|
pub fn to_activity(&self, conn: &Connection) -> Result<activity::Like> {
|
|
let mut act = activity::Like::default();
|
|
act.like_props
|
|
.set_actor_link(User::get(conn, self.user_id)?.into_id())?;
|
|
act.like_props
|
|
.set_object_link(Post::get(conn, self.post_id)?.into_id())?;
|
|
act.object_props
|
|
.set_to_link_vec(vec![Id::new(PUBLIC_VISIBILITY.to_string())])?;
|
|
act.object_props.set_cc_link_vec(vec![Id::new(
|
|
User::get(conn, self.user_id)?.followers_endpoint,
|
|
)])?;
|
|
act.object_props.set_id_string(self.ap_url.clone())?;
|
|
|
|
Ok(act)
|
|
}
|
|
|
|
pub fn notify(&self, conn: &Connection) -> Result<()> {
|
|
let post = Post::get(conn, self.post_id)?;
|
|
for author in post.get_authors(conn)? {
|
|
if author.is_local() {
|
|
Notification::insert(
|
|
conn,
|
|
NewNotification {
|
|
kind: notification_kind::LIKE.to_string(),
|
|
object_id: self.id,
|
|
user_id: author.id,
|
|
},
|
|
)?;
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub fn build_undo(&self, conn: &Connection) -> Result<activity::Undo> {
|
|
let mut act = activity::Undo::default();
|
|
act.undo_props
|
|
.set_actor_link(User::get(conn, self.user_id)?.into_id())?;
|
|
act.undo_props.set_object_object(self.to_activity(conn)?)?;
|
|
act.object_props
|
|
.set_id_string(format!("{}#delete", self.ap_url))?;
|
|
act.object_props
|
|
.set_to_link_vec(vec![Id::new(PUBLIC_VISIBILITY.to_string())])?;
|
|
act.object_props.set_cc_link_vec(vec![Id::new(
|
|
User::get(conn, self.user_id)?.followers_endpoint,
|
|
)])?;
|
|
|
|
Ok(act)
|
|
}
|
|
}
|
|
|
|
impl AsObject<User, activity::Like, &PlumeRocket> for Post {
|
|
type Error = Error;
|
|
type Output = Like;
|
|
|
|
fn activity(self, c: &PlumeRocket, actor: User, id: &str) -> Result<Like> {
|
|
let res = Like::insert(
|
|
&c.conn,
|
|
NewLike {
|
|
post_id: self.id,
|
|
user_id: actor.id,
|
|
ap_url: id.to_string(),
|
|
},
|
|
)?;
|
|
res.notify(&c.conn)?;
|
|
|
|
Timeline::add_to_all_timelines(c, &self, Kind::Like(&actor))?;
|
|
Ok(res)
|
|
}
|
|
}
|
|
|
|
impl FromId<PlumeRocket> for Like {
|
|
type Error = Error;
|
|
type Object = activity::Like;
|
|
|
|
fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
|
|
Like::find_by_ap_url(&c.conn, id)
|
|
}
|
|
|
|
fn from_activity(c: &PlumeRocket, act: activity::Like) -> Result<Self> {
|
|
let res = Like::insert(
|
|
&c.conn,
|
|
NewLike {
|
|
post_id: Post::from_id(c, &act.like_props.object_link::<Id>()?, None)
|
|
.map_err(|(_, e)| e)?
|
|
.id,
|
|
user_id: User::from_id(c, &act.like_props.actor_link::<Id>()?, None)
|
|
.map_err(|(_, e)| e)?
|
|
.id,
|
|
ap_url: act.object_props.id_string()?,
|
|
},
|
|
)?;
|
|
res.notify(&c.conn)?;
|
|
Ok(res)
|
|
}
|
|
}
|
|
|
|
impl AsObject<User, activity::Undo, &PlumeRocket> for Like {
|
|
type Error = Error;
|
|
type Output = ();
|
|
|
|
fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
|
|
let conn = &*c.conn;
|
|
if actor.id == self.user_id {
|
|
diesel::delete(&self).execute(conn)?;
|
|
|
|
// delete associated notification if any
|
|
if let Ok(notif) = Notification::find(conn, notification_kind::LIKE, self.id) {
|
|
diesel::delete(¬if).execute(conn)?;
|
|
}
|
|
Ok(())
|
|
} else {
|
|
Err(Error::Unauthorized)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl NewLike {
|
|
pub fn new(p: &Post, u: &User) -> Self {
|
|
// TODO: this URL is not valid
|
|
let ap_url = format!("{}/like/{}", u.ap_url, p.ap_url);
|
|
NewLike {
|
|
post_id: p.id,
|
|
user_id: u.id,
|
|
ap_url,
|
|
}
|
|
}
|
|
}
|