X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=afb8cfb8aa2c31d699bc5d85f5f27d77bfb27f36;hb=a3cff596592ae70701afae2e293eab03fe5408df;hp=06d399b2e3631493e0e7ca76ddc1236fd5fdb07d;hpb=bf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2;p=akkoma diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 06d399b2e..afb8cfb8a 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -25,7 +25,7 @@ defmodule Pleroma.Application do if Process.whereis(Pleroma.Web.Endpoint) do case Config.get([:http, :user_agent], :default) do :default -> - info = "#{Pleroma.Web.base_url()} <#{Config.get([:instance, :email], "")}>" + info = "#{Pleroma.Web.Endpoint.url()} <#{Config.get([:instance, :email], "")}>" named_version() <> "; " <> info custom -> @@ -239,7 +239,7 @@ defmodule Pleroma.Application do defp chat_child(true) do [ - Pleroma.Web.ChatChannel.ChatChannelState, + Pleroma.Web.ShoutChannel.ShoutChannelState, {Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]} ] end