X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/e439c64e7489a392a0debce2dbf4a87ee05e367c..1f167a59278b568b88fd70b3f96c7570541638cb:/src/main.zig diff --git a/src/main.zig b/src/main.zig index 2ccb16b..24bdc51 100644 --- a/src/main.zig +++ b/src/main.zig @@ -6,18 +6,34 @@ const http = @import("http"); // db {{{ const Db = struct { - fn users(txn: lmdb.Txn) !db.Db(UserId, User) { - return try db.Db(UserId, User).init(txn, "users"); - } - fn user_ids(txn: lmdb.Txn) !db.Db(Username, UserId) { - return try db.Db(Username, UserId).init(txn, "user_ids"); - } - fn sessions(txn: lmdb.Txn) !db.Db(SessionToken, UserId) { - return try db.Db(SessionToken, UserId).init(txn, "sessions"); - } - fn posts(txn: lmdb.Txn) !db.Db(PostId, Post) { - return try db.Db(PostId, Post).init(txn, "posts"); + pub fn init(env: lmdb.Env) !void { + const txn = try env.txn(); + const dbi = try txn.dbi(null); + if (try dbi.has(1001)) { + users = try dbi.get(1001, @TypeOf(users)); + } else { + users = try @TypeOf(users).init(txn); + } + if (try dbi.has(1002)) { + user_ids = try dbi.get(1002, @TypeOf(user_ids)); + } else { + user_ids = try @TypeOf(user_ids).init(txn); + } + if (try dbi.has(1003)) { + sessions = try dbi.get(1003, @TypeOf(sessions)); + } else { + sessions = try @TypeOf(sessions).init(txn); + } + if (try dbi.has(1004)) { + posts = try dbi.get(1004, @TypeOf(posts)); + } else { + posts = try @TypeOf(posts).init(txn); + } } + var users: UserList = undefined; + var user_ids: UsernameList = undefined; + var sessions: SessionList = undefined; + var posts: PostList = undefined; }; // }}} @@ -29,10 +45,13 @@ const User = struct { id: UserId, name: Username, display_name: DisplayName, + description: UserDescription, password_hash: PasswordHash, - posts: PostList, - following: UserList, - followers: UserList, + + posts: PostSet, + + following: UserSet, + followers: UserSet, post_lists: PostListList, feeds: UserListList, @@ -49,19 +68,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 { @@ -82,23 +101,28 @@ 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 SessionList = db.SetList(SessionToken, 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 @@ -107,28 +131,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); @@ -168,19 +183,18 @@ 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); @@ -189,8 +203,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(), @@ -211,27 +224,28 @@ const Chirp = struct { std.debug.print("error registering user: {}\n", .{err}); }; - const users = try Db.users(txn); - const user_ids = try Db.user_ids(txn); + var users = try Db.users.open(txn); + var user_ids = try Db.user_ids.open(txn); if (try user_ids.has(username_array)) { return false; } else { - const user_id = try db.Prng.gen(users.dbi, UserId); + const user_id = try db.Prng.gen(users.base.dbi, UserId); - try users.put(user_id, User{ + try users.append(user_id, User{ .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), - .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), }); - try user_ids.put(username_array, user_id); + try user_ids.append(username_array, user_id); return true; } @@ -247,17 +261,17 @@ const Chirp = struct { const txn = try env.txn(); defer txn.commit() catch {}; - const user_ids = try Db.user_ids(txn); + const user_ids = try Db.user_ids.open(txn); const user_id = try user_ids.get(username_array); std.debug.print("user logging in, id: {}\n", .{user_id}); - const users = try Db.users(txn); + const users = try Db.users.open(txn); const user = try users.get(user_id); if (verify_password(password, user.password_hash)) { - const sessions = try Db.sessions(txn); - const session_token = try db.Prng.gen(sessions.dbi, SessionToken); - try sessions.put(session_token, user_id); + var sessions = try Db.sessions.open(txn); + const session_token = try db.Prng.gen(sessions.base.dbi, SessionToken); + try sessions.append(session_token, user_id); return session_token; } else { return error.IncorrectPassword; @@ -268,11 +282,11 @@ const Chirp = struct { const txn = try env.txn(); defer txn.commit() catch {}; - const sessions = try Db.sessions(txn); + var sessions = try Db.sessions.open(txn); 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 @@ -283,10 +297,10 @@ const Chirp = struct { txn = try env.txn(); defer txn.commit() catch {}; - const posts = try Db.posts(txn); + const posts = try Db.posts.open(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, @@ -294,8 +308,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, }); } @@ -313,7 +327,7 @@ const Chirp = struct { txn = try env.txn(); defer txn.commit() catch {}; - const posts = try Db.posts(txn); + const posts = try Db.posts.open(txn); const quote_post = try posts.get(quote_id.?); var quotes = try quote_post.quotes.open(txn); try quotes.append(post_id); @@ -324,7 +338,7 @@ const Chirp = struct { fn post(env: lmdb.Env, user_id: UserId, text: []const u8) !void { var txn = try env.txn(); - const users = try Db.users(txn); + const users = try Db.users.open(txn); const user = try users.get(user_id); txn.abort(); @@ -334,10 +348,10 @@ const Chirp = struct { fn comment(env: lmdb.Env, user_id: UserId, parent_post_id: PostId, text: []const u8) !void { var txn = try env.txn(); - const users = try Db.users(txn); + const users = try Db.users.open(txn); const user = try users.get(user_id); - const posts = try Db.posts(txn); + const posts = try Db.posts.open(txn); const parent_post = try posts.get(parent_post_id); txn.abort(); @@ -351,7 +365,7 @@ const Chirp = struct { fn quote(env: lmdb.Env, user_id: UserId, quote_post_id: PostId, text: []const u8) !void { var txn = try env.txn(); - const users = try Db.users(txn); + const users = try Db.users.open(txn); const user = try users.get(user_id); txn.abort(); @@ -363,7 +377,7 @@ const Chirp = struct { const txn = try env.txn(); defer txn.commit() catch {}; - const posts = try Db.posts(txn); + const posts = try Db.posts.open(txn); var p = try posts.get(post_id); var votes_view = try p.votes.open(txn); @@ -403,7 +417,7 @@ const Chirp = struct { const txn = try env.txn(); defer txn.commit() catch {}; - const users = try Db.users(txn); + const users = try Db.users.open(txn); const user = try users.get(user_id); const user_to_follow = try users.get(user_id_to_follow); @@ -426,7 +440,7 @@ const Chirp = struct { const txn = try env.txn(); defer txn.abort(); - const sessions = try Db.sessions(txn); + const sessions = try Db.sessions.open(txn); return try sessions.get(session_token); } @@ -435,7 +449,7 @@ const Chirp = struct { const txn = try env.txn(); defer txn.abort(); - const users = try Db.users(txn); + const users = try Db.users.open(txn); return try users.get(user_id); } }; @@ -447,24 +461,20 @@ pub fn Paginate(comptime T: type) type { return struct { const Self = @This(); - const IterateResult = @typeInfo(@TypeOf(T.View.Iterator.next)).Fn.return_type.?; + const IterateResult = T.Base.View.Iterator.Result; res: *http.Response, view: T.View, per_page: u64, - it: T.View.Iterator, - starting_idx: ?T.Key, + 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.Key, starting_at_str, 16); - } - - if (it.idx == null) { - return error.InvalidIterator; + it.idx = try parse_enum(T.Base.Key, starting_at_str, 16); } return .{ @@ -472,10 +482,10 @@ pub fn Paginate(comptime T: type) type { .view = view, .per_page = per_page, .it = it, - .starting_idx = it.idx.?, + .starting_idx = it.idx, }; } - pub fn next(self: *Self) IterateResult { + pub fn next(self: *Self) ?IterateResult { if (self.it.next()) |kv| { if (self.count < self.per_page) { self.count += 1; @@ -487,7 +497,7 @@ pub fn Paginate(comptime T: type) type { pub fn write_navigation(self: *Self) !void { const next_idx = self.it.next(); - if (self.view.head.last != self.starting_idx) { + 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.?; @@ -517,10 +527,16 @@ fn html_form(res: *http.Response, action: []const u8, inputs: anytype) !void { 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(" \\ \\ @@ -612,12 +632,12 @@ fn write_end(res: *http.Response) !void { try res.write("", .{}); } fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: PostId, options: struct { recurse: u8 = 0, show_comment_field: bool = false }) !void { - const posts = try Db.posts(txn); + const posts = try Db.posts.open(txn); const post = posts.get(post_id) catch { res.redirect("/") catch {}; return; }; - const users = try Db.users(txn); + const users = try Db.users.open(txn); const user = try users.get(post.user_id); try res.write( @@ -702,13 +722,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.?; + 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("", .{}); } @@ -718,7 +738,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("
", .{}); @@ -783,13 +803,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.?; + 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( @@ -818,19 +838,28 @@ 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, options: struct { +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 paginate = try Paginate(PostList).init(res, posts_view, Chirp.PostsPerPage); + var paginate = try Paginate(PostSet).init(res, posts_view, Chirp.PostsPerPage); while (paginate.next()) |post_id| { - const posts = try Db.posts(txn); + const posts = try Db.posts.open(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 @@ -843,14 +872,19 @@ fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: 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); - const posts = try Db.posts(txn); +fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserSet) !void { + // TODO: paginate + const users = try Db.users.open(txn); + const posts = try Db.posts.open(txn); var newest_post_ids = try std.BoundedArray(PostId, 10).init(0); // TODO: TimelinePostsCount 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; @@ -887,8 +921,21 @@ 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.open(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 users = try Db.users.open(txn); const user = try users.get(user_id); try res.write( \\{s} @@ -928,7 +975,7 @@ fn check_login(env: lmdb.Env, req: http.Request, res: *http.Response) !?Login { 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); + const users = try Db.users.open(txn); result = .{ .user = try users.get(user_id), @@ -962,20 +1009,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; } @@ -983,10 +1030,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 => { @@ -1003,9 +1050,9 @@ const GET = struct { } pub fn @"/user/"(self: Self, args: struct { username: []const u8 }) !void { - const user_ids = try Db.user_ids(self.txn); + const user_ids = try Db.user_ids.open(self.txn); if (user_ids.get(try Username.fromSlice(args.username))) |user_id| { - const users = try Db.users(self.txn); + const users = try Db.users.open(self.txn); const user = try users.get(user_id); try write_profile(self.res, self.txn, self.logged_in, user); @@ -1022,9 +1069,9 @@ const GET = struct { } } pub fn @"/comments/"(self: Self, args: struct { username: []const u8 }) !void { - const user_ids = try Db.user_ids(self.txn); + const user_ids = try Db.user_ids.open(self.txn); if (user_ids.get(try Username.fromSlice(args.username))) |user_id| { - const users = try Db.users(self.txn); + const users = try Db.users.open(self.txn); const user = try users.get(user_id); try write_profile(self.res, self.txn, self.logged_in, user); @@ -1041,9 +1088,9 @@ const GET = struct { } } pub fn @"/quotes/"(self: Self, args: struct { username: []const u8 }) !void { - const user_ids = try Db.user_ids(self.txn); + const user_ids = try Db.user_ids.open(self.txn); if (user_ids.get(try Username.fromSlice(args.username))) |user_id| { - const users = try Db.users(self.txn); + const users = try Db.users.open(self.txn); const user = try users.get(user_id); try write_profile(self.res, self.txn, self.logged_in, user); @@ -1060,9 +1107,9 @@ const GET = struct { } } pub fn @"/all/"(self: Self, args: struct { username: []const u8 }) !void { - const user_ids = try Db.user_ids(self.txn); + const user_ids = try Db.user_ids.open(self.txn); if (user_ids.get(try Username.fromSlice(args.username))) |user_id| { - const users = try Db.users(self.txn); + const users = try Db.users.open(self.txn); const user = try users.get(user_id); try write_profile(self.res, self.txn, self.logged_in, user); @@ -1079,14 +1126,14 @@ const GET = struct { } } pub fn @"/following/"(self: Self, args: struct { username: []const u8 }) !void { - const user_ids = try Db.user_ids(self.txn); + const user_ids = try Db.user_ids.open(self.txn); if (user_ids.get(try Username.fromSlice(args.username))) |user_id| { - const users = try Db.users(self.txn); + const users = try Db.users.open(self.txn); const user = try users.get(user_id); const following_view = try user.following.open(self.txn); - var paginate = try Paginate(UserList).init(self.res, following_view, Chirp.UsersPerPage); + var paginate = try Paginate(UserSet).init(self.res, following_view, Chirp.UsersPerPage); try self.res.write( \\

{s} follows:

@@ -1108,13 +1155,13 @@ const GET = struct { } } pub fn @"/followers/"(self: Self, args: struct { username: []const u8 }) !void { - const user_ids = try Db.user_ids(self.txn); + const user_ids = try Db.user_ids.open(self.txn); if (user_ids.get(try Username.fromSlice(args.username))) |user_id| { - const users = try Db.users(self.txn); + const users = try Db.users.open(self.txn); const user = try users.get(user_id); const followers_view = try user.followers.open(self.txn); - var paginate = try Paginate(UserList).init(self.res, followers_view, Chirp.UsersPerPage); + var paginate = try Paginate(UserSet).init(self.res, followers_view, Chirp.UsersPerPage); try self.res.write( \\

{s} followers:

@@ -1142,13 +1189,13 @@ const GET = struct { }); } pub fn @"/upvotes/"(self: Self, args: struct { post_id: PostId }) !void { - const posts = try Db.posts(self.txn); + const posts = try Db.posts.open(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 posts = try Db.posts.open(self.txn); const post = try posts.get(args.post_id); const referer = if (self.req.get_header("Referer")) |ref| ref else self.req.target; @@ -1157,7 +1204,7 @@ 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\" autofocus", + .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", .{} }, "type=\"submit\" value=\"Quote\"", }); try self.res.write("
", .{}); @@ -1170,8 +1217,8 @@ const GET = struct { .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, @@ -1194,7 +1241,7 @@ const GET = struct { const post_list = kv.val.list; try self.res.write( \\{s} - , .{ post_list.idx.?, name.constSlice() }); + , .{ 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\"", @@ -1205,8 +1252,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| { @@ -1225,7 +1272,7 @@ const GET = struct { const user_list = kv.val.list; try self.res.write( \\{s} - , .{ user_list.idx.?, name.constSlice() }); + , .{ 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\"", @@ -1243,7 +1290,7 @@ const GET = struct { try html_form(self.res, "/post", .{ .{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} }, - "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", + .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", .{} }, "type=\"submit\" value=\"Post\"", }); } else { @@ -1262,6 +1309,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\"", @@ -1277,6 +1329,7 @@ const GET = struct { } else { // TODO: generic home try self.res.write("Homepage", .{}); + // try write_frontpage(self.res, self.txn); } } }; @@ -1293,24 +1346,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 => { @@ -1361,13 +1414,13 @@ const POST = struct { const txn = try self.env.txn(); defer txn.commit() catch {}; - const user_ids = try Db.user_ids(txn); + var user_ids = try Db.user_ids.open(txn); if (!try user_ids.has(username)) { try user_ids.del(login.user.name); try user_ids.put(username, login.user.id); - const users = try Db.users(txn); + const users = try Db.users.open(txn); var user = login.user; user.name = username; try users.put(login.user.id, user); @@ -1380,18 +1433,30 @@ const POST = struct { const txn = try self.env.txn(); defer txn.commit() catch {}; - const users = try Db.users(txn); + const users = try Db.users.open(txn); var user = login.user; 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.open(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; const txn = try self.env.txn(); defer txn.commit() catch {}; - const users = try Db.users(txn); + const users = try Db.users.open(txn); var user = login.user; user.password_hash = try Chirp.hash_password(args.password); try users.put(login.user.id, user); @@ -1442,7 +1507,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(); @@ -1451,9 +1516,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 {}; @@ -1469,14 +1534,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); @@ -1491,7 +1556,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(); @@ -1500,9 +1565,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(); @@ -1519,14 +1584,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); @@ -1575,8 +1640,8 @@ fn list_users(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const users = try Db.users(txn); - var it = try users.iterator(); + const users = try Db.users.open(txn); + var it = users.iterator(); while (it.next()) |kv| { const key = kv.key; @@ -1588,8 +1653,8 @@ fn list_user_ids(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const user_ids = try Db.user_ids(txn); - var it = try user_ids.iterator(); + const user_ids = try Db.user_ids.open(txn); + var it = user_ids.iterator(); while (it.next()) |kv| { const key = kv.key; @@ -1602,8 +1667,8 @@ fn list_sessions(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const sessions = try Db.sessions(txn); - var it = try sessions.iterator(); + const sessions = try Db.sessions.open(txn); + var it = sessions.iterator(); while (it.next()) |kv| { const key = kv.key; @@ -1616,8 +1681,8 @@ fn list_posts(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const posts = try Db.posts(txn); - var it = try posts.iterator(); + const posts = try Db.posts.open(txn); + var it = posts.iterator(); while (it.next()) |kv| { const key = kv.key; @@ -1644,6 +1709,8 @@ pub fn main() !void { var env = try lmdb.Env.open("db", 1024 * 1024 * 10); defer env.close(); + try Db.init(env); + std.debug.print("Users:\n", .{}); try list_users(env); std.debug.print("User IDs:\n", .{}); @@ -1657,9 +1724,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;