add: following timeline

crates/app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tetratto"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2024"
 
 [features]

crates/app/src/assets.rs

@@ -54,6 +54,7 @@ pub const COMMUNITIES_SETTINGS: &str = include_str!("./public/html/communities/s
 pub const COMMUNITIES_MEMBERS: &str = include_str!("./public/html/communities/members.html");
 
 pub const TIMELINES_HOME: &str = include_str!("./public/html/timelines/home.html");
+pub const TIMELINES_FOLLOWING: &str = include_str!("./public/html/timelines/following.html");
 pub const TIMELINES_POPULAR: &str = include_str!("./public/html/timelines/popular.html");
 
 pub const MOD_AUDIT_LOG: &str = include_str!("./public/html/mod/audit_log.html");
@@ -181,6 +182,7 @@ pub(crate) async fn write_assets(config: &Config) -> PathBufD {
     write_template!(html_path->"communities/members.html"(crate::assets::COMMUNITIES_MEMBERS) --config=config);
 
     write_template!(html_path->"timelines/home.html"(crate::assets::TIMELINES_HOME) -d "timelines" --config=config);
+    write_template!(html_path->"timelines/following.html"(crate::assets::TIMELINES_FOLLOWING) --config=config);
     write_template!(html_path->"timelines/popular.html"(crate::assets::TIMELINES_POPULAR) --config=config);
 
     write_template!(html_path->"mod/audit_log.html"(crate::assets::MOD_AUDIT_LOG) -d "mod" --config=config);

crates/app/src/langs/en-US.toml

@@ -3,6 +3,7 @@ version = "1.0.0"
 
 [data]
 "general:link.home" = "Home"
+"general:link.following" = "Following"
 "general:link.popular" = "Popular"
 "general:link.communities" = "Communities"
 "general:link.next" = "Next"

crates/app/src/public/html/macros.html

@@ -163,6 +163,14 @@
         <span>{{ text "general:link.home" }}</span>
     </a>
 
+    <a
+        href="/following"
+        class="{% if selected == 'following' %}active{% endif %}"
+    >
+        {{ icon "earth" }}
+        <span>{{ text "general:link.following" }}</span>
+    </a>
+
     <a href="/popular" class="{% if selected == 'popular' %}active{% endif %}">
         {{ icon "trending-up" }}
         <span>{{ text "general:link.popular" }}</span>

crates/app/src/public/html/timelines/following.html

@@ -0,0 +1,16 @@
+{% extends "root.html" %} {% block head %}
+<title>Following - {{ config.name }}</title>
+{% endblock %} {% block body %} {{ macros::nav() }}
+<main class="flex flex-col gap-2">
+    {{ macros::timelines_nav(selected="following") }}
+
+    <!-- prettier-ignore -->
+    <div class="card w-full flex flex-col gap-2">
+        {% for post in list %}
+            {{ components::post(post=post[0], owner=post[1], secondary=true, community=post[2], show_community=true) }}
+        {% endfor %}
+
+        {{ components::pagination(page=page, items=list|length) }}
+    </div>
+</main>
+{% endblock %}

crates/app/src/public/html/timelines/home.html

@@ -5,7 +5,7 @@
     <!-- prettier-ignore -->
     {{ macros::timelines_nav(selected="home") }}
 
-    {% if list|length == 0 %}
+    {% if list|length == 0 and page == 0 %}
     <div class="card-nest">
         <div class="card">
             <b>✨ Welcome to <i>{{ config.name }}</i>!</b>
@@ -21,6 +21,8 @@
         {% for post in list %}
             {{ components::post(post=post[0], owner=post[1], secondary=true, community=post[2], show_community=true) }}
         {% endfor %}
+
+        {{ components::pagination(page=page, items=list|length) }}
     </div>
     {% endif %}
 </main>

crates/app/src/public/html/timelines/popular.html

@@ -9,6 +9,8 @@
         {% for post in list %}
             {{ components::post(post=post[0], owner=post[1], secondary=true, community=post[2], show_community=true) }}
         {% endfor %}
+
+        {{ components::pagination(page=page, items=list|length) }}
     </div>
 </main>
 {% endblock %}

crates/app/src/routes/pages/misc.rs

@@ -58,9 +58,48 @@ pub async fn index_request(
     let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
 
     context.insert("list", &list);
+    context.insert("page", &req.page);
     Html(data.1.render("timelines/home.html", &context).unwrap())
 }
 
+/// `/following`
+pub async fn following_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+    Query(req): Query<PaginatedQuery>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = match get_user_from_token!(jar, data.0) {
+        Some(ua) => ua,
+        None => {
+            return Err(Html(
+                render_error(Error::NotAllowed, &jar, &data, &None).await,
+            ));
+        }
+    };
+
+    let list = match data
+        .0
+        .get_posts_from_user_following(user.id, 12, req.page)
+        .await
+    {
+        Ok(l) => match data.0.fill_posts_with_community(l).await {
+            Ok(l) => l,
+            Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+        },
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+    };
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
+
+    context.insert("list", &list);
+    context.insert("page", &req.page);
+    Ok(Html(
+        data.1.render("timelines/following.html", &context).unwrap(),
+    ))
+}
+
 /// `/popular`
 pub async fn popular_request(
     jar: CookieJar,
@@ -82,6 +121,7 @@ pub async fn popular_request(
     let mut context = initial_context(&data.0.0, lang, &user).await;
 
     context.insert("list", &list);
+    context.insert("page", &req.page);
     Html(data.1.render("timelines/popular.html", &context).unwrap())
 }
 

crates/app/src/routes/pages/mod.rs

@@ -18,6 +18,7 @@ pub fn routes() -> Router {
     Router::new()
         // misc
         .route("/", get(misc::index_request))
+        .route("/following", get(misc::following_request))
         .route("/popular", get(misc::popular_request))
         .route("/notifs", get(misc::notifications_request))
         .route("/doc/{*file_name}", get(misc::markdown_document_request))

crates/core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tetratto-core"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2024"
 
 [features]

crates/core/src/database/posts.rs

@@ -307,6 +307,53 @@ impl DataManager {
         Ok(res.unwrap())
     }
 
+    /// Get posts from all users the given user is following.
+    ///
+    /// # Arguments
+    /// * `id` - the ID of the user
+    /// * `batch` - the limit of posts in each page
+    /// * `page` - the page number
+    pub async fn get_posts_from_user_following(
+        &self,
+        id: usize,
+        batch: usize,
+        page: usize,
+    ) -> Result<Vec<Post>> {
+        let following = self.get_userfollows_by_initiator_all(id).await?;
+        let mut following = following.iter();
+        let first = match following.next() {
+            Some(f) => f,
+            None => return Ok(Vec::new()),
+        };
+
+        let mut query_string: String = String::new();
+
+        for user in following {
+            query_string.push_str(&format!(" OR owner = {}", user.receiver));
+        }
+
+        let conn = match self.connect().await {
+            Ok(c) => c,
+            Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
+        };
+
+        let res = query_rows!(
+            &conn,
+            &format!(
+                "SELECT * FROM posts WHERE (owner = {} {query_string}) AND replying_to = 0 ORDER BY created DESC LIMIT $1 OFFSET $2",
+                first.receiver
+            ),
+            &[&(batch as i64), &((page * batch) as i64)],
+            |x| { Self::get_post_from_row(x) }
+        );
+
+        if res.is_err() {
+            return Err(Error::GeneralNotFound("post".to_string()));
+        }
+
+        Ok(res.unwrap())
+    }
+
     /// Check if the given `uid` can post in the given `community`.
     pub async fn check_can_post(&self, community: &Community, uid: usize) -> bool {
         match community.write_access {

crates/core/src/database/userfollows.rs

@@ -106,6 +106,30 @@ impl DataManager {
         Ok(res.unwrap())
     }
 
+    /// Get users the given user is following.
+    ///
+    /// # Arguments
+    /// * `id` - the ID of the user
+    pub async fn get_userfollows_by_initiator_all(&self, id: usize) -> Result<Vec<UserFollow>> {
+        let conn = match self.connect().await {
+            Ok(c) => c,
+            Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
+        };
+
+        let res = query_rows!(
+            &conn,
+            "SELECT * FROM userfollows WHERE initiator = $1",
+            &[&(id as i64)],
+            |x| { Self::get_userfollow_from_row(x) }
+        );
+
+        if res.is_err() {
+            return Err(Error::GeneralNotFound("user follow".to_string()));
+        }
+
+        Ok(res.unwrap())
+    }
+
     /// Get users following the given user.
     ///
     /// # Arguments
@@ -137,6 +161,30 @@ impl DataManager {
         Ok(res.unwrap())
     }
 
+    /// Get users following the given user.
+    ///
+    /// # Arguments
+    /// * `id` - the ID of the user
+    pub async fn get_userfollows_by_receiver_all(&self, id: usize) -> Result<Vec<UserFollow>> {
+        let conn = match self.connect().await {
+            Ok(c) => c,
+            Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
+        };
+
+        let res = query_rows!(
+            &conn,
+            "SELECT * FROM userfollows WHERE receiver = $1",
+            &[&(id as i64)],
+            |x| { Self::get_userfollow_from_row(x) }
+        );
+
+        if res.is_err() {
+            return Err(Error::GeneralNotFound("user follow".to_string()));
+        }
+
+        Ok(res.unwrap())
+    }
+
     /// Complete a vector of just userfollows with their receiver as well.
     pub async fn fill_userfollows_with_receiver(
         &self,

crates/l10n/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tetratto-l10n"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2024"
 authors.workspace = true
 repository.workspace = true

crates/shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tetratto-shared"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2024"
 authors.workspace = true
 repository.workspace = true