diff options
| author | Roman Chvanikov <roman@Romans-MacBook-Pro-2.local> | 2019-06-05 02:45:21 +0300 |
|---|---|---|
| committer | Roman Chvanikov <roman@Romans-MacBook-Pro-2.local> | 2019-06-05 02:45:21 +0300 |
| commit | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (patch) | |
| tree | 41a5896012a3f55f3de31f7ec97dc397ba02cd62 /lib/pleroma/web/common_api/common_api.ex | |
| parent | f6036ce3b9649902ce1c2af819616ad25f0caef1 (diff) | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| download | pleroma-b1b1a270e8f17b76d08771ca1e4025b1d227da05.tar.gz | |
Fix conflict
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 5212d5ce5..ad3c03c55 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -132,13 +132,16 @@ defmodule Pleroma.Web.CommonAPI do Enum.map(choices, fn index -> answer_data = make_answer_data(user, object, Enum.at(options, index)["name"]) - ActivityPub.create(%{ - to: answer_data["to"], - actor: user, - context: object.data["context"], - object: answer_data, - additional: %{"cc" => answer_data["cc"]} - }) + {:ok, activity} = + ActivityPub.create(%{ + to: answer_data["to"], + actor: user, + context: object.data["context"], + object: answer_data, + additional: %{"cc" => answer_data["cc"]} + }) + + activity end) object = Object.get_cached_by_ap_id(object.data["id"]) |