update_poll() can be called many times in a row for the same item if a multiple poll is being updated. This could result in the queueworker not processing duplicates. We are now adding the source item mid to the notifier call as the third argument (fragment) so that the queueworker will not think they are duplicates. The fragment is also passed to the deliver_hooks call in the notifier

3 files changed, 15 insertions, 12 deletions

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 23bddae8f..76c17545a 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -78,6 +78,10 @@ class Notifier {
 	static public $encoded_item = null;
 	static public $channel = null;
 	static public $private = false;
+	// $fragment can contain additional info to omit de-duplication in the queueworker.
+	// E.g. if an item is updated many times in a row from different sources (multiple vote updates) the
+	// update source mid or a timestamp or random string can be added.
+	static public $fragment = null;
 
 	static public function run($argc, $argv) {
 
@@ -88,7 +92,6 @@ class Notifier {
 		logger('notifier: invoked: ' . print_r($argv, true), LOGGER_DEBUG);
 
 		$cmd = $argv[1];
-
 		$item_id = $argv[2];
 
 		if (!$item_id) {
@@ -103,6 +106,7 @@ class Notifier {
 		self::$encoded_item = null;
 		self::$channel      = null;
 		self::$private      = false;
+		self::$fragment     = null;
 
 		$sys         = get_sys_channel();
 		$normal_mode = true;
@@ -222,6 +226,8 @@ class Notifier {
 
 			// Fetch the target item
 
+			self::$fragment = $argv[3] ?? '';
+
 			$r = q("SELECT * FROM item WHERE id = %d AND parent != 0",
 				intval($item_id)
 			);
@@ -685,7 +691,7 @@ class Notifier {
 			// This wastes a process if there are no delivery hooks configured, so check this before launching the new process
 			$x = q("select * from hook where hook = 'notifier_normal'");
 			if ($x) {
-				Master::Summon(['Deliver_hooks', $target_item['id']]);
+				Master::Summon(['Deliver_hooks', $target_item['id'], self::$fragment]);
 			}
 		}
 
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 8e5a4e1a6..ef18040c0 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -2115,6 +2115,7 @@ class Activity {
 	}
 
 	static function update_poll($item, $post) {
+
 		$multi   = false;
 		$mid     = $post['mid'];
 		$content = $post['title'];
@@ -2199,7 +2200,8 @@ class Activity {
 				dbesc(datetime_convert()),
 				intval($item['id'])
 			);
-			Master::Summon(['Notifier', 'wall-new', $item['id']]);
+
+			Master::Summon(['Notifier', 'wall-new', $item['id'], $post['mid'] /* trick queueworker de-duplication  */ ]);
 			return true;
 		}
 
diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php
index d67a6f176..4f909d33d 100644
--- a/Zotlabs/Module/Vote.php
+++ b/Zotlabs/Module/Vote.php
@@ -24,7 +24,7 @@ class Vote extends Controller {
 		$fetch = null;
 		$id = argv(1);
 		$response = $_REQUEST['answer'];
-		
+
 		if ($id) {
 			$fetch = q("select * from item where id = %d limit 1",
 				intval($id)
@@ -42,7 +42,7 @@ class Vote extends Controller {
 		}
 
 		$valid = false;
-		
+
 		if ($obj['oneOf']) {
 			foreach($obj['oneOf'] as $selection) {
 				//		logger('selection: ' . $selection);
@@ -80,7 +80,6 @@ class Vote extends Controller {
 
 			$item = [];
 
-
 			$item['aid'] = $channel['channel_account_id'];
 			$item['uid'] = $channel['channel_id'];
 			$item['item_origin'] = 1;
@@ -95,11 +94,8 @@ class Vote extends Controller {
 			$item['owner_xchan'] = $fetch[0]['author_xchan'];
 			$item['allow_cid'] = '<' . $fetch[0]['author_xchan'] . '>';
 			$item['item_private'] = 1;
-
-			
 			$item['obj_type'] = 'Note';
 			$item['author'] = channelx_by_n($channel['channel_id']);
-
 			$item['obj'] = Activity::encode_item($item);
 
 			// now reset the placeholders
@@ -108,17 +104,15 @@ class Vote extends Controller {
 			$item['obj_type'] = 'Answer';
 			unset($item['author']);
 
-
 			$x = item_store($item);
 
-
 			retain_item($fetch[0]['id']);
 
 			if($x['success']) {
 				$itemid = $x['item_id'];
 				Master::Summon( [ 'Notifier', 'like', $itemid ] );
 			}
-		
+
 			$r = q("select * from item where id = %d",
 				intval($itemid)
 			);
@@ -128,6 +122,7 @@ class Vote extends Controller {
 				Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]);
 			}
 		}
+
 		$ret['success'] = true;
 		$ret['message'] = t('Response submitted. Updates may not appear instantly.');
 		json_return_and_die($ret);