srctree

Gregory Mullen parent 195a76a7 964e424b
replace bleach with verse alloc

src/api/repo.zig added: 60, removed: 269, total 0

@@ -16,8 +16,7 @@ pub const RepoRequest = struct {

};

fn openRepo(a: Allocator, raw_name: []const u8) !Git.Repo {

const dname = try a.alloc(u8, raw_name.len);

const rname = Bleach.sanitize(raw_name, dname, .{ .rules = .filename }) catch return error.InvalidName;

const rname = verse.abx.Filename.cleanAlloc(a, raw_name) catch return error.InvalidName;

if (!std.mem.eql(u8, raw_name, rname)) return error.InvalidName;

var cwd = std.fs.cwd();

@@ -137,9 +136,9 @@ const std = @import("std");

const Allocator = std.mem.Allocator;

const API = @import("../api.zig");

const Bleach = @import("../bleach.zig");

const Git = @import("../git.zig");

const Router = API.Router;

const verse = @import("verse");

const ROUTE = Router.ROUTE;

ev/null added: 60, removed: 269, total 0

@@ -1,199 +0,0 @@

const std = @import("std");

pub const Bleach = @This();

pub const Error = error{

NoSpaceLeft,

OutOfMemory,

};

pub const Rules = enum {

filename,

html,

path,

title,

pub fn func(r: Rules) RuleFn {

return switch (r) {

.filename => bleachFilename,

.html => bleachHtml,

.path => bleachPath,

.title => bleachHtml,

};

}

};

pub const RuleFn = *const fn (u8, ?[]u8) Error!usize;

pub const Options = struct {

rules: Rules,

skip_chars: ?[]const u8 = null,

// when true, sanitizer functions will return an error instead of replacing the char.

error_on_replace: bool = false,

};

pub const Html = struct {

text: []const u8,

pub fn sanitizeAlloc(a: std.mem.Allocator, in: []const u8) Error![]u8 {

return try Bleach.sanitizeAlloc(a, in, .{ .rules = .html });

}

pub fn format(self: Html, comptime _: []const u8, _: std.fmt.FormatOptions, out: anytype) !void {

var buf: [6]u8 = undefined;

for (self.text) |c| {

try out.writeAll(buf[0 .. bleachHtml(c, &buf) catch unreachable]);

}

};

pub const Filename = struct {

text: []const u8,

permit_directories: bool = false,

pub fn sanitizeAlloc(a: std.mem.Allocator, in: []const u8) Error![]u8 {

return try Bleach.sanitizeAlloc(a, in, .{ .rules = .filename });

}

pub fn format(self: Filename, comptime _: []const u8, _: std.fmt.FormatOptions, out: anytype) !void {

const bleach_fn = if (self.permit_directories) bleachPath else bleachFilename;

var buf: [2]u8 = undefined;

for (self.text) |txt| {

try out.writeAll(buf[0..bleach_fn(txt, &buf)]);

}

};

pub fn sanitizeAlloc(a: std.mem.Allocator, in: []const u8, opts: Options) Error![]u8 {

const func = opts.rules.func();

var out_size: usize = 0;

for (in) |c| out_size +|= try func(c, null);

const out = try a.alloc(u8, out_size);

return try sanitize(in, out, opts);

}

pub fn streamSanitizer(src: anytype, opts: Options) StreamSanitizer(@TypeOf(src)) {

return StreamSanitizer(@TypeOf(src)).init(src, opts);

}

/// if an error is encountered, `out` is undefined

pub fn sanitize(in: []const u8, out: []u8, opts: Options) Error![]u8 {

const func = opts.rules.func();

var pos: usize = 0;

for (in) |src| {

const count = try func(src, out[pos..]);

pos += count;

}

return out[0..pos];

}

pub fn StreamSanitizer(comptime Source: type) type {

return struct {

const Self = @This();

index: usize,

src: Source,

src_opts: Options,

sanitizer: RuleFn,

fn init(src: Source, opts: Options) Self {

return Self{

.index = 0,

.src = src,

.src_opts = opts,

.sanitizer = opts.rules.func(),

};

}

pub fn raze(_: *Self) void {}

pub fn any(self: *const Self) std.io.AnyReader {

return .{

.context = @ptrCast(*self.context),

.readFn = typeErasedReadFn,

};

}

pub fn typeErasedReadFn(context: *const anyopaque, buffer: []u8) anyerror!usize {

const ptr: *const Source = @alignCast(@ptrCast(context));

return read(ptr.*, buffer);

}

pub fn read(self: *Self, buffer: []u8) Error!usize {

const count = try self.sanitizer(self.src[self.index..], buffer);

self.index += count;

return count;

}

};

}

/// Allows subdirectories but not parents.

fn bleachPath(in: u8, out: ?[]u8) Error!usize {

var same = [1:0]u8{in};

const replace = switch (in) {

'a'...'z', 'A'...'Z', '0'...'9', '-', '_' => &same,

' ', '.' => "-",

'\n', '\t', '\\' => "",

else => "",

};

if (out) |o| {

if (replace.len > o.len) return error.NoSpaceLeft;

@memcpy(o[0..replace.len], replace);

}

return replace.len;

}

/// Filters out '/'

fn bleachFilename(in: u8, out: ?[]u8) Error!usize {

const replace = switch (in) {

'/' => "-",

else => return bleachPath(in, out),

};

if (out) |o| {

if (replace.len > o.len) return error.NoSpaceLeft;

@memcpy(o[0..replace.len], replace);

}

return replace.len;

}

fn bleachHtml(in: u8, out: ?[]u8) Error!usize {

var same = [1:0]u8{in};

const replace = switch (in) {

'<' => "<",

'&' => "&",

'>' => ">",

'"' => """,

else => &same,

};

if (out) |o| {

std.debug.assert(o.len > 0);

if (replace.len > o.len) return error.NoSpaceLeft;

@memcpy(o[0..replace.len], replace);

}

return replace.len;

}

test Html {

var a = std.testing.allocator;

const clean = try std.fmt.allocPrint(a, "{}", .{Html{ .text = "<tags not allowed>" }});

defer a.free(clean);

try std.testing.expectEqualStrings("<tags not allowed>", clean);

}

test bleachFilename {

var a = std.testing.allocator;

const allowed = "this-filename-is-allowed";

const not_allowed = "this-file\nname is !really! me$$ed up?";

var output = try sanitizeAlloc(a, allowed, .{ .rules = .filename });

try std.testing.expectEqualStrings(allowed, output);

a.free(output);

output = try sanitizeAlloc(a, not_allowed, .{ .rules = .filename });

try std.testing.expectEqualStrings("this-filename-is-really-meed-up", output);

a.free(output);

}

src/endpoints/commit-flex.zig added: 60, removed: 269, total 0

@@ -54,8 +54,8 @@ const Journal = struct {

if (commit_time < until) break;

if (std.mem.eql(u8, email.?, commit.author.email)) {

try list.append(.{

.name = try Bleach.Html.sanitizeAlloc(a, commit.author.name),

.title = try Bleach.Html.sanitizeAlloc(a, commit.title),

.name = try Verse.abx.Html.cleanAlloc(a, commit.author.name),

.title = try Verse.abx.Html.cleanAlloc(a, commit.title),

.date = DateTime.fromEpoch(commit_time),

.sha = commit.sha,

.repo = try a.dupe(u8, gitdir[8..]),

@@ -442,7 +442,6 @@ const eql = std.mem.eql;

const Allocator = std.mem.Allocator;

const allocPrint = std.fmt.allocPrint;

const Bleach = @import("../bleach.zig");

const DateTime = @import("../datetime.zig");

const Git = @import("../git.zig");

src/endpoints/gist.zig added: 60, removed: 269, total 0

@@ -99,8 +99,8 @@ fn toTemplate(a: Allocator, files: []const Gist.File) ![]S.GistFiles {

const out = try a.alloc(S.GistFiles, files.len);

for (files, out) |file, *o| {

o.* = .{

.file_name = try Bleach.Html.sanitizeAlloc(a, file.name),

.file_blob = try Bleach.Html.sanitizeAlloc(a, file.blob),

.file_name = try verse.abx.Html.cleanAlloc(a, file.name),

.file_blob = try verse.abx.Html.cleanAlloc(a, file.blob),

};

}

return out;

@@ -115,7 +115,7 @@ fn view(vrs: *Frame) Error!void {

const gist = Gist.open(vrs.alloc, hash[0..64].*) catch return error.Unknown;

const files = toTemplate(vrs.alloc, gist.files) catch return error.Unknown;

const og = try std.fmt.allocPrint(vrs.alloc, "A perfect paste from {}", .{Bleach.Html{ .text = gist.owner }});

const og = try std.fmt.allocPrint(vrs.alloc, "A perfect paste from {}", .{verse.abx.Html{ .text = gist.owner }});

var page = GistPage.init(.{

.meta_head = .{

.open_graph = .{

@@ -143,7 +143,6 @@ const Frame = verse.Frame;

const template = verse.template;

const S = template.Structs;

const RequestData = verse.RequestData.RequestData;

const Bleach = @import("../bleach.zig");

const Allocator = std.mem.Allocator;

const Gist = @import("../types.zig").Gist;

src/endpoints/repos.zig added: 60, removed: 269, total 0

@@ -439,7 +439,7 @@ fn blame(ctx: *Frame) Error!void {

const formatted = if (Highlight.Language.guessFromFilename(blame_file)) |lang| fmt: {

var pre = try Highlight.highlight(ctx.alloc, lang, source_lines.items);

break :fmt pre[28..][0 .. pre.len - 38];

} else Bleach.Html.sanitizeAlloc(ctx.alloc, source_lines.items) catch return error.Unknown;

} else verse.abx.Html.cleanAlloc(ctx.alloc, source_lines.items) catch return error.Unknown;

var litr = std.mem.splitScalar(u8, formatted, '\n');

for (parsed.lines) |*line| {

@@ -456,7 +456,7 @@ fn blame(ctx: *Frame) Error!void {

var page = BlamePage.init(.{

.meta_head = .{ .open_graph = .{} },

.body_header = ctx.response_data.get(S.BodyHeaderHtml) catch return error.Unknown,

.filename = Bleach.Html.sanitizeAlloc(ctx.alloc, blame_file) catch unreachable,

.filename = verse.abx.Html.cleanAlloc(ctx.alloc, blame_file) catch unreachable,

.blame_lines = wrapped_blames,

});

@@ -477,8 +477,8 @@ fn wrapLineNumbersBlame(

.repo_name = repo_name,

.sha = bcommit.sha[0..8],

.author_email = .{

.author = Bleach.Html.sanitizeAlloc(a, bcommit.author.name) catch unreachable,

.email = Bleach.Html.sanitizeAlloc(a, bcommit.author.email) catch unreachable,

.author = verse.abx.Html.cleanAlloc(a, bcommit.author.name) catch unreachable,

.email = verse.abx.Html.cleanAlloc(a, bcommit.author.email) catch unreachable,

.time = try Humanize.unix(bcommit.author.timestamp).printAlloc(a),

.num = i + 1,

@@ -548,7 +548,7 @@ fn blob(vrs: *Frame, repo: *Git.Repo, pfiles: Git.Tree) Error!void {

} else if (excludedExt(blb.name)) {

formatted = "This file type is currently unsupported";

} else {

formatted = Bleach.Html.sanitizeAlloc(vrs.alloc, resolve.data.?) catch return error.Unknown;

formatted = verse.abx.Html.cleanAlloc(vrs.alloc, resolve.data.?) catch return error.Unknown;

}

const wrapped = try wrapLineNumbers(vrs.alloc, formatted);

@@ -557,7 +557,7 @@ fn blob(vrs: *Frame, repo: *Git.Repo, pfiles: Git.Tree) Error!void {

_ = vrs.uri.next();

const uri_repo = vrs.uri.next() orelse return error.Unrouteable;

_ = vrs.uri.next();

const uri_filename = Bleach.Html.sanitizeAlloc(vrs.alloc, vrs.uri.rest()) catch return error.Unknown;

const uri_filename = verse.abx.Html.cleanAlloc(vrs.alloc, vrs.uri.rest()) catch return error.Unknown;

vrs.status = .ok;

@@ -595,7 +595,7 @@ fn htmlReadme(a: Allocator, readme: []const u8) ![]html.E {

dom = dom.open(html.element("readme", null, null));

dom.push(html.element("intro", "README.md", null));

dom = dom.open(html.element("code", null, null));

const clean = Bleach.Html.sanitizeAlloc(a, readme) catch return error.Unknown;

const clean = verse.abx.Html.cleanAlloc(a, readme) catch return error.Unknown;

const translated = try Highlight.translate(a, .markdown, clean);

dom.push(html.text(translated));

dom = dom.close();

@@ -810,7 +810,6 @@ const POST = Router.POST;

const GET = Router.GET;

const RequestData = verse.RequestData.RequestData;

const Bleach = @import("../bleach.zig");

const Humanize = @import("../humanize.zig");

const Ini = @import("../ini.zig");

const Repos = @import("../repos.zig");

src/endpoints/repos/commits.zig added: 60, removed: 269, total 0

@@ -17,7 +17,6 @@ const Diffs = @import("diffs.zig");

const Repos = @import("../repos.zig");

const Git = @import("../../git.zig");

const Bleach = @import("../../bleach.zig");

const Humanize = @import("../../humanize.zig");

const Patch = @import("../../patch.zig");

const Types = @import("../../types.zig");

@@ -111,7 +110,7 @@ fn commitHtml(ctx: *Verse.Frame, sha: []const u8, repo_name: []const u8, repo: G

const diffstat = patch.patchStat();

const og_title = try allocPrint(ctx.alloc, "Commit by {s}: {} file{s} changed +{} -{}", .{

Bleach.Html.sanitizeAlloc(ctx.alloc, current.author.name) catch unreachable,

Verse.abx.Html.cleanAlloc(ctx.alloc, current.author.name) catch unreachable,

diffstat.files,

if (diffstat.files > 1) "s" else "",

diffstat.additions,

@@ -120,7 +119,7 @@ fn commitHtml(ctx: *Verse.Frame, sha: []const u8, repo_name: []const u8, repo: G

const meta_head = S.MetaHeadHtml{

.open_graph = .{

.title = og_title,

.desc = Bleach.Html.sanitizeAlloc(ctx.alloc, current.message) catch unreachable,

.desc = Verse.abx.Html.cleanAlloc(ctx.alloc, current.message) catch unreachable,

};

@@ -138,9 +137,9 @@ fn commitHtml(ctx: *Verse.Frame, sha: []const u8, repo_name: []const u8, repo: G

switch (msg.kind) {

.comment => |cmt| {

pg_comment.* = .{

.author = try Bleach.Html.sanitizeAlloc(ctx.alloc, cmt.author),

.author = try Verse.abx.Html.cleanAlloc(ctx.alloc, cmt.author),

.date = try allocPrint(ctx.alloc, "{}", .{Humanize.unix(msg.updated)}),

.message = try Bleach.Html.sanitizeAlloc(ctx.alloc, cmt.message),

.message = try Verse.abx.Html.cleanAlloc(ctx.alloc, cmt.message),

.direct_reply = null,

.sub_thread = null,

};

@@ -240,13 +239,13 @@ pub fn commitCtxParents(a: Allocator, c: Git.Commit, repo: []const u8) ![]Templa

pub fn commitCtx(a: Allocator, c: Git.Commit, repo: []const u8) !Template.Structs.Commit {

return .{

.author = Bleach.Html.sanitizeAlloc(a, c.author.name) catch unreachable,

.author = Verse.abx.Html.cleanAlloc(a, c.author.name) catch unreachable,

.parents = try commitCtxParents(a, c, repo),

.sha_uri = try allocPrint(a, "/repo/{s}/commit/{s}", .{ repo, c.sha.hex[0..8] }),

.sha_short = try a.dupe(u8, c.sha.hex[0..8]),

//.sha = try a.dupe(u8, c.sha),

.title = Bleach.Html.sanitizeAlloc(a, c.title) catch unreachable,

.body = Bleach.Html.sanitizeAlloc(a, c.body) catch unreachable,

.title = Verse.abx.Html.cleanAlloc(a, c.title) catch unreachable,

.body = Verse.abx.Html.cleanAlloc(a, c.body) catch unreachable,

};

}

@@ -262,10 +261,10 @@ pub fn htmlCommit(a: Allocator, c: Git.Commit, repo: []const u8, comptime top: b

try std.fmt.allocPrint(a, "/repo/{s}/commit/{s}", .{ repo, c.sha[0..8] }),

));

cd_dom.push(HTML.br());

cd_dom.push(HTML.text(Bleach.Html.sanitizeAlloc(a, c.title) catch unreachable));

cd_dom.push(HTML.text(Verse.abx.Html.cleanAlloc(a, c.title) catch unreachable));

if (c.body.len > 0) {

cd_dom.push(HTML.br());

cd_dom.push(HTML.text(Bleach.Html.sanitizeAlloc(a, c.body) catch unreachable));

cd_dom.push(HTML.text(Verse.abx.Html.cleanAlloc(a, c.body) catch unreachable));

}

cd_dom = cd_dom.close();

const cdata = cd_dom.done();

@@ -315,8 +314,8 @@ fn commitVerse(a: Allocator, c: Git.Commit, repo_name: []const u8) !S.Commits {

return .{

.sha = try allocPrint(a, "{s}", .{c.sha.hex[0..8]}),

.uri = try allocPrint(a, "/repo/{s}/commit/{s}", .{ repo_name, c.sha.hex[0..8] }),

.msg_title = try Bleach.Html.sanitizeAlloc(a, c.title),

.msg = try Bleach.Html.sanitizeAlloc(a, c.body),

.msg_title = try Verse.abx.Html.cleanAlloc(a, c.title),

.msg = try Verse.abx.Html.cleanAlloc(a, c.body),

.author = c.author.name,

.commit_parent = parents,

};

src/endpoints/repos/diffs.zig added: 60, removed: 269, total 0

@@ -19,7 +19,6 @@ const Repos = @import("../repos.zig");

const Verse = @import("verse");

const Git = @import("../../git.zig");

const Bleach = @import("../../bleach.zig");

const DOM = Verse.DOM;

const HTML = Verse.HTML;

const Humanize = @import("../../humanize.zig");

@@ -446,12 +445,12 @@ fn resolveLineRefRepo(

else if (Highlighting.Language.guessFromFilename(filename)) |lang| fmt: {

var pre = try Highlighting.highlight(a, lang, found_line[1..]);

break :fmt pre[28..][0 .. pre.len - 41];

} else try Bleach.Html.sanitizeAlloc(a, found_line[1..]);

} else try Verse.abx.Html.cleanAlloc(a, found_line[1..]);

const wrapped_line = try allocPrint(

"<div title=\"{s}\" class=\"coderef\">{s}</div>",

.{ try Bleach.Html.sanitizeAlloc(a, line), formatted },

.{ try Verse.abx.Html.cleanAlloc(a, line), formatted },

);

try found_lines.append(wrapped_line);

return try found_lines.toOwnedSlice();

@@ -495,12 +494,12 @@ fn resolveLineRefDiff(

else if (Highlighting.Language.guessFromFilename(filename)) |lang| fmt: {

var pre = try Highlighting.highlight(a, lang, found_line[1..]);

break :fmt pre[28..][0 .. pre.len - 41];

} else try Bleach.Html.sanitizeAlloc(a, found_line[1..]);

} else try Verse.abx.Html.cleanAlloc(a, found_line[1..]);

const wrapped_line = try allocPrint(

"<div title=\"{s}\" class=\"coderef {s}\">{s}</div>",

.{ try Bleach.Html.sanitizeAlloc(a, line), color, formatted },

.{ try Verse.abx.Html.cleanAlloc(a, line), color, formatted },

);

try found_lines.append(wrapped_line);

}

@@ -585,7 +584,7 @@ fn translateComment(a: Allocator, comment: []const u8, patch: Patch, repo: *cons

end += 1;

}

if (end < line.len) try message_lines.append(

try Bleach.Html.sanitizeAlloc(a, line[end..]),

try Verse.abx.Html.cleanAlloc(a, line[end..]),

);

} else if (resolveLineRefRepo(

@@ -604,14 +603,14 @@ fn translateComment(a: Allocator, comment: []const u8, patch: Patch, repo: *cons

try message_lines.append(try allocPrint(

"<span title=\"line not found in this diff\">{s}</span>",

.{try Bleach.Html.sanitizeAlloc(a, line)},

.{try Verse.abx.Html.cleanAlloc(a, line)},

));

}

break;

}

} else {

try message_lines.append(try Bleach.Html.sanitizeAlloc(a, line));

try message_lines.append(try Verse.abx.Html.cleanAlloc(a, line));

}

@@ -641,8 +640,8 @@ fn view(ctx: *Verse.Frame) Error!void {

} orelse return error.Unrouteable;

const patch_header = S.Header{

.title = Bleach.Html.sanitizeAlloc(ctx.alloc, delta.title) catch unreachable,

.message = Bleach.Html.sanitizeAlloc(ctx.alloc, delta.message) catch unreachable,

.title = Verse.abx.Html.cleanAlloc(ctx.alloc, delta.title) catch unreachable,

.message = Verse.abx.Html.cleanAlloc(ctx.alloc, delta.message) catch unreachable,

};

// meme saved to protect history

@@ -692,12 +691,12 @@ fn view(ctx: *Verse.Frame) Error!void {

switch (msg.kind) {

.comment => |comment| {

c_ctx.* = .{

.author = try Bleach.Html.sanitizeAlloc(ctx.alloc, comment.author),

.author = try Verse.abx.Html.cleanAlloc(ctx.alloc, comment.author),

.date = try allocPrint(ctx.alloc, "{}", .{Humanize.unix(msg.updated)}),

.message = if (patch) |pt|

translateComment(ctx.alloc, comment.message, pt, &repo) catch unreachable

else

try Bleach.Html.sanitizeAlloc(ctx.alloc, comment.message),

try Verse.abx.Html.cleanAlloc(ctx.alloc, comment.message),

.direct_reply = .{ .uri = try allocPrint(ctx.alloc, "{}/direct_reply/{x}", .{

index,

fmtSliceHexLower(msg.hash[0..]),

@@ -767,13 +766,13 @@ fn list(ctx: *Verse.Frame) Error!void {

"/repo/{s}/{s}/{x}",

.{ d.repo, if (d.attach == .issue) "issues" else "diffs", d.index },

.title = try Bleach.Html.sanitizeAlloc(ctx.alloc, d.title),

.title = try Verse.abx.Html.cleanAlloc(ctx.alloc, d.title),

.comments_icon = try allocPrint(

ctx.alloc,

"<span><span class=\"icon{s}\">\xee\xa0\x9c</span> {}</span>",

.{ if (cmtsmeta.new) " new" else "", cmtsmeta.count },

.desc = try Bleach.Html.sanitizeAlloc(ctx.alloc, d.message),

.desc = try Verse.abx.Html.cleanAlloc(ctx.alloc, d.message),

});

}

var default_search_buf: [0xFF]u8 = undefined;

src/endpoints/repos/issues.zig added: 60, removed: 269, total 0

@@ -18,7 +18,6 @@ const S = Template.Structs;

const Repos = @import("../repos.zig");

const CURL = @import("../../curl.zig");

const Bleach = @import("../../bleach.zig");

const Types = @import("../../types.zig");

const Delta = Types.Delta;

const Humanize = @import("../../humanize.zig");

@@ -132,9 +131,9 @@ fn view(ctx: *Verse.Frame) Error!void {

switch (msg.kind) {

.comment => |comment| {

c_ctx.* = .{

.author = try Bleach.Html.sanitizeAlloc(ctx.alloc, comment.author),

.author = try Verse.abx.Html.cleanAlloc(ctx.alloc, comment.author),

.date = try allocPrint(ctx.alloc, "{}", .{Humanize.unix(msg.updated)}),

.message = try Bleach.Html.sanitizeAlloc(ctx.alloc, comment.message),

.message = try Verse.abx.Html.cleanAlloc(ctx.alloc, comment.message),

.direct_reply = .{ .uri = try allocPrint(ctx.alloc, "{}/direct_reply/{x}", .{

index,

fmtSliceHexLower(msg.hash[0..]),

@@ -158,8 +157,8 @@ fn view(ctx: *Verse.Frame) Error!void {

.body_header = .{ .nav = .{

.nav_buttons = &try Repos.navButtons(ctx),

} },

.title = Bleach.Html.sanitizeAlloc(ctx.alloc, delta.title) catch unreachable,

.desc = Bleach.Html.sanitizeAlloc(ctx.alloc, delta.message) catch unreachable,

.title = Verse.abx.Html.cleanAlloc(ctx.alloc, delta.title) catch unreachable,

.desc = Verse.abx.Html.cleanAlloc(ctx.alloc, delta.message) catch unreachable,

.delta_id = delta_id,

.comments = .{

.thread = root_thread,

@@ -195,13 +194,13 @@ fn list(ctx: *Verse.Frame) Error!void {

"/repo/{s}/{s}/{x}",

.{ d.repo, if (d.attach == .issue) "issues" else "diffs", d.index },

.title = try Bleach.Html.sanitizeAlloc(ctx.alloc, d.title),

.title = try Verse.abx.Html.cleanAlloc(ctx.alloc, d.title),

.comments_icon = try allocPrint(

ctx.alloc,

"<span><span class=\"icon{s}\">\xee\xa0\x9c</span> {}</span>",

.{ if (cmtsmeta.new) " new" else "", cmtsmeta.count },

.desc = try Bleach.Html.sanitizeAlloc(ctx.alloc, d.message),

.desc = try Verse.abx.Html.cleanAlloc(ctx.alloc, d.message),

});

}

src/endpoints/search.zig added: 60, removed: 269, total 0

@@ -75,13 +75,13 @@ fn custom(ctx: *Frame, search_str: []const u8) Error!void {

"/repo/{s}/{s}/{x}",

.{ d.repo, if (d.attach == .issue) "issues" else "diffs", d.index },

.title = try Bleach.Html.sanitizeAlloc(ctx.alloc, d.title),

.title = try verse.abx.Html.cleanAlloc(ctx.alloc, d.title),

.comments_icon = try allocPrint(

ctx.alloc,

"<span><span class=\"icon{s}\">\xee\xa0\x9c</span> {}</span>",

.{ if (cmtsmeta.new) " new" else "", cmtsmeta.count },

.desc = try Bleach.Html.sanitizeAlloc(ctx.alloc, d.message),

.desc = try verse.abx.Html.cleanAlloc(ctx.alloc, d.message),

});

}

@@ -100,7 +100,7 @@ fn custom(ctx: *Frame, search_str: []const u8) Error!void {

.nav_buttons = &btns,

} },

.delta_list = try d_list.toOwnedSlice(),

.search = Bleach.Html.sanitizeAlloc(ctx.alloc, search_str) catch unreachable,

.search = verse.abx.Html.cleanAlloc(ctx.alloc, search_str) catch unreachable,

});

try ctx.sendPage(&page);

@@ -120,4 +120,3 @@ const ROUTE = Routes.ROUTE;

const S = Template.Structs;

const Delta = @import("../types.zig").Delta;

const Bleach = @import("../bleach.zig");

src/patch.zig added: 60, removed: 269, total 0

@@ -9,7 +9,6 @@ const indexOfPos = std.mem.indexOfPos;

const splitScalar = std.mem.splitScalar;

const CURL = @import("curl.zig");

const Bleach = @import("bleach.zig");

const Verse = @import("verse");

const Response = Verse.Response;

const HTML = Verse.template.html;

@@ -399,7 +398,7 @@ pub fn diffLineHtmlSplit(a: Allocator, diff: []const u8) ![]HTML.Element {

const a_del = &HTML.Attr.class("del");

const a_block = &HTML.Attr.class("block");

const clean = Bleach.Html.sanitizeAlloc(a, diff) catch unreachable;

const clean = Verse.abx.Html.cleanAlloc(a, diff) catch unreachable;

const line_count = std.mem.count(u8, clean, "\n");

var litr = std.mem.splitScalar(u8, clean, '\n');

const nbsp = " ";

@@ -473,7 +472,7 @@ pub fn diffLineHtmlUnified(a: Allocator, diff: []const u8) []HTML.Element {

var dom = DOM.new(a);

dom = dom.open(HTML.span(null, null));

const clean = Bleach.Html.sanitizeAlloc(a, diff) catch unreachable;

const clean = Verse.abx.Html.cleanAlloc(a, diff) catch unreachable;

const line_count = std.mem.count(u8, clean, "\n");

var litr = splitScalar(u8, clean, '\n');

for (0..line_count + 1) |_| {

src/types/delta.zig added: 60, removed: 269, total 0

@@ -4,7 +4,6 @@ const Allocator = std.mem.Allocator;

const endian = builtin.cpu.arch.endian();

const AnyReader = std.io.AnyReader;

const Bleach = @import("../bleach.zig");

const Types = @import("../types.zig");

const Thread = Types.Thread;

const Message = Thread.Message;