X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailstream%2Fmailstream.php;h=3abf2e5aefc35a8e3247f3f1429e4055f80dc0ef;hb=d754a5c0f9b27143e88251a76f9656a818168568;hp=9631a11ab5f3338edee71d193524b552b9e63e3c;hpb=29586d3498f79bcb0136edfce97516f4685955fd;p=friendica-addons.git

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 9631a11a..3abf2e5a 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -13,6 +13,7 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Protocol\Activity;
 
 function mailstream_install() {
@@ -213,7 +214,7 @@ function mailstream_subject($item) {
 	$parent = $item['thr-parent'];
 	// Don't look more than 100 levels deep for a subject, in case of loops
 	for ($i = 0; ($i < 100) && $parent; $i++) {
-		$parent_item = Item::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
+		$parent_item = Post::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
 		if (!DBA::isResult($parent_item)) {
 			break;
 		}
@@ -331,13 +332,13 @@ function mailstream_cron($a, $b) {
 	// send the email itself before cron jumps in.  Only if
 	// mailstream_post_remote_hook fails for some reason will this get
 	// used, and in that case it's worth holding off a bit anyway.
-	$ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
+	$ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `post-view`.`id` FROM `mailstream_item` JOIN `post-view` ON (`mailstream_item`.`uid` = `post-view`.`uid` AND `mailstream_item`.`uri` = `post-view`.`uri` AND `mailstream_item`.`contact-id` = `post-view`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `post-view`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
 	Logger::debug('mailstream_cron processing ' . count($ms_item_ids) . ' items');
 	foreach ($ms_item_ids as $ms_item_id) {
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
 			Logger::info('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id');
 		}
-		$item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
+		$item = Post::selectFirst([], ['id' => $ms_item_id['id']]);
 		$users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
 		$user = $users[0];
 		if ($user && $item) {
@@ -345,7 +346,7 @@ function mailstream_cron($a, $b) {
 		}
 		else {
 			Logger::info('mailstream_cron: Unable to find item ' . $ms_item_id['id']);
-			q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id']));
+			q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item_id['message-id']));
 		}
 	}
 	mailstream_tidy();