spelling: importer

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 0b005570b230bc263e35318ae2fea405d0f69499..10c43626a1d3e72b2653e3d40e16dbbda5acf241 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -774,6 +774,7 @@ class DFRN
                }
 
                $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+               $body = Post\Media::addHTMLAttachmentToBody($item['uri-id'], $body);
 
                if ($item['private'] == Item::PRIVATE) {
                        $body = Item::fixPrivatePhotos($body, $owner['uid'], $item, $cid);
@@ -1341,7 +1342,7 @@ class DFRN
         */
        private static function processMail(DOMXPath $xpath, DOMNode $mail, array $importer)
        {
-               Logger::notice("Processing mails");
+               Logger::info("Processing mails");
 
                $msg = [];
                $msg['uid'] = $importer['importer_uid'];
@@ -1369,7 +1370,7 @@ class DFRN
         */
        private static function processSuggestion(DOMXPath $xpath, DOMNode $suggestion, array $importer)
        {
-               Logger::notice('Processing suggestions');
+               Logger::info('Processing suggestions');
 
                $url = $xpath->evaluate('string(dfrn:url[1]/text())', $suggestion);
                $cid = Contact::getIdForURL($url);
@@ -1445,7 +1446,7 @@ class DFRN
         */
        private static function processRelocation(DOMXPath $xpath, DOMNode $relocation, array $importer): bool
        {
-               Logger::notice("Processing relocations");
+               Logger::info("Processing relocations");
 
                /// @TODO Rewrite this to one statement
                $relocate = [];
@@ -1498,7 +1499,7 @@ class DFRN
 
                Contact::updateAvatar($importer['id'], $relocate['avatar'], true);
 
-               Logger::notice('Contacts are updated.');
+               Logger::info('Contacts are updated.');
 
                /// @TODO
                /// merge with current record, current contents have priority
@@ -1593,22 +1594,22 @@ class DFRN
                        // Big question: Do we need these functions? They were part of the "consume_feed" function.
                        // This function once was responsible for DFRN and OStatus.
                        if ($activity->match($item['verb'], Activity::FOLLOW)) {
-                               Logger::notice("New follower");
+                               Logger::info("New follower");
                                Contact::addRelationship($importer, $contact, $item);
                                return false;
                        }
                        if ($activity->match($item['verb'], Activity::UNFOLLOW)) {
-                               Logger::notice("Lost follower");
+                               Logger::info("Lost follower");
                                Contact::removeFollower($contact);
                                return false;
                        }
                        if ($activity->match($item['verb'], Activity::REQ_FRIEND)) {
-                               Logger::notice("New friend request");
+                               Logger::info("New friend request");
                                Contact::addRelationship($importer, $contact, $item, true);
                                return false;
                        }
                        if ($activity->match($item['verb'], Activity::UNFRIEND)) {
-                               Logger::notice("Lost sharer");
+                               Logger::info("Lost sharer");
                                Contact::removeSharer($contact);
                                return false;
                        }
@@ -1712,7 +1713,7 @@ class DFRN
         * Checks if an incoming message is wanted
         *
         * @param array $item
-        * @param array $imporer
+        * @param array $importer
         * @return boolean Is the message wanted?
         */
        private static function isSolicitedMessage(array $item, array $importer): bool
@@ -1758,7 +1759,7 @@ class DFRN
         */
        private static function processEntry(array $header, DOMXPath $xpath, DOMNode $entry, array $importer, string $xml, int $protocol)
        {
-               Logger::notice("Processing entries");
+               Logger::info("Processing entries");
 
                $item = $header;
 
@@ -2079,6 +2080,7 @@ class DFRN
                        // This is my contact on another system, but it's really me.
                        // Turn this into a wall post.
                        $notify = Item::isRemoteSelf($importer, $item);
+                       $item['wall'] = (bool)$notify;
 
                        $posted_id = Item::insert($item, $notify);
 
@@ -2105,7 +2107,7 @@ class DFRN
         */
        private static function processDeletion(DOMXPath $xpath, DOMNode $deletion, array $importer)
        {
-               Logger::notice("Processing deletions");
+               Logger::info("Processing deletions");
                $uri = null;
 
                foreach ($deletion->attributes as $attributes) {
@@ -2285,7 +2287,7 @@ class DFRN
                                self::processDeletion($xpath, $deletion, $importer);
                        }
                        if (count($deletions) > 0) {
-                               Logger::notice(count($deletions) . ' deletions had been processed');
+                               Logger::info(count($deletions) . ' deletions had been processed');
                                return 200;
                        }
                }