Merge pull request #7907 from nupplaphil/task/reduce_app_deps

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index fefe7d8020b451130d06e444c80b372734368ef7..3dbc0cccd1cd06c3ebd8e481862b65d6c8f4fc75 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -41,7 +41,7 @@ class OnePoll
                }
 
                if ($force) {
-                       Contact::updateFromProbe($contact_id, true);
+                       Contact::updateFromProbe($contact_id, '', true);
                }
 
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
@@ -494,6 +494,8 @@ class OnePoll
                                        Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA);
 
                                        $datarray = [];
+                                       $datarray['uid'] = $importer_uid;
+                                       $datarray['contact-id'] = $contact['id'];
                                        $datarray['verb'] = Activity::POST;
                                        $datarray['object-type'] = Activity\ObjectType::NOTE;
                                        $datarray['network'] = Protocol::MAIL;
@@ -596,18 +598,8 @@ class OnePoll
                                                $datarray['parent-uri'] = $datarray['uri'];
                                        }
 
-                                       $r = Email::getMessage($mbox, $msg_uid, $reply);
-                                       if (!$r) {
-                                               Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
-                                               continue;
-                                       }
-
-                                       $datarray['body'] = Strings::escapeHtml($r['body']);
-                                       $datarray['body'] = BBCode::limitBodySize($datarray['body']);
-
-                                       Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
-
                                        $headers = imap_headerinfo($mbox, $meta->msgno);
+
                                        $object = [];
 
                                        if (!empty($headers->from)) {
@@ -643,16 +635,23 @@ class OnePoll
                                        $datarray['owner-link'] = "mailto:".$contact['addr'];
                                        $datarray['owner-avatar'] = $contact['photo'];
 
-                                       $datarray['uid'] = $importer_uid;
-                                       $datarray['contact-id'] = $contact['id'];
                                        if ($datarray['parent-uri'] === $datarray['uri']) {
                                                $datarray['private'] = 1;
                                        }
+
                                        if (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
                                                $datarray['private'] = 1;
                                                $datarray['allow_cid'] = '<' . $contact['id'] . '>';
                                        }
 
+                                       $datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
+                                       if (empty($datarray['body'])) {
+                                               Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
+                                               continue;
+                                       }
+
+                                       Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+
                                        Item::insert($datarray);
 
                                        switch ($mailconf['action']) {