", .{});
if (options.recurse > 0) {
@@ -619,12 +702,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("", .{});
}
@@ -634,7 +718,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("
", .{});
@@ -650,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;
@@ -682,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"
});
}
@@ -699,12 +783,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(
@@ -733,6 +818,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 {
@@ -742,18 +836,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);
@@ -763,13 +860,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) {
@@ -778,7 +879,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;
@@ -799,6 +900,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;
@@ -845,20 +975,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;
}
@@ -866,10 +996,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 => {
@@ -967,20 +1097,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 [{}]
@@ -993,20 +1126,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 [{}]
@@ -1019,6 +1154,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);
@@ -1029,21 +1170,21 @@ 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: PostList.Base.Index }) !void {
+ try write_posts(self.res, self.txn, self.logged_in, PostList{ .base = .{ .idx = args.list_id } }, .{
.show_posts = true,
.show_quotes = true,
.show_comments = true,
@@ -1065,8 +1206,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\"",
@@ -1077,8 +1218,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: UserList.Base.Index }) !void {
+ try write_timeline(self.res, self.txn, self.logged_in, UserList{ .base = .{ .idx = args.feed_id } });
}
pub fn @"/feeds"(self: Self) !void {
if (self.logged_in) |login| {
@@ -1096,8 +1237,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\"",
@@ -1115,7 +1256,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 {
@@ -1134,6 +1275,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\"",
@@ -1165,24 +1311,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 => {
@@ -1257,6 +1403,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;
@@ -1323,7 +1481,7 @@ 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: PostList.Base.Index }) !void {
if (self.logged_in) |login| {
var post_list: ?PostList = null;
{
@@ -1341,14 +1499,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: PostList.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 = PostList{ .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);
@@ -1372,7 +1530,7 @@ 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: UserList.Base.Index }) !void {
if (self.logged_in) |login| {
var user_list: ?UserList = null;
@@ -1391,14 +1549,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: UserList.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 = UserList{ .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);
@@ -1529,9 +1687,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;
@@ -1549,7 +1708,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);
@@ -1560,7 +1719,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);