sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

formatting

Browse source
This commit is contained in:
William Pitcock 2018-12-04 05:01:21 +00:00
parent 419d4bd5e4
commit d6ab701a14
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/ostatus/handlers/note_handler.ex
View file

@ -106,7 +106,8 @@ def handle_note(entry, doc \\ nil) do
cw <- OStatus.get_cw(entry),
inReplyTo <- XML.string_from_xpath("//thr:in-reply-to[1]/@ref", entry),
inReplyToActivity <- fetch_replied_to_activity(entry, inReplyTo),
inReplyToObject <- (inReplyToActivity && Object.normalize(inReplyToActivity.data["object"])) || nil,
inReplyToObject <-
(inReplyToActivity && Object.normalize(inReplyToActivity.data["object"])) || nil,
inReplyTo <- (inReplyToObject && inReplyToObject.data["id"]) || inReplyTo,
attachments <- OStatus.get_attachments(entry),
context <- get_context(entry, inReplyTo),

10
test/object_test.exs
View file

@ -52,19 +52,23 @@ test "ensures cache is cleared for the object" do
describe "normalizer" do
test "fetches unknown objects by default" do
%Object{} = object = Object.normalize("http://mastodon.example.org/@admin/99541947525187367")
%Object{} =
object = Object.normalize("http://mastodon.example.org/@admin/99541947525187367")
assert object.data["url"] == "http://mastodon.example.org/@admin/99541947525187367"
end
test "fetches unknown objects when fetch_remote is explicitly true" do
%Object{} = object = Object.normalize("http://mastodon.example.org/@admin/99541947525187367", true)
%Object{} =
object = Object.normalize("http://mastodon.example.org/@admin/99541947525187367", true)
assert object.data["url"] == "http://mastodon.example.org/@admin/99541947525187367"
end
test "does not fetch unknown objects when fetch_remote is false" do
assert is_nil(Object.normalize("http://mastodon.example.org/@admin/99541947525187367", false))
assert is_nil(
Object.normalize("http://mastodon.example.org/@admin/99541947525187367", false)
)
end
end
end