From 16b9d9f199548a266729594554d1d69194ddd90e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 11 Jun 2019 19:35:03 +0000
Subject: [PATCH] Fix pixture posts to connectors / fix delivery counter for
 connector posts

---
 src/Content/Text/BBCode.php |  4 +++-
 src/Worker/Notifier.php     | 14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 0d83b665cd..7560019aee 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -252,7 +252,9 @@ class BBCode extends BaseObject
 			if (preg_match_all("(\[url=([$URLSearchString]*)\]\s*\[img\]([$URLSearchString]*)\[\/img\]\s*\[\/url\])ism", $body, $pictures, PREG_SET_ORDER)) {
 				if ((count($pictures) == 1) && !$has_title) {
 					if (!empty($item['object-type']) && ($item['object-type'] == ACTIVITY_OBJ_IMAGE)) {
-						$data = ['url' => $pictures[0][1], 'type' => 'photo'];
+						// Replace the preview picture with the real picture
+						$url = str_replace('-1.', '-0.', $pictures[0][2]);
+						$data = ['url' => $url, 'type' => 'photo'];
 					} else {
 						// Checking, if the link goes to a picture
 						$data = ParseUrl::getSiteinfoCached($pictures[0][1], true);
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index a677cef604..36c6e92a04 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -529,13 +529,19 @@ class Notifier
 		if (!empty($target_item)) {
 			Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
 
-			if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]);
-			}
-
 			Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
 
 			Hook::callAll('notifier_end', $target_item);
+
+			// Workaround for pure connector posts
+			if ($delivery_queue_count == 0) {
+				ItemDeliveryData::incrementQueueDone($target_item['id']);
+				$delivery_queue_count = 1;
+			}
+
+			if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+				ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]);
+			}
 		}
 
 		return;