Add support for generic timeline

migrations/postgres/2019-06-24-101212_use_timelines_for_feed/down.sql

@@ -0,0 +1,4 @@
+-- This file should undo anything in `up.sql`
+DELETE FROM timeline_definition WHERE name = 'Your feed';
+DELETE FROM timeline_definition WHERE name = 'Local feed' AND query = 'local';
+DELETE FROM timeline_definition WHERE name = 'Federared feed' AND query = 'all';

migrations/postgres/2019-06-24-101212_use_timelines_for_feed/up.sql

@@ -0,0 +1,21 @@
+-- Your SQL goes here
+--#!|conn: &Connection, path: &Path| {
+--#!	let mut i = 0;
+--#!	loop {
+--#!		let users = super::users::User::get_local_page(conn, (i * 20, (i + 1) * 20)).unwrap();
+--#!
+--#!		if users.is_empty() {
+--#!			break;
+--#!		}
+--#!
+--#!		for u in users {
+--#!			super::timeline::Timeline::new_for_user(conn, u.id, "Your feed".into(), format!("followed or author in [ {} ]", u.fqn)).unwrap();
+--#!		}
+--#!		i += 1;
+--#!
+--#!	}
+--#!
+--#!	super::timeline::Timeline::new_for_instance(conn, "Local feed".into(), "local".into()).expect("Local feed creation error");
+--#!	super::timeline::Timeline::new_for_instance(conn, "Federated feed".into(), "all".into()).expect("Federated feed creation error");
+--#!	Ok(())
+--#!}

migrations/sqlite/2019-06-24-105533_use_timelines_for_feed/down.sql

@@ -0,0 +1,4 @@
+-- This file should undo anything in `up.sql`
+DELETE FROM timeline_definition WHERE name = 'Your feed';
+DELETE FROM timeline_definition WHERE name = 'Local feed' AND query = 'local';
+DELETE FROM timeline_definition WHERE name = 'Federared feed' AND query = 'all';

migrations/sqlite/2019-06-24-105533_use_timelines_for_feed/up.sql

@@ -0,0 +1,21 @@
+-- Your SQL goes here
+--#!|conn: &Connection, path: &Path| {
+--#!	let mut i = 0;
+--#!	loop {
+--#!		let users = super::users::User::get_local_page(conn, (i * 20, (i + 1) * 20)).unwrap();
+--#!
+--#!		if users.is_empty() {
+--#!			break;
+--#!		}
+--#!
+--#!		for u in users {
+--#!			super::timeline::Timeline::new_for_user(conn, u.id, "Your feed".into(), format!("followed or author in [ {} ]", u.fqn)).unwrap();
+--#!		}
+--#!		i += 1;
+--#!
+--#!	}
+--#!
+--#!	super::timeline::Timeline::new_for_instance(conn, "Local feed".into(), "local".into()).expect("Local feed creation error");
+--#!	super::timeline::Timeline::new_for_instance(conn, "Federated feed".into(), "all".into()).expect("Federated feed creation error");
+--#!	Ok(())
+--#!}

plume-models/src/likes.rs

@@ -9,6 +9,7 @@ use plume_common::activity_pub::{
 };
 use posts::Post;
 use schema::likes;
+use timeline::*;
 use users::User;
 use {Connection, Error, PlumeRocket, Result};
 
@@ -99,6 +100,8 @@ impl AsObject<User, activity::Like, &PlumeRocket> for Post {
             },
         )?;
         res.notify(&c.conn)?;
+
+        Timeline::add_to_all_timelines(c, &self, Kind::Original)?;
         Ok(res)
     }
 }

plume-models/src/posts.rs

@@ -26,6 +26,7 @@ use safe_string::SafeString;
 use schema::posts;
 use search::Searcher;
 use tags::*;
+use timeline::*;
 use users::User;
 use {ap_url, Connection, Error, PlumeRocket, Result, CONFIG};
 
@@ -182,15 +183,6 @@ impl Post {
         query.get_results::<Post>(conn).map_err(Error::from)
     }
 
-    pub fn get_recents(conn: &Connection, limit: i64) -> Result<Vec<Post>> {
-        posts::table
-            .order(posts::creation_date.desc())
-            .filter(posts::published.eq(true))
-            .limit(limit)
-            .load::<Post>(conn)
-            .map_err(Error::from)
-    }
-
     pub fn get_recents_for_author(
         conn: &Connection,
         author: &User,
@@ -246,60 +238,6 @@ impl Post {
             .map_err(Error::from)
     }
 
-    /// Give a page of all the recent posts known to this instance (= federated timeline)
-    pub fn get_recents_page(conn: &Connection, (min, max): (i32, i32)) -> Result<Vec<Post>> {
-        posts::table
-            .order(posts::creation_date.desc())
-            .filter(posts::published.eq(true))
-            .offset(min.into())
-            .limit((max - min).into())
-            .load::<Post>(conn)
-            .map_err(Error::from)
-    }
-
-    /// Give a page of posts from a specific instance
-    pub fn get_instance_page(
-        conn: &Connection,
-        instance_id: i32,
-        (min, max): (i32, i32),
-    ) -> Result<Vec<Post>> {
-        use schema::blogs;
-
-        let blog_ids = blogs::table
-            .filter(blogs::instance_id.eq(instance_id))
-            .select(blogs::id);
-
-        posts::table
-            .order(posts::creation_date.desc())
-            .filter(posts::published.eq(true))
-            .filter(posts::blog_id.eq_any(blog_ids))
-            .offset(min.into())
-            .limit((max - min).into())
-            .load::<Post>(conn)
-            .map_err(Error::from)
-    }
-
-    /// Give a page of customized user feed, based on a list of followed users
-    pub fn user_feed_page(
-        conn: &Connection,
-        followed: Vec<i32>,
-        (min, max): (i32, i32),
-    ) -> Result<Vec<Post>> {
-        use schema::post_authors;
-        let post_ids = post_authors::table
-            .filter(post_authors::author_id.eq_any(followed))
-            .select(post_authors::post_id);
-
-        posts::table
-            .order(posts::creation_date.desc())
-            .filter(posts::published.eq(true))
-            .filter(posts::id.eq_any(post_ids))
-            .offset(min.into())
-            .limit((max - min).into())
-            .load::<Post>(conn)
-            .map_err(Error::from)
-    }
-
     pub fn drafts_by_author(conn: &Connection, author: &User) -> Result<Vec<Post>> {
         use schema::post_authors;
 
@@ -714,6 +652,9 @@ impl FromId<PlumeRocket> for Post {
                     .ok();
             }
         }
+
+        Timeline::add_to_all_timelines(c, &post, Kind::Original)?;
+
         Ok(post)
     }
 }

plume-models/src/reshares.rs

@@ -9,6 +9,7 @@ use plume_common::activity_pub::{
 };
 use posts::Post;
 use schema::reshares;
+use timeline::*;
 use users::User;
 use {Connection, Error, PlumeRocket, Result};
 
@@ -124,6 +125,8 @@ impl AsObject<User, Announce, &PlumeRocket> for Post {
             },
         )?;
         reshare.notify(conn)?;
+
+        Timeline::add_to_all_timelines(c, &self, Kind::Original)?;
         Ok(reshare)
     }
 }

plume-models/src/timeline/mod.rs

@@ -1,4 +1,4 @@
-use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+use diesel::{self, BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
 
 use lists::List;
 use posts::Post;
@@ -8,7 +8,9 @@ use {Connection, Error, PlumeRocket, Result};
 
 pub(crate) mod query;
 
-use self::query::{Kind, QueryError, TimelineQuery};
+use self::query::{QueryError, TimelineQuery};
+
+pub use self::query::Kind;
 
 #[derive(Clone, Debug, PartialEq, Queryable, Identifiable, AsChangeset)]
 #[table_name = "timeline_definition"]
@@ -68,6 +70,21 @@ impl Timeline {
         }
     }
 
+    /// Same as `list_for_user`, but also includes instance timelines if `user_id` is `Some`.
+    pub fn list_all_for_user(conn: &Connection, user_id: Option<i32>) -> Result<Vec<Self>> {
+        if let Some(user_id) = user_id {
+            timeline_definition::table
+                .filter(timeline_definition::user_id.eq(user_id).or(timeline_definition::user_id.is_null()))
+                .load::<Self>(conn)
+                .map_err(Error::from)
+        } else {
+            timeline_definition::table
+                .filter(timeline_definition::user_id.is_null())
+                .load::<Self>(conn)
+                .map_err(Error::from)
+        }
+    }
+
     pub fn new_for_user(
         conn: &Connection,
         user_id: i32,
@@ -173,6 +190,15 @@ impl Timeline {
             .map_err(Error::from)
     }
 
+    pub fn count_posts(&self, conn: &Connection) -> Result<i64> {
+        timeline::table
+            .filter(timeline::timeline_id.eq(self.id))
+            .inner_join(posts::table)
+            .count()
+            .get_result(conn)
+            .map_err(Error::from)
+    }
+
     pub fn add_to_all_timelines(rocket: &PlumeRocket, post: &Post, kind: Kind) -> Result<()> {
         let timelines = timeline_definition::table
             .load::<Self>(rocket.conn.deref())

plume-models/src/users.rs

@@ -50,6 +50,7 @@ use posts::Post;
 use safe_string::SafeString;
 use schema::users;
 use search::Searcher;
+use timeline::Timeline;
 use {ap_url, Connection, Error, PlumeRocket, Result};
 
 pub type CustomPerson = CustomObject<ApSignature, Person>;
@@ -927,7 +928,7 @@ impl NewUser {
         password: String,
     ) -> Result<User> {
         let (pub_key, priv_key) = gen_keypair();
-        User::insert(
+        let res = User::insert(
             conn,
             NewUser {
                 username,
@@ -943,7 +944,12 @@ impl NewUser {
                 private_key: Some(String::from_utf8(priv_key).or(Err(Error::Signature))?),
                 ..NewUser::default()
             },
-        )
+        )?;
+
+        // create default timeline
+        Timeline::new_for_user(conn, res.id, "My feed".into(), "followed".into())?;
+
+        Ok(res)
     }
 }
 

po/plume/ar.po

@@ -37,10 +37,27 @@ msgstr "أشار إليك {0}."
 msgid "{0} boosted your article."
 msgstr ""
 
+msgid "Your feed"
+msgstr "خيطك"
+
+msgid "Local feed"
+msgstr "الخيط المحلي"
+
+msgid "Federated feed"
+msgstr "الخيط الموحد"
+
 # src/template_utils.rs:108
 msgid "{0}'s avatar"
 msgstr "الصورة الرمزية لـ {0}"
 
+# src/template_utils.rs:195
+msgid "Previous page"
+msgstr ""
+
+# src/template_utils.rs:206
+msgid "Next page"
+msgstr ""
+
 # src/routes/blogs.rs:70
 msgid "To create a new blog, you need to be logged in"
 msgstr "لإنشاء مدونة جديدة، تحتاج إلى تسجيل الدخول"
@@ -302,14 +319,8 @@ msgstr "مرحبا بكم في {0}"
 msgid "Latest articles"
 msgstr "آخر المقالات"
 
-msgid "Your feed"
-msgstr "خيطك"
-
-msgid "Federated feed"
-msgstr "الخيط الموحد"
-
-msgid "Local feed"
-msgstr "الخيط المحلي"
+msgid "View all"
+msgstr "عرضها كافة"
 
 msgid "Administration of {0}"
 msgstr "إدارة {0}"
@@ -332,15 +343,6 @@ msgstr "حظر"
 msgid "Ban"
 msgstr "اطرد"
 
-msgid "All the articles of the Fediverse"
-msgstr "كافة مقالات الفديفرس"
-
-msgid "Articles from {}"
-msgstr "مقالات صادرة مِن {}"
-
-msgid "Nothing to see here yet. Try subscribing to more people."
-msgstr ""
-
 # src/template_utils.rs:217
 msgid "Name"
 msgstr "الاسم"
@@ -568,9 +570,6 @@ msgstr "لا شيء"
 msgid "No description"
 msgstr "مِن دون وصف"
 
-msgid "View all"
-msgstr "عرضها كافة"
-
 msgid "By {0}"
 msgstr "مِن طرف {0}"
 
@@ -937,12 +936,9 @@ msgstr[5] ""
 msgid "No posts to see here yet."
 msgstr "في الوقت الراهن لا توجد أية منشورات هنا."
 
-msgid "Query"
-msgstr ""
-
 #, fuzzy
-msgid "Articles in this timeline"
-msgstr "رخصة المقال"
+msgid "Nothing to see here yet."
+msgstr "في الوقت الراهن لا توجد أية منشورات هنا."
 
 msgid "Articles tagged \"{0}\""
 msgstr "المقالات الموسومة بـ \"{0}\""
@@ -1007,6 +1003,20 @@ msgstr ""
 msgid "Use as an avatar"
 msgstr "استخدمها كصورة رمزية"
 
+#, fuzzy
+#~ msgid "My feed"
+#~ msgstr "خيطك"
+
+#~ msgid "All the articles of the Fediverse"
+#~ msgstr "كافة مقالات الفديفرس"
+
+#~ msgid "Articles from {}"
+#~ msgstr "مقالات صادرة مِن {}"
+
+#, fuzzy
+#~ msgid "Articles in this timeline"
+#~ msgstr "رخصة المقال"
+
 # src/routes/session.rs:263
 #~ msgid "Sorry, but the link expired. Try again"
 #~ msgstr "عذراً، ولكن انتهت مدة صلاحية الرابط. حاول مرة أخرى"