Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't break on empty mentions.

Browse Source
This commit is contained in:
Roger Braun 2017-08-24 12:54:01 +02:00
parent e477608b7e
commit 1a001588e8
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/ostatus/handlers/note_handler.ex
View File

@ -55,8 +55,9 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
end end
def get_mentions(entry) do def get_mentions(entry) do
get_people_mentions(entry) (get_people_mentions(entry)
++ get_collection_mentions(entry) ++ get_collection_mentions(entry))
|> Enum.filter(&(&1))
end end
def make_to_list(actor, mentions) do def make_to_list(actor, mentions) do

6
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -270,7 +270,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
user = User.get_cached_by_ap_id(actor) user = User.get_cached_by_ap_id(actor)
# mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"]) # mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) -> mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
User.get_cached_by_ap_id(ap_id) if ap_id do
User.get_cached_by_ap_id(ap_id)
else
nil
end
end) end)
|> Enum.filter(&(&1)) |> Enum.filter(&(&1))

7
test/web/ostatus/ostatus_test.exs
View File

@ -346,4 +346,11 @@ defmodule Pleroma.Web.OStatusTest do
assert {:ok, %User{}} = OStatus.insert_or_update_user(data) assert {:ok, %User{}} = OStatus.insert_or_update_user(data)
end end
test "it doesn't add nil in the do field" do
incoming = File.read!("test/fixtures/nil_mention_entry.xml")
{:ok, [activity]} = OStatus.handle_incoming(incoming)
assert activity.data["to"] == ["http://localhost:4001/users/atarifrosch@social.stopwatchingus-heidelberg.de/followers", "https://www.w3.org/ns/activitystreams#Public"]
end
end end