X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb.ex;h=b82242a785ad0267890914b7b7288ec2177411d9;hb=a44d87f0594ad10809afe269e20e8d4c777b5d5c;hp=ee7ee78e9c1f565cc80d641dee9a31423bfa0e8f;hpb=8141024259ee4bebd58d6ecd963f181aad420846;p=akkoma diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex index ee7ee78e9..b82242a78 100644 --- a/lib/pleroma/web/web.ex +++ b/lib/pleroma/web/web.ex @@ -20,22 +20,20 @@ defmodule Pleroma.Web do quote do use Phoenix.Controller, namespace: Pleroma.Web import Plug.Conn - import Pleroma.Web.Router.Helpers - import Pleroma.Web.Gettext + import Pleroma.Web.{Gettext, Router.Helpers} end end def view do quote do - use Phoenix.View, root: "lib/pleroma/web/templates", - namespace: Pleroma.Web + use Phoenix.View, + root: "lib/pleroma/web/templates", + namespace: Pleroma.Web # Import convenience functions from controllers import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1] - import Pleroma.Web.Router.Helpers - import Pleroma.Web.ErrorHelpers - import Pleroma.Web.Gettext + import Pleroma.Web.{ErrorHelpers, Gettext, Router.Helpers} end end @@ -62,6 +60,6 @@ defmodule Pleroma.Web do end def base_url do - Pleroma.Web.Endpoint.url + Pleroma.Web.Endpoint.url() end end