PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-17 11:04:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

disallow tag self-aliasing

Browse source
This commit is contained in:
Wren 2020-06-06 12:13:31 -04:00
parent 7f55c63303
commit 485d8be3b3
1 changed files with 45 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/philomena/tags.ex
View file

@ -179,6 +179,9 @@ defmodule Philomena.Tags do
def alias_tag(%Tag{} = tag, attrs) do def alias_tag(%Tag{} = tag, attrs) do
target_tag = Repo.get_by!(Tag, name: attrs["target_tag"]) target_tag = Repo.get_by!(Tag, name: attrs["target_tag"])
if(tag.id == target_tag.id) do
tag
else
filters_hidden = filters_hidden =
where(Filter, [f], fragment("? @> ARRAY[?]::integer[]", f.hidden_tag_ids, ^tag.id)) where(Filter, [f], fragment("? @> ARRAY[?]::integer[]", f.hidden_tag_ids, ^tag.id))
@ -230,6 +233,7 @@ defmodule Philomena.Tags do
reindex_tag_images(target_tag) reindex_tag_images(target_tag)
reindex_tags([tag, target_tag]) reindex_tags([tag, target_tag])
end end
end
def reindex_tag_images(%Tag{} = tag) do def reindex_tag_images(%Tag{} = tag) do
# First recount the tag # First recount the tag