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

Allow textile linking to non-visible images (fixes philomena-dev/philomena#122)

Browse source
This commit is contained in:
byte[] 2021-07-15 20:29:34 -04:00
parent 66c758cb13
commit 4c03bc5c62
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/philomena_web/textile_renderer.ex
View file

@ -74,7 +74,7 @@ defmodule PhilomenaWeb.TextileRenderer do
[nil] -> [nil] ->
match match
[image, "p"] -> [image, "p"] when not image.hidden_from_users ->
Phoenix.View.render(@image_view, "_image_target.html", Phoenix.View.render(@image_view, "_image_target.html",
image: image, image: image,
size: :medium, size: :medium,
@ -82,7 +82,7 @@ defmodule PhilomenaWeb.TextileRenderer do
) )
|> safe_to_string() |> safe_to_string()
[image, "t"] -> [image, "t"] when not image.hidden_from_users ->
Phoenix.View.render(@image_view, "_image_target.html", Phoenix.View.render(@image_view, "_image_target.html",
image: image, image: image,
size: :small, size: :small,
@ -90,7 +90,7 @@ defmodule PhilomenaWeb.TextileRenderer do
) )
|> safe_to_string() |> safe_to_string()
[image, "s"] -> [image, "s"] when not image.hidden_from_users ->
Phoenix.View.render(@image_view, "_image_target.html", Phoenix.View.render(@image_view, "_image_target.html",
image: image, image: image,
size: :thumb_small, size: :thumb_small,
@ -98,8 +98,12 @@ defmodule PhilomenaWeb.TextileRenderer do
) )
|> safe_to_string() |> safe_to_string()
[image, suffix] when suffix in ["p", "t", "s"] ->
link(">>#{image.id}#{suffix}#{link_postfix(image)}", to: "/#{image.id}")
|> safe_to_string()
[image] -> [image] ->
link(">>#{image.id}", to: "/#{image.id}") link(">>#{image.id}#{link_postfix(image)}", to: "/#{image.id}")
|> safe_to_string() |> safe_to_string()
end end
end) end)
@ -120,9 +124,21 @@ defmodule PhilomenaWeb.TextileRenderer do
defp load_images(ids) do defp load_images(ids) do
Image Image
|> where([i], i.id in ^ids) |> where([i], i.id in ^ids)
|> where([i], i.hidden_from_users == false)
|> preload(tags: :aliases) |> preload(tags: :aliases)
|> Repo.all() |> Repo.all()
|> Map.new(&{&1.id, &1}) |> Map.new(&{&1.id, &1})
end end
defp link_postfix(image) do
cond do
not is_nil(image.duplicate_id) ->
" (merged)"
not is_nil(image.hidden_from_users) ->
" (deleted)"
true ->
""
end
end
end end