X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/a68112f4ed195cb5dbe21e8401f04e2f6cc1a7e8..HEAD:/src/main.zig diff --git a/src/main.zig b/src/main.zig index b54841d..259f3da 100644 --- a/src/main.zig +++ b/src/main.zig @@ -29,8 +29,11 @@ const User = struct { id: UserId, name: Username, display_name: DisplayName, + description: UserDescription, password_hash: PasswordHash, + posts: PostList, + following: UserList, followers: UserList, @@ -82,6 +85,7 @@ const PostId = enum(u64) { _ }; const Timestamp = i64; const Username = std.BoundedArray(u8, 32); const DisplayName = std.BoundedArray(u8, 64); +const UserDescription = std.BoundedArray(u8, 1024); const PasswordHash = std.BoundedArray(u8, 128); const SessionToken = u64; const CookieValue = std.BoundedArray(u8, 128); @@ -93,12 +97,12 @@ const PostListList = db.List(SavedPostList); const UserListList = db.List(SavedUserList); fn parse_enum(comptime E: type, buf: []const u8, base: u8) !E { - return @enumFromInt(try std.fmt.parseUnsigned(@typeInfo(E).Enum.tag_type, buf, base)); + return @enumFromInt(try std.fmt.parseUnsigned(@typeInfo(E).@"enum".tag_type, buf, base)); } // https://developer.mozilla.org/en-US/docs/Glossary/Percent-encoding -fn reencode(text: []const u8) !PostText { - var result = try PostText.init(0); +fn reencode(comptime T: type, text: []const u8) !T { + var result = try T.init(0); const len = @min(text.len, 1024); // TODO: PostText length @@ -107,28 +111,19 @@ fn reencode(text: []const u8) !PostText { const c = text[idx]; if (c == '+') { try result.append(' '); - } else if (c == '%') { - // special case of &#... - // assume only &#, no &#x - if (idx + 6 < text.len and std.mem.eql(u8, text[idx .. idx + 6], "%26%23")) { - const num_start = idx + 6; - var num_end = num_start; - while (num_end < text.len and std.ascii.isDigit(text[num_end])) { - num_end += 1; - } + } else if (c == '%' and idx + 2 < text.len) { + const allow = &[_]u8{ 0x26, 0x23, 0x3b, 0x0a }; - if (num_end + 2 < text.len and - text[num_end] == '%' and - text[num_end + 1] == '3' and - std.ascii.toLower(text[num_end + 2]) == 'b') - { - try std.fmt.format(result.writer(), "&#{s};", .{text[num_start..num_end]}); - idx = num_end + 2; - continue; - } + const escaped_value = std.fmt.parseUnsigned(u8, text[idx + 1 .. idx + 3], 16) catch continue; + + if (escaped_value == 0x0d) { + try std.fmt.format(result.writer(), "
", .{}); + } else if (std.mem.indexOfScalar(u8, allow, escaped_value) != null) { + try std.fmt.format(result.writer(), "{c}", .{escaped_value}); + } else { + try std.fmt.format(result.writer(), "&#x{x};", .{escaped_value}); } - try std.fmt.format(result.writer(), "&#x{s};", .{text[idx + 1 .. idx + 3]}); idx += 2; } else { try result.append(c); @@ -166,18 +161,20 @@ fn decode(text: []const u8) !std.BoundedArray(u8, 1024) { } const Chirp = struct { + const PostsPerPage = 10; + const UsersPerPage = 10; + var HashBuffer = std.mem.zeroes([1024 * 1024 * 50]u8); + 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); + var alloc = std.heap.FixedBufferAllocator.init(&HashBuffer); // TODO: choose limits const result = try std.crypto.pwhash.argon2.strHash(password, .{ .allocator = alloc.allocator(), - .params = std.crypto.pwhash.argon2.Params.fromLimits(1000, 1024), + .params = std.crypto.pwhash.argon2.Params.owasp_2id, }, hash_buffer.slice()); try hash_buffer.resize(result.len); @@ -186,8 +183,7 @@ const Chirp = struct { } pub fn verify_password(password: []const u8, hash: PasswordHash) bool { - var buffer: [1024 * 10]u8 = undefined; - var alloc = std.heap.FixedBufferAllocator.init(&buffer); + var alloc = std.heap.FixedBufferAllocator.init(&HashBuffer); if (std.crypto.pwhash.argon2.strVerify(hash.constSlice(), password, .{ .allocator = alloc.allocator(), @@ -220,6 +216,7 @@ const Chirp = struct { .id = user_id, .name = username_array, .display_name = display_name, + .description = try UserDescription.init(0), .password_hash = try hash_password(password), .posts = try PostList.init(txn), .following = try UserList.init(txn), @@ -269,7 +266,7 @@ const Chirp = struct { 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 @@ -283,7 +280,7 @@ const Chirp = struct { const posts = try Db.posts(txn); post_id = try db.Prng.gen(posts.dbi, PostId); - const decoded_text = try reencode(text); + const decoded_text = try reencode(PostText, text); try posts.put(post_id, Post{ .id = post_id, .parent_id = parent_id, @@ -315,39 +312,45 @@ const Chirp = struct { 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 { - const txn = try env.txn(); - + var txn = try env.txn(); const users = try Db.users(txn); const user = try users.get(user_id); - 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 { - 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); - 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 { - const txn = try env.txn(); - + var txn = try env.txn(); const users = try Db.users(txn); const user = try users.get(user_id); - 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 { @@ -434,17 +437,86 @@ const Chirp = struct { // }}} // html {{{ -fn html_form(res: *http.Response, comptime fmt_action: []const u8, args_action: anytype, inputs: anytype) !void { - try res.write("
", .{}); +pub fn Paginate(comptime T: type) type { + return struct { + const Self = @This(); + + const IterateResult = T.Base.View.Iterator.Result; + + res: *http.Response, + view: T.View, + per_page: u64, + + it: T.Base.View.Iterator, + starting_idx: ?T.Base.Key, + count: u64 = 0, + + pub fn init(res: *http.Response, view: T.View, per_page: u64) !Self { + var it = view.reverse_iterator(); + if (res.req.get_param("starting_at")) |starting_at_str| { + it.idx = try parse_enum(T.Base.Key, starting_at_str, 16); + } + + return .{ + .res = res, + .view = view, + .per_page = per_page, + .it = it, + .starting_idx = it.idx, + }; + } + pub fn next(self: *Self) ?IterateResult { + if (self.it.next()) |kv| { + if (self.count < self.per_page) { + self.count += 1; + return kv; + } + } + return null; + } + pub fn write_navigation(self: *Self) !void { + const next_idx = self.it.next(); + + if (self.view.base.head.last != self.starting_idx) { + var prev_it = self.view.iterator(); + prev_it.idx = self.starting_idx.?; + var oldest_idx = self.starting_idx.?; + + var count: u64 = 0; + while (prev_it.next()) |kv| { + oldest_idx = kv.key; + + if (count > self.per_page) { + break; + } else { + count += 1; + } + } + + try self.res.write("Prev ", .{ self.res.req.target, @intFromEnum(oldest_idx) }); + } + + if (next_idx) |kv| { + try self.res.write("Next", .{ self.res.req.target, @intFromEnum(kv.key) }); + } + } + }; +} +fn html_form(res: *http.Response, action: []const u8, inputs: anytype) !void { + try res.write("", .{action}); inline for (inputs) |input| { switch (@typeInfo(@TypeOf(input))) { - .Struct => { - try res.write("", .{}); + .@"struct" => |s| { + if (s.fields.len == 3) { + try res.write("<{s} ", .{input[0]}); + try res.write(input[1], input[2]); + try res.write(">", .{input[0]}); + } else { + try res.write("", .{}); + } }, else => { try res.write("Post
, .{}); - try html_form(res, "/logout", .{}, .{ + try html_form(res, "/logout", .{ \\type="submit" value="Logout" }); try res.write("

", .{}); @@ -507,17 +579,13 @@ fn write_header(res: *http.Response, logged_in: ?Login) !void { \\ \\ \\ - \\
+ \\
\\
\\ \\ \\ - \\
+ \\

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

", .{}); } } fn write_start(res: *http.Response) !void { @@ -526,10 +594,15 @@ fn write_start(res: *http.Response) !void { \\ \\ \\ + \\ \\ \\ \\ @@ -548,17 +621,34 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po const user = try users.get(post.user_id); try res.write( - \\
- \\{s} {s}
+ \\
+ \\{s} + , .{ @intFromEnum(post_id), user.name.constSlice(), user.display_name.constSlice() }); + if (post.parent_id) |id| { + try res.write(" ..", .{@intFromEnum(id)}); + } + try res.write( + \\ {s}
\\{s}
- , .{ user.name.constSlice(), user.display_name.constSlice(), time_str(post.time).constSlice(), post.text.constSlice() }); + , .{ time_str(post.time).constSlice(), post.text.constSlice() }); + + if (logged_in != null and post.user_id == logged_in.?.user.id) { + // Votes + try res.write( + \\ + \\{1} Upvotes + \\{2} Downvotes + \\ + \\
+ , .{ @intFromEnum(post_id), post.upvotes, post.downvotes }); + } if (post.quote_id) |quote_id| { try res.write("
", .{}); if (options.recurse > 0) { try write_post(res, txn, logged_in, quote_id, .{ .recurse = options.recurse - 1 }); } else { - try res.write("...", .{@intFromEnum(quote_id)}); + try res.write("...", .{@intFromEnum(post_id)}); } try res.write("
", .{}); } @@ -571,23 +661,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) { - try html_form(res, "/upvote", .{}, .{ + try html_form(res, "/upvote", .{ .{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} }, .{ "type=\"submit\" value=\"⬆ {}\"", .{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=\"⇧ {}\"", .{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=\"⬇ {}\"", .{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=\"⇩ {}\"", .{post.downvotes} }, }); @@ -600,7 +690,7 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po // Quote try res.write( - \\🔁 {} + \\🔁 {} , .{ @intFromEnum(post.id), quotes_view.len() }); // Save to List @@ -609,14 +699,16 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po try res.write("
", .{}); try res.write("", .{}); - try res.write("", .{@intFromEnum(post_id)}); - try res.write("", .{}); + try res.write("", .{@intFromEnum(post_id)}); + try res.write("", .{}); try res.write("
", .{}); } @@ -624,9 +716,9 @@ 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("

", .{}); - 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\"", + .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\"", .{} }, "type=\"submit\" value=\"Comment\"", }); try res.write("
", .{}); @@ -642,7 +734,7 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po var it = comments_view.iterator(); var count: u8 = 0; while (it.next()) |comment_id| { - try write_post(res, txn, logged_in, comment_id, .{ .recurse = options.recurse - 1 }); + try write_post(res, txn, logged_in, comment_id.key, .{ .recurse = options.recurse - 1 }); try res.write("
", .{}); if (options.recurse == 1) { count += 1; @@ -659,14 +751,106 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po \\
, .{}); } -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( + \\

{s}

+ , .{ + 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("
", .{}); + try res.write("", .{}); + try res.write("", .{@intFromEnum(user.id)}); + try res.write("", .{}); + try res.write("
", .{}); + } + try res.write( + \\ {} following + \\ {} followers + \\
+ , .{ + user.name.constSlice(), following.len(), + user.name.constSlice(), followers.len(), + }); + + try res.write( + \\All Posts + \\ Comments + \\ Quotes
+ , .{ + user.name.constSlice(), + }); + + if (logged_in != null and user.id == logged_in.?.user.id) { + try res.write( + \\Lists + \\Feeds + \\Edit
+ \\
+ , .{}); + } + + if (user.description.len > 0) { + try res.write( + \\
+ // \\« {s} » + \\{s} + \\
+ , .{user.description.constSlice()}); + } + + try res.write("
", .{}); +} +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| { - try write_post(res, txn, logged_in, post_id, .{ .recurse = 1 }); - try res.write("
", .{}); + var paginate = try Paginate(PostList).init(res, posts_view, Chirp.PostsPerPage); + + while (paginate.next()) |post_id| { + const posts = try Db.posts(txn); + const post = try posts.get(post_id.key); + 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.key, .{ .recurse = 1 }); + try res.write("
", .{}); + } } + + try paginate.write_navigation(); } fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserList) !void { const users = try Db.users(txn); @@ -676,13 +860,17 @@ fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_li var prev_newest_post: ?Post = null; const following = try user_list.open(txn); + if (following.len() == 0) { + try res.write("Empty timeline (no users)", .{}); + return; + } while (true) { var newest_post: ?Post = null; var following_it = following.iterator(); while (following_it.next()) |following_id| { - const followed_user = try users.get(following_id); + const followed_user = try users.get(following_id.key); const followed_posts = try followed_user.posts.open(txn); if (followed_posts.len() == 0) { @@ -691,7 +879,7 @@ fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_li var followed_posts_it = followed_posts.reverse_iterator(); while (followed_posts_it.next()) |followed_post_id| { - const p = try posts.get(followed_post_id); + const p = try posts.get(followed_post_id.key); if ((prev_newest_post == null or p.time < prev_newest_post.?.time) and (newest_post == null or newest_post.?.time < p.time)) { newest_post = p; @@ -712,6 +900,68 @@ fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_li try res.write("
", .{}); } } +fn write_user(res: *http.Response, txn: lmdb.Txn, user_id: UserId) !void { + const users = try Db.users(txn); + const user = try users.get(user_id); + try res.write( + \\{s} + , .{ user.name.constSlice(), user.display_name.constSlice() }); +} +fn write_votes(res: *http.Response, txn: lmdb.Txn, votes: VoteList, options: struct { + show_upvotes: bool = true, + show_downvotes: bool = true, +}) !void { + const votes_view = try votes.open(txn); + + var paginate = try Paginate(VoteList).init(res, votes_view, Chirp.UsersPerPage); + + while (paginate.next()) |kv| { + const user_id = kv.key; + const vote = kv.val; + + if ((options.show_upvotes and vote.kind == .Up) or + (options.show_downvotes and vote.kind == .Down)) + { + try write_user(res, txn, user_id); + try res.write(" {s}
", .{time_str(vote.time).constSlice()}); + } + } + + try paginate.write_navigation(); +} +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 {{{ @@ -719,26 +969,26 @@ const GET = struct { const Self = @This(); txn: lmdb.Txn, - req: *http.Request, + req: http.Request, res: *http.Response, logged_in: ?Login, fn handle(self: Self) !bool { const ti = @typeInfo(Self); - inline for (ti.Struct.decls) |f_decl| { + inline for (ti.@"struct".decls) |f_decl| { const has_arg = f_decl.name.len > 1 and f_decl.name[f_decl.name.len - 1] == '/'; const match = if (has_arg) std.mem.startsWith(u8, self.req.target, f_decl.name) else std.mem.eql(u8, self.req.target, f_decl.name); if (match) { const f = @field(Self, f_decl.name); const fi = @typeInfo(@TypeOf(f)); - if (fi.Fn.params.len == 1) { + if (fi.@"fn".params.len == 1) { try @call(.auto, f, .{self}); } else { - const arg_type = fi.Fn.params[1].type.?; + const arg_type = fi.@"fn".params[1].type.?; const arg_info = @typeInfo(arg_type); var arg: arg_type = undefined; - const field = arg_info.Struct.fields[0]; + const field = arg_info.@"struct".fields[0]; if (self.req.target.len <= f_decl.name.len) { return error.NoArgProvided; } @@ -746,10 +996,10 @@ const GET = struct { const field_ti = @typeInfo(field.type); switch (field_ti) { // TODO: maybe handle BoundedArray? - .Int => { + .int => { @field(arg, field.name) = try std.fmt.parseUnsigned(field.type, str, 16); }, - .Enum => { + .@"enum" => { @field(arg, field.name) = try parse_enum(field.type, str, 16); }, else => { @@ -771,48 +1021,70 @@ const GET = struct { 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( - \\

{s}

- , .{ - 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) { - if (try followers.has(self.logged_in.?.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" - }); - } - } + } else |err| { try self.res.write( - \\ {} following - \\ {} followers - \\
- , .{ - user.name.constSlice(), following.len(), - user.name.constSlice(), followers.len(), + \\

User not found [{}]

+ , .{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( + \\

User not found [{}]

+ , .{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( - \\Lists - \\Feeds - \\Edit
- \\
- , .{}); - } + try write_profile(self.res, self.txn, self.logged_in, user); - try self.res.write("
", .{}); + 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( + \\

User not found [{}]

+ , .{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_posts(self.res, self.txn, self.logged_in, user.posts); + 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 = true, + .show_quotes = true, + .show_comments = true, + }); } else |err| { try self.res.write( \\

User not found [{}]

@@ -825,20 +1097,23 @@ const GET = struct { const users = try Db.users(self.txn); const user = try users.get(user_id); - const following = try user.following.open(self.txn); - var it = following.iterator(); + const following_view = try user.following.open(self.txn); + + var paginate = try Paginate(UserList).init(self.res, following_view, Chirp.UsersPerPage); try self.res.write( \\

{s} follows:

, .{ user.name.constSlice(), user.display_name.constSlice() }); - while (it.next()) |following_id| { - const following_user = try users.get(following_id); + while (paginate.next()) |following_id| { + const following_user = try users.get(following_id.key); try self.res.write( \\{s}
, .{ following_user.name.constSlice(), following_user.display_name.constSlice() }); } + + try paginate.write_navigation(); } else |err| { try self.res.write( \\

User not found [{}]

@@ -851,20 +1126,22 @@ const GET = struct { const users = try Db.users(self.txn); const user = try users.get(user_id); - const followers = try user.followers.open(self.txn); - var it = followers.iterator(); + const followers_view = try user.followers.open(self.txn); + var paginate = try Paginate(UserList).init(self.res, followers_view, Chirp.UsersPerPage); try self.res.write( \\

{s} followers:

, .{ user.name.constSlice(), user.display_name.constSlice() }); - while (it.next()) |follower_id| { - const follower_user = try users.get(follower_id); + while (paginate.next()) |follower_id| { + const follower_user = try users.get(follower_id.key); try self.res.write( \\{s}
, .{ follower_user.name.constSlice(), follower_user.display_name.constSlice() }); } + + try paginate.write_navigation(); } else |err| { try self.res.write( \\

User not found [{}]

@@ -877,37 +1154,47 @@ const GET = struct { .show_comment_field = true, }); } - pub fn @"/quotes/"(self: Self, args: struct { post_id: PostId }) !void { + pub fn @"/upvotes/"(self: Self, args: struct { post_id: PostId }) !void { + const posts = try Db.posts(self.txn); + const post = try posts.get(args.post_id); + try self.res.write("{} upvotes:
", .{post.upvotes}); + try write_votes(self.res, self.txn, post.votes, .{}); + } + 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) { - 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\"", + .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", .{} }, "type=\"submit\" value=\"Quote\"", }); try self.res.write("
", .{}); } - const quotes_view = try post.quotes.open(self.txn); - var it = quotes_view.iterator(); - while (it.next()) |quote_id| { - try write_post(self.res, self.txn, self.logged_in, quote_id, .{ .recurse = 1 }); - try self.res.write("
", .{}); - } + // TODO: show all bc this only contains quotes? + try write_posts(self.res, self.txn, self.logged_in, post.quotes, .{ + .show_posts = false, + .show_quotes = true, + .show_comments = false, + }); } - pub fn @"/list/"(self: Self, args: struct { list_id: PostListList.Index }) !void { - try write_posts(self.res, self.txn, self.logged_in, PostList{ .idx = args.list_id }); + pub fn @"/list/"(self: Self, args: struct { list_id: PostList.Base.Index }) !void { + try write_posts(self.res, self.txn, self.logged_in, PostList{ .base = .{ .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); - try html_form(self.res, "/new_list", .{}, .{ + try html_form(self.res, "/create_list", .{ "type=\"text\" name=\"name\"", "type=\"submit\" value=\"Add\"", }); @@ -919,8 +1206,44 @@ const GET = struct { const name = kv.val.name; const post_list = kv.val.list; try self.res.write( - \\{s}
- , .{ post_list.idx.?, name.constSlice() }); + \\{s} + , .{ post_list.base.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("
", .{}); + } + } else { + try self.res.write("not logged in", .{}); + } + } + pub fn @"/feed/"(self: Self, args: struct { feed_id: UserList.Base.Index }) !void { + try write_timeline(self.res, self.txn, self.logged_in, UserList{ .base = .{ .idx = args.feed_id } }); + } + pub fn @"/feeds"(self: Self) !void { + if (self.logged_in) |login| { + const feeds_view = try login.user.feeds.open(self.txn); + + try html_form(self.res, "/create_feed", .{ + "type=\"text\" name=\"name\"", + "type=\"submit\" value=\"Add\"", + }); + + try self.res.write("

", .{}); + + var it = feeds_view.iterator(); + while (it.next()) |kv| { + const name = kv.val.name; + const user_list = kv.val.list; + try self.res.write( + \\{s} + , .{ user_list.base.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("
", .{}); } } else { try self.res.write("not logged in", .{}); @@ -931,9 +1254,9 @@ const GET = struct { _ = 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\"", + .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", .{} }, "type=\"submit\" value=\"Post\"", }); } else { @@ -943,17 +1266,22 @@ const GET = struct { pub fn @"/edit"(self: Self) !void { if (self.logged_in) |login| { try self.res.write("
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("
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("
Description: ", .{}); + try html_form(self.res, "/set_description", .{ + .{ "textarea", "type=\"text\" name=\"description\" placeholder=\"{s}\"", .{login.user.description.constSlice()} }, + "type=\"submit\" value=\"Change\"", + }); try self.res.write("
Password: ", .{}); - try html_form(self.res, "/set_password", .{}, .{ + try html_form(self.res, "/set_password", .{ "type=\"text\" name=\"password\"", "type=\"submit\" value=\"Change\"", }); @@ -977,30 +1305,30 @@ const POST = struct { const Self = @This(); env: lmdb.Env, - req: *http.Request, + req: http.Request, res: *http.Response, logged_in: ?Login, pub fn handle(self: Self) !bool { const ti = @typeInfo(Self); - inline for (ti.Struct.decls) |f_decl| { + inline for (ti.@"struct".decls) |f_decl| { if (std.mem.eql(u8, f_decl.name, self.req.target)) { const f = @field(Self, f_decl.name); const fi = @typeInfo(@TypeOf(f)); - if (fi.Fn.params.len == 1) { + if (fi.@"fn".params.len == 1) { _ = try @call(.auto, f, .{self}); } else { - const args_type = fi.Fn.params[fi.Fn.params.len - 1].type.?; + const args_type = fi.@"fn".params[fi.@"fn".params.len - 1].type.?; const argsi = @typeInfo(args_type); var args: args_type = undefined; - inline for (argsi.Struct.fields) |field| { + inline for (argsi.@"struct".fields) |field| { const str = self.req.get_value(field.name) orelse return error.ArgNotFound; const field_ti = @typeInfo(field.type); switch (field_ti) { - .Int => { + .int => { @field(args, field.name) = try std.fmt.parseUnsigned(field.type, str, 16); }, - .Enum => { + .@"enum" => { @field(args, field.name) = try parse_enum(field.type, str, 16); }, else => { @@ -1075,6 +1403,18 @@ const POST = struct { user.display_name = display_name; try users.put(login.user.id, user); } + pub fn @"/set_description"(self: Self, args: struct { description: []const u8 }) !void { + const login = self.logged_in orelse return error.NotLoggedIn; + const description = try reencode(UserDescription, args.description); + + const txn = try self.env.txn(); + defer txn.commit() catch {}; + + const users = try Db.users(txn); + var user = login.user; + user.description = description; + try users.put(login.user.id, user); + } pub fn @"/set_password"(self: Self, args: struct { password: []const u8 }) !void { const login = self.logged_in orelse return error.NotLoggedIn; @@ -1124,13 +1464,14 @@ const POST = struct { } } } - pub fn @"/new_list"(self: Self) !void { + // TODO: add arguments instead of parsing manually + 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(); - const postlist = try PostList.init(txn); try txn.commit(); @@ -1140,24 +1481,87 @@ const POST = struct { try txn.commit(); } } - pub fn @"/list_add"(self: Self) !void { + pub fn @"/delete_list"(self: Self, args: struct { list_id: PostList.Base.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.Base.Index, post_id: PostId }) !void { 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 post_list = PostList{ .idx = list_id }; + const post_list = PostList{ .base = .{ .idx = args.list_id } }; 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 { + try post_list_view.append(args.post_id); + } + } + } + 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(); + const userlist = try UserList.init(txn); + try txn.commit(); + + txn = try self.env.txn(); + var feeds_view = try login.user.feeds.open(txn); + _ = try feeds_view.append(.{ .name = name, .list = userlist }); + try txn.commit(); + } + } + pub fn @"/delete_feed"(self: Self, args: struct { list_id: UserList.Base.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.Base.Index, user_id: UserId }) !void { + if (self.logged_in) |login| { + _ = login; + + const txn = try self.env.txn(); + defer txn.commit() catch {}; + + const user_list = UserList{ .base = .{ .idx = args.feed_id } }; + var user_list_view = try user_list.open(txn); + if (try user_list_view.has(args.user_id)) { + try user_list_view.del(args.user_id); } else { - try post_list_view.append(post_id); + try user_list_view.append(args.user_id); } } } @@ -1256,6 +1660,11 @@ const ReqBufferSize = 4096; 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); @@ -1274,7 +1683,16 @@ pub fn main() !void { 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); + // }; + try handle_request(env, req); + } + } // const ThreadCount = 1; // var ts: [ThreadCount]std.Thread = undefined; @@ -1288,99 +1706,64 @@ pub fn main() !void { 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, &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, &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("

[POST] {s}

", .{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("

[POST] {s}

", .{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(); } }