From: patrick-scho Date: Sun, 6 Apr 2025 09:59:36 +0000 (+0200) Subject: add pagination X-Git-Url: https://gitweb.ps.run/chirp/commitdiff_plain/e439c64e7489a392a0debce2dbf4a87ee05e367c?hp=a93c6e557f10d3c948bec3ec54b1cde6b2a7a983 add pagination --- diff --git a/src/main.zig b/src/main.zig index 98da131..2ccb16b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -166,6 +166,9 @@ fn decode(text: []const u8) !std.BoundedArray(u8, 1024) { } const Chirp = struct { + const PostsPerPage = 10; + const UsersPerPage = 10; + pub fn hash_password(password: []const u8) !PasswordHash { var hash_buffer = try PasswordHash.init(128); @@ -440,6 +443,75 @@ const Chirp = struct { // }}} // html {{{ +pub fn Paginate(comptime T: type) type { + return struct { + const Self = @This(); + + const IterateResult = @typeInfo(@TypeOf(T.View.Iterator.next)).Fn.return_type.?; + + res: *http.Response, + view: T.View, + per_page: u64, + + it: T.View.Iterator, + starting_idx: ?T.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.Key, starting_at_str, 16); + } + + if (it.idx == null) { + return error.InvalidIterator; + } + + 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.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}); @@ -549,9 +621,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)}); } @@ -560,6 +632,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) { @@ -651,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; @@ -683,12 +766,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" }); } @@ -744,18 +827,21 @@ fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: }) !void { const posts_view = try post_list.open(txn); - var it = posts_view.reverse_iterator(); - while (it.next()) |post_id| { + 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); + 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, .{ .recurse = 1 }); + 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); @@ -771,7 +857,7 @@ fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_li 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) { @@ -780,7 +866,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; @@ -801,6 +887,35 @@ 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; @@ -969,20 +1084,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 [{}]

@@ -995,20 +1113,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 [{}]

@@ -1021,6 +1141,12 @@ const GET = struct { .show_comment_field = true, }); } + 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); @@ -1031,18 +1157,18 @@ 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\"", + "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 }, .{ @@ -1117,7 +1243,7 @@ const GET = struct { try html_form(self.res, "/post", .{ .{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} }, - "type=\"text\" name=\"text\"", + "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", "type=\"submit\" value=\"Post\"", }); } else { @@ -1551,7 +1677,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); @@ -1562,7 +1688,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);