diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-31 18:30:40 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-31 18:30:40 +0000 |
| commit | 8980c1c769dab3df91d34a90407d31e09788beff (patch) | |
| tree | e4418f4dbca7f6fb5ddc3025f139e9faa41e59bb /lib/pleroma/web/ostatus/handlers/note_handler.ex | |
| parent | 957de9d77151c03c7eb42d71d4dcd533aff1903e (diff) | |
| parent | f72e0b7caddd96da67269552db3102733e4a2581 (diff) | |
| download | pleroma-8980c1c769dab3df91d34a90407d31e09788beff.tar.gz | |
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
ostatus: explicitly disallow protocol downgrade from activitypub
See merge request pleroma/pleroma!1511
Diffstat (limited to 'lib/pleroma/web/ostatus/handlers/note_handler.ex')
| -rw-r--r-- | lib/pleroma/web/ostatus/handlers/note_handler.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex index 3005e8f57..7fae14f7b 100644 --- a/lib/pleroma/web/ostatus/handlers/note_handler.ex +++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex @@ -111,7 +111,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler do with id <- XML.string_from_xpath("//id", entry), activity when is_nil(activity) <- Activity.get_create_by_object_ap_id_with_object(id), [author] <- :xmerl_xpath.string('//author[1]', doc), - {:ok, actor} <- OStatus.find_make_or_update_user(author), + {:ok, actor} <- OStatus.find_make_or_update_actor(author), content_html <- OStatus.get_content(entry), cw <- OStatus.get_cw(entry), in_reply_to <- XML.string_from_xpath("//thr:in-reply-to[1]/@ref", entry), |