fix(pastes): replacing a paste with a URL now shortens the URL
fixes #5 Signed-off-by: SphericalKat <amolele@gmail.com>
This commit is contained in:
parent
47acc97955
commit
478bea7efb
@ -13,11 +13,14 @@ defmodule KetbinWeb.PageController do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def show(%{assigns: %{show_edit: show_edit}} = conn, %{"id" => id}) do
|
def show(%{assigns: %{show_edit: show_edit}} = conn, %{"id" => id}) do
|
||||||
paste = Pastes.get_paste!(id) # fetch paste from db
|
# fetch paste from db
|
||||||
|
paste = Pastes.get_paste!(id)
|
||||||
|
|
||||||
if paste.is_url do # paste is a url, redirect
|
# paste is a url, redirect
|
||||||
|
# regular paste, show content
|
||||||
|
if paste.is_url do
|
||||||
redirect(conn, external: paste.content)
|
redirect(conn, external: paste.content)
|
||||||
else # regular paste, show content
|
else
|
||||||
render(conn, "show.html", paste: paste, show_edit: show_edit)
|
render(conn, "show.html", paste: paste, show_edit: show_edit)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -49,16 +52,20 @@ defmodule KetbinWeb.PageController do
|
|||||||
|
|
||||||
# attempt to create a paste
|
# attempt to create a paste
|
||||||
case Pastes.create_paste(paste_params) do
|
case Pastes.create_paste(paste_params) do
|
||||||
{:ok, paste} -> # all good, redirect
|
# all good, redirect
|
||||||
|
{:ok, paste} ->
|
||||||
unless is_url do
|
unless is_url do
|
||||||
conn
|
conn
|
||||||
|> redirect(to: Routes.page_path(conn, :show, paste)) # is a regular paste, take to regular route
|
# is a regular paste, take to regular route
|
||||||
|
|> redirect(to: Routes.page_path(conn, :show, paste))
|
||||||
else
|
else
|
||||||
conn
|
conn
|
||||||
|> redirect(to: Routes.page_path(conn, :showlink, paste)) # is a url, take to route with /v/ prefix
|
# is a url, take to route with /v/ prefix
|
||||||
|
|> redirect(to: Routes.page_path(conn, :showlink, paste))
|
||||||
end
|
end
|
||||||
|
|
||||||
{:error, %Ecto.Changeset{} = changeset} -> # something went wrong, bail
|
# something went wrong, bail
|
||||||
|
{:error, %Ecto.Changeset{} = changeset} ->
|
||||||
render(conn, "index.html", changeset: changeset)
|
render(conn, "index.html", changeset: changeset)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -72,11 +79,24 @@ defmodule KetbinWeb.PageController do
|
|||||||
def update(conn, %{"id" => id, "paste" => paste_params}) do
|
def update(conn, %{"id" => id, "paste" => paste_params}) do
|
||||||
paste = Pastes.get_paste!(id)
|
paste = Pastes.get_paste!(id)
|
||||||
|
|
||||||
|
# check if content is a url
|
||||||
|
is_url =
|
||||||
|
Map.get(paste_params, "content")
|
||||||
|
|> Utils.is_url?()
|
||||||
|
|
||||||
|
paste_params = Map.put(paste_params, "is_url", is_url)
|
||||||
|
|
||||||
case Pastes.update_paste(paste, paste_params) do
|
case Pastes.update_paste(paste, paste_params) do
|
||||||
{:ok, paste} ->
|
{:ok, paste} ->
|
||||||
conn
|
unless is_url do
|
||||||
|> put_flash(:info, "Paste updated successfully.")
|
conn
|
||||||
|> redirect(to: Routes.page_path(conn, :show, paste))
|
|> put_flash(:info, "Paste updated successfully.")
|
||||||
|
|> redirect(to: Routes.page_path(conn, :show, paste))
|
||||||
|
else
|
||||||
|
conn
|
||||||
|
|> put_flash(:info, "Paste updated successfully.")
|
||||||
|
|> redirect(to: Routes.page_path(conn, :showlink, paste))
|
||||||
|
end
|
||||||
|
|
||||||
{:error, %Ecto.Changeset{} = changeset} ->
|
{:error, %Ecto.Changeset{} = changeset} ->
|
||||||
render(conn, "edit.html", paste: paste, changeset: changeset)
|
render(conn, "edit.html", paste: paste, changeset: changeset)
|
||||||
|
Loading…
Reference in New Issue
Block a user