projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do recursive fetching in-band for now.
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
ostatus_controller.ex
diff --git
a/lib/pleroma/web/ostatus/ostatus_controller.ex
b/lib/pleroma/web/ostatus/ostatus_controller.ex
index c6700ae782e9bb00715c0f95a9775efc4eb95b59..5f79cc7e9979ef1a5101af6297696fc791054b3e 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/
lib/pleroma/web/ostatus/ostatus_controller.ex
@@
-22,7
+22,8
@@
defmodule Pleroma.Web.OStatus.OStatusController do
activities = query
|> Repo.all
activities = query
|> Repo.all
- response = FeedRepresenter.to_simple_form(user, activities, [user])
+ response = user
+ |> FeedRepresenter.to_simple_form(activities, [user])
|> :xmerl.export_simple(:xmerl_xml)
|> to_string
|> :xmerl.export_simple(:xmerl_xml)
|> to_string
@@
-33,7
+34,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
def salmon_incoming(conn, params) do
{:ok, body, _conn} = read_body(conn)
def salmon_incoming(conn, params) do
{:ok, body, _conn} = read_body(conn)
-
magic_key
= Pleroma.Web.Salmon.fetch_magic_key(body)
+
{:ok, magic_key}
= Pleroma.Web.Salmon.fetch_magic_key(body)
{:ok, doc} = Pleroma.Web.Salmon.decode_and_validate(magic_key, body)
Pleroma.Web.OStatus.handle_incoming(doc)
{:ok, doc} = Pleroma.Web.Salmon.decode_and_validate(magic_key, body)
Pleroma.Web.OStatus.handle_incoming(doc)
@@
-47,7
+48,8
@@
defmodule Pleroma.Web.OStatus.OStatusController do
activity = Activity.get_create_activity_by_object_ap_id(id)
user = User.get_cached_by_ap_id(activity.data["actor"])
activity = Activity.get_create_activity_by_object_ap_id(id)
user = User.get_cached_by_ap_id(activity.data["actor"])
- response = ActivityRepresenter.to_simple_form(activity, user, true)
+ response = activity
+ |> ActivityRepresenter.to_simple_form(user, true)
|> ActivityRepresenter.wrap_with_entry
|> :xmerl.export_simple(:xmerl_xml)
|> to_string
|> ActivityRepresenter.wrap_with_entry
|> :xmerl.export_simple(:xmerl_xml)
|> to_string