X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/4440a97c5a3bc8dca03198dbe0d9474978aa8904..355355f8305852a609d3960fb9e9b07177cf8f1f:/src/main.zig
diff --git a/src/main.zig b/src/main.zig
index 7fe3b63..8cabda6 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);
@@ -107,28 +111,19 @@ fn reencode(comptime T: type, text: []const u8) !T {
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);
@@ -223,6 +218,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 +459,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 {
@@ -707,8 +699,8 @@ fn write_post(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_id: Po
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("", .{});
}
@@ -788,8 +780,8 @@ fn write_profile(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user: Us
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,6 +810,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 +1263,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 +1391,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 +1675,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;