From 87bcc07faefe97c771b664459b3e4346c9c99a66 Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Tue, 10 Jan 2017 15:12:37 -0800 Subject: [PATCH] enable ragel parser for remaining dtext endpoints --- app/views/forum_posts/_forum_post.html.erb | 2 +- app/views/pools/show.html.erb | 2 +- app/views/post_appeals/_new.html.erb | 2 +- app/views/post_flags/_new.html.erb | 2 +- app/views/posts/partials/index/_excerpt.html.erb | 6 +++--- app/views/tag_aliases/show.html.erb | 2 +- app/views/tag_implications/show.html.erb | 2 +- app/views/uploads/new.html.erb | 2 +- app/views/user_feedbacks/index.html.erb | 2 +- app/views/user_feedbacks/show.html.erb | 2 +- app/views/user_mailer/forum_notice.html.erb | 2 +- app/views/users/_ban_notice.html.erb | 2 +- app/views/users/_statistics.html.erb | 2 +- app/views/wiki_page_versions/show.html.erb | 2 +- app/views/wiki_pages/show.html.erb | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb index 1b31895bf..c6694580c 100644 --- a/app/views/forum_posts/_forum_post.html.erb +++ b/app/views/forum_posts/_forum_post.html.erb @@ -13,7 +13,7 @@
- <%= format_text(forum_post.body) %> + <%= format_text(forum_post.body, :ragel => true) %>
<% if forum_post.updated_at - forum_post.created_at > 5.minutes %>

Updated by <%= link_to_user forum_post.updater %> <%= time_ago_in_words_tagged(forum_post.updated_at) %>

diff --git a/app/views/pools/show.html.erb b/app/views/pools/show.html.erb index 0adcf2bf4..f11f6be57 100644 --- a/app/views/pools/show.html.erb +++ b/app/views/pools/show.html.erb @@ -9,7 +9,7 @@
- <%= format_text(@pool.description) %> + <%= format_text(@pool.description, :ragel => true) %>
<%= render "posts/partials/common/inline_blacklist" %> diff --git a/app/views/post_appeals/_new.html.erb b/app/views/post_appeals/_new.html.erb index 217364699..a5b8b2605 100644 --- a/app/views/post_appeals/_new.html.erb +++ b/app/views/post_appeals/_new.html.erb @@ -1,4 +1,4 @@ -<%= format_text(WikiPage.titled(Danbooru.config.appeal_notice_wiki_page).first.try(&:body)) %> +<%= format_text(WikiPage.titled(Danbooru.config.appeal_notice_wiki_page).first.try(&:body), :ragel => true) %> <%= form_tag(post_appeals_path(:format => :js), :remote => true) do %> <%= hidden_field_tag "post_appeal[post_id]", @post_appeal.post_id %> diff --git a/app/views/post_flags/_new.html.erb b/app/views/post_flags/_new.html.erb index 3a990bc64..29539da2b 100644 --- a/app/views/post_flags/_new.html.erb +++ b/app/views/post_flags/_new.html.erb @@ -1,4 +1,4 @@ -<%= format_text(WikiPage.titled(Danbooru.config.flag_notice_wiki_page).first.try(&:body)) %> +<%= format_text(WikiPage.titled(Danbooru.config.flag_notice_wiki_page).first.try(&:body), :ragel => true) %>

Enter a reason:

diff --git a/app/views/posts/partials/index/_excerpt.html.erb b/app/views/posts/partials/index/_excerpt.html.erb index 6ef74599c..a12807bee 100644 --- a/app/views/posts/partials/index/_excerpt.html.erb +++ b/app/views/posts/partials/index/_excerpt.html.erb @@ -7,7 +7,7 @@ <% if post_set.artist.visible? %> <% unless post_set.artist.notes.blank? %>
- <%= format_text(post_set.artist.notes) %> + <%= format_text(post_set.artist.notes, :ragel => true) %>

<%= link_to "View wiki page", post_set.artist.wiki_page %>

@@ -49,7 +49,7 @@

<%= wiki_page_other_names_list(post_set.wiki_page) %>

<% end %> - <%= format_text(post_set.wiki_page.presenter.excerpt) %> + <%= format_text(post_set.wiki_page.presenter.excerpt, :ragel => true) %> <% if post_set.wiki_page.artist %>

<%= link_to "View artist", post_set.wiki_page.artist %>

@@ -69,7 +69,7 @@
- <%= format_text(post_set.pool.description) %> + <%= format_text(post_set.pool.description, :ragel => true) %>

<%= link_to "View pool", pool_path(post_set.pool.id) %>

diff --git a/app/views/tag_aliases/show.html.erb b/app/views/tag_aliases/show.html.erb index 91fcbba74..884c1ea6e 100644 --- a/app/views/tag_aliases/show.html.erb +++ b/app/views/tag_aliases/show.html.erb @@ -9,7 +9,7 @@
  • Creator <%= link_to_user @tag_alias.creator %>
  • Date <%= @tag_alias.created_at %>
    • <% if @tag_alias.respond_to?(:reason) && @tag_alias.reason.present? %> -
  • Reason <%= format_text @tag_alias.reason %>
    • +
  • Reason <%= format_text @tag_alias.reason, :ragel => true %>
    • <% end %> diff --git a/app/views/tag_implications/show.html.erb b/app/views/tag_implications/show.html.erb index 579cd0e82..8a1f6ca02 100644 --- a/app/views/tag_implications/show.html.erb +++ b/app/views/tag_implications/show.html.erb @@ -9,7 +9,7 @@
  • Creator <%= link_to_user @tag_implication.creator %>
  • Date <%= @tag_implication.created_at %>
    • <% if @tag_implication.respond_to?(:reason) && @tag_implication.reason.present? %> -
  • Reason <%= format_text @tag_implication.reason %>
    • +
  • Reason <%= format_text @tag_implication.reason, :ragel => true %>
    • <% end %> diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index fecce8a01..9fd97c39b 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -4,7 +4,7 @@ <% if CurrentUser.can_upload? %>
    - <%= format_text(@upload_notice_wiki.try(&:body)) %> + <%= format_text(@upload_notice_wiki.try(&:body), :ragel => true) %>
    <% unless CurrentUser.can_upload_free? %> diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb index 005e7d1bc..114342d6a 100644 --- a/app/views/user_feedbacks/index.html.erb +++ b/app/views/user_feedbacks/index.html.erb @@ -18,7 +18,7 @@ <%= link_to_user feedback.user %> <%= link_to_user feedback.creator %> <%= compact_time(feedback.created_at) %> - <%= format_text(feedback.body) %> + <%= format_text(feedback.body, :ragel => true) %> <% if feedback.editable_by?(CurrentUser.user) %> <%= link_to "edit", edit_user_feedback_path(feedback) %> diff --git a/app/views/user_feedbacks/show.html.erb b/app/views/user_feedbacks/show.html.erb index 34efbfb57..12a871af8 100644 --- a/app/views/user_feedbacks/show.html.erb +++ b/app/views/user_feedbacks/show.html.erb @@ -6,7 +6,7 @@
  • Creator <%= link_to_user @user_feedback.creator %>
  • Date <%= @user_feedback.created_at %>
  • Category <%= @user_feedback.category %>
    • -
  • Message <%= format_text @user_feedback.body %>
    • +
  • Message <%= format_text @user_feedback.body, :ragel => true %>
    • <% if @user_feedback.editable_by?(CurrentUser.user) %> diff --git a/app/views/user_mailer/forum_notice.html.erb b/app/views/user_mailer/forum_notice.html.erb index 39bb1fd88..7ba08cfa5 100644 --- a/app/views/user_mailer/forum_notice.html.erb +++ b/app/views/user_mailer/forum_notice.html.erb @@ -4,7 +4,7 @@

    <%= forum_post.creator_name %> said:

    - <%= format_text(forum_post.body) %> + <%= format_text(forum_post.body, :ragel => true) %>

    diff --git a/app/views/users/_ban_notice.html.erb b/app/views/users/_ban_notice.html.erb index 14194123d..20b58df08 100644 --- a/app/views/users/_ban_notice.html.erb +++ b/app/views/users/_ban_notice.html.erb @@ -1,5 +1,5 @@

    Your account has been temporarily banned

    -

    Reason: <%= format_text CurrentUser.user.recent_ban.reason %>

    +

    Reason: <%= format_text CurrentUser.user.recent_ban.reason, :ragel => true %>

    Your ban will expire in <%= time_ago_in_words(CurrentUser.user.recent_ban.expires_at) %>

    diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb index d574e1695..a488a3472 100644 --- a/app/views/users/_statistics.html.erb +++ b/app/views/users/_statistics.html.erb @@ -25,7 +25,7 @@ <% if user.is_banned? && user.recent_ban %> Ban reason - <%= format_text presenter.ban_reason %> + <%= format_text presenter.ban_reason, :ragel => true %> <% end %> diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb index 917306945..ecfd85b86 100644 --- a/app/views/wiki_page_versions/show.html.erb +++ b/app/views/wiki_page_versions/show.html.erb @@ -11,7 +11,7 @@

    <%= wiki_page_other_names_list(@wiki_page_version) %>

    <% end %> - <%= format_text(@wiki_page_version.body) %> + <%= format_text(@wiki_page_version.body, :ragel => true) %> <% else %>

    The artist has requested removal of this page.

    <% end %> diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb index 3e5a68108..cd3bfc11a 100644 --- a/app/views/wiki_pages/show.html.erb +++ b/app/views/wiki_pages/show.html.erb @@ -22,7 +22,7 @@

    <%= wiki_page_other_names_list(@wiki_page) %>

    <% end %> - <%= format_text(@wiki_page.body) %> + <%= format_text(@wiki_page.body, :ragel => true) %> <% if @wiki_page.artist %>

    <%= link_to "View artist", @wiki_page.artist %>