Merge branch 'develop' into task/3954-move-auth-to-src

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

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 070cf598acbed34f3f0146716cd632a9ddb3814c..4d63f2b0bb531ff343d7bc21a666117b5d4ea399 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -8,6 +8,7 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\Content\OEmbed;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -34,7 +35,6 @@ require_once "include/tags.php";
 require_once "include/files.php";
 require_once "include/event.php";
 require_once "include/text.php";
-require_once "include/oembed.php";
 require_once "include/html2bbcode.php";
 require_once "include/bbcode.php";
 
@@ -464,7 +464,7 @@ class DFRN
                /* get site pubkey. this could be a new installation with no site keys*/
                $pubkey = Config::get('system', 'site_pubkey');
                if (! $pubkey) {
-                       $res = new_keypair(1024);
+                       $res = Crypto::newKeypair(1024);
                        Config::set('system', 'site_prvkey', $res['prvkey']);
                        Config::set('system', 'site_pubkey', $res['pubkey']);
                }
@@ -2503,7 +2503,7 @@ class DFRN
 
                        $item['body'] = html2bb_video($item['body']);
 
-                       $item['body'] = oembed_html2bbcode($item['body']);
+                       $item['body'] = OEmbed::HTML2BBCode($item['body']);
 
                        $config = \HTMLPurifier_Config::createDefault();
                        $config->set('Cache.DefinitionImpl', null);