From e058a212e7580f8a5fb07c81b54a5020542f707d Mon Sep 17 00:00:00 2001
From: parasprite <parasprite@users.noreply.github.com>
Date: Fri, 6 Nov 2020 23:22:41 -0600
Subject: [PATCH] Removes discourage bans (#65)

Co-authored-by: Parasprite <foalspeedahead@gmail.com>
---
 lib/philomena/bans.ex                         |  3 ---
 .../controllers/profile_controller.ex         |  1 -
 lib/philomena_web/plugs/current_ban_plug.ex   | 22 +------------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/lib/philomena/bans.ex b/lib/philomena/bans.ex
index c0660339..8b6daa6e 100644
--- a/lib/philomena/bans.ex
+++ b/lib/philomena/bans.ex
@@ -344,7 +344,6 @@ defmodule Philomena.Bans do
       Fingerprint
       |> select([f], %{
         reason: f.reason,
-        note: f.note,
         valid_until: f.valid_until,
         generated_ban_id: f.generated_ban_id,
         type: ^"FingerprintBan"
@@ -363,7 +362,6 @@ defmodule Philomena.Bans do
       Subnet
       |> select([s], %{
         reason: s.reason,
-        note: s.note,
         valid_until: s.valid_until,
         generated_ban_id: s.generated_ban_id,
         type: ^"SubnetBan"
@@ -380,7 +378,6 @@ defmodule Philomena.Bans do
       User
       |> select([u], %{
         reason: u.reason,
-        note: u.note,
         valid_until: u.valid_until,
         generated_ban_id: u.generated_ban_id,
         type: ^"UserBan"
diff --git a/lib/philomena_web/controllers/profile_controller.ex b/lib/philomena_web/controllers/profile_controller.ex
index 7e25bb5c..a141c1bc 100644
--- a/lib/philomena_web/controllers/profile_controller.ex
+++ b/lib/philomena_web/controllers/profile_controller.ex
@@ -158,7 +158,6 @@ defmodule PhilomenaWeb.ProfileController do
       Bans.User
       |> where(user_id: ^user.id)
       |> Repo.all()
-      |> Enum.reject(&String.contains?(&1.note || "", "discourage"))
 
     render(
       conn,
diff --git a/lib/philomena_web/plugs/current_ban_plug.ex b/lib/philomena_web/plugs/current_ban_plug.ex
index f82e74b1..d600e8b3 100644
--- a/lib/philomena_web/plugs/current_ban_plug.ex
+++ b/lib/philomena_web/plugs/current_ban_plug.ex
@@ -24,26 +24,6 @@ defmodule PhilomenaWeb.CurrentBanPlug do
 
     ban = Bans.exists_for?(user, ip, fingerprint)
 
-    cond do
-      discourage?(ban) ->
-        Conn.register_before_send(conn, fn conn ->
-          :timer.sleep(normal_time())
-
-          pass(error?(), conn)
-        end)
-        |> Conn.assign(:current_ban, nil)
-
-      true ->
-        Conn.assign(conn, :current_ban, ban)
-    end
+    Conn.assign(conn, :current_ban, ban) 
   end
-
-  defp discourage?(%{note: note}) when is_binary(note), do: String.contains?(note, "discourage")
-  defp discourage?(_ban), do: false
-
-  defp normal_time, do: :rand.normal(5_000, 25_000_000) |> trunc() |> max(0)
-  defp error?, do: :rand.uniform() < 0.05
-
-  defp pass(false, conn), do: conn
-  defp pass(_true, _conn), do: nil
 end