Remove consume_feed in favor of Protocol\Feed::consume

diff --git a/include/items.php b/include/items.php
index 16fe897..ad87ecc 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -63,12 +63,3 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false)
 {
        return \Friendica\Content\PageInfo::appendToBody($body, $texturl, $no_photos);
 }
-
-/**
- * @deprecated since 2020.06
- * @see \Friendica\Protocol\Feed::consume
- */
-function consume_feed($xml, array $importer, array $contact, &$hub)
-{
-       \Friendica\Protocol\Feed::consume($xml, $importer, $contact, $hub);
-}

diff --git a/mod/pubsub.php b/mod/pubsub.php
index cae3464..ece95dc 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -25,6 +25,7 @@ use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Protocol\Feed;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
@@ -146,11 +147,11 @@ function pubsub_post(App $a)
 
        Logger::log('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
        $feedhub = '';
-       consume_feed($xml, $importer, $contact, $feedhub);
+       Feed::consume($xml, $importer, $contact, $feedhub);
 
        // do it a second time for DFRN so that any children find their parents.
        if ($contact['network'] === Protocol::DFRN) {
-               consume_feed($xml, $importer, $contact, $feedhub);
+               Feed::consume($xml, $importer, $contact, $feedhub);
        }
 
        hub_post_return();

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index fbe9221..a2659f4 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -31,6 +31,7 @@ use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
+use Friendica\Protocol\Feed;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -173,11 +174,11 @@ class OnePoll
 
                        Logger::log("Consume feed of contact ".$contact['id']);
 
-                       consume_feed($xml, $importer, $contact, $hub);
+                       Feed::consume($xml, $importer, $contact, $hub);
 
                        // do it a second time for DFRN so that any children find their parents.
                        if ($protocol === Protocol::DFRN) {
-                               consume_feed($xml, $importer, $contact, $hub);
+                               Feed::consume($xml, $importer, $contact, $hub);
                        }
 
                        $hubmode = 'subscribe';