Update doignore() in main.js to match new Item\Ignore return type

[friendica.git] / src / Module / Oembed.php
diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php

index 452162ff208f3af7f9db16107674679f91500bd7..f9d928428169d4def9383fb56c08272af40e2d1b 100644 (file)
--- a/src/Module/Oembed.php
+++ b/src/Module/Oembed.php
@@ -4,6 +4,7 @@ namespace Friendica\Module;
  
  use Friendica\BaseModule;
  use Friendica\Content;
+use Friendica\Util\Strings;
  
  /**
   * Oembed module
@@ -16,7 +17,7 @@ use Friendica\Content;
   */
  class Oembed extends BaseModule
  {
-       public static function content()
+       public static function content(array $parameters = [])
         {
                 $a = self::getApp();
  
@@ -24,19 +25,20 @@ class Oembed extends BaseModule
                 if ($a->argv[1] == 'b2h') {
                         $url = ["", trim(hex2bin($_REQUEST['url']))];
                         echo Content\OEmbed::replaceCallback($url);
-                       killme();
+                       exit();
                 }
  
                 // Unused form: /oembed/h2b?text=...
                 if ($a->argv[1] == 'h2b') {
                         $text = trim(hex2bin($_REQUEST['text']));
                         echo Content\OEmbed::HTML2BBCode($text);
-                       killme();
+                       exit();
                 }
  
+               // @TODO: Replace with parameter from router
                 if ($a->argc == 2) {
                         echo '<html><body>';
-                       $url = base64url_decode($a->argv[1]);
+                       $url = Strings::base64UrlDecode($a->argv[1]);
                         $j = Content\OEmbed::fetchURL($url);
  
                         // workaround for media.ccc.de (and any other endpoint that return size 0)
@@ -48,6 +50,6 @@ class Oembed extends BaseModule
                         echo $j->html;
                         echo '</body></html>';
                 }
-               killme();
+               exit();
         }
  }