X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/e8c4ebe56c1382517e02f9a770397799b0e0b066..48e80ae12c563913af56f867268c02650292f7ee:/src/main.zig diff --git a/src/main.zig b/src/main.zig index 2fa757c..9fb872f 100644 --- a/src/main.zig +++ b/src/main.zig @@ -6,6 +6,18 @@ const http = @import("http"); // db {{{ const Db = struct { + fn users(txn: lmdb.Txn) !UserList { + return try db.Db(UserId, User).init(txn, "users"); + } + fn user_ids(txn: lmdb.Txn) !UsernameList { + return try db.Db(Username, UserId).init(txn, "user_ids"); + } + fn sessions(txn: lmdb.Txn) !SessionList { + return try db.Db(SessionToken, UserId).init(txn, "sessions"); + } + fn posts(txn: lmdb.Txn) !PostList { + return try db.Db(PostId, Post).init(txn, "posts"); + } fn users(txn: lmdb.Txn) !db.Db(UserId, User) { return try db.Db(UserId, User).init(txn, "users"); } @@ -29,11 +41,13 @@ const User = struct { id: UserId, name: Username, display_name: DisplayName, + description: UserDescription, password_hash: PasswordHash, - posts: PostList, - replies: PostList, - following: UserList, - followers: UserList, + + posts: PostSet, + + following: UserSet, + followers: UserSet, post_lists: PostListList, feeds: UserListList, @@ -50,19 +64,19 @@ const Post = struct { upvotes: u64 = 0, downvotes: u64 = 0, votes: VoteList, - comments: PostList, - quotes: PostList, + comments: PostSet, + quotes: PostSet, text: PostText, }; const SavedPostList = struct { name: Name, - list: PostList, + list: PostSet, }; const SavedUserList = struct { name: Name, - list: UserList, + list: UserSet, }; const Vote = struct { @@ -83,23 +97,27 @@ 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); const PostText = std.BoundedArray(u8, 1024); -const PostList = db.Set(PostId); -const UserList = db.Set(UserId); +const PostSet = db.Set(PostId); +const UserSet = db.Set(UserId); +const PostList = db.SetList(PostId, Post); +const UserList = db.SetList(UserId, User); +const UsernameList = db.SetList(Username, UserId); const VoteList = db.SetList(UserId, Vote); 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 @@ -108,28 +126,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); @@ -167,18 +176,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); @@ -187,8 +198,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(), @@ -221,11 +231,11 @@ 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), - .replies = try PostList.init(txn), - .following = try UserList.init(txn), - .followers = try UserList.init(txn), + .posts = try PostSet.init(txn), + .following = try UserSet.init(txn), + .followers = try UserSet.init(txn), .post_lists = try PostListList.init(txn), .feeds = try UserListList.init(txn), }); @@ -271,7 +281,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) !PostId { + fn append_post(env: lmdb.Env, user_id: UserId, post_list: PostSet, parent_id: ?PostId, quote_id: ?PostId, text: []const u8) !PostId { var post_id: PostId = undefined; // TODO: do this in one commit @@ -285,7 +295,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, @@ -293,8 +303,8 @@ const Chirp = struct { .user_id = user_id, .time = std.time.timestamp(), .votes = try VoteList.init(txn), - .comments = try PostList.init(txn), - .quotes = try PostList.init(txn), + .comments = try PostSet.init(txn), + .quotes = try PostSet.init(txn), .text = decoded_text, }); } @@ -328,11 +338,7 @@ const Chirp = struct { txn.abort(); const post_id = try append_post(env, user_id, user.posts, null, null, text); - - txn = try env.txn(); - var replies_view = try user.replies.open(txn); - try replies_view.append(post_id); - try txn.commit(); + _ = post_id; } fn comment(env: lmdb.Env, user_id: UserId, parent_post_id: PostId, text: []const u8) !void { @@ -347,7 +353,7 @@ const Chirp = struct { 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.replies.open(txn); + var replies_view = try user.posts.open(txn); try replies_view.append(post_id); try txn.commit(); } @@ -359,11 +365,7 @@ const Chirp = struct { txn.abort(); const post_id = try append_post(env, user_id, user.posts, null, quote_post_id, text); - - txn = try env.txn(); - var replies_view = try user.replies.open(txn); - try replies_view.append(post_id); - try txn.commit(); + _ = post_id; } fn vote(env: lmdb.Env, post_id: PostId, user_id: UserId, kind: Vote.Kind) !void { @@ -450,15 +452,86 @@ const Chirp = struct { // }}} // html {{{ +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(" \\ \\ + \\ \\ \\ \\ @@ -558,9 +636,9 @@ 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} - , .{ user.name.constSlice(), user.display_name.constSlice() }); + , .{ @intFromEnum(post_id), user.name.constSlice(), user.display_name.constSlice() }); if (post.parent_id) |id| { try res.write(" ..", .{@intFromEnum(id)}); } @@ -569,6 +647,17 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po \\{s}
, .{ 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) { @@ -616,7 +705,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 @@ -628,12 +717,13 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po // TODO: mark lists that already contain post while (it.next()) |kv| { const name = kv.val.name; - const id = kv.val.list.idx.?; - try res.write("", .{ id, name.constSlice() }); + const id = kv.val.list.base.idx.?; + const list_view = try kv.val.list.open(txn); + try res.write("", .{ id, name.constSlice(), if (list_view.has(post_id) catch false) " *" else "" }); } try res.write("", .{}); - try res.write("", .{@intFromEnum(post_id)}); - try res.write("", .{}); + try res.write("", .{@intFromEnum(post_id)}); + try res.write("", .{}); try res.write("", .{}); } @@ -643,7 +733,7 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po try res.write("

", .{}); 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("
", .{}); @@ -659,7 +749,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; @@ -691,12 +781,12 @@ fn write_profile(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user: Us // 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=\"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=\"hidden\" name=\"user_id\" value=\"{x}\"", .{@intFromEnum(user.id)} }, \\type="submit" value="Follow" }); } @@ -708,12 +798,13 @@ fn write_profile(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user: Us var it = feeds_view.iterator(); while (it.next()) |kv| { const name = kv.val.name; - const id = kv.val.list.idx.?; - try res.write("", .{ id, name.constSlice() }); + const id = kv.val.list.base.idx.?; + const list_view = try kv.val.list.open(txn); + try res.write("", .{ id, name.constSlice(), if (list_view.has(user.id) catch false) " *" else "" }); } try res.write("", .{}); - try res.write("", .{@intFromEnum(user.id)}); - try res.write("", .{}); + try res.write("", .{@intFromEnum(user.id)}); + try res.write("", .{}); try res.write("", .{}); } try res.write( @@ -725,7 +816,11 @@ fn write_profile(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user: Us user.name.constSlice(), followers.len(), }); - try res.write("Replies
", .{ + try res.write( + \\All Posts + \\ Comments + \\ Quotes
+ , .{ user.name.constSlice(), }); @@ -738,18 +833,42 @@ fn write_profile(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user: Us , .{}); } + 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) !void { +fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: PostSet, 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(PostSet).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 { +fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserSet) !void { + // TODO: paginate const users = try Db.users(txn); const posts = try Db.posts(txn); @@ -757,13 +876,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) { @@ -772,7 +895,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; @@ -793,6 +916,48 @@ fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_li try res.write("
", .{}); } } +fn write_frontpage(res: *http.Response, txn: lmdb.Txn) !void { + const posts = try Db.posts(txn); + var counter: u64 = 0; + var it = try posts.reverse_iterator(); + while (it.next()) |p| { + if (p.val.parent_id == null and p.val.quote_id == null) { + try write_post(res, txn, null, p.key, .{ .recurse = 1 }); + counter += 1; + } + + if (counter >= 10) break; + } +} +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; @@ -839,20 +1004,20 @@ const GET = struct { 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; } @@ -860,10 +1025,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 => { @@ -887,14 +1052,18 @@ const GET = struct { 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 = false, + .show_comments = false, + }); } else |err| { try self.res.write( \\

User not found [{}]

, .{err}); } } - pub fn @"/replies/"(self: Self, args: struct { username: []const u8 }) !void { + 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); @@ -902,7 +1071,49 @@ const GET = struct { try write_profile(self.res, self.txn, self.logged_in, user); - try write_posts(self.res, self.txn, self.logged_in, user.replies); + 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); + + 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 = 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_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 [{}]

@@ -915,20 +1126,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(UserSet).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 [{}]

@@ -941,20 +1155,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(UserSet).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 [{}]

@@ -967,7 +1183,13 @@ 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); @@ -977,21 +1199,25 @@ const GET = struct { 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: PostList.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: PostSet.Base.Index }) !void { + try write_posts(self.res, self.txn, self.logged_in, PostSet{ .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| { @@ -1009,8 +1235,8 @@ 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\"", @@ -1021,8 +1247,8 @@ const GET = struct { try self.res.write("not logged in", .{}); } } - pub fn @"/feed/"(self: Self, args: struct { feed_id: UserList.Index }) !void { - try write_timeline(self.res, self.txn, self.logged_in, UserList{ .idx = args.feed_id }); + pub fn @"/feed/"(self: Self, args: struct { feed_id: UserSet.Base.Index }) !void { + try write_timeline(self.res, self.txn, self.logged_in, UserSet{ .base = .{ .idx = args.feed_id } }); } pub fn @"/feeds"(self: Self) !void { if (self.logged_in) |login| { @@ -1040,8 +1266,8 @@ const GET = struct { const name = kv.val.name; const user_list = kv.val.list; try self.res.write( - \\{s} - , .{ user_list.idx.?, name.constSlice() }); + \\{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\"", @@ -1059,7 +1285,7 @@ const GET = struct { 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 { @@ -1078,6 +1304,11 @@ const GET = struct { .{ "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", .{ "type=\"text\" name=\"password\"", @@ -1093,6 +1324,7 @@ const GET = struct { } else { // TODO: generic home try self.res.write("Homepage", .{}); + // try write_frontpage(self.res, self.txn); } } }; @@ -1109,24 +1341,24 @@ const POST = struct { 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 => { @@ -1201,6 +1433,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; @@ -1258,7 +1502,7 @@ const POST = struct { // TODO: decode name var txn = try self.env.txn(); - const postlist = try PostList.init(txn); + const postlist = try PostSet.init(txn); try txn.commit(); txn = try self.env.txn(); @@ -1267,9 +1511,9 @@ const POST = struct { try txn.commit(); } } - pub fn @"/delete_list"(self: Self, args: struct { list_id: PostList.Index }) !void { + pub fn @"/delete_list"(self: Self, args: struct { list_id: PostSet.Base.Index }) !void { if (self.logged_in) |login| { - var post_list: ?PostList = null; + var post_list: ?PostSet = null; { const txn = try self.env.txn(); defer txn.commit() catch {}; @@ -1285,14 +1529,14 @@ const POST = struct { } } } - pub fn @"/list_add"(self: Self, args: struct { list_id: PostList.Index, post_id: PostId }) !void { + pub fn @"/list_add"(self: Self, args: struct { list_id: PostSet.Base.Index, post_id: PostId }) !void { if (self.logged_in) |login| { _ = login; const txn = try self.env.txn(); defer txn.commit() catch {}; - const post_list = PostList{ .idx = args.list_id }; + const post_list = PostSet{ .base = .{ .idx = args.list_id } }; var post_list_view = try post_list.open(txn); if (try post_list_view.has(args.post_id)) { try post_list_view.del(args.post_id); @@ -1307,7 +1551,7 @@ const POST = struct { const name = try Name.fromSlice(name_str); var txn = try self.env.txn(); - const userlist = try UserList.init(txn); + const userlist = try UserSet.init(txn); try txn.commit(); txn = try self.env.txn(); @@ -1316,9 +1560,9 @@ const POST = struct { try txn.commit(); } } - pub fn @"/delete_feed"(self: Self, args: struct { list_id: UserList.Index }) !void { + pub fn @"/delete_feed"(self: Self, args: struct { list_id: UserSet.Base.Index }) !void { if (self.logged_in) |login| { - var user_list: ?UserList = null; + var user_list: ?UserSet = null; { const txn = try self.env.txn(); @@ -1335,14 +1579,14 @@ const POST = struct { } } } - pub fn @"/feed_add"(self: Self, args: struct { feed_id: UserList.Index, user_id: UserId }) !void { + pub fn @"/feed_add"(self: Self, args: struct { feed_id: UserSet.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{ .idx = args.feed_id }; + const user_list = UserSet{ .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); @@ -1473,9 +1717,10 @@ pub fn main() !void { 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); - }; + // handle_request(env, req) catch { + // try handle_error(env, req); + // }; + try handle_request(env, req); } } // const ThreadCount = 1; @@ -1493,7 +1738,7 @@ pub fn main() !void { fn handle_error(env: lmdb.Env, req: http.Request) !void { _ = env; - var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer); + 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); @@ -1504,7 +1749,7 @@ fn handle_request(env: lmdb.Env, req: http.Request) !void { // std.debug.print("[{}]: {s}\n", .{ req.method, req.head.? }); // reponse - var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer); + var res = http.Response.init(req, &res_head_buffer, &res_body_buffer); // check session token const logged_in: ?Login = try check_login(env, req, &res);