diff options
| author | zotlabs <mike@macgirvin.com> | 2020-02-10 14:38:28 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-02-10 14:38:28 -0800 |
| commit | b767bda4105b141d71b94d4fdd4d6332f775db1a (patch) | |
| tree | 76f4bf2319d35e60701dbe6c272bf08307906a9b /Zotlabs | |
| parent | be81a40b2b3a0b0c117e2c6571bb38f577859bb8 (diff) | |
| parent | a39d436f9f46138db623ee3c9ddef2c501ea8bd2 (diff) | |
| download | volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.tar.gz volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.tar.bz2 volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Vote.php | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 06aa3b931..5a406beb7 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -928,6 +928,7 @@ class Activity { 'http://purl.org/zot/activity/file' => 'zot:File', 'http://purl.org/zot/activity/mood' => 'zot:Mood', 'Invite' => 'Invite', + 'Question' => 'Question' ]; call_hooks('activity_obj_decode_mapper',$objs); @@ -962,7 +963,8 @@ class Activity { 'http://purl.org/zot/activity/thing' => 'Object', 'http://purl.org/zot/activity/file' => 'zot:File', 'http://purl.org/zot/activity/mood' => 'zot:Mood', - 'Invite' => 'Invite', + 'Invite' => 'Invite', + 'Question' => 'Question' ]; call_hooks('activity_obj_mapper',$objs); @@ -1806,6 +1808,8 @@ class Activity { $s['item_deleted'] = 1; } + + $s['obj_type'] = self::activity_obj_decode_mapper($act->obj['type']); if($s['obj_type'] === ACTIVITY_OBJ_NOTE && $s['mid'] !== $s['parent_mid']) { $s['obj_type'] = ACTIVITY_OBJ_COMMENT; @@ -2219,6 +2223,7 @@ class Activity { } } + if ($p[0]['obj_type'] === 'Question') { if ($item['obj_type'] === ACTIVITY_OBJ_NOTE && $item['title'] && (! $item['content'])) { $item['obj_type'] = 'Answer'; diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 2776a681e..d64421926 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1643,7 +1643,7 @@ class Libzot { // route checking doesn't work correctly here because we've changed the privacy $r[0]['route'] = EMPTY_STR; // If this is a poll response, convert the obj_type to our (internal-only) "Answer" type - if ($arr['obj_type'] === ACTIVITY_OBJ_NOTE && $arr['title'] && (! $arr['content'])) { + if ($arr['obj_type'] === ACTIVITY_OBJ_COMMENT && $arr['title'] && (! $arr['body'])) { $arr['obj_type'] = 'Answer'; } } diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php index 2c31d84dc..e1932da23 100644 --- a/Zotlabs/Module/Vote.php +++ b/Zotlabs/Module/Vote.php @@ -86,6 +86,7 @@ class Vote extends Controller { $item['item_origin'] = true; $item['parent'] = $fetch[0]['id']; $item['parent_mid'] = $fetch[0]['mid']; + $item['thr_parent'] = $fetch[0]['mid']; $item['uuid'] = new_uuid(); $item['mid'] = z_root() . '/item/' . $item['uuid']; $item['verb'] = 'Create'; @@ -96,10 +97,11 @@ class Vote extends Controller { $item['obj_type'] = 'Note'; $item['author'] = channelx_by_n($channel['channel_id']); - $item['obj'] = Activity::encode_item($item,true); + $item['obj'] = Activity::encode_item($item); // now reset the placeholders + $item['verb'] = ACTIVITY_POST; $item['obj_type'] = 'Answer'; unset($item['author']); @@ -107,7 +109,6 @@ class Vote extends Controller { $x = item_store($item); - retain_item($fetch[0]['id']); if($x['success']) { |