AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 24 Projects 2 Releases 14 Packages Wiki Activity

Make user keys on usage.

Browse source
This commit is contained in:
Roger Braun 2017-05-01 14:07:29 +02:00
parent e54e592d6c
commit 35938656ab
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/federator/federator.ex
View file

@ -1,5 +1,6 @@
defmodule Pleroma.Web.Federator do defmodule Pleroma.Web.Federator do
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.WebFinger
require Logger require Logger
@websub Application.get_env(:pleroma, :websub) @websub Application.get_env(:pleroma, :websub)
@ -10,6 +11,7 @@ def handle(:publish, activity) do
Logger.debug("Sending #{activity.data["id"]} out via websub") Logger.debug("Sending #{activity.data["id"]} out via websub")
Pleroma.Web.Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity) Pleroma.Web.Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
{:ok, actor} = WebFinger.ensure_keys_present(actor)
Logger.debug("Sending #{activity.data["id"]} out via salmon") Logger.debug("Sending #{activity.data["id"]} out via salmon")
Pleroma.Web.Salmon.publish(actor, activity) Pleroma.Web.Salmon.publish(actor, activity)
end end

1
lib/pleroma/web/web_finger/web_finger.ex
View file

@ -47,6 +47,7 @@ def represent_user(user) do
|> XmlBuilder.to_doc |> XmlBuilder.to_doc
end end
# This seems a better fit in Salmon
def ensure_keys_present(user) do def ensure_keys_present(user) do
info = user.info || %{} info = user.info || %{}
if info["keys"] do if info["keys"] do