PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 13:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

filter fixes

Browse source
This commit is contained in:
byte[] 2020-06-06 21:56:07 -04:00
parent 9294e54771
commit 417305e43c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/philomena_web/controllers/admin/user/force_filter_controller.ex
View file

@ -22,7 +22,7 @@ defmodule PhilomenaWeb.Admin.User.ForceFilterController do
end
def delete(conn, _params) do
{:ok, user} = Users.unforce_filter(conn.assigns.current_user)
{:ok, user} = Users.unforce_filter(conn.assigns.user)
conn
|> put_flash(:info, "Forced filter was removed.")

2
lib/philomena_web/plugs/image_filter_plug.ex
View file

@ -14,7 +14,7 @@ defmodule PhilomenaWeb.ImageFilterPlug do
filter = defaults(conn.assigns[:current_filter])
forced = defaults(conn.assigns[:forced_filter])
tag_exclusion = %{terms: %{tag_ids: filter.hidden_tag_ids}}
tag_exclusion = %{terms: %{tag_ids: filter.hidden_tag_ids ++ forced.hidden_tag_ids}}
query_spoiler = invalid_filter_guard(user, filter.spoilered_complex_str)
query_exclusion = %{
bool: %{

2
lib/philomena_web/templates/profile/_admin_block.html.slime
View file

@ -16,7 +16,7 @@
br
i.fa.fa-fw.fa-filter>
strong.comment_deleted> Forced Filter:
= link @forced.name, to: Routes.filter_path(@conn, :show, @filter)
= link @forced.name, to: Routes.filter_path(@conn, :show, @forced)
br
i.far.fa-fw.fa-clock>