Merge remote-tracking branch 'origin/main' into ap07

.circleci/config.yml

@@ -11,7 +11,7 @@ executors:
         default: false
     docker:
     - image: plumeorg/plume-buildenv:v0.4.0
-    - image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
+    - image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
       environment:
         POSTGRES_USER: postgres
         POSTGRES_DB: plume

Cargo.toml

@@ -20,7 +20,7 @@ rocket_contrib = { version = "0.4.5", features = ["json"] }
 rocket_i18n = "0.4.1"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
-serde_json = "1.0.80"
+serde_json = "1.0.81"
 shrinkwraprs = "0.3.0"
 validator = { version = "0.15", features = ["derive"] }
 webfinger = "0.4.1"

assets/themes/default/_global.scss

@@ -507,6 +507,7 @@ figure {
   margin: auto $horizontal-margin 2em;
   overflow: auto;
   display: flex;
+  justify-content: center;
 
   a {
     display: inline-block;

plume-common/Cargo.toml

@@ -9,12 +9,12 @@ array_tool = "1.0"
 base64 = "0.13"
 heck = "0.4.0"
 hex = "0.4"
-openssl = "0.10.22"
+openssl = "0.10.40"
 rocket = "0.4.6"
 reqwest = { version = "0.11.10", features = ["blocking", "json", "socks"] }
 serde = "1.0"
 serde_derive = "1.0"
-serde_json = "1.0.80"
+serde_json = "1.0.81"
 shrinkwraprs = "0.3.0"
 syntect = "4.5.0"
 regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }

plume-common/src/activity_pub/mod.rs

@@ -157,6 +157,9 @@ where
         .build()
         .expect("Error while initializing tokio runtime for federation");
     rt.block_on(async {
+        // TODO: should be determined dependent on database connections because
+        // after broadcasting, target instance sends request to this instance,
+        // and Plume accesses database at that time.
         let capacity = 6;
         let (tx, rx) = flume::bounded::<RequestBuilder>(capacity);
         let mut handles = Vec::with_capacity(capacity);
@@ -206,7 +209,7 @@ where
                     .expect("activity_pub::broadcast: request signature error"),
             );
             let request_builder = client.post(&inbox).headers(headers.clone()).body(body);
-            tx.send_async(request_builder).await.unwrap();
+            let _ = tx.send_async(request_builder).await;
         }
         drop(tx);
         join_all(handles).await;

plume-models/Cargo.toml

@@ -12,14 +12,14 @@ itertools = "0.10.3"
 lazy_static = "1.0"
 ldap3 = "0.10.4"
 migrations_internals= "1.4.0"
-openssl = "0.10.22"
+openssl = "0.10.40"
 rocket = "0.4.6"
 rocket_i18n = "0.4.1"
 reqwest = "0.11.10"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_derive = "1.0"
-serde_json = "1.0.80"
+serde_json = "1.0.81"
 tantivy = "0.13.3"
 url = "2.1"
 walkdir = "2.2"

plume-models/src/timeline/mod.rs

@@ -6,6 +6,7 @@ use crate::{
     Connection, Error, Result,
 };
 use diesel::{self, BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
+use std::cmp::Ordering;
 use std::ops::Deref;
 
 pub(crate) mod query;
@@ -85,6 +86,16 @@ impl Timeline {
                         .or(timeline_definition::user_id.is_null()),
                 )
                 .load::<Self>(conn)
+                .map(|mut timelines| {
+                    timelines.sort_by(|t1, t2| {
+                        if t1.user_id.is_some() && t2.user_id.is_none() {
+                            Ordering::Less
+                        } else {
+                            Ordering::Equal
+                        }
+                    });
+                    timelines
+                })
                 .map_err(Error::from)
         } else {
             timeline_definition::table

src/routes/errors.rs

@@ -21,8 +21,9 @@ impl<'r> Responder<'r> for ErrorPage {
         warn!("{:?}", self.0);
 
         match self.0 {
-            Error::NotFound => Err(Status::NotFound),
+            Error::NotFound | Error::Unauthorized | Error::Db(diesel::result::Error::NotFound) => {
-            Error::Unauthorized => Err(Status::NotFound),
+                Err(Status::NotFound)
+            }
             _ => Err(Status::InternalServerError),
         }
     }

src/routes/instance.rs

@@ -28,25 +28,26 @@ use plume_models::{
 
 #[get("/")]
 pub fn index(conn: DbConn, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
-    let inst = Instance::get_local()?;
+    let all_tl = Timeline::list_all_for_user(&conn, rockets.user.clone().map(|u| u.id))?;
-    let timelines = Timeline::list_all_for_user(&conn, rockets.user.clone().map(|u| u.id))?
+    if all_tl.is_empty() {
-        .into_iter()
+        Err(Error::NotFound.into())
-        .filter_map(|t| {
+    } else {
-            if let Ok(latest) = t.get_latest(&conn, 12) {
+        let inst = Instance::get_local()?;
-                Some((t, latest))
+        let page = Page::default();
-            } else {
+        let tl = &all_tl[0];
-                None
+        let posts = tl.get_page(&conn, page.limits())?;
-            }
+        let total_posts = tl.count_posts(&conn)?;
-        })
+        Ok(render!(instance::index(
-        .collect();
+            &(&conn, &rockets).to_context(),
-
+            inst,
-    Ok(render!(instance::index(
+            User::count_local(&conn)?,
-        &(&conn, &rockets).to_context(),
+            Post::count_local(&conn)?,
-        inst,
+            tl.id,
-        User::count_local(&conn)?,
+            posts,
-        Post::count_local(&conn)?,
+            all_tl,
-        timelines
+            Page::total(total_posts as i32)
-    )))
+        )))
+    }
 }
 
 #[get("/admin")]

src/routes/mod.rs

@@ -59,6 +59,12 @@ impl From<Flash<Redirect>> for RespondOrRedirect {
 #[derive(Shrinkwrap, Copy, Clone, UriDisplayQuery)]
 pub struct Page(i32);
 
+impl From<i32> for Page {
+    fn from(page: i32) -> Self {
+        Self(page)
+    }
+}
+
 impl<'v> FromFormValue<'v> for Page {
     type Error = &'v RawStr;
     fn from_form_value(form_value: &'v RawStr) -> Result<Page, &'v RawStr> {

templates/instance/index.rs.html

@@ -4,37 +4,37 @@
 @use crate::templates::{base, partials::*};
 @use crate::template_utils::*;
 @use crate::routes::*;
+@use rocket::uri;
 
-@(ctx: BaseContext, instance: Instance, n_users: i64, n_articles: i64, all_tl: Vec<(Timeline, Vec<Post>)>)
+@(ctx: BaseContext, instance: Instance, n_users: i64, n_articles: i64, tl_id: i32, articles: Vec<Post>, all_tl: Vec<Timeline>, n_pages: i32)
 
 @:base(ctx, instance.name.clone(), {}, {}, {
-  <h1>@i18n!(ctx.1, "Welcome to {}"; instance.name.as_str())</h1>
+    <section class="flex wrap" dir="auto">
+        <h1 class="grow">@i18n!(ctx.1, "Welcome to {}"; instance.name.as_str())</h1>
+    </section>
 
-    @tabs(&vec![(format!("{}", uri!(instance::index)), i18n!(ctx.1, "Latest articles"), true)]
+    @tabs(&all_tl
-        .into_iter().chain(all_tl.clone()
             .into_iter()
-            .map(|(tl, _)| {
+            .map(|t| {
-                let url = format!("{}", uri!(timelines::details: id = tl.id, page = _));
+                let url = format!("{}", uri!(timelines::details: id = t.id, page = _));
-                (url, i18n_timeline_name(ctx.1, &tl.name), false)
+                (url, i18n_timeline_name(ctx.1, &t.name), t.id == tl_id)
             })
-        ).collect::<Vec<_>>()
+            .collect::<Vec<_>>()
     )
 
-    @for (tl, articles) in all_tl {
+    @if !articles.is_empty() {
-        @if !articles.is_empty() {
+        <div class="cards">
-            <div class="h-feed">
+            @for article in articles {
-                <h2 dir="auto">
+                @:post_card(ctx, article)
-                    <span class="p-name">@i18n_timeline_name(ctx.1, &tl.name)</span>
+            }
-                    &mdash;
+        </div>
-                    <a href="@uri!(timelines::details: id = tl.id, page = _)">@i18n!(ctx.1, "View all")</a>
+    } else {
-                </h2>
+        <p class="center">@i18n!(ctx.1, "Nothing to see here yet.")</p>
-                <div class="cards">
+    }
-                    @for article in articles {
+    @if n_pages > 1 {
-                        @:post_card(ctx, article)
+        <div class="pagination" dir="auto">
-                    }
+            <a href="@uri!(timelines::details: id = tl_id, page = Some(2.into()))">@i18n!(ctx.1, "Next page")</a>
-                </div>
+        </div>
-            </div>
-        }
     }
 
     @:instance_description(ctx, instance, n_users, n_articles)

templates/timelines/details.rs.html

@@ -8,21 +8,20 @@
 @(ctx: BaseContext, tl: Timeline, articles: Vec<Post>, all_tl: Vec<Timeline>, page: i32, n_pages: i32)
 
 @:base(ctx, tl.name.clone(), {}, {}, {
-	<section class="flex wrap" dir="auto">
+    <section class="flex wrap" dir="auto">
-		<h1 class="grow">@i18n_timeline_name(ctx.1, &tl.name)</h1>
+        <h1 class="grow">@i18n_timeline_name(ctx.1, &tl.name)</h1>
-	</section>
+    </section>
 
-    @tabs(&vec![(format!("{}", uri!(instance::index)), i18n!(ctx.1, "Latest articles"), false)]
+    @tabs(&all_tl
-        .into_iter().chain(all_tl
             .into_iter()
             .map(|t| {
-            	let url = format!("{}", uri!(timelines::details: id = t.id, page = _));
+                let url = format!("{}", uri!(timelines::details: id = t.id, page = _));
                 (url, i18n_timeline_name(ctx.1, &t.name), t.id == tl.id)
             })
-        ).collect::<Vec<_>>()
+            .collect::<Vec<_>>()
     )
 
-	@if !articles.is_empty() {
+    @if !articles.is_empty() {
         <div class="cards">
             @for article in articles {
                 @:post_card(ctx, article)