The "term" table is removed

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

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 8dbb9a47364dce03a25a76e7e9b7fbf696035533..959d28237468f86a9cda755758e6f68305942533 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Worker/OnePoll.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
@@ -37,7 +54,6 @@ class OnePoll
                        return;
                }
 
-               Contact::updateFromProbe($contact_id, '', $force);
 
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
                if (!DBA::isResult($contact)) {
@@ -45,6 +61,10 @@ class OnePoll
                        return;
                }
 
+               if (($contact['network'] != Protocol::MAIL) || $force) {
+                       Contact::updateFromProbe($contact_id, '', $force);
+               }
+
                // Special treatment for wrongly detected local contacts
                if (!$force && ($contact['network'] != Protocol::DFRN) && Contact::isLocalById($contact_id)) {
                        Contact::updateFromProbe($contact_id, Protocol::DFRN, true);
@@ -637,11 +657,11 @@ class OnePoll
                                        $datarray['owner-avatar'] = $contact['photo'];
 
                                        if ($datarray['parent-uri'] === $datarray['uri']) {
-                                               $datarray['private'] = 1;
+                                               $datarray['private'] = Item::PRIVATE;
                                        }
 
                                        if (!DI::pConfig()->get($importer_uid, 'system', 'allow_public_email_replies')) {
-                                               $datarray['private'] = 1;
+                                               $datarray['private'] = Item::PRIVATE;
                                                $datarray['allow_cid'] = '<' . $contact['id'] . '>';
                                        }