refactor replies and add qoutes view; rename /quotes/ to /quoted/ and /replies/ to...

[chirp] / src / main.zig

diff --git a/src/main.zig b/src/main.zig
index 80a174ac6b6d33d011475673f411159aee667124..0b22dbb6a47a1a8d046cac4000461d2813c3922c 100644 (file)
--- a/src/main.zig
+++ b/src/main.zig
@@ -269,7 +269,7 @@ const Chirp = struct {
         try sessions.del(session_token);
     }
 
         try sessions.del(session_token);
     }
 

-    fn append_post(env: lmdb.Env, user_id: UserId, post_list: PostList, parent_id: ?PostId, quote_id: ?PostId, text: []const u8) !void {
+    fn append_post(env: lmdb.Env, user_id: UserId, post_list: PostList, parent_id: ?PostId, quote_id: ?PostId, text: []const u8) !PostId {

         var post_id: PostId = undefined;
 
         // TODO: do this in one commit
         var post_id: PostId = undefined;
 
         // TODO: do this in one commit


@@ -315,39 +315,45 @@ const Chirp = struct {
             var quotes = try quote_post.quotes.open(txn);
             try quotes.append(post_id);
         }
             var quotes = try quote_post.quotes.open(txn);
             try quotes.append(post_id);
         }

+
+        return post_id;

     }
 
     fn post(env: lmdb.Env, user_id: UserId, text: []const u8) !void {
     }
 
     fn post(env: lmdb.Env, user_id: UserId, text: []const u8) !void {

-        const txn = try env.txn();
-
+        var txn = try env.txn();

         const users = try Db.users(txn);
         const user = try users.get(user_id);
         const users = try Db.users(txn);
         const user = try users.get(user_id);

-

         txn.abort();
 
         txn.abort();
 

-        try append_post(env, user_id, user.posts, null, null, text);
+        const post_id = try append_post(env, user_id, user.posts, null, null, text);
+        _ = post_id;

     }
 
     fn comment(env: lmdb.Env, user_id: UserId, parent_post_id: PostId, text: []const u8) !void {
     }
 
     fn comment(env: lmdb.Env, user_id: UserId, parent_post_id: PostId, text: []const u8) !void {

-        const txn = try env.txn();
+        var txn = try env.txn();
+        const users = try Db.users(txn);
+        const user = try users.get(user_id);

 
         const posts = try Db.posts(txn);
         const parent_post = try posts.get(parent_post_id);
 
         const posts = try Db.posts(txn);
         const parent_post = try posts.get(parent_post_id);

-

         txn.abort();
 
         txn.abort();
 

-        try append_post(env, user_id, parent_post.comments, parent_post_id, null, text);
+        const post_id = try append_post(env, user_id, parent_post.comments, parent_post_id, null, text);
+
+        txn = try env.txn();
+        var replies_view = try user.posts.open(txn);
+        try replies_view.append(post_id);
+        try txn.commit();

     }
 
     fn quote(env: lmdb.Env, user_id: UserId, quote_post_id: PostId, text: []const u8) !void {
     }
 
     fn quote(env: lmdb.Env, user_id: UserId, quote_post_id: PostId, text: []const u8) !void {

-        const txn = try env.txn();
-
+        var txn = try env.txn();

         const users = try Db.users(txn);
         const user = try users.get(user_id);
         const users = try Db.users(txn);
         const user = try users.get(user_id);

-

         txn.abort();
 
         txn.abort();
 

-        try append_post(env, user_id, user.posts, null, quote_post_id, text);
+        const post_id = try append_post(env, user_id, user.posts, null, quote_post_id, text);
+        _ = post_id;

     }
 
     fn vote(env: lmdb.Env, post_id: PostId, user_id: UserId, kind: Vote.Kind) !void {
     }
 
     fn vote(env: lmdb.Env, post_id: PostId, user_id: UserId, kind: Vote.Kind) !void {


@@ -434,10 +440,8 @@ const Chirp = struct {
 // }}}
 
 // html {{{
 // }}}
 
 // html {{{

-fn html_form(res: *http.Response, comptime fmt_action: []const u8, args_action: anytype, inputs: anytype) !void {
-    try res.write("<form action=\"", .{});
-    try res.write(fmt_action, args_action);
-    try res.write("\" method=\"post\">", .{});
+fn html_form(res: *http.Response, action: []const u8, inputs: anytype) !void {
+    try res.write("<form action=\"{s}\" method=\"post\">", .{action});

 
     inline for (inputs) |input| {
         switch (@typeInfo(@TypeOf(input))) {
 
     inline for (inputs) |input| {
         switch (@typeInfo(@TypeOf(input))) {


@@ -496,7 +500,7 @@ fn write_header(res: *http.Response, logged_in: ?Login) !void {
         try res.write(
             \\<a href="/post">Post</a><br />
         , .{});
         try res.write(
             \\<a href="/post">Post</a><br />
         , .{});

-        try html_form(res, "/logout", .{}, .{
+        try html_form(res, "/logout", .{

             \\type="submit" value="Logout"
         });
         try res.write("<br /><br />", .{});
             \\type="submit" value="Logout"
         });
         try res.write("<br /><br />", .{});


@@ -507,17 +511,13 @@ fn write_header(res: *http.Response, logged_in: ?Login) !void {
             \\<input type="text" name="username" />
             \\<input type="password" name="password" />
             \\<input type="submit" value="Register" />
             \\<input type="text" name="username" />
             \\<input type="password" name="password" />
             \\<input type="submit" value="Register" />

-            \\</form>
+            \\</form><br />

             \\<form action="/login" method="post">
             \\<input type="text" name="username" />
             \\<input type="password" name="password" />
             \\<input type="submit" value="Login" />
             \\<form action="/login" method="post">
             \\<input type="text" name="username" />
             \\<input type="password" name="password" />
             \\<input type="submit" value="Login" />

-            \\</form>
+            \\</form><br /><br />

         , .{});
         , .{});

-        try html_form(res, "/quit", .{}, .{
-            \\type="submit" value="Quit"
-        });
-        try res.write("<br /><br />", .{});

     }
 }
 fn write_start(res: *http.Response) !void {
     }
 }
 fn write_start(res: *http.Response) !void {


@@ -549,16 +549,22 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
 
     try res.write(
         \\<div>
 
     try res.write(
         \\<div>

-        \\<span><a href="/user/{s}">{s}</a> {s}</span><br />
+        \\<span><a href="/user/{s}">{s}</a>
+    , .{ user.name.constSlice(), user.display_name.constSlice() });
+    if (post.parent_id) |id| {
+        try res.write(" <a href=\"/post/{x}\">..</a>", .{@intFromEnum(id)});
+    }
+    try res.write(
+        \\ {s}</span><br />

         \\<span>{s}</span><br />
         \\<span>{s}</span><br />

-    , .{ user.name.constSlice(), user.display_name.constSlice(), time_str(post.time).constSlice(), post.text.constSlice() });
+    , .{ time_str(post.time).constSlice(), post.text.constSlice() });

 
     if (post.quote_id) |quote_id| {
         try res.write("<div style=\"border: 1px solid black;\">", .{});
         if (options.recurse > 0) {
             try write_post(res, txn, logged_in, quote_id, .{ .recurse = options.recurse - 1 });
         } else {
 
     if (post.quote_id) |quote_id| {
         try res.write("<div style=\"border: 1px solid black;\">", .{});
         if (options.recurse > 0) {
             try write_post(res, txn, logged_in, quote_id, .{ .recurse = options.recurse - 1 });
         } else {

-            try res.write("<a href=\"/post/{x}\">...</a>", .{@intFromEnum(quote_id)});
+            try res.write("<a href=\"/post/{x}\">...</a>", .{@intFromEnum(post_id)});

         }
         try res.write("</div>", .{});
     }
         }
         try res.write("</div>", .{});
     }


@@ -571,23 +577,23 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
     const vote: ?Vote = if (logged_in != null and try votes_view.has(logged_in.?.user.id)) try votes_view.get(logged_in.?.user.id) else null;
 
     if (vote != null and vote.?.kind == .Up) {
     const vote: ?Vote = if (logged_in != null and try votes_view.has(logged_in.?.user.id)) try votes_view.get(logged_in.?.user.id) else null;
 
     if (vote != null and vote.?.kind == .Up) {

-        try html_form(res, "/upvote", .{}, .{
+        try html_form(res, "/upvote", .{

             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x2B06; {}\"", .{post.upvotes} },
         });
     } else {
             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x2B06; {}\"", .{post.upvotes} },
         });
     } else {

-        try html_form(res, "/upvote", .{}, .{
+        try html_form(res, "/upvote", .{

             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x21E7; {}\"", .{post.upvotes} },
         });
     }
     if (vote != null and vote.?.kind == .Down) {
             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x21E7; {}\"", .{post.upvotes} },
         });
     }
     if (vote != null and vote.?.kind == .Down) {

-        try html_form(res, "/downvote", .{}, .{
+        try html_form(res, "/downvote", .{

             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x2B07; {}\"", .{post.downvotes} },
         });
     } else {
             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x2B07; {}\"", .{post.downvotes} },
         });
     } else {

-        try html_form(res, "/downvote", .{}, .{
+        try html_form(res, "/downvote", .{

             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x21E9; {}\"", .{post.downvotes} },
         });
             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             .{ "type=\"submit\" value=\"&#x21E9; {}\"", .{post.downvotes} },
         });


@@ -600,7 +606,7 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
 
     // Quote
     try res.write(
 
     // Quote
     try res.write(

-        \\<a href="/quotes/{x}">&#x1F501; {}</a> 
+        \\<a href="/quoted/{x}">&#x1F501; {}</a> 

     , .{ @intFromEnum(post.id), quotes_view.len() });
 
     // Save to List
     , .{ @intFromEnum(post.id), quotes_view.len() });
 
     // Save to List


@@ -609,6 +615,7 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
         try res.write("<form action=\"/list_add\" method=\"post\">", .{});
         try res.write("<select name=\"list_id\">", .{});
         var it = lists_view.iterator();
         try res.write("<form action=\"/list_add\" method=\"post\">", .{});
         try res.write("<select name=\"list_id\">", .{});
         var it = lists_view.iterator();

+        // TODO: mark lists that already contain post

         while (it.next()) |kv| {
             const name = kv.val.name;
             const id = kv.val.list.idx.?;
         while (it.next()) |kv| {
             const name = kv.val.name;
             const id = kv.val.list.idx.?;


@@ -624,7 +631,7 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
     // TODO: maybe always show comment field and prompt for login
     if (options.show_comment_field and logged_in != null) {
         try res.write("<br /><br />", .{});
     // TODO: maybe always show comment field and prompt for login
     if (options.show_comment_field and logged_in != null) {
         try res.write("<br /><br />", .{});

-        try html_form(res, "/comment", .{}, .{
+        try html_form(res, "/comment", .{

             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             "type=\"text\" name=\"text\" placeholder=\"Text\"",
             "type=\"submit\" value=\"Comment\"",
             .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
             "type=\"text\" name=\"text\" placeholder=\"Text\"",
             "type=\"submit\" value=\"Comment\"",


@@ -659,13 +666,92 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
         \\</div>
     , .{});
 }
         \\</div>
     , .{});
 }

-fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: PostList) !void {
+fn write_profile(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user: User) !void {
+    const following = try user.following.open(txn);
+    const followers = try user.followers.open(txn);
+
+    try res.write(
+        \\<h2 style="display: inline;"><a href="/user/{s}">{s}</a></h2>
+    , .{
+        user.name.constSlice(), user.display_name.constSlice(),
+    });
+    if (logged_in != null and user.id != logged_in.?.user.id) {
+        const login = logged_in.?;
+
+        // follow/unfollow
+        if (try followers.has(login.user.id)) {
+            try html_form(res, "/follow", .{
+                .{ "type=\"hidden\" name=\"user.id\" value=\"{x}\"", .{@intFromEnum(user.id)} },
+                \\type="submit" value="Unfollow"
+            });
+        } else {
+            try html_form(res, "/follow", .{
+                .{ "type=\"hidden\" name=\"user.id\" value=\"{x}\"", .{@intFromEnum(user.id)} },
+                \\type="submit" value="Follow"
+            });
+        }
+
+        // add to feed
+        const feeds_view = try login.user.feeds.open(txn);
+        try res.write("<form action=\"/feed_add\" method=\"post\">", .{});
+        try res.write("<select name=\"feed_id\">", .{});
+        var it = feeds_view.iterator();
+        while (it.next()) |kv| {
+            const name = kv.val.name;
+            const id = kv.val.list.idx.?;
+            try res.write("<option value=\"{x}\">{s}</option>", .{ id, name.constSlice() });
+        }
+        try res.write("</select>", .{});
+        try res.write("<input type=\"hidden\" name=\"user.id\" value=\"{x}\"></input>", .{@intFromEnum(user.id)});
+        try res.write("<input type=\"submit\" value=\"Add to feed\"></input>", .{});
+        try res.write("</form>", .{});
+    }
+    try res.write(
+        \\ <a href="/following/{s}">{} following</a>
+        \\ <a href="/followers/{s}">{} followers</a>
+        \\<br />
+    , .{
+        user.name.constSlice(), following.len(),
+        user.name.constSlice(), followers.len(),
+    });
+
+    try res.write(
+        \\<a href="/all/{0s}">All Posts</a>
+        \\ <a href="/comments/{0s}">Comments</a>
+        \\ <a href="/quotes/{0s}">Quotes</a><br />
+    , .{
+        user.name.constSlice(),
+    });
+
+    if (logged_in != null and user.id == logged_in.?.user.id) {
+        try res.write(
+            \\<a href="/lists">Lists</a>
+            \\<a href="/feeds">Feeds</a>
+            \\<a href="/edit">Edit</a><br />
+            \\<br />
+        , .{});
+    }
+
+    try res.write("<br />", .{});
+}
+fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: PostList, options: struct {
+    show_posts: bool,
+    show_quotes: bool,
+    show_comments: bool,
+}) !void {

     const posts_view = try post_list.open(txn);
 
     var it = posts_view.reverse_iterator();
     while (it.next()) |post_id| {
     const posts_view = try post_list.open(txn);
 
     var it = posts_view.reverse_iterator();
     while (it.next()) |post_id| {

-        try write_post(res, txn, logged_in, post_id, .{ .recurse = 1 });
-        try res.write("<br />", .{});
+        const posts = try Db.posts(txn);
+        const post = try posts.get(post_id);
+        if ((options.show_posts and (post.parent_id == null and post.quote_id == null)) or
+            (options.show_quotes and (post.quote_id != null)) or
+            (options.show_comments and (post.parent_id != null)))
+        {
+            try write_post(res, txn, logged_in, post_id, .{ .recurse = 1 });
+            try res.write("<br />", .{});
+        }

     }
 }
 fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserList) !void {
     }
 }
 fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserList) !void {


@@ -712,6 +798,39 @@ fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_li
         try res.write("<br />", .{});
     }
 }
         try res.write("<br />", .{});
     }
 }

+fn check_login(env: lmdb.Env, req: http.Request, res: *http.Response) !?Login {
+    var result: ?Login = null;
+
+    if (req.get_cookie("session_token")) |session_token_str| {
+        var remove_session_token = true;
+
+        if (std.fmt.parseUnsigned(SessionToken, session_token_str, 16) catch null) |session_token| {
+            // const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 10);
+            // const session_token = std.mem.bytesToValue(SessionToken, session_token_str);
+            if (Chirp.get_session_user_id(env, session_token) catch null) |user_id| {
+                const txn = try env.txn();
+                defer txn.abort();
+                const users = try Db.users(txn);
+
+                result = .{
+                    .user = try users.get(user_id),
+                    .session_token = session_token,
+                };
+
+                remove_session_token = false;
+            }
+        }
+
+        if (remove_session_token) {
+            try res.add_header(
+                "Set-Cookie",
+                .{"session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT"},
+            );
+        }
+    }
+
+    return result;
+}

 // }}}
 
 // GET {{{
 // }}}
 
 // GET {{{


@@ -719,7 +838,7 @@ const GET = struct {
     const Self = @This();
 
     txn: lmdb.Txn,
     const Self = @This();
 
     txn: lmdb.Txn,

-    req: *http.Request,
+    req: http.Request,

     res: *http.Response,
     logged_in: ?Login,
 
     res: *http.Response,
     logged_in: ?Login,
 


@@ -771,66 +890,70 @@ const GET = struct {
             const users = try Db.users(self.txn);
             const user = try users.get(user_id);
 
             const users = try Db.users(self.txn);
             const user = try users.get(user_id);
 

-            const following = try user.following.open(self.txn);
-            const followers = try user.followers.open(self.txn);
+            try write_profile(self.res, self.txn, self.logged_in, user);

 
 

-            try self.res.write(
-                \\<h2 style="display: inline;"><a href="/user/{s}">{s}</a></h2>
-            , .{
-                user.name.constSlice(), user.display_name.constSlice(),
+            try write_posts(self.res, self.txn, self.logged_in, user.posts, .{
+                .show_posts = true,
+                .show_quotes = false,
+                .show_comments = false,

             });
             });

-            if (self.logged_in != null and user_id != self.logged_in.?.user.id) {
-                const login = self.logged_in.?;
-
-                // follow/unfollow
-                if (try followers.has(login.user.id)) {
-                    try html_form(self.res, "/follow", .{}, .{
-                        .{ "type=\"hidden\" name=\"user_id\" value=\"{x}\"", .{@intFromEnum(user_id)} },
-                        \\type="submit" value="Unfollow"
-                    });
-                } else {
-                    try html_form(self.res, "/follow", .{}, .{
-                        .{ "type=\"hidden\" name=\"user_id\" value=\"{x}\"", .{@intFromEnum(user_id)} },
-                        \\type="submit" value="Follow"
-                    });
-                }
-
-                // add to feed
-                const feeds_view = try login.user.feeds.open(self.txn);
-                try self.res.write("<form action=\"/feed_add\" method=\"post\">", .{});
-                try self.res.write("<select name=\"feed_id\">", .{});
-                var it = feeds_view.iterator();
-                while (it.next()) |kv| {
-                    const name = kv.val.name;
-                    const id = kv.val.list.idx.?;
-                    try self.res.write("<option value=\"{x}\">{s}</option>", .{ id, name.constSlice() });
-                }
-                try self.res.write("</select>", .{});
-                try self.res.write("<input type=\"hidden\" name=\"user_id\" value=\"{x}\"></input>", .{@intFromEnum(user_id)});
-                try self.res.write("<input type=\"submit\" value=\"Add to feed\"></input>", .{});
-                try self.res.write("</form>", .{});
-            }
+        } else |err| {

             try self.res.write(
             try self.res.write(

-                \\ <a href="/following/{s}">{} following</a>
-                \\ <a href="/followers/{s}">{} followers</a>
-                \\<br />
-            , .{
-                user.name.constSlice(), following.len(),
-                user.name.constSlice(), followers.len(),
+                \\<p>User not found [{}]</p>
+            , .{err});
+        }
+    }
+    pub fn @"/comments/"(self: Self, args: struct { username: []const u8 }) !void {
+        const user_ids = try Db.user_ids(self.txn);
+        if (user_ids.get(try Username.fromSlice(args.username))) |user_id| {
+            const users = try Db.users(self.txn);
+            const user = try users.get(user_id);
+
+            try write_profile(self.res, self.txn, self.logged_in, user);
+
+            try write_posts(self.res, self.txn, self.logged_in, user.posts, .{
+                .show_posts = false,
+                .show_quotes = false,
+                .show_comments = true,

             });
             });

+        } else |err| {
+            try self.res.write(
+                \\<p>User not found [{}]</p>
+            , .{err});
+        }
+    }
+    pub fn @"/quotes/"(self: Self, args: struct { username: []const u8 }) !void {
+        const user_ids = try Db.user_ids(self.txn);
+        if (user_ids.get(try Username.fromSlice(args.username))) |user_id| {
+            const users = try Db.users(self.txn);
+            const user = try users.get(user_id);

 
 

-            if (self.logged_in != null and user_id == self.logged_in.?.user.id) {
-                try self.res.write(
-                    \\<a href="/lists">Lists</a>
-                    \\<a href="/feeds">Feeds</a>
-                    \\<a href="/edit">Edit</a><br />
-                    \\<br />
-                , .{});
-            }
+            try write_profile(self.res, self.txn, self.logged_in, user);

 
 

-            try self.res.write("<br />", .{});
+            try write_posts(self.res, self.txn, self.logged_in, user.posts, .{
+                .show_posts = false,
+                .show_quotes = true,
+                .show_comments = false,
+            });
+        } else |err| {
+            try self.res.write(
+                \\<p>User not found [{}]</p>
+            , .{err});
+        }
+    }
+    pub fn @"/all/"(self: Self, args: struct { username: []const u8 }) !void {
+        const user_ids = try Db.user_ids(self.txn);
+        if (user_ids.get(try Username.fromSlice(args.username))) |user_id| {
+            const users = try Db.users(self.txn);
+            const user = try users.get(user_id);
+
+            try write_profile(self.res, self.txn, self.logged_in, user);

 
 

-            try write_posts(self.res, self.txn, self.logged_in, user.posts);
+            try write_posts(self.res, self.txn, self.logged_in, user.posts, .{
+                .show_posts = true,
+                .show_quotes = true,
+                .show_comments = true,
+            });

         } else |err| {
             try self.res.write(
                 \\<p>User not found [{}]</p>
         } else |err| {
             try self.res.write(
                 \\<p>User not found [{}]</p>


@@ -895,14 +1018,14 @@ const GET = struct {
             .show_comment_field = true,
         });
     }
             .show_comment_field = true,
         });
     }

-    pub fn @"/quotes/"(self: Self, args: struct { post_id: PostId }) !void {
+    pub fn @"/quoted/"(self: Self, args: struct { post_id: PostId }) !void {

         const posts = try Db.posts(self.txn);
         const post = try posts.get(args.post_id);
 
         const referer = if (self.req.get_header("Referer")) |ref| ref else self.req.target;
 
         if (self.logged_in != null) {
         const posts = try Db.posts(self.txn);
         const post = try posts.get(args.post_id);
 
         const referer = if (self.req.get_header("Referer")) |ref| ref else self.req.target;
 
         if (self.logged_in != null) {

-            try html_form(self.res, "/quote", .{}, .{
+            try html_form(self.res, "/quote", .{

                 .{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} },
                 .{ "type=\"hidden\" name=\"post_id\" value=\"{x}\"", .{@intFromEnum(post.id)} },
                 "type=\"text\" name=\"text\" placeholder=\"Text\"",
                 .{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} },
                 .{ "type=\"hidden\" name=\"post_id\" value=\"{x}\"", .{@intFromEnum(post.id)} },
                 "type=\"text\" name=\"text\" placeholder=\"Text\"",


@@ -919,13 +1042,17 @@ const GET = struct {
         }
     }
     pub fn @"/list/"(self: Self, args: struct { list_id: PostList.Index }) !void {
         }
     }
     pub fn @"/list/"(self: Self, args: struct { list_id: PostList.Index }) !void {

-        try write_posts(self.res, self.txn, self.logged_in, PostList{ .idx = args.list_id });
+        try write_posts(self.res, self.txn, self.logged_in, PostList{ .idx = args.list_id }, .{
+            .show_posts = true,
+            .show_quotes = true,
+            .show_comments = true,
+        });

     }
     pub fn @"/lists"(self: Self) !void {
         if (self.logged_in) |login| {
             const post_lists_view = try login.user.post_lists.open(self.txn);
 
     }
     pub fn @"/lists"(self: Self) !void {
         if (self.logged_in) |login| {
             const post_lists_view = try login.user.post_lists.open(self.txn);
 

-            try html_form(self.res, "/new_list", .{}, .{
+            try html_form(self.res, "/create_list", .{

                 "type=\"text\" name=\"name\"",
                 "type=\"submit\" value=\"Add\"",
             });
                 "type=\"text\" name=\"name\"",
                 "type=\"submit\" value=\"Add\"",
             });


@@ -937,8 +1064,13 @@ const GET = struct {
                 const name = kv.val.name;
                 const post_list = kv.val.list;
                 try self.res.write(
                 const name = kv.val.name;
                 const post_list = kv.val.list;
                 try self.res.write(

-                    \\<a href="/list/{x}">{s}</a><br />
+                    \\<a href="/list/{x}">{s}</a>

                 , .{ post_list.idx.?, name.constSlice() });
                 , .{ post_list.idx.?, name.constSlice() });

+                try html_form(self.res, "/delete_list", .{
+                    .{ "type=\"hidden\" name=\"list_id\" value=\"{x}\"", .{kv.key} },
+                    "type=\"submit\" value=\"Delete\"",
+                });
+                try self.res.write("<br />", .{});

             }
         } else {
             try self.res.write("not logged in", .{});
             }
         } else {
             try self.res.write("not logged in", .{});


@@ -951,7 +1083,7 @@ const GET = struct {
         if (self.logged_in) |login| {
             const feeds_view = try login.user.feeds.open(self.txn);
 
         if (self.logged_in) |login| {
             const feeds_view = try login.user.feeds.open(self.txn);
 

-            try html_form(self.res, "/new_feed", .{}, .{
+            try html_form(self.res, "/create_feed", .{

                 "type=\"text\" name=\"name\"",
                 "type=\"submit\" value=\"Add\"",
             });
                 "type=\"text\" name=\"name\"",
                 "type=\"submit\" value=\"Add\"",
             });


@@ -963,8 +1095,13 @@ const GET = struct {
                 const name = kv.val.name;
                 const user_list = kv.val.list;
                 try self.res.write(
                 const name = kv.val.name;
                 const user_list = kv.val.list;
                 try self.res.write(

-                    \\<a href="/feed/{x}">{s}</a><br />
+                    \\<a href="/feed/{x}">{s}</a>

                 , .{ user_list.idx.?, name.constSlice() });
                 , .{ user_list.idx.?, name.constSlice() });

+                try html_form(self.res, "/delete_feed", .{
+                    .{ "type=\"hidden\" name=\"list_id\" value=\"{x}\"", .{kv.key} },
+                    "type=\"submit\" value=\"Delete\"",
+                });
+                try self.res.write("<br />", .{});

             }
         } else {
             try self.res.write("not logged in", .{});
             }
         } else {
             try self.res.write("not logged in", .{});


@@ -975,7 +1112,7 @@ const GET = struct {
             _ = login;
             const referer = if (self.req.get_header("Referer")) |ref| ref else self.req.target;
 
             _ = login;
             const referer = if (self.req.get_header("Referer")) |ref| ref else self.req.target;
 

-            try html_form(self.res, "/post", .{}, .{
+            try html_form(self.res, "/post", .{

                 .{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} },
                 "type=\"text\" name=\"text\"",
                 "type=\"submit\" value=\"Post\"",
                 .{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} },
                 "type=\"text\" name=\"text\"",
                 "type=\"submit\" value=\"Post\"",


@@ -987,17 +1124,17 @@ const GET = struct {
     pub fn @"/edit"(self: Self) !void {
         if (self.logged_in) |login| {
             try self.res.write("<br />Username: ", .{});
     pub fn @"/edit"(self: Self) !void {
         if (self.logged_in) |login| {
             try self.res.write("<br />Username: ", .{});

-            try html_form(self.res, "/set_username", .{}, .{
+            try html_form(self.res, "/set_username", .{

                 .{ "type=\"text\" name=\"username\" placeholder=\"{s}\"", .{login.user.name.constSlice()} },
                 "type=\"submit\" value=\"Change\"",
             });
             try self.res.write("<br />Display Name: ", .{});
                 .{ "type=\"text\" name=\"username\" placeholder=\"{s}\"", .{login.user.name.constSlice()} },
                 "type=\"submit\" value=\"Change\"",
             });
             try self.res.write("<br />Display Name: ", .{});

-            try html_form(self.res, "/set_display_name", .{}, .{
+            try html_form(self.res, "/set_display_name", .{

                 .{ "type=\"text\" name=\"display_name\" placeholder=\"{s}\"", .{login.user.display_name.constSlice()} },
                 "type=\"submit\" value=\"Change\"",
             });
             try self.res.write("<br />Password: ", .{});
                 .{ "type=\"text\" name=\"display_name\" placeholder=\"{s}\"", .{login.user.display_name.constSlice()} },
                 "type=\"submit\" value=\"Change\"",
             });
             try self.res.write("<br />Password: ", .{});

-            try html_form(self.res, "/set_password", .{}, .{
+            try html_form(self.res, "/set_password", .{

                 "type=\"text\" name=\"password\"",
                 "type=\"submit\" value=\"Change\"",
             });
                 "type=\"text\" name=\"password\"",
                 "type=\"submit\" value=\"Change\"",
             });


@@ -1021,7 +1158,7 @@ const POST = struct {
     const Self = @This();
 
     env: lmdb.Env,
     const Self = @This();
 
     env: lmdb.Env,

-    req: *http.Request,
+    req: http.Request,

     res: *http.Response,
     logged_in: ?Login,
 
     res: *http.Response,
     logged_in: ?Login,
 


@@ -1169,14 +1306,13 @@ const POST = struct {
         }
     }
     // TODO: add arguments instead of parsing manually
         }
     }
     // TODO: add arguments instead of parsing manually

-    pub fn @"/new_list"(self: Self) !void {
+    pub fn @"/create_list"(self: Self) !void {

         if (self.logged_in) |login| {
             const name_str = self.req.get_value("name") orelse return error.NoName;
             const name = try Name.fromSlice(name_str);
             // TODO: decode name
 
             var txn = try self.env.txn();
         if (self.logged_in) |login| {
             const name_str = self.req.get_value("name") orelse return error.NoName;
             const name = try Name.fromSlice(name_str);
             // TODO: decode name
 
             var txn = try self.env.txn();

-

             const postlist = try PostList.init(txn);
             try txn.commit();
 
             const postlist = try PostList.init(txn);
             try txn.commit();
 


@@ -1186,34 +1322,46 @@ const POST = struct {
             try txn.commit();
         }
     }
             try txn.commit();
         }
     }

-    pub fn @"/list_add"(self: Self) !void {
+    pub fn @"/delete_list"(self: Self, args: struct { list_id: PostList.Index }) !void {
+        if (self.logged_in) |login| {
+            var post_list: ?PostList = null;
+            {
+                const txn = try self.env.txn();
+                defer txn.commit() catch {};
+                var post_lists_view = try login.user.post_lists.open(txn);
+                post_list = (try post_lists_view.get(args.list_id)).list;
+                try post_lists_view.del(args.list_id);
+            }
+            if (post_list != null) {
+                const txn = try self.env.txn();
+                defer txn.commit() catch {};
+                var list_view = try post_list.?.open(txn);
+                try list_view.clear();
+            }
+        }
+    }
+    pub fn @"/list_add"(self: Self, args: struct { list_id: PostList.Index, post_id: PostId }) !void {

         if (self.logged_in) |login| {
             _ = login;
 
         if (self.logged_in) |login| {
             _ = login;
 

-            const list_id_str = self.req.get_value("list_id") orelse return error.NoListId;
-            const post_id_str = self.req.get_value("post_id") orelse return error.NoPostId;
-            const list_id = try std.fmt.parseUnsigned(PostList.Index, list_id_str, 16);
-            const post_id = try parse_enum(PostId, post_id_str, 16);
-

             const txn = try self.env.txn();
             defer txn.commit() catch {};
 
             const txn = try self.env.txn();
             defer txn.commit() catch {};
 

-            const post_list = PostList{ .idx = list_id };
+            const post_list = PostList{ .idx = args.list_id };

             var post_list_view = try post_list.open(txn);
             var post_list_view = try post_list.open(txn);

-            if (try post_list_view.has(post_id)) {
-                try post_list_view.del(post_id);
+            if (try post_list_view.has(args.post_id)) {
+                try post_list_view.del(args.post_id);

             } else {
             } else {

-                try post_list_view.append(post_id);
+                try post_list_view.append(args.post_id);

             }
         }
     }
             }
         }
     }

-    pub fn @"/new_feed"(self: Self) !void {
+    pub fn @"/create_feed"(self: Self) !void {

         if (self.logged_in) |login| {
             const name_str = self.req.get_value("name") orelse return error.NoName;
             const name = try Name.fromSlice(name_str);
 
             var txn = try self.env.txn();
         if (self.logged_in) |login| {
             const name_str = self.req.get_value("name") orelse return error.NoName;
             const name = try Name.fromSlice(name_str);
 
             var txn = try self.env.txn();

-

             const userlist = try UserList.init(txn);
             try txn.commit();
 
             const userlist = try UserList.init(txn);
             try txn.commit();
 


@@ -1223,24 +1371,38 @@ const POST = struct {
             try txn.commit();
         }
     }
             try txn.commit();
         }
     }

-    pub fn @"/feed_add"(self: Self) !void {
+    pub fn @"/delete_feed"(self: Self, args: struct { list_id: UserList.Index }) !void {
+        if (self.logged_in) |login| {
+            var user_list: ?UserList = null;
+
+            {
+                const txn = try self.env.txn();
+                defer txn.commit() catch {};
+                var feeds_view = try login.user.feeds.open(txn);
+                user_list = (try feeds_view.get(args.list_id)).list;
+                try feeds_view.del(args.list_id);
+            }
+            if (user_list != null) {
+                const txn = try self.env.txn();
+                defer txn.commit() catch {};
+                var list_view = try user_list.?.open(txn);
+                try list_view.clear();
+            }
+        }
+    }
+    pub fn @"/feed_add"(self: Self, args: struct { feed_id: UserList.Index, user_id: UserId }) !void {

         if (self.logged_in) |login| {
             _ = login;
 
         if (self.logged_in) |login| {
             _ = login;
 

-            const list_id_str = self.req.get_value("feed_id") orelse return error.NoListId;
-            const user_id_str = self.req.get_value("user_id") orelse return error.NoUserId;
-            const list_id = try std.fmt.parseUnsigned(UserList.Index, list_id_str, 16);
-            const user_id = try parse_enum(UserId, user_id_str, 16);
-

             const txn = try self.env.txn();
             defer txn.commit() catch {};
 
             const txn = try self.env.txn();
             defer txn.commit() catch {};
 

-            const user_list = UserList{ .idx = list_id };
+            const user_list = UserList{ .idx = args.feed_id };

             var user_list_view = try user_list.open(txn);
             var user_list_view = try user_list.open(txn);

-            if (try user_list_view.has(user_id)) {
-                try user_list_view.del(user_id);
+            if (try user_list_view.has(args.user_id)) {
+                try user_list_view.del(args.user_id);

             } else {
             } else {

-                try user_list_view.append(user_id);
+                try user_list_view.append(args.user_id);

             }
         }
     }
             }
         }
     }


@@ -1339,6 +1501,11 @@ const ReqBufferSize = 4096;
 const ResHeadBufferSize = 1024 * 64;
 const ResBodyBufferSize = 1024 * 64;
 
 const ResHeadBufferSize = 1024 * 64;
 const ResBodyBufferSize = 1024 * 64;
 

+// TODO: static?
+var req_buffer: [ReqBufferSize]u8 = undefined;
+var res_head_buffer: [ResHeadBufferSize]u8 = undefined;
+var res_body_buffer: [ResBodyBufferSize]u8 = undefined;
+

 pub fn main() !void {
     // server
     var server = try http.Server.init("::", 8080);
 pub fn main() !void {
     // server
     var server = try http.Server.init("::", 8080);


@@ -1357,7 +1524,15 @@ pub fn main() !void {
     std.debug.print("Posts:\n", .{});
     try list_posts(env);
 
     std.debug.print("Posts:\n", .{});
     try list_posts(env);
 

-    try handle_connection(&server, env);
+    while (true) {
+        server.wait();
+        while (true) {
+            const req = (server.next_request(&req_buffer) catch break) orelse break;
+            handle_request(env, req) catch {
+                try handle_error(env, req);
+            };
+        }
+    }

     // const ThreadCount = 1;
     // var ts: [ThreadCount]std.Thread = undefined;
 
     // const ThreadCount = 1;
     // var ts: [ThreadCount]std.Thread = undefined;
 


@@ -1371,99 +1546,64 @@ pub fn main() !void {
     std.debug.print("done\n", .{});
 }
 
     std.debug.print("done\n", .{});
 }
 

-fn handle_connection(server: *http.Server, env: lmdb.Env) !void {
-    // TODO: static?
-    var req_buffer: [ReqBufferSize]u8 = undefined;
-    var res_head_buffer: [ResHeadBufferSize]u8 = undefined;
-    var res_body_buffer: [ResBodyBufferSize]u8 = undefined;
-
-    while (true) {
-        server.wait();
-
-        while (try server.next_request(&req_buffer)) |*_req| {
-            var req: *http.Request = @constCast(_req);
-            // std.debug.print("[{}]: {s}\n", .{ req.method, req.target });
-            // std.debug.print("[{}]: {s}\n", .{ req.method, req.head.? });
-
-            // reponse
-            var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer);
-
-            // check session token
-            var logged_in: ?Login = null;
-
-            if (req.get_cookie("session_token")) |session_token_str| {
-                var remove_session_token = true;
-
-                if (std.fmt.parseUnsigned(SessionToken, session_token_str, 16) catch null) |session_token| {
-                    // const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 10);
-                    // const session_token = std.mem.bytesToValue(SessionToken, session_token_str);
-                    if (Chirp.get_session_user_id(env, session_token) catch null) |user_id| {
-                        const txn = try env.txn();
-                        defer txn.abort();
-                        const users = try Db.users(txn);
-
-                        logged_in = .{
-                            .user = try users.get(user_id),
-                            .session_token = session_token,
-                        };
-
-                        remove_session_token = false;
-                    }
-                }
+fn handle_error(env: lmdb.Env, req: http.Request) !void {
+    _ = env;
+    var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer);
+    try write_start(&res);
+    try res.write("Oops, something went terribly wrong there D:", .{});
+    try write_end(&res);
+    try res.send();
+}
+fn handle_request(env: lmdb.Env, req: http.Request) !void {
+    // std.debug.print("[{}]: {s}\n", .{ req.method, req.target });
+    // std.debug.print("[{}]: {s}\n", .{ req.method, req.head.? });

 
 

-                if (remove_session_token) {
-                    try res.add_header(
-                        "Set-Cookie",
-                        .{"session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT"},
-                    );
-                }
-            }
+    // reponse
+    var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer);

 
 

-            // TODO: refactor into functions
-            // TODO: make sure we send a reply
+    // check session token
+    const logged_in: ?Login = try check_login(env, req, &res);

 
 

-            // html
-            if (req.method == .GET) {
-                try write_start(&res);
-                try write_header(&res, logged_in);
+    // html
+    if (req.method == .GET) {
+        try write_start(&res);
+        try write_header(&res, logged_in);

 
 

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

 
 

-                const get = GET{
-                    .txn = txn,
-                    .req = req,
-                    .res = &res,
-                    .logged_in = logged_in,
-                };
-                if (try get.handle()) {} else {
-                    try res.redirect("/");
-                }
+        const get = GET{
+            .txn = txn,
+            .req = req,
+            .res = &res,
+            .logged_in = logged_in,
+        };
+        if (try get.handle()) {} else {
+            try res.redirect("/");
+        }

 
 

-                try write_end(&res);
-                try res.send();
-            }
-            // api
-            else {
-                const post = POST{
-                    .env = env,
-                    .req = req,
-                    .res = &res,
-                    .logged_in = logged_in,
-                };
-                if (try post.handle()) {} else {
-                    try res.write("<p>[POST] {s}</p>", .{req.target});
-                }
+        try write_end(&res);
+        try res.send();
+    }
+    // api
+    else {
+        const post = POST{
+            .env = env,
+            .req = req,
+            .res = &res,
+            .logged_in = logged_in,
+        };
+        if (try post.handle()) {} else {
+            try res.write("<p>[POST] {s}</p>", .{req.target});
+        }

 
 

-                if (!res.has_header("Location")) {
-                    if (req.get_header("Referer")) |ref| {
-                        try res.redirect(ref);
-                    } else {
-                        try res.redirect("/");
-                    }
-                }
-                try res.send();
+        if (!res.has_header("Location")) {
+            if (req.get_header("Referer")) |ref| {
+                try res.redirect(ref);
+            } else {
+                try res.redirect("/");

             }
         }
             }
         }

+        try res.send();

     }
 }
     }
 }