Merge pull request #1097 from annando/acvlang

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

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 382832c..0d06100 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -12,8 +12,8 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
+use Friendica\Model\Tag;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function ljpost_install() {
@@ -24,15 +24,6 @@ function ljpost_install() {
     Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
 
 }
-function ljpost_uninstall() {
-    Hook::unregister('post_local',       'addon/ljpost/ljpost.php', 'ljpost_post_local');
-    Hook::unregister('notifier_normal',  'addon/ljpost/ljpost.php', 'ljpost_send');
-    Hook::unregister('jot_networks',     'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
-    Hook::unregister('connector_settings',      'addon/ljpost/ljpost.php', 'ljpost_settings');
-    Hook::unregister('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
-
-}
-
 
 function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 {
@@ -188,7 +179,7 @@ function ljpost_send(&$a,&$b) {
                $title = XML::escape($b['title']);
                $post = BBCode::convert($b['body']);
                $post = XML::escape($post);
-               $tags = ljpost_get_tags($b['tag']);
+               $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
                $date = DateTimeFormat::convert($b['created'], $tz);
                $year = intval(substr($date,0,4));
@@ -240,15 +231,8 @@ EOT;
                Logger::log('ljpost: data: ' . $xml, Logger::DATA);
 
                if ($lj_blog !== 'test') {
-                       $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
+                       $x = DI::httpRequest()->post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
                }
                Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG);
        }
 }
-
-function ljpost_get_tags($post)
-{
-       preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
-       $tags = implode(', ',$matches[1]);
-       return $tags;
-}