logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 846d59a536544b246960322c874d1569fd79c54b
parent: 6b48489237f85ec8b6a9a98c539e0aad68d3a601
Author: Lain Iwakura <lain@soykaf.club>
Date:   Mon, 18 Dec 2017 16:16:22 +0100

Send out salmons before websub.

Diffstat:

Mlib/pleroma/web/federator/federator.ex6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex @@ -41,12 +41,12 @@ defmodule Pleroma.Web.Federator do def handle(:publish, activity) do Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end) with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do - Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end) - Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity) - {:ok, actor} = WebFinger.ensure_keys_present(actor) Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end) Pleroma.Web.Salmon.publish(actor, activity) + + Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end) + Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity) end end