Skip to content

lint on preview so these are visible in the proofreading stage rather… #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adamdruppe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lint on preview so these are visible in the proofreading stage rather… #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions src/dfeed/web/web/posting.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,31 @@ string discussionSend(UrlParameters clientVars, Headers headers)
action = "send";
}

bool lint() {
foreach (rule; lintRules)
if ("lint-ignore-" ~ rule.id !in draft.serverVars && rule.check(draft))
{
PostError error;
error.message = _!"Warning:" ~ " " ~ rule.shortDescription();
error.extraHTML ~= ` <input name="action-lint-ignore-` ~ rule.id ~ `" type="submit" value="` ~ _!`Ignore` ~ `">`;
if (!lintDetails)
error.extraHTML ~= ` <input name="action-lint-explain" type="submit" value="` ~ _!`Explain` ~ `">`;
if (rule.canFix(draft))
error.extraHTML ~= ` <input name="action-lint-fix-` ~ rule.id ~ `" type="submit" value="` ~ _!`Fix it for me` ~ `">`;
if (lintDetails)
error.extraHTML ~= `<div class="lint-description">` ~ rule.longDescription() ~ `</div>`;
discussionPostForm(draft, null, error);
return false;
}
return true;
}

switch (action)
{
case "save":
{
discussionPostForm(draft);
if (lint())
discussionPostForm(draft);
// Show preview
auto post = draftToPost(draft, headers, ip);
post.compile();
Expand All @@ -296,21 +316,8 @@ string discussionSend(UrlParameters clientVars, Headers headers)
userSettings.name = aaGet(clientVars, "name");
userSettings.email = aaGet(clientVars, "email");

foreach (rule; lintRules)
if ("lint-ignore-" ~ rule.id !in draft.serverVars && rule.check(draft))
{
PostError error;
error.message = _!"Warning:" ~ " " ~ rule.shortDescription();
error.extraHTML ~= ` <input name="action-lint-ignore-` ~ rule.id ~ `" type="submit" value="` ~ _!`Ignore` ~ `">`;
if (!lintDetails)
error.extraHTML ~= ` <input name="action-lint-explain" type="submit" value="` ~ _!`Explain` ~ `">`;
if (rule.canFix(draft))
error.extraHTML ~= ` <input name="action-lint-fix-` ~ rule.id ~ `" type="submit" value="` ~ _!`Fix it for me` ~ `">`;
if (lintDetails)
error.extraHTML ~= `<div class="lint-description">` ~ rule.longDescription() ~ `</div>`;
discussionPostForm(draft, null, error);
return null;
}
if (!lint())
return null;

auto now = Clock.currTime();

Expand Down