Add support for generic timeline

assets/themes/default/_global.scss

@@ -317,6 +317,10 @@ p.error {
     flex: 1;
     margin: 0 1em;
   }
+
+  .grow:first-child {
+    margin: 1em 0;
+  }
 }
 
 .left-icon {

build.rs

@@ -1,6 +1,6 @@
 extern crate rsass;
 extern crate ructe;
-use ructe::*;
+use ructe::Ructe;
 use std::process::{Command, Stdio};
 use std::{env, ffi::OsStr, fs::*, io::Write, path::*};
 
@@ -37,9 +37,10 @@ fn compute_static_hash() -> String {
 }
 
 fn main() {
-    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let in_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("templates");
-    compile_templates(&in_dir, &out_dir).expect("compile templates");
+    Ructe::from_env()
+        .expect("This must be run with cargo")
+        .compile_templates("templates")
+        .expect("compile templates");
 
     compile_themes().expect("Theme compilation error");
     recursive_copy(&Path::new("assets").join("icons"), &Path::new("static"))

migrations/postgres/2019-06-20-145757_timeline/down.sql

@@ -0,0 +1,6 @@
+-- This file should undo anything in `up.sql`
+
+DROP TABLE timeline;
+DROP TABLE timeline_definition;
+DROP TABLE list_elems;
+DROP TABLE lists;

migrations/postgres/2019-06-20-145757_timeline/up.sql

@@ -0,0 +1,31 @@
+-- Your SQL goes here
+
+CREATE TABLE timeline_definition(
+	id SERIAL PRIMARY KEY,
+	user_id integer REFERENCES users ON DELETE CASCADE,
+	name VARCHAR NOT NULL,
+	query VARCHAR NOT NULL,
+	CONSTRAINT timeline_unique_user_name UNIQUE(user_id, name)
+);
+
+CREATE TABLE timeline(
+	id SERIAL PRIMARY KEY,
+	post_id integer NOT NULL REFERENCES posts ON DELETE CASCADE,
+	timeline_id integer NOT NULL REFERENCES timeline_definition ON DELETE CASCADE
+);
+
+CREATE TABLE lists(
+	id SERIAL PRIMARY KEY,
+	name VARCHAR NOT NULL,
+	user_id integer REFERENCES users ON DELETE CASCADE,
+	type integer NOT NULL,
+	CONSTRAINT list_unique_user_name UNIQUE(user_id, name)
+);
+
+CREATE TABLE list_elems(
+	id SERIAL PRIMARY KEY,
+	list_id integer NOT NULL REFERENCES lists ON DELETE CASCADE,
+	user_id integer REFERENCES users ON DELETE CASCADE,
+	blog_id integer REFERENCES blogs ON DELETE CASCADE,
+	word VARCHAR
+);

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,17 @@
+-- Your SQL goes here
+--#!|conn: &Connection, path: &Path| {
+--#!	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");
+--#!
+--#!	for i in 0.. {
+--#!		if let Some(users) = super::users::User::get_local_page(conn, (i * 20, (i + 1) * 20)).ok().filter(|l| !l.is_empty()) {
+--#!			for u in users {
+--#!				super::timeline::Timeline::new_for_user(conn, u.id, "Your feed".into(), format!("followed or author in [ {} ]", u.fqn)).expect("User feed creation error");
+--#!			}
+--#!		} else {
+--#!			break;
+--#!		}
+--#!	}
+--#!
+--#!	Ok(())
+--#!}

migrations/sqlite/2019-06-22-145757_timeline/down.sql

@@ -0,0 +1,6 @@
+-- This file should undo anything in `up.sql`
+
+DROP TABLE timeline;
+DROP TABLE timeline_definition;
+DROP TABLE list_elems;
+DROP TABLE lists;

migrations/sqlite/2019-06-22-145757_timeline/up.sql

@@ -0,0 +1,31 @@
+-- Your SQL goes here
+
+CREATE TABLE timeline_definition(
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+	name VARCHAR NOT NULL,
+	query VARCHAR NOT NULL,
+	CONSTRAINT timeline_unique_user_name UNIQUE(user_id, name)
+);
+
+CREATE TABLE timeline(
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	post_id integer NOT NULL REFERENCES posts(id) ON DELETE CASCADE,
+	timeline_id integer NOT NULL REFERENCES timeline_definition(id) ON DELETE CASCADE
+);
+
+CREATE TABLE lists(
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	name VARCHAR NOT NULL,
+	user_id integer REFERENCES users(id) ON DELETE CASCADE,
+	type integer NOT NULL,
+	CONSTRAINT timeline_unique_user_name UNIQUE(user_id, name)
+);
+
+CREATE TABLE list_elems(
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	list_id integer NOT NULL REFERENCES lists(id) ON DELETE CASCADE,
+	user_id integer REFERENCES users(id) ON DELETE CASCADE,
+	blog_id integer REFERENCES blogs(id) ON DELETE CASCADE,
+	word VARCHAR
+);

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,17 @@
+-- Your SQL goes here
+--#!|conn: &Connection, path: &Path| {
+--#!	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");
+--#!
+--#!	for i in 0.. {
+--#!		if let Some(users) = super::users::User::get_local_page(conn, (i * 20, (i + 1) * 20)).ok().filter(|l| !l.is_empty()) {
+--#!			for u in users {
+--#!				super::timeline::Timeline::new_for_user(conn, u.id, "Your feed".into(), format!("followed or author in [ {} ]", u.fqn)).expect("User feed creation error");
+--#!			}
+--#!		} else {
+--#!			break;
+--#!		}
+--#!	}
+--#!
+--#!	Ok(())
+--#!}

plume-models/src/blogs.rs

@@ -1,6 +1,6 @@
 use activitypub::{actor::Group, collection::OrderedCollection, object::Image, CustomObject};
 use chrono::NaiveDateTime;
-use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
+use diesel::{self, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl, SaveChangesDsl};
 use openssl::{
     hash::MessageDigest,
     pkey::{PKey, Private},
@@ -135,10 +135,8 @@ impl Blog {
     pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<Blog> {
         let from_db = blogs::table
             .filter(blogs::fqn.eq(fqn))
-            .limit(1)
-            .load::<Blog>(&*c.conn)?
-            .into_iter()
-            .next();
+            .first(&*c.conn)
+            .optional()?;
         if let Some(from_db) = from_db {
             Ok(from_db)
         } else {
@@ -572,9 +570,8 @@ pub(crate) mod tests {
                 Instance::get_local().unwrap().id
             );
             // TODO add tests for remote instance
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -674,9 +671,8 @@ pub(crate) mod tests {
                 .unwrap()
                 .iter()
                 .any(|b| b.id == blog[1].id));
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -699,9 +695,8 @@ pub(crate) mod tests {
             .unwrap();
 
             assert_eq!(Blog::find_by_fqn(&r, "SomeName").unwrap().id, blog.id);
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -723,9 +718,8 @@ pub(crate) mod tests {
             .unwrap();
 
             assert_eq!(blog.fqn, "SomeName");
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -736,9 +730,8 @@ pub(crate) mod tests {
 
             blogs[0].delete(conn, &get_searcher()).unwrap();
             assert!(Blog::get(conn, blogs[0].id).is_err());
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -807,9 +800,8 @@ pub(crate) mod tests {
             assert!(Blog::get(conn, blog[1].id).is_err());
             user[1].delete(conn, &searcher).unwrap();
             assert!(Blog::get(conn, blog[0].id).is_err());
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -870,6 +862,6 @@ pub(crate) mod tests {
             assert_eq!(blog.banner_url(conn), blogs[0].banner_url(conn));
 
             Ok(())
-        });
+        })
     }
 }

plume-models/src/comments.rs

@@ -436,8 +436,7 @@ mod tests {
                 }
                 _ => panic!("Unexpected result"),
             };
-
             Ok(())
-        });
+        })
     }
 }

plume-models/src/db_conn.rs

@@ -59,3 +59,19 @@ impl CustomizeConnection<Connection, ConnError> for PragmaForeignKey {
             })
     }
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use diesel::Connection as _;
+
+    #[derive(Debug)]
+    pub struct TestConnectionCustomizer;
+    impl CustomizeConnection<Connection, ConnError> for TestConnectionCustomizer {
+        fn on_acquire(&self, conn: &mut Connection) -> Result<(), ConnError> {
+            PragmaForeignKey.on_acquire(conn)?;
+            Ok(conn.begin_test_transaction().unwrap())
+        }
+    }
+
+}

plume-models/src/follows.rs

@@ -235,7 +235,8 @@ mod tests {
             )
             .expect("Couldn't insert new follow");
             assert_eq!(follow.ap_url, String::from("https://some.url/"));
+
             Ok(())
-        });
+        })
     }
 }

plume-models/src/inbox.rs

@@ -135,7 +135,6 @@ pub(crate) mod tests {
                 }
                 _ => panic!("Unexpected result"),
             };
-
             Ok(())
         });
     }
@@ -170,7 +169,6 @@ pub(crate) mod tests {
                 }
                 _ => panic!("Unexpected result"),
             };
-
             Ok(())
         });
     }
@@ -212,7 +210,6 @@ pub(crate) mod tests {
                 }
                 _ => panic!("Unexpected result"),
             };
-
             Ok(())
         });
     }
@@ -255,9 +252,8 @@ pub(crate) mod tests {
                 "type": "Delete",
             });
             assert!(super::inbox(&r, ok_act).is_ok());
-
             Ok(())
-        });
+        })
     }
 
     #[test]
@@ -282,7 +278,6 @@ pub(crate) mod tests {
                 "type": "Delete",
             });
             assert!(super::inbox(&r, ok_act).is_ok());
-
             Ok(())
         });
     }
@@ -336,7 +331,6 @@ pub(crate) mod tests {
                 }
                 _ => panic!("Unexpected result"),
             }
-
             Ok(())
         });
     }
@@ -362,7 +356,6 @@ pub(crate) mod tests {
                 }
                 _ => panic!("Unexpected result"),
             }
-
             Ok(())
         });
     }
@@ -401,7 +394,6 @@ pub(crate) mod tests {
                 "type": "Undo",
             });
             assert!(super::inbox(&r, ok_act).is_ok());
-
             Ok(())
         });
     }
@@ -440,7 +432,6 @@ pub(crate) mod tests {
                 "type": "Undo",
             });
             assert!(super::inbox(&r, ok_act).is_ok());
-
             Ok(())
         });
     }
@@ -479,7 +470,6 @@ pub(crate) mod tests {
                 "type": "Undo",
             });
             assert!(super::inbox(&r, ok_act).is_ok());
-
             Ok(())
         });
     }
@@ -509,7 +499,6 @@ pub(crate) mod tests {
             });
 
             super::inbox(&r, act).unwrap();
-
             Ok(())
         });
     }