From 0cf6f7a54d60c89fe38e6a55ba464497ff5a445c Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 19 Mar 2018 17:38:54 +0000 Subject: [PATCH] capitalize Salmon protocol name --- lib/pleroma/web/federator/federator.ex | 2 +- lib/pleroma/web/salmon/salmon.ex | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index 3cc30cdd9..a0f827609 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -51,7 +51,7 @@ def handle(:publish, activity) do Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end) Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity) - Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end) + Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end) Pleroma.Web.Salmon.publish(actor, activity) end diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex index 46ca645d1..61c04e091 100644 --- a/lib/pleroma/web/salmon/salmon.ex +++ b/lib/pleroma/web/salmon/salmon.ex @@ -150,7 +150,7 @@ defp send_to_user(%{info: %{"salmon" => salmon}}, feed, poster) do with {:ok, %{status_code: code}} <- poster.(salmon, feed, [{"Content-Type", "application/magic-envelope+xml"}], timeout: 10000, recv_timeout: 20000) do Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end) else - e -> Logger.debug(fn -> "Pushing salmon to #{salmon} failed, #{inspect(e)}" end) + e -> Logger.debug(fn -> "Pushing Salmon to #{salmon} failed, #{inspect(e)}" end) end end @@ -178,7 +178,7 @@ def publish(%{info: %{"keys" => keys}} = user, %{data: %{"type" => type}} = acti remote_users(activity) |> Enum.each(fn(remote_user) -> Task.start(fn -> - Logger.debug(fn -> "sending salmon to #{remote_user.ap_id}" end) + Logger.debug(fn -> "sending Salmon to #{remote_user.ap_id}" end) send_to_user(remote_user, feed, poster) end) end)