smileybutton addon HU translation added THX Balázs Úr

[friendica-addons.git] / ijpost / ijpost.php

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 89e53852384c4dfc728b268aaf74801ab56f8944..15f2b41e63e55bf9ff70c3bbfcb7423cf3e9c883 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -10,11 +10,10 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\DI;
+use Friendica\Model\Tag;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function ijpost_install()
@@ -26,15 +25,6 @@ function ijpost_install()
        Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
 }
 
-function ijpost_uninstall()
-{
-       Hook::unregister('post_local',       'addon/ijpost/ijpost.php', 'ijpost_post_local');
-       Hook::unregister('notifier_normal',  'addon/ijpost/ijpost.php', 'ijpost_send');
-       Hook::unregister('jot_networks',     'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
-       Hook::unregister('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
-       Hook::unregister('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
-}
-
 function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 {
        if (!local_user()) {
@@ -190,7 +180,7 @@ function ijpost_send(&$a, &$b)
                $title = $b['title'];
                $post = BBCode::convert($b['body']);
                $post = XML::escape($post);
-               $tags = ijpost_get_tags($b['tag']);
+               $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
                $date = DateTimeFormat::convert($b['created'], $tz);
                $year = intval(substr($date,0,4));
@@ -229,15 +219,8 @@ EOT;
                Logger::log('ijpost: data: ' . $xml, Logger::DATA);
 
                if ($ij_blog !== 'test') {
-                       $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
+                       $x = DI::httpRequest()->post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
                }
                Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG);
        }
 }
-
-function ijpost_get_tags($post)
-{
-       preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
-       $tags = implode(', ', $matches[1]);
-       return $tags;
-}