Use Content\OEmbed

- Remove references to include/oembed

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 4b36859c1e4574a77d83e0c807d63d28142d7222..6c76c48cbf1d69bb3ebe6fc75eabd859afa0c589 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -46,6 +46,7 @@ require_once 'library/twitteroauth.php';
 require_once 'include/enotify.php';
 
 use Friendica\App;
+use Friendica\Content\OEmbed;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Model\GContact;
@@ -1629,7 +1630,6 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 
 function statusnet_convertmsg(App $a, $body, $no_tags = false)
 {
-       require_once "include/oembed.php";
        require_once "include/items.php";
        require_once "include/network.php";
 
@@ -1653,7 +1653,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
 
                        logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
 
-                       $oembed_data = oembed_fetch_url($expanded_url, true);
+                       $oembed_data = OEmbed::fetchURL($expanded_url, true);
 
                        logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
 

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 01fa7471afa8a1d918be6cd767e58e53fee45b0d..ca5da52ff0bcb69f57f596ad08e41e6e657dec01 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -61,6 +61,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\OEmbed;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
@@ -1172,7 +1173,6 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 
 function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $picture)
 {
-       require_once "include/oembed.php";
        require_once "include/network.php";
 
        $tags = "";
@@ -1191,7 +1191,7 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
                        if ($url->url && $url->expanded_url && $url->display_url) {
                                $expanded_url = original_url($url->expanded_url);
 
-                               $oembed_data = oembed_fetch_url($expanded_url);
+                               $oembed_data = OEmbed::fetchURL($expanded_url);
 
                                // Quickfix: Workaround for URL with "[" and "]" in it
                                if (strpos($expanded_url, "[") || strpos($expanded_url, "]")) {