From bf7c96807a50433b7241ddf6df9e01d4ef11f43d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 10 Feb 2020 18:17:41 -0800
Subject: fix poll responses

---
 Zotlabs/Daemon/Notifier.php | 12 +++++++++++-
 Zotlabs/Lib/Libzot.php      |  1 +
 include/items.php           |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 1d0be10d9..00c6fb077 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -3,6 +3,7 @@
 namespace Zotlabs\Daemon;
 
 use Zotlabs\Lib\Libzot;
+use Zotlabs\Lib\Activity;
 
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
@@ -366,9 +367,18 @@ class Notifier {
 				$activity = json_decode($m,true);
 			}
 			else {
-				$activity = \Zotlabs\Lib\Activity::encode_activity($target_item);
+				$activity = array_merge(['@context' => [
+                    ACTIVITYSTREAMS_JSONLD_REV,
+                    'https://w3id.org/security/v1',
+                    z_root() . ZOT_APSCHEMA_REV
+                    ]], Activity::encode_activity($target_item)
+				);
 			}		
 
+			logger('target_item: ' . print_r($target_item,true), LOGGER_DEBUG);
+			logger('encoded: ' . print_r($activity,true), LOGGER_DEBUG);
+
+
 			// Send comments to the owner to re-deliver to everybody in the conversation
 			// We only do this if the item in question originated on this site. This prevents looping.
 			// To clarify, a site accepting a new comment is responsible for sending it to the owner for relay.
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index d64421926..42e706754 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1617,6 +1617,7 @@ class Libzot {
 					dbesc($arr['parent_mid']),
 					intval($channel['channel_id'])
 				);
+
 				if(! $r) {
 					$DR->update('comment parent not found');
 					$result[] = $DR->get();
diff --git a/include/items.php b/include/items.php
index c5743e91c..bf1ddee82 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1949,7 +1949,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 			if(intval($r[0]['item_uplink']) && (! $r[0]['item_private']))
 				$arr['item_private'] = 0;
 
-			if(in_array($arr['verb'], ['Note','Answer']) && $arr['obj_type'] === 'Question' && intval($r[0]['item_wall'])) {
+			if(in_array($arr['obj_type'], ['Note','Answer']) && $r[0]['obj_type'] === 'Question' && intval($r[0]['item_wall'])) {
 				Activity::update_poll($r[0],$arr['mid'],$arr['title']);
 			}
 
-- 
cgit v1.2.3