diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index eb76bb990..64161eb14 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -49,12 +49,6 @@ class StaticController < ApplicationController
redirect_back fallback_location: posts_path
end
- def dont_fool_me
- cookies[:dont_fool_me] = { value: "1", expires: 1.week }
- flash[:notice] = "òwō"
- redirect_back fallback_location: posts_path
- end
-
def discord
unless CurrentUser.can_discord?
raise User::PrivilegeError.new("You must have an account for at least one week in order to join the Discord server.")
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 43342b58b..65109d894 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -44,58 +44,14 @@ module ApplicationHelper
end
def format_text(text, **options)
- something_funny = options[:fool] && fool?
- options = options.except(:fool)
# preserve the currrent inline behaviour
if options[:inline]
dtext_ragel(text, **options)
else
- result = %(
- <%= format_text(blip.body, allow_color: blip.creator.is_privileged?, fool: true) %>
+ <%= format_text(blip.body, allow_color: blip.creator.is_privileged?) %>
<%= render "application/update_notice", record: blip %>
<%= render "application/warned_notice", record: blip %>
diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb
index 823430c91..537ef5137 100644
--- a/app/views/comments/partials/show/_comment.html.erb
+++ b/app/views/comments/partials/show/_comment.html.erb
@@ -20,7 +20,7 @@
- <%= format_text(comment.body, allow_color: comment.creator.is_privileged?, fool: true) %>
+ <%= format_text(comment.body, allow_color: comment.creator.is_privileged?) %>
<%= render "application/update_notice", record: comment %>
<%= render "application/warned_notice", record: comment %>
diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 011c11283..bb1de1552 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -20,7 +20,7 @@
- <%= format_text(parse_embedded_tag_request_text(forum_post.body), allow_color: forum_post.creator.is_privileged?, fool: true) %>
+ <%= format_text(parse_embedded_tag_request_text(forum_post.body), allow_color: forum_post.creator.is_privileged?) %>
<%= render "application/update_notice", record: forum_post %>
<%= render "application/warned_notice", record: forum_post %>
diff --git a/app/views/static/theme.html.erb b/app/views/static/theme.html.erb
index 503b65b7a..f252c29fc 100644
--- a/app/views/static/theme.html.erb
+++ b/app/views/static/theme.html.erb
@@ -7,13 +7,6 @@
Your device does not allow the site to save theme settings.
-<% if fool? %>
-
- Click <%= link_to "here", dont_fool_me_static_path %> to kill the joke early.
-
-<% end %>
-
-