X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/4440a97c5a3bc8dca03198dbe0d9474978aa8904..4cf4bee6f41428be1e4138b329b3f9d0a7ccf4f4:/src/main.zig diff --git a/src/main.zig b/src/main.zig index 7fe3b63..cc33216 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); @@ -223,6 +227,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), @@ -463,16 +468,12 @@ pub fn Paginate(comptime T: type) type { it.idx = try parse_enum(T.Base.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.?, + .starting_idx = it.idx, }; } pub fn next(self: *Self) IterateResult { @@ -818,6 +819,15 @@ 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 { @@ -1262,6 +1272,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", .{ + .{ "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\"", @@ -1385,6 +1400,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; @@ -1657,9 +1684,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;