From bfc8ede4e895d50511eba426405a05c277d924ee Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 31 Dec 2017 21:06:03 -0500 Subject: [PATCH] Use Content\OEmbed - Remove references to include/oembed --- statusnet/statusnet.php | 4 ++-- twitter/twitter.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 4b36859c..6c76c48c 100644 --- 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 01fa7471..ca5da52f 100644 --- 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, "]")) { -- 2.39.5