queries

Worker used to clean up pending subscriptions and old idempotency
records

.sqlx/query-059162eba48cf5f519d0d8b6ce63575ced91941b8c55c986b8c5591c7d9b09e4.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT p.post_id, p.author_id, u.username AS author, p.title, p.content, p.published_at\n        FROM posts p\n        LEFT JOIN users u ON p.author_id = u.user_id\n        WHERE p.post_id = $1\n        ",
+  "query": "\n        SELECT p.post_id, p.author_id, u.username AS author, u.full_name,\n               p.title, p.content, p.published_at, last_modified\n        FROM posts p\n        LEFT JOIN users u ON p.author_id = u.user_id\n        WHERE p.post_id = $1\n        ",
   "describe": {
     "columns": [
       {
@@ -20,18 +20,28 @@
       },
       {
         "ordinal": 3,
-        "name": "title",
+        "name": "full_name",
         "type_info": "Text"
       },
       {
         "ordinal": 4,
-        "name": "content",
+        "name": "title",
         "type_info": "Text"
       },
       {
         "ordinal": 5,
+        "name": "content",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
         "name": "published_at",
         "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 7,
+        "name": "last_modified",
+        "type_info": "Timestamptz"
       }
     ],
     "parameters": {
@@ -43,10 +53,12 @@
       false,
       false,
       false,
+      true,
       false,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "3b9af6d6aeed0d4550e7cc2d13a7923cfa3658c3bc4ab7b881c2147218db3d82"
+  "hash": "059162eba48cf5f519d0d8b6ce63575ced91941b8c55c986b8c5591c7d9b09e4"
 }

.sqlx/query-1e1a90042e89bd8662df3bae15bc7506146cff102034664c77ab0fc68b9480f5.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        DELETE FROM idempotency\n        WHERE created_at < NOW() - INTERVAL '1 hour'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "1e1a90042e89bd8662df3bae15bc7506146cff102034664c77ab0fc68b9480f5"
+}

.sqlx/query-1fc92c14786c21d24951341e3a8149964533b7627d2d073eeac7b7d3230513ce.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT p.author_id, u.username as author, p.post_id, p.title, p.content, p.published_at\n        FROM posts p\n        INNER JOIN users u ON p.author_id = u.user_id\n        WHERE p.author_id = $1\n        ORDER BY p.published_at DESC\n        ",
+  "query": "\n        SELECT p.author_id, u.username as author, u.full_name,\n               p.post_id, p.title, p.content, p.published_at, p.last_modified\n        FROM posts p\n        INNER JOIN users u ON p.author_id = u.user_id\n        WHERE p.author_id = $1\n        ORDER BY p.published_at DESC\n        ",
   "describe": {
     "columns": [
       {
@@ -15,23 +15,33 @@
       },
       {
         "ordinal": 2,
+        "name": "full_name",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
         "name": "post_id",
         "type_info": "Uuid"
       },
       {
-        "ordinal": 3,
+        "ordinal": 4,
         "name": "title",
         "type_info": "Text"
       },
       {
-        "ordinal": 4,
+        "ordinal": 5,
         "name": "content",
         "type_info": "Text"
       },
       {
-        "ordinal": 5,
+        "ordinal": 6,
         "name": "published_at",
         "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 7,
+        "name": "last_modified",
+        "type_info": "Timestamptz"
       }
     ],
     "parameters": {
@@ -42,11 +52,13 @@
     "nullable": [
       false,
       false,
+      true,
       false,
       false,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "35ef2d2ed8b1477aebf642fe0f7e7dfc51157611de2da3ed45aed1fcbdf247b0"
+  "hash": "1fc92c14786c21d24951341e3a8149964533b7627d2d073eeac7b7d3230513ce"
 }

.sqlx/query-769e8762bd2173c088d85fc132326b05a08e67092eac4c3a7aff8a49d086b5a0.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT login_time FROM user_logins\n                WHERE user_id = $1\n                ORDER BY login_time DESC\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "login_time",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "769e8762bd2173c088d85fc132326b05a08e67092eac4c3a7aff8a49d086b5a0"
+}

.sqlx/query-7eccf0027753bc1c42897aef12c9350eca023f3be52e24530127d06c3c449104.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        DELETE FROM subscriptions\n        WHERE status = 'pending_confirmation'\n        AND subscribed_at < NOW() - INTERVAL '24 hours'\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "7eccf0027753bc1c42897aef12c9350eca023f3be52e24530127d06c3c449104"
+}

.sqlx/query-aef1e780d14be61aa66ae8771309751741068694b291499ee1371de693c6a654.json

@@ -1,16 +1,17 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE posts\n                SET title = $1, content = $2 WHERE post_id = $3\n                ",
+  "query": "\n                UPDATE posts\n                SET title = $1, content = $2, last_modified = $3 WHERE post_id = $4\n                ",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Text",
         "Text",
+        "Timestamptz",
         "Uuid"
       ]
     },
     "nullable": []
   },
-  "hash": "790175eabe78857d16f1890ef4a1cd71f3a9c5f3e98a7c00553196f7a48d3bc3"
+  "hash": "aef1e780d14be61aa66ae8771309751741068694b291499ee1371de693c6a654"
 }

.sqlx/query-dc3c1b786b4f4bd65f625922ce05eab4cb161f3de6c6e676af778f7749af5710.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT p.post_id, p.author_id, u.username AS author, p.title, p.content, p.published_at\n        FROM posts p\n        LEFT JOIN users u ON p.author_id = u.user_id\n        ORDER BY p.published_at DESC\n        LIMIT $1\n        OFFSET $2\n        ",
+  "query": "\n        SELECT p.post_id, p.author_id, u.username AS author, u.full_name,\n               p.title, p.content, p.published_at, p.last_modified\n        FROM posts p\n        LEFT JOIN users u ON p.author_id = u.user_id\n        ORDER BY p.published_at DESC\n        LIMIT $1\n        OFFSET $2\n        ",
   "describe": {
     "columns": [
       {
@@ -20,18 +20,28 @@
       },
       {
         "ordinal": 3,
-        "name": "title",
+        "name": "full_name",
         "type_info": "Text"
       },
       {
         "ordinal": 4,
-        "name": "content",
+        "name": "title",
         "type_info": "Text"
       },
       {
         "ordinal": 5,
+        "name": "content",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
         "name": "published_at",
         "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 7,
+        "name": "last_modified",
+        "type_info": "Timestamptz"
       }
     ],
     "parameters": {
@@ -44,10 +54,12 @@
       false,
       false,
       false,
+      true,
       false,
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "0463e392b69c5a82a64b4fa47fcf8f0abc63fa8ee77bdf60b4f6fdaca8b77e5a"
+  "hash": "dc3c1b786b4f4bd65f625922ce05eab4cb161f3de6c6e676af778f7749af5710"
 }

.sqlx/query-fc383671ada951baa611ab7dd00efcc7f4f2aea7c22e4c0865e5c766ed7f99b3.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO user_logins (user_id) VALUES ($1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fc383671ada951baa611ab7dd00efcc7f4f2aea7c22e4c0865e5c766ed7f99b3"
+}

migrations/20251009173005_add_last_modified_to_posts.sql

@@ -0,0 +1,2 @@
+ALTER TABLE posts
+ADD COLUMN last_modified TIMESTAMPTZ;

migrations/20251009180347_create_user_logins_table.sql

@@ -0,0 +1,5 @@
+CREATE TABLE user_logins (
+    id BIGSERIAL PRIMARY KEY,
+    user_id UUID NOT NULL REFERENCES users (user_id) ON DELETE CASCADE,
+    login_time TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);

package-lock.json

@@ -1123,7 +1123,8 @@
       "version": "4.1.13",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.13.tgz",
       "integrity": "sha512-i+zidfmTqtwquj4hMEwdjshYYgMbOrPzb9a0M3ZgNa0JMoZeFC6bxZvO8yr8ozS6ix2SDz0+mvryPeBs2TFE+w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/tapable": {
       "version": "2.2.3",

src/database_worker.rs

@@ -0,0 +1,58 @@
+use anyhow::Context;
+use sqlx::{
+    PgPool,
+    postgres::{PgConnectOptions, PgPoolOptions},
+};
+use std::time::Duration;
+
+pub async fn run_until_stopped(configuration: PgConnectOptions) -> Result<(), anyhow::Error> {
+    let connection_pool = PgPoolOptions::new().connect_lazy_with(configuration);
+    worker_loop(connection_pool).await
+}
+
+async fn worker_loop(connection_pool: PgPool) -> Result<(), anyhow::Error> {
+    loop {
+        if let Err(e) = clean_pending_subscriptions(&connection_pool).await {
+            tracing::error!("{:?}", e);
+        }
+        if let Err(e) = clean_idempotency_keys(&connection_pool).await {
+            tracing::error!("{:?}", e);
+        }
+        tokio::time::sleep(Duration::from_secs(60)).await;
+    }
+}
+
+async fn clean_pending_subscriptions(connection_pool: &PgPool) -> Result<(), anyhow::Error> {
+    let result = sqlx::query!(
+        "
+        DELETE FROM subscriptions
+        WHERE status = 'pending_confirmation'
+        AND subscribed_at < NOW() - INTERVAL '24 hours'
+        "
+    )
+    .execute(connection_pool)
+    .await
+    .context("Failed to clean up subscriptions table.")?;
+    match result.rows_affected() {
+        n if n > 0 => tracing::info!("Cleaned up {} expired subscriptions.", n),
+        _ => (),
+    }
+    Ok(())
+}
+
+async fn clean_idempotency_keys(connection_pool: &PgPool) -> Result<(), anyhow::Error> {
+    let result = sqlx::query!(
+        "
+        DELETE FROM idempotency
+        WHERE created_at < NOW() - INTERVAL '1 hour'
+        "
+    )
+    .execute(connection_pool)
+    .await
+    .context("Failed to clean up idempontency table.")?;
+    match result.rows_affected() {
+        n if n > 0 => tracing::info!("Cleaned up {} old idempotency records.", n),
+        _ => (),
+    }
+    Ok(())
+}

src/domain/comment.rs

@@ -13,6 +13,6 @@ pub struct CommentEntry {
 
 impl CommentEntry {
     pub fn formatted_date(&self) -> String {
-        self.published_at.format("%B %d, %Y").to_string()
+        self.published_at.format("%B %d, %Y %H:%M").to_string()
     }
 }

src/domain/post.rs

@@ -5,14 +5,16 @@ pub struct PostEntry {
     pub post_id: Uuid,
     pub author_id: Uuid,
     pub author: String,
+    pub full_name: Option<String>,
     pub title: String,
     pub content: String,
     pub published_at: DateTime<Utc>,
+    pub last_modified: Option<DateTime<Utc>>,
 }
 
 impl PostEntry {
     pub fn formatted_date(&self) -> String {
-        self.published_at.format("%B %d, %Y").to_string()
+        self.published_at.format("%B %d, %Y %H:%M").to_string()
     }
 
     pub fn to_html(&self) -> anyhow::Result<String> {

src/domain/subscriber_email.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use validator::Validate;
 
 #[derive(Debug, Validate)]
@@ -22,6 +24,12 @@ impl AsRef<str> for SubscriberEmail {
     }
 }
 
+impl Display for SubscriberEmail {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.email)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::SubscriberEmail;

src/issue_delivery_worker.rs

@@ -7,7 +7,7 @@ use std::time::Duration;
 use tracing::{Span, field::display};
 use uuid::Uuid;
 
-pub async fn run_worker_until_stopped(configuration: Settings) -> Result<(), anyhow::Error> {
+pub async fn run_until_stopped(configuration: Settings) -> Result<(), anyhow::Error> {
     let connection_pool = PgPoolOptions::new().connect_lazy_with(configuration.database.with_db());
     let email_client = EmailClient::build(configuration.email_client).unwrap();
     worker_loop(connection_pool, email_client).await
@@ -31,14 +31,6 @@ pub enum ExecutionOutcome {
     EmptyQueue,
 }
 
-#[tracing::instrument(
-    skip_all,
-    fields(
-        newsletter_issue_id=tracing::field::Empty,
-        subscriber_email=tracing::field::Empty
-    ),
-    err
-)]
 pub async fn try_execute_task(
     connection_pool: &PgPool,
     email_client: &EmailClient,
@@ -53,25 +45,14 @@ pub async fn try_execute_task(
         .record("subscriber_email", display(&task.subscriber_email));
     match SubscriberEmail::parse(task.subscriber_email.clone()) {
         Ok(email) => {
-            let mut issue = get_issue(connection_pool, task.newsletter_issue_id).await?;
-            issue.inject_unsubscribe_token(&task.unsubscribe_token);
-            if task.kind == EmailType::NewPost.to_string() {
-                issue.inject_tracking_info(&mut transaction).await?;
-            }
-            if let Err(e) = email_client
-                .send_email(
-                    &email,
-                    &issue.title,
-                    &issue.html_content,
-                    &issue.text_content,
+            execute_task(
+                connection_pool,
+                &mut transaction,
+                &task,
+                email,
+                email_client,
             )
-                .await
-            {
-                tracing::error!(
-                    error = %e,
-                    "Failed to deliver issue to confirmed subscriber. Skipping."
-                );
-            }
+            .await?;
         }
         Err(e) => {
             tracing::error!(
@@ -178,6 +159,35 @@ async fn dequeue_task(
     }
 }
 
+#[tracing::instrument(
+    name = "Executing task",
+    skip_all,
+    fields(email = %email),
+)]
+async fn execute_task(
+    connection_pool: &PgPool,
+    transaction: &mut Transaction<'static, Postgres>,
+    task: &Task,
+    email: SubscriberEmail,
+    email_client: &EmailClient,
+) -> Result<(), anyhow::Error> {
+    let mut issue = get_issue(connection_pool, task.newsletter_issue_id).await?;
+    issue.inject_unsubscribe_token(&task.unsubscribe_token);
+    if task.kind == EmailType::NewPost.to_string() {
+        issue.inject_tracking_info(transaction).await?;
+    }
+    email_client
+        .send_email(
+            &email,
+            &issue.title,
+            &issue.html_content,
+            &issue.text_content,
+        )
+        .await
+        .context("Failed to deliver newsletter issue to subscriber..")?;
+    Ok(())
+}
+
 async fn delete_task(
     mut transaction: Transaction<'static, Postgres>,
     issue_id: Uuid,

src/lib.rs

@@ -1,5 +1,6 @@
 pub mod authentication;
 pub mod configuration;
+pub mod database_worker;
 pub mod domain;
 pub mod email_client;
 pub mod idempotency;

src/main.rs

@@ -1,6 +1,6 @@
 use zero2prod::{
-    configuration::get_configuration, issue_delivery_worker::run_worker_until_stopped,
-    startup::Application, telemetry::init_subscriber,
+    configuration::get_configuration, database_worker, issue_delivery_worker, startup::Application,
+    telemetry::init_subscriber,
 };
 
 #[tokio::main]
@@ -11,11 +11,16 @@ async fn main() -> Result<(), anyhow::Error> {
     let application = Application::build(configuration.clone()).await?;
 
     let application_task = tokio::spawn(application.run_until_stopped());
-    let worker_task = tokio::spawn(run_worker_until_stopped(configuration));
+    let database_worker_task = tokio::spawn(database_worker::run_until_stopped(
+        configuration.database.with_db(),
+    ));
+    let delivery_worker_task =
+        tokio::spawn(issue_delivery_worker::run_until_stopped(configuration));
 
     tokio::select! {
         _ = application_task => {},
-        _ = worker_task => {},
+        _ = database_worker_task => {},
+        _ = delivery_worker_task => {},
     };
 
     Ok(())

src/routes/login.rs

@@ -15,6 +15,8 @@ use axum::{
 };
 use axum::{http::StatusCode, response::Redirect};
 use secrecy::SecretString;
+use sqlx::PgPool;
+use uuid::Uuid;
 
 #[derive(serde::Deserialize)]
 pub struct LoginFormData {
@@ -50,6 +52,9 @@ pub async fn post_login(
     tracing::Span::current().record("username", tracing::field::display(&credentials.username));
     let (user_id, role) = validate_credentials(credentials, &connection_pool).await?;
     tracing::Span::current().record("user_id", tracing::field::display(&user_id));
+    record_login(&connection_pool, &user_id)
+        .await
+        .context("Failed to register new login event.")?;
 
     session.renew().await.context("Failed to renew session.")?;
     session
@@ -69,3 +74,11 @@ pub async fn post_login(
     headers.insert("HX-Redirect", "/dashboard".parse().unwrap());
     Ok((StatusCode::OK, headers).into_response())
 }
+
+#[tracing::instrument(name = "Recording new login event", skip_all, fields(user_id = %user_id))]
+async fn record_login(connection_pool: &PgPool, user_id: &Uuid) -> Result<(), sqlx::Error> {
+    sqlx::query!("INSERT INTO user_logins (user_id) VALUES ($1)", user_id)
+        .execute(connection_pool)
+        .await?;
+    Ok(())
+}

src/routes/posts.rs

@@ -17,6 +17,7 @@ use axum::{
     extract::State,
     response::{Html, IntoResponse, Redirect, Response},
 };
+use chrono::Utc;
 use sqlx::PgPool;
 use uuid::Uuid;
 use validator::Validate;
@@ -77,7 +78,8 @@ async fn get_posts(
     sqlx::query_as!(
         PostEntry,
         r#"
-        SELECT p.post_id, p.author_id, u.username AS author, p.title, p.content, p.published_at
+        SELECT p.post_id, p.author_id, u.username AS author, u.full_name,
+               p.title, p.content, p.published_at, p.last_modified
         FROM posts p
         LEFT JOIN users u ON p.author_id = u.user_id
         ORDER BY p.published_at DESC
@@ -99,7 +101,8 @@ pub async fn get_posts_page(
     sqlx::query_as!(
         PostEntry,
         r#"
-        SELECT p.post_id, p.author_id, u.username AS author, p.title, p.content, p.published_at
+        SELECT p.post_id, p.author_id, u.username AS author, u.full_name,
+               p.title, p.content, p.published_at, p.last_modified
         FROM posts p
         LEFT JOIN users u ON p.author_id = u.user_id
         ORDER BY p.published_at DESC
@@ -151,10 +154,11 @@ pub async fn update_post(
             sqlx::query!(
                 "
                 UPDATE posts
-                SET title = $1, content = $2 WHERE post_id = $3
+                SET title = $1, content = $2, last_modified = $3 WHERE post_id = $4
                 ",
                 form.title,
                 form.content,
+                Utc::now(),
                 post_id
             )
             .execute(&connection_pool)
@@ -257,7 +261,8 @@ async fn get_post_data(
     sqlx::query_as!(
         PostEntry,
         r#"
-        SELECT p.post_id, p.author_id, u.username AS author, p.title, p.content, p.published_at
+        SELECT p.post_id, p.author_id, u.username AS author, u.full_name,
+               p.title, p.content, p.published_at, last_modified
         FROM posts p
         LEFT JOIN users u ON p.author_id = u.user_id
         WHERE p.post_id = $1

src/routes/users.rs

@@ -91,7 +91,11 @@ pub async fn update_user(
         return Ok(template.into_response());
     }
     let updated_full_name = form.full_name.trim();
+    let bio = {
         let bio = form.bio.trim();
+        if bio.is_empty() { None } else { Some(bio) }
+    };
+
     sqlx::query!(
         "
         UPDATE users
@@ -255,13 +259,32 @@ pub async fn user_profile(
             let posts = fetch_user_posts(&connection_pool, &user.user_id)
                 .await
                 .context("Could not fetch user posts.")?;
-            let session_username = session
-                .get_username()
+            let session_user_id = session
+                .get_user_id()
                 .await
                 .context("Could not fetch session username.")?;
+            let profile_user_id =
+                sqlx::query!("SELECT user_id FROM users WHERE username = $1", username)
+                    .fetch_one(&connection_pool)
+                    .await
+                    .context("Could not fetch profile user id.")?
+                    .user_id;
+            let last_seen = sqlx::query!(
+                "
+                SELECT login_time FROM user_logins
+                WHERE user_id = $1
+                ORDER BY login_time DESC
+                ",
+                profile_user_id
+            )
+            .fetch_optional(&connection_pool)
+            .await
+            .context("Failed to fetch last user login")?
+            .map(|r| r.login_time);
             let template = HtmlTemplate(UserTemplate {
                 user,
-                session_username,
+                session_user_id,
+                last_seen,
                 posts,
             });
             Ok(template.into_response())
@@ -299,7 +322,8 @@ async fn fetch_user_posts(
     sqlx::query_as!(
         PostEntry,
         r#"
-        SELECT p.author_id, u.username as author, p.post_id, p.title, p.content, p.published_at
+        SELECT p.author_id, u.username as author, u.full_name,
+               p.post_id, p.title, p.content, p.published_at, p.last_modified
         FROM posts p
         INNER JOIN users u ON p.author_id = u.user_id
         WHERE p.author_id = $1

src/telemetry.rs

@@ -21,7 +21,7 @@ where
         )
         .with(
             tracing_subscriber::fmt::layer()
-                .compact()
+                .pretty()
                 .with_writer(sink)
                 .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE),
         )

src/templates.rs

@@ -5,6 +5,7 @@ use crate::{
 };
 use askama::Template;
 use axum::response::{Html, IntoResponse};
+use chrono::{DateTime, Utc};
 use uuid::Uuid;
 
 pub struct HtmlTemplate<T>(pub T);
@@ -25,8 +26,9 @@ where
 #[template(path = "user/profile.html")]
 pub struct UserTemplate {
     pub user: UserEntry,
-    pub session_username: Option<String>,
+    pub session_user_id: Option<Uuid>,
     pub posts: Vec<PostEntry>,
+    pub last_seen: Option<DateTime<Utc>>,
 }
 
 #[derive(Template)]

templates/dashboard/comments/card.html

@@ -5,7 +5,7 @@
             <div class="mb-1">
                 {% if let Some(user_id) = comment.user_id %}
                     <a href="/users/{{ comment.username.as_ref().unwrap() }}"
-                       class="font-semibold text-blue-600 hover:text-blue-800 hover:underline">
+                       class="font-semibold text-blue-800 hover:text-blue-600 hover:underline">
                         {{ comment.username.as_ref().unwrap() }}
                     </a>
                 {% else %}

templates/posts/card.html

@@ -3,16 +3,17 @@
         <div class="flex items-start justify-between">
             <div class="flex-1 min-w-0">
                 <a href="/posts/{{ post.post_id }}">
-                    <h2 class="text-xl font-semibold text-gray-900 mb-3 hover:text-blue-600 transition-colors">{{
-                        post.title }}</h2>
+                    <h2 class="text-xl font-semibold text-gray-900 mb-3 hover:text-blue-600 transition-colors">
+                        {{
+                        post.title }}
+                    </h2>
                 </a>
                 <div class="flex items-center text-sm text-gray-500 mb-1">
                     <svg class="w-4 h-4 mr-1"
                          fill="none"
                          viewBox="0 0 24 24"
                          stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                              d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"/>
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
                     </svg>
                     <time datetime="{{ post.published_at }}">
                         {{ post.formatted_date() }}
@@ -23,11 +24,16 @@
                          fill="none"
                          viewBox="0 0 24 24"
                          stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                              d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
                     </svg>
                     <a href="/users/{{ post.author }}"
-                       class="hover:text-blue-600 hover:underline">{{ post.author }}</a>
+                       class="hover:text-blue-600 hover:underline">
+                        {% if let Some(full_name) = post.full_name %}
+                            {{ full_name }}
+                        {% else %}
+                            {{ post.author }}
+                        {% endif %}
+                    </a>
                 </div>
             </div>
             <a href="/posts/{{ post.post_id }}" class="flex-shrink-0 ml-4">
@@ -35,7 +41,7 @@
                      fill="none"
                      viewBox="0 0 24 24"
                      stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
                 </svg>
             </a>
         </div>

templates/posts/page.html

@@ -3,8 +3,8 @@
 {% block content %}
     <div class="max-w-3xl mx-auto">
         <article>
-            <header class="mb-4">
-                <h1 class="text-4xl font-bold text-gray-900 mb-4 leading-tight">{{ post.title }}</h1>
+            <header class="mb-4 space-y-4">
+                <h1 class="text-4xl font-bold text-gray-900 leading-tight">{{ post.title }}</h1>
                 <div class="flex flex-col sm:flex-row sm:items-center sm:justify-between text-sm text-gray-600">
                     <div class="flex items-center space-x-4">
                         <div class="flex items-center">
@@ -17,7 +17,13 @@
                                 </svg>
                             </div>
                             <a href="/users/{{ post.author }}"
-                               class="hover:text-blue-600 hover:underline font-medium">{{ post.author }}</a>
+                               class="hover:text-blue-600 hover:underline font-medium">
+                                {% if let Some(full_name) = post.full_name %}
+                                    {{ full_name }}
+                                {% else %}
+                                    {{ post.author }}
+                                {% endif %}
+                            </a>
                         </div>
                         <div class="flex items-center">
                             <svg class="w-4 h-4 mr-1 text-gray-400"
@@ -46,6 +52,9 @@
                         </div>
                     {% endif %}
                 </div>
+                {% if let Some(modified) = post.last_modified %}
+                    <span class="text-sm italic text-gray-500">Last modified on {{ modified.format("%B %d, %Y") }} at {{ modified.format("%H:%M") }}</span>
+                {% endif %}
             </header>
             {% if session_user_id.as_ref() == Some(post.author_id) %}
                 <div id="edit-form"

templates/user/profile.html

@@ -1,55 +1,63 @@
 {% extends "base.html" %}
 {% block title %}{{ user.username }}{% endblock %}
 {% block content %}
-<div class="max-w-4xl mx-auto p-4 sm:p-6">
-    <div class="bg-white rounded-lg shadow-md border border-gray-200 p-8 mb-6">
+    <div class="max-w-4xl mx-auto p-4 sm:p-6">
+        <div class="bg-white rounded-2xl shadow-sm border border-gray-200 p-6 sm:p-8 space-y-6">
             <div class="flex flex-col sm:flex-row items-center sm:items-start gap-6">
                 <div class="flex-shrink-0">
-                <div class="w-24 h-24 bg-gradient-to-br from-blue-500 to-indigo-600 rounded-full flex items-center justify-center text-white text-3xl font-bold shadow-lg">
+                    <div class="w-24 h-24 rounded-full bg-gradient-to-br from-blue-500 to-indigo-600 flex items-center justify-center text-white text-3xl font-bold shadow-md">
                         {{ user.username }}
                     </div>
                 </div>
-            <div class="flex-1 text-center sm:text-left">
-                <div class="flex flex-col sm:flex-row sm:items-center gap-2 mb-2">
-                    <h1 class="text-3xl font-bold text-gray-900">{{ user.full_name.as_deref().unwrap_or(user.username)
-                        }}</h1>
+                <div class="flex-1 text-center sm:text-left space-y-2">
+                    <div class="flex flex-col sm:flex-row sm:items-center gap-2">
+                        <h1 class="text-3xl font-semibold text-gray-900 tracking-tight">
+                            {{ user.full_name.as_deref().unwrap_or(user.username) }}
+                        </h1>
                         {% if user.is_admin() %}
-                    <svg class="w-6 h-6 text-blue-600 flex-shrink-0 mx-auto sm:mx-0"
+                            <svg class="w-5 h-5 text-blue-600 flex-shrink-0 mx-auto sm:mx-0"
                                  fill="currentColor"
                                  viewBox="0 0 24 24">
-                        <path d="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm0 10.99h7c-.53 4.12-3.28 7.79-7 8.94V12H5V6.3l7-3.11v8.8z"/>
+                                <path d="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm0 10.99h7c-.53 4.12-3.28 7.79-7 8.94V12H5V6.3l7-3.11v8.8z" />
                             </svg>
                         {% endif %}
                     </div>
-                {% if session_username.as_deref() == Some(user.username) %}
+                    {% if session_user_id.as_ref() == Some(user.user_id) %}
                         <a href="/users/edit"
-                   class="inline-flex items-center text-sm text-blue-600 hover:text-blue-700 font-medium mb-3">
-                    <svg class="w-4 h-4 mr-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                              d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
+                           class="inline-flex items-center text-sm font-medium text-blue-600 hover:text-blue-700 transition-colors">
+                            <svg class="w-4 h-4 mr-1.5"
+                                 fill="none"
+                                 viewBox="0 0 24 24"
+                                 stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
                             </svg>
                             Edit
                         </a>
                     {% endif %}
-                <p class="text-gray-500 text-lg mb-3">@{{ user.username }}</p>
+                    <p class="text-gray-500 text-lg">@{{ user.username }}</p>
                     <div class="flex items-center justify-center sm:justify-start text-sm text-gray-500">
                         <svg class="w-4 h-4 mr-1.5"
                              fill="none"
                              viewBox="0 0 24 24"
                              stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                              d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"/>
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
                         </svg>
                         {{ user.formatted_date() }}
                     </div>
+                    {% if let Some(last_seen) = last_seen %}
+                        <p class="text-sm italic text-gray-400">
+                            Last seen on {{ last_seen.format("%h %d, %Y") }} at {{ last_seen.format("%H:%M") }}
+                        </p>
+                    {% endif %}
                 </div>
             </div>
             {% if user.bio.is_some() %}
-        <div class="mt-6 pt-6 border-t border-gray-200">
-            <p class="text-gray-700 whitespace-pre-line">{{ user.bio.as_deref().unwrap() }}</p>
+                <div class="border-t border-gray-100 pt-6">
+                    <p class="text-gray-700 leading-relaxed whitespace-pre-line">{{ user.bio.as_deref().unwrap() }}</p>
                 </div>
             {% endif %}
         </div>
-    {% include "activity.html" %}
-</div>
+        <!-- Activity -->
+        <div class="mt-8">{% include "activity.html" %}</div>
+    </div>
 {% endblock %}