Detection of local requests

[friendica.git] / src / Worker / OnePoll.php

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index bb3dd97198fe5dde383f6c1436beae935ea23fb1..9e41a57adb6651b5d6fd6c852435bd3aa1f8a643 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,6 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
@@ -244,12 +245,12 @@ class OnePoll
                                        $datarray['network'] = Protocol::MAIL;
                                        // $meta = Email::messageMeta($mbox, $msg_uid);
 
-                                       $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
+                                       $datarray['thr-parent'] = $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
 
                                        // Have we seen it before?
                                        $fields = ['deleted', 'id'];
                                        $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
-                                       $item = Item::selectFirst($fields, $condition);
+                                       $item = Post::selectFirst($fields, $condition);
                                        if (DBA::isResult($item)) {
                                                Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG);
 
@@ -298,7 +299,7 @@ class OnePoll
                                                        }
                                                }
                                                $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
-                                               $parent = Item::selectFirst(['uri'], $condition);
+                                               $parent = Post::selectFirst(['uri'], $condition);
                                                if (DBA::isResult($parent)) {
                                                        $datarray['thr-parent'] = $parent['uri'];
                                                }
@@ -331,7 +332,7 @@ class OnePoll
                                        if (empty($datarray['thr-parent']) && $reply) {
                                                $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
                                                $params = ['order' => ['created' => true]];
-                                               $parent = Item::selectFirst(['uri'], $condition, $params);
+                                               $parent = Post::selectFirst(['uri'], $condition, $params);
                                                if (DBA::isResult($parent)) {
                                                        $datarray['thr-parent'] = $parent['uri'];
                                                }