get things working again

[chirp] / src / main.zig

diff --git a/src/main.zig b/src/main.zig
index 86820082c263626605b277a95a3cb954d80a4ef4..65dab0798228554b0cbacd70e96cad0b2fb66ea6 100644 (file)
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,52 +1,22 @@
 const std = @import("std");
 const lmdb = @import("lmdb");
 const std = @import("std");
 const lmdb = @import("lmdb");

+const db = @import("db");

 const http = @import("http");
 
 // db {{{
 
 const http = @import("http");
 
 // db {{{
 

-const Prng = struct {
-    var prng: std.Random.DefaultPrng = std.Random.DefaultPrng.init(0);
-
-    pub fn gen_id(dbi: anytype) Id {
-        var id = Prng.prng.next();
-
-        while (dbi.has(id)) {
-            id = Prng.prng.next();
-        }
-
-        return id;
-    }
-
-    pub fn gen_str(dbi: anytype, comptime len: usize) [len]u8 {
-        var buf: [len / 2]u8 = undefined;
-        var res: [len]u8 = undefined;
-        Prng.prng.fill(&buf);
-        for (0..len / 2) |i| {
-            res[i * 2 + 0] = 'a' + (buf[i] % 16);
-            res[i * 2 + 1] = 'a' + (buf[i] >> 4 % 16);
-        }
-
-        while (dbi.has(res)) {
-            Prng.prng.fill(&buf);
-            for (0..len / 2) |i| {
-                res[i * 2 + 0] = 'a' + (buf[i] % 16);
-                res[i * 2 + 1] = 'a' + (buf[i] >> 4 % 16);
-            }
-        }
-
-        return res;
-    }
-};
-

 const Db = struct {
 const Db = struct {

-    fn users(txn: *const lmdb.Txn) !lmdb.Dbi(Id, User) {
-        return try txn.dbi("users", Id, User);
+    fn users(txn: lmdb.Txn) !db.Db(UserId, User) {
+        return try db.Db(UserId, User).init(txn, "users");
+    }
+    fn user_ids(txn: lmdb.Txn) !db.Db(Username, UserId) {
+        return try db.Db(Username, UserId).init(txn, "user_ids");

     }
     }

-    fn user_ids(txn: *const lmdb.Txn) !lmdb.Dbi(Username, Id) {
-        return try txn.dbi("user_ids", Username, Id);
+    fn sessions(txn: lmdb.Txn) !db.Db(SessionToken, UserId) {
+        return try db.Db(SessionToken, UserId).init(txn, "sessions");

     }
     }

-    fn sessions(txn: *const lmdb.Txn) !lmdb.Dbi(SessionToken, Id) {
-        return try txn.dbi("sessions", SessionToken, Id);
+    fn posts(txn: lmdb.Txn) !db.Db(PostId, Post) {
+        return try db.Db(PostId, Post).init(txn, "posts");

     }
 };
 
     }
 };
 


@@ -56,187 +26,434 @@ const Db = struct {
 
 const User = struct {
     // TODO: choose sizes
 
 const User = struct {
     // TODO: choose sizes

-    username: Username,
+    id: UserId,
+    name: Username,

     password_hash: PasswordHash,
     password_hash: PasswordHash,

+    posts: PostList,
+};
+
+const Post = struct {
+    id: PostId,
+
+    user_id: UserId,
+    time: Timestamp,
+
+    upvotes: u64 = 0,
+    downvotes: u64 = 0,
+    votes: VoteList,
+    comments: PostList,
+    // quote posts
+
+    text: PostText,

 };
 
 };
 

-const SessionTokenLen = 16;
+const Vote = struct {
+    const Kind = enum { Up, Down };
+
+    kind: Kind,
+    time: Timestamp,
+};

 
 const Id = u64;
 
 const Id = u64;

+const Login = struct {
+    user: User,
+    user_id: UserId,
+    session_token: SessionToken,
+};
+const UserId = enum(u64) { _ };
+const PostId = enum(u64) { _ };
+const Timestamp = i64;

 const Username = std.BoundedArray(u8, 16);
 const PasswordHash = std.BoundedArray(u8, 128);
 const Username = std.BoundedArray(u8, 16);
 const PasswordHash = std.BoundedArray(u8, 128);

-const SessionToken = [SessionTokenLen]u8;
+const SessionToken = u64;

 const CookieValue = std.BoundedArray(u8, 128);
 const CookieValue = std.BoundedArray(u8, 128);

+const PostText = std.BoundedArray(u8, 1024);
+const PostList = db.SetList(PostId, void);
+const UserList = db.SetList(UserId, User);
+const VoteList = db.SetList(UserId, Vote);

 
 

-pub fn hash_password(password: []const u8) !PasswordHash {
-    var hash_buffer = try PasswordHash.init(128);
+const Chirp = struct {
+    pub fn hash_password(password: []const u8) !PasswordHash {
+        var hash_buffer = try PasswordHash.init(128);

 
 

-    // TODO: choose buffer size
-    // TODO: dont allocate on stack, maybe zero memory?
-    var buffer: [1024 * 10]u8 = undefined;
-    var alloc = std.heap.FixedBufferAllocator.init(&buffer);
+        // TODO: choose buffer size
+        // TODO: dont allocate on stack, maybe zero memory?
+        var buffer: [1024 * 10]u8 = undefined;
+        var alloc = std.heap.FixedBufferAllocator.init(&buffer);

 
 

-    // TODO: choose limits
-    const result = try std.crypto.pwhash.argon2.strHash(password, .{
-        .allocator = alloc.allocator(),
-        .params = std.crypto.pwhash.argon2.Params.fromLimits(1000, 1024),
-    }, hash_buffer.slice());
+        // TODO: choose limits
+        const result = try std.crypto.pwhash.argon2.strHash(password, .{
+            .allocator = alloc.allocator(),
+            .params = std.crypto.pwhash.argon2.Params.fromLimits(1000, 1024),
+        }, hash_buffer.slice());

 
 

-    try hash_buffer.resize(result.len);
+        try hash_buffer.resize(result.len);

 
 

-    return hash_buffer;
-}
+        return hash_buffer;
+    }

 
 

-pub fn verify_password(password: []const u8, hash: PasswordHash) bool {
-    var buffer: [1024 * 10]u8 = undefined;
-    var alloc = std.heap.FixedBufferAllocator.init(&buffer);
-
-    if (std.crypto.pwhash.argon2.strVerify(hash.constSlice(), password, .{
-        .allocator = alloc.allocator(),
-    })) {
-        return true;
-    } else |err| {
-        std.debug.print("verify error: {}\n", .{err});
-        return false;
+    pub fn verify_password(password: []const u8, hash: PasswordHash) bool {
+        var buffer: [1024 * 10]u8 = undefined;
+        var alloc = std.heap.FixedBufferAllocator.init(&buffer);
+
+        if (std.crypto.pwhash.argon2.strVerify(hash.constSlice(), password, .{
+            .allocator = alloc.allocator(),
+        })) {
+            return true;
+        } else |err| {
+            std.debug.print("verify error: {}\n", .{err});
+            return false;
+        }

     }
     }

-}

 
 

-pub fn register_user(env: *lmdb.Env, username: []const u8, password: []const u8) !bool {
-    const username_array = try Username.fromSlice(username);
+    pub fn register_user(env: *lmdb.Env, username: []const u8, password: []const u8) !bool {
+        const username_array = try Username.fromSlice(username);

 
 

-    const txn = try env.txn();
-    defer {
-        txn.commit();
-        env.sync();
-    }
+        const txn = try env.txn();
+        defer txn.commit() catch {};

 
 

-    const users = try Db.users(&txn);
-    const user_ids = try Db.user_ids(&txn);
+        const users = try Db.users(txn);
+        const user_ids = try Db.user_ids(txn);

 
 

-    if (user_ids.has(username_array)) {
-        return false;
-    } else {
-        const user_id = Prng.gen_id(users);
-        users.put(user_id, User{
-            .username = username_array,
-            .password_hash = try hash_password(password),
-        });
+        if (try user_ids.has(username_array)) {
+            return false;
+        } else {
+            const user_id = try db.Prng.gen(users.dbi, UserId);
+            const posts = try Db.posts(txn);
+
+            try users.put(user_id, User{
+                .id = user_id,
+                .name = username_array,
+                .password_hash = try hash_password(password),
+                .posts = try PostList.init(posts.dbi),
+            });

 
 

-        user_ids.put(username_array, user_id);
+            try user_ids.put(username_array, user_id);

 
 

-        return true;
+            return true;
+        }

     }
     }

-}

 
 

-pub fn login_user(env: *lmdb.Env, username: []const u8, password: []const u8) !SessionToken {
-    const username_array = try Username.fromSlice(username);
+    pub fn login_user(
+        env: *lmdb.Env,
+        username: []const u8,
+        password: []const u8,
+    ) !SessionToken {
+        const username_array = try Username.fromSlice(username);

 
 

-    const txn = try env.txn();
-    defer {
-        txn.commit();
-        env.sync();
-    }
+        const txn = try env.txn();
+        defer txn.commit() catch {};

 
 

-    const user_ids = try Db.user_ids(&txn);
-    const user_id = user_ids.get(username_array) orelse return error.UnknownUsername;
-    std.debug.print("id: {}\n", .{user_id});
+        const user_ids = try Db.user_ids(txn);
+        const user_id = try user_ids.get(username_array);
+        std.debug.print("user logging in, id: {}\n", .{user_id});
+
+        const users = try Db.users(txn);
+        const user = try users.get(user_id);

 
 

-    const users = try Db.users(&txn);
-    if (users.get(user_id)) |user| {

         if (verify_password(password, user.password_hash)) {
         if (verify_password(password, user.password_hash)) {

-            const sessions = try Db.sessions(&txn);
-            const session_token = Prng.gen_str(sessions, SessionTokenLen);
-            sessions.put(session_token, user_id);
+            const sessions = try Db.sessions(txn);
+            const session_token = try db.Prng.gen(sessions.dbi, SessionToken);
+            try sessions.put(session_token, user_id);

             return session_token;
         } else {
             return error.IncorrectPassword;
         }
             return session_token;
         } else {
             return error.IncorrectPassword;
         }

-    } else {
-        return error.UserNotFound;

     }
     }

-}

 
 

-fn logout_user(env: *lmdb.Env, session_token: SessionToken) !void {
-    const txn = try env.txn();
-    defer {
-        txn.commit();
-        env.sync();
+    fn logout_user(env: *lmdb.Env, session_token: SessionToken) !void {
+        const txn = try env.txn();
+        defer txn.commit() catch {};
+
+        const sessions = try Db.sessions(txn);
+        try sessions.del(session_token);

     }
 
     }
 

-    const sessions = try Db.sessions(&txn);
-    sessions.del(session_token);
-}
+    fn post(env: *lmdb.Env, user_id: UserId, text: []const u8) !void {
+        var post_id: PostId = undefined;
+
+        // TODO: do this in one commit
+
+        var txn: lmdb.Txn = undefined;
+        {
+            // create post
+            txn = try env.txn();
+            defer txn.commit() catch {};
+
+            const posts = try Db.posts(txn);
+            post_id = try db.Prng.gen(posts.dbi, PostId);
+            const votes = try txn.dbi("votes");
+            try posts.put(post_id, Post{
+                .id = post_id,
+                .user_id = user_id,
+                .time = std.time.timestamp(),
+                .votes = try VoteList.init(votes),
+                .comments = try PostList.init(posts.dbi),
+                .text = try PostText.fromSlice(text),
+            });
+        }

 
 

-fn get_session_user(env: *lmdb.Env, session_token: SessionToken) !User {
-    const txn = try env.txn();
-    defer txn.abort();
+        {
+            // append to user's posts
+            txn = try env.txn();
+            defer txn.commit() catch {};
+
+            const users = try Db.users(txn);
+            var user = try users.get(user_id);
+
+            const posts = try Db.posts(txn);
+            var posts_view = try user.posts.open(posts.dbi);
+            try posts_view.append(post_id, {});
+        }
+    }
+
+    fn vote(env: *lmdb.Env, post_id: PostId, user_id: UserId, kind: Vote.Kind) !void {
+        const txn = try env.txn();
+        defer txn.commit() catch {};
+
+        const posts = try Db.posts(txn);
+        const votes = try txn.dbi("votes");
+
+        var p = try posts.get(post_id);
+        var votes_view = try p.votes.open(votes);
+
+        if (try votes_view.has(user_id)) {
+            const old_vote = try votes_view.get(user_id);
+
+            if (old_vote.kind == kind) {
+                return;
+            } else {
+                try votes_view.del(user_id);
+
+                if (old_vote.kind == .Up) {
+                    p.upvotes -= 1;
+                } else {
+                    p.downvotes -= 1;
+                }
+                try posts.put(post_id, p);
+            }
+        }
+        try votes_view.append(user_id, Vote{
+            .kind = kind,
+            .time = std.time.timestamp(),
+        });
+
+        if (kind == .Up) {
+            p.upvotes += 1;
+        } else {
+            p.downvotes += 1;
+        }
+        try posts.put(post_id, p);
+    }
+
+    fn unvote(env: *lmdb.Env, post_id: PostId, user_id: UserId) !void {
+        const txn = try env.txn();
+        defer txn.commit() catch {};
+
+        const posts = try Db.posts(txn);
+        const votes = try txn.dbi("votes");
+
+        var p = try posts.get(post_id);
+        var votes_view = try p.votes.open(votes);

 
 

-    const sessions = try Db.sessions(&txn);
-    const users = try Db.users(&txn);
+        if (try votes_view.has(user_id)) {
+            const v = try votes_view.get(user_id);
+
+            if (v.kind == .Up) {
+                p.upvotes -= 1;
+            } else {
+                p.downvotes -= 1;
+            }
+            try posts.put(post_id, p);
+
+            try votes_view.del(user_id);
+        }
+    }
+
+    fn get_session_user_id(env: *lmdb.Env, session_token: SessionToken) !UserId {
+        const txn = try env.txn();
+        defer txn.abort();
+
+        const sessions = try Db.sessions(txn);
+
+        return try sessions.get(session_token);
+    }

 
 

-    if (sessions.get(session_token)) |user_id| {
-        return users.get(user_id) orelse error.UnknownUser;
+    fn get_user(env: *lmdb.Env, user_id: UserId) !User {
+        const txn = try env.txn();
+        defer txn.abort();
+
+        const users = try Db.users(txn);
+        return try users.get(user_id);
+    }
+};
+
+// }}}
+
+// html {{{
+fn html_form(res: *http.Response, comptime fmt_action: []const u8, args_action: anytype, inputs: anytype) !void {
+    try res.write("<form style=\"display: inline-block!important;\" action=\"", .{});
+    try res.write(fmt_action, args_action);
+    try res.write("\" method=\"post\">", .{});
+
+    inline for (inputs) |input| {
+        switch (@typeInfo(@TypeOf(input))) {
+            .Struct => {
+                try res.write("<input ", .{});
+                try res.write(input[0], input[1]);
+                try res.write(" />", .{});
+            },
+            else => {
+                try res.write("<input ", .{});
+                try res.write(input, .{});
+                try res.write(" />", .{});
+            },
+        }
+    }
+
+    try res.write("</form>", .{});
+}
+// }}}
+
+// write {{{
+fn write_header(res: *http.Response, logged_in: ?Login) !void {
+    if (logged_in) |login| {
+        try res.write(
+            \\<a href="/user/{s}">Home</a><br />
+        , .{login.user.name.constSlice()});
+        try html_form(res, "/logout", .{}, .{
+            \\type="submit" value="Logout"
+        });
+        try html_form(res, "/quit", .{}, .{
+            \\type="submit" value="Quit"
+        });
+        try res.write("<br />", .{});
+        try html_form(res, "/post", .{}, .{
+            \\type="text" name="text"
+            ,
+            \\type="submit" value="Post"
+        });

     } else {
     } else {

-        return error.SessionNotFound;
+        try res.write(
+            \\<a href="/">Home</a><br />
+            \\<a href="/register">Register</a>
+            \\<a href="/login">Login</a><br />
+        , .{});
+        try html_form(res, "/quit", .{}, .{
+            \\type="submit" value="Quit"
+        });

     }
 }
     }
 }

+fn write_posts(res: *http.Response, txn: lmdb.Txn, user: User, login: ?Login) !void {
+    const votes_dbi = try txn.dbi("votes");
+    const posts = try Db.posts(txn);
+    const posts_view = try user.posts.open(posts.dbi);

 
 

-// }}}
+    var it = posts_view.iterator();
+    while (it.next()) |kv| {
+        const post_id = kv.key;
+        const post = try posts.get(post_id);

 
 

-fn list_users(env: *lmdb.Env) !void {
-    const txn = try env.txn();
-    defer txn.abort();
+        try res.write(
+            \\<div>
+            \\<p>{s}</p>
+        , .{post.text.constSlice()});

 
 

-    // const users = try Db.users(&txn);
-    const users = try txn.dbi("users", Id, User);
-    var cursor = try users.cursor();
+        const votes_view = try post.votes.open(votes_dbi);
+        const comments_view = try post.comments.open(posts.dbi);

 
 

-    var key: Id = undefined;
-    var user_maybe = cursor.get(&key, .First);
+        var has_voted: ?Vote.Kind = null;

 
 

-    while (user_maybe) |*user| {
-        std.debug.print("[{}] {s}\n", .{ key, user.username.constSlice() });
+        if (login != null and try votes_view.has(login.?.user_id)) {
+            const vote = try votes_view.get(login.?.user_id);

 
 

-        user_maybe = cursor.get(&key, .Next);
+            has_voted = vote.kind;
+        }
+
+        if (has_voted != null and has_voted.? == .Up) {
+            try html_form(res, "/unupvote/{}", .{@intFromEnum(post_id)}, .{
+                .{ "type=\"submit\" value=\"&#x2B06; {}\"", .{post.upvotes} },
+            });
+        } else {
+            try html_form(res, "/upvote/{}", .{@intFromEnum(post_id)}, .{
+                .{ "type=\"submit\" value=\"&#x2B06; {}\"", .{post.upvotes} },
+            });
+        }
+        if (has_voted != null and has_voted.? == .Down) {
+            try html_form(res, "/undownvote/{}", .{@intFromEnum(post_id)}, .{
+                .{ "type=\"submit\" value=\"&#x2B07; {}\"", .{post.downvotes} },
+            });
+        } else {
+            try html_form(res, "/downvote/{}", .{@intFromEnum(post_id)}, .{
+                .{ "type=\"submit\" value=\"&#x2B07; {}\"", .{post.downvotes} },
+            });
+        }
+        try res.write(
+            \\<span>&#x1F4AD; {}</span>
+            \\</div>
+        , .{comments_view.len()});

     }
 }
     }
 }

-fn list_user_ids(env: *lmdb.Env) !void {
+// }}}
+
+fn list_users(env: lmdb.Env) !void {

     const txn = try env.txn();
     defer txn.abort();
 
     const txn = try env.txn();
     defer txn.abort();
 

-    const user_ids = try Db.user_ids(&txn);
-    var cursor = try user_ids.cursor();
+    const users = try Db.users(txn);
+    var it = try users.iterator();

 
 

-    var key: Username = undefined;
-    var user_id_maybe = cursor.get(&key, .First);
+    while (it.next()) |kv| {
+        const key = kv.key;
+        const user = kv.val;
+        std.debug.print("[{}] {s}\n", .{ key, user.name.constSlice() });
+    }
+}
+fn list_user_ids(env: lmdb.Env) !void {
+    const txn = try env.txn();
+    defer txn.abort();

 
 

-    while (user_id_maybe) |user_id| {
-        std.debug.print("[{s}] {}\n", .{ key.constSlice(), user_id });
+    const user_ids = try Db.user_ids(txn);
+    var it = try user_ids.iterator();

 
 

-        user_id_maybe = cursor.get(&key, .Next);
+    while (it.next()) |kv| {
+        const key = kv.key;
+        const user_id = kv.val;
+        std.debug.print("[{s}] {}\n", .{ key.constSlice(), user_id });

     }
 }
 
     }
 }
 

-fn list_sessions(env: *lmdb.Env) !void {
+fn list_sessions(env: lmdb.Env) !void {

     const txn = try env.txn();
     defer txn.abort();
 
     const txn = try env.txn();
     defer txn.abort();
 

-    const sessions = try Db.sessions(&txn);
-    var cursor = try sessions.cursor();
+    const sessions = try Db.sessions(txn);
+    var it = try sessions.iterator();

 
 

-    var key: SessionToken = undefined;
-    var user_id_maybe = cursor.get(&key, .First);
+    while (it.next()) |kv| {
+        const key = kv.key;
+        const user_id = kv.val;
+        std.debug.print("[{x}] {}\n", .{ key, user_id });
+    }
+}
+
+fn list_posts(env: lmdb.Env) !void {
+    const txn = try env.txn();
+    defer txn.abort();

 
 

-    while (user_id_maybe) |user_id| {
-        std.debug.print("[{s}] {}\n", .{ key, user_id });
+    const posts = try Db.posts(txn);
+    var it = try posts.iterator();

 
 

-        user_id_maybe = cursor.get(&key, .Next);
+    while (it.next()) |kv| {
+        const key = kv.key;
+        const post = kv.val;
+        std.debug.print("[{}] {s}\n", .{ key, post.text.constSlice() });

     }
 }
 
 const ReqBufferSize = 4096;
     }
 }
 
 const ReqBufferSize = 4096;

-const ResHeadBufferSize = 4096;
-const ResBodyBufferSize = 4096;
+const ResHeadBufferSize = 1024 * 16;
+const ResBodyBufferSize = 1024 * 16;

 
 pub fn main() !void {
     // server
 
 pub fn main() !void {
     // server


@@ -244,15 +461,17 @@ pub fn main() !void {
     defer server.deinit();
 
     // lmdb
     defer server.deinit();
 
     // lmdb

-    var env = lmdb.Env.open("db", 1024 * 100);
+    var env = try lmdb.Env.open("db", 1024 * 1024 * 10);

     defer env.close();
 
     defer env.close();
 

-    std.debug.print("Users:\n", .{});
-    try list_users(&env);
-    std.debug.print("User IDs:\n", .{});
-    try list_user_ids(&env);
-    std.debug.print("Sessions:\n", .{});
-    try list_sessions(&env);
+    // std.debug.print("Users:\n", .{});
+    // try list_users(env);
+    // std.debug.print("User IDs:\n", .{});
+    // try list_user_ids(env);
+    // std.debug.print("Sessions:\n", .{});
+    // try list_sessions(env);
+    // std.debug.print("Posts:\n", .{});
+    // try list_posts(env);

 
     try handle_connection(&server, &env);
     // const ThreadCount = 1;
 
     try handle_connection(&server, &env);
     // const ThreadCount = 1;


@@ -284,19 +503,20 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
             var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer);
 
             // check session token
             var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer);
 
             // check session token

-            var logged_in: ?struct {
-                user: User,
-                session_token: SessionToken,
-            } = null;
+            var logged_in: ?Login = null;

 
             if (req.get_cookie("session_token")) |session_token_str| {
 
             if (req.get_cookie("session_token")) |session_token_str| {

-                var session_token: SessionToken = undefined;
-                std.mem.copyForwards(u8, &session_token, session_token_str);
+                const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 16);

                 // const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 10);
                 // const session_token = std.mem.bytesToValue(SessionToken, session_token_str);
                 // const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 10);
                 // const session_token = std.mem.bytesToValue(SessionToken, session_token_str);

-                if (get_session_user(env, session_token)) |user| {
+                if (Chirp.get_session_user_id(env, session_token)) |user_id| {
+                    const txn = try env.txn();
+                    defer txn.abort();
+                    const users = try Db.users(txn);
+

                     logged_in = .{
                     logged_in = .{

-                        .user = user,
+                        .user = try users.get(user_id),
+                        .user_id = user_id,

                         .session_token = session_token,
                     };
                 } else |err| {
                         .session_token = session_token,
                     };
                 } else |err| {


@@ -311,6 +531,8 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
 
             // html
             if (req.method == .GET) {
 
             // html
             if (req.method == .GET) {

+                try write_header(&res, logged_in);
+

                 if (std.mem.eql(u8, req.target, "/register")) {
                     try res.write(
                         \\<form action="/register" method="post">
                 if (std.mem.eql(u8, req.target, "/register")) {
                     try res.write(
                         \\<form action="/register" method="post">


@@ -329,20 +551,35 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
                         \\</form>
                     , .{});
                     try res.send();
                         \\</form>
                     , .{});
                     try res.send();

+                } else if (std.mem.startsWith(u8, req.target, "/user/")) {
+                    const username = req.target[6..req.target.len];
+
+                    const txn = try env.txn();
+                    defer txn.abort();
+
+                    const user_ids = try Db.user_ids(txn);
+                    if (user_ids.get(try Username.fromSlice(username))) |user_id| {
+                        const users = try Db.users(txn);
+                        const user = try users.get(user_id);
+                        try write_posts(&res, txn, user, logged_in);
+                    } else |err| {
+                        try res.write(
+                            \\<p>User not found [{}]</p>
+                        , .{err});
+                    }
+                    try res.send();

                 } else {
                     if (logged_in) |login| {
                 } else {
                     if (logged_in) |login| {

-                        try res.write(
-                            \\<a href="/user/{s}">Home</a>
-                            \\<form action="/logout" method="post"><input type="submit" value="Logout" /></form>
-                            \\<form action="/quit" method="post"><input type="submit" value="Quit" /></form>
-                        , .{login.user.username.constSlice()});
+                        const user = try Chirp.get_user(env, login.user_id);
+
+                        const txn = try env.txn();
+                        defer txn.abort();
+
+                        try write_posts(&res, txn, user, logged_in);
+

                         try res.send();
                     } else {
                         try res.send();
                     } else {

-                        try res.write(
-                            \\<a href="/register">Register</a>
-                            \\<a href="/login">Login</a>
-                            \\<form action="/quit" method="post"><input type="submit" value="Quit" /></form>
-                        , .{});
+                        try res.write("[GET] {s}", .{req.target});

                         try res.send();
                     }
                 }
                         try res.send();
                     }
                 }


@@ -355,7 +592,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
                     const password = req.get_value("password").?;
 
                     std.debug.print("New user: {s} {s}\n", .{ username, password });
                     const password = req.get_value("password").?;
 
                     std.debug.print("New user: {s} {s}\n", .{ username, password });

-                    if (try register_user(env, username, password)) {
+                    if (try Chirp.register_user(env, username, password)) {

                         try res.redirect("/login");
                     } else {
                         try res.redirect("/register");
                         try res.redirect("/login");
                     } else {
                         try res.redirect("/register");


@@ -367,7 +604,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
                     const password = req.get_value("password").?;
 
                     std.debug.print("New login: {s} {s}\n", .{ username, password });
                     const password = req.get_value("password").?;
 
                     std.debug.print("New login: {s} {s}\n", .{ username, password });

-                    if (login_user(env, username, password)) |session_token| {
+                    if (Chirp.login_user(env, username, password)) |session_token| {

                         res.status = .see_other;
                         try res.add_header(
                             "Location",
                         res.status = .see_other;
                         try res.add_header(
                             "Location",


@@ -375,7 +612,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
                         );
                         try res.add_header(
                             "Set-Cookie",
                         );
                         try res.add_header(
                             "Set-Cookie",

-                            .{ "session_token={s}; Secure; HttpOnly", .{session_token} },
+                            .{ "session_token={x}; Secure; HttpOnly", .{session_token} },

                         );
 
                         try res.send();
                         );
 
                         try res.send();


@@ -386,13 +623,21 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
                     }
                 } else if (std.mem.eql(u8, req.target, "/logout")) {
                     if (logged_in) |login| {
                     }
                 } else if (std.mem.eql(u8, req.target, "/logout")) {
                     if (logged_in) |login| {

-                        try logout_user(env, login.session_token);
+                        try Chirp.logout_user(env, login.session_token);

 
                         try res.add_header(
                             "Set-Cookie",
                             .{"session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT"},
                         );
 
 
                         try res.add_header(
                             "Set-Cookie",
                             .{"session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT"},
                         );
 

+                        try res.redirect("/");
+                        try res.send();
+                    }
+                } else if (std.mem.eql(u8, req.target, "/post")) {
+                    if (logged_in) |login| {
+                        const text = req.get_value("text").?;
+                        try Chirp.post(env, login.user_id, text);
+

                         try res.redirect("/");
                         try res.send();
                     }
                         try res.redirect("/");
                         try res.send();
                     }


@@ -400,11 +645,60 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
                     try res.redirect("/");
                     try res.send();
                     break :accept;
                     try res.redirect("/");
                     try res.send();
                     break :accept;

+                } else if (std.mem.startsWith(u8, req.target, "/upvote/")) {
+                    const login = logged_in orelse return error.NotLoggedIn;
+
+                    const post_id_str = req.target[8..req.target.len];
+                    const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10));
+
+                    try Chirp.vote(env, post_id, login.user_id, .Up);
+
+                    if (req.get_header("Referer")) |ref| {
+                        try res.redirect(ref);
+                    }
+                    try res.send();
+                } else if (std.mem.startsWith(u8, req.target, "/downvote/")) {
+                    const login = logged_in orelse return error.NotLoggedIn;
+
+                    const post_id_str = req.target[10..req.target.len];
+                    const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10));
+
+                    try Chirp.vote(env, post_id, login.user_id, .Down);
+
+                    if (req.get_header("Referer")) |ref| {
+                        try res.redirect(ref);
+                    }
+                    try res.send();
+                } else if (std.mem.startsWith(u8, req.target, "/unupvote/")) {
+                    // TODO: maybe move to one /unvote?
+                    const login = logged_in orelse return error.NotLoggedIn;
+
+                    const post_id_str = req.target[10..req.target.len];
+                    const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10));
+
+                    try Chirp.unvote(env, post_id, login.user_id);
+
+                    if (req.get_header("Referer")) |ref| {
+                        try res.redirect(ref);
+                    }
+                    try res.send();
+                } else if (std.mem.startsWith(u8, req.target, "/undownvote/")) {
+                    const login = logged_in orelse return error.NotLoggedIn;
+
+                    const post_id_str = req.target[12..req.target.len];
+                    const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10));
+
+                    try Chirp.unvote(env, post_id, login.user_id);
+
+                    if (req.get_header("Referer")) |ref| {
+                        try res.redirect(ref);
+                    }
+                    try res.send();

                 } else {
                     // try req.respond(
                     //     \\<p>POST</p>
                     // , .{});
                 } else {
                     // try req.respond(
                     //     \\<p>POST</p>
                     // , .{});

-                    try res.write("<p>{s}</p>", .{req.target});
+                    try res.write("<p>[POST] {s}</p>", .{req.target});

                     try res.send();
                 }
             }
                     try res.send();
                 }
             }