diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-08-24 06:55:49 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-08-24 06:55:49 -0400 |
| commit | 51dc2b1696ee4d2c444b4809a1859379af6e3bc8 (patch) | |
| tree | 7d969cabf9038ab9368aa425373fe1e8367a80d6 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | e477608b7e87cc9adfaab8d91fb614ce1c0b8505 (diff) | |
| parent | 08bd59e446d5d176a9f2082424f70bde5cba64a5 (diff) | |
| download | pleroma-51dc2b1696ee4d2c444b4809a1859379af6e3bc8.tar.gz | |
Merge branch 'feauture/webfinger' into 'develop'
Feauture/webfinger
See merge request !25
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index dc66e27ad..de39834ca 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -270,7 +270,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do 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 = 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) |> Enum.filter(&(&1)) |