ijpost addon HU translation added THX Balázs Úr

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

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index dbc9c4f08b75bf324349bce5e459a167c813d94c..3abf2e5aefc35a8e3247f3f1429e4055f80dc0ef 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -13,7 +13,7 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Network\HTTPRequest;
+use Friendica\Model\Post;
 use Friendica\Protocol\Activity;
 
 function mailstream_install() {
@@ -57,19 +57,6 @@ function mailstream_install() {
        }
 }
 
-function mailstream_uninstall() {
-       Hook::unregister('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
-       Hook::unregister('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
-       Hook::unregister('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
-       Hook::unregister('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
-       Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
-       Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
-       Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-       Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-       Hook::unregister('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
-       Hook::unregister('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail');
-}
-
 function mailstream_module() {}
 
 function mailstream_addon_admin(&$a,&$o) {
@@ -169,7 +156,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
                        continue;
                }
                $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
-               $curlResult = HTTPRequest::fetchUrlFull($url, true, 0, '', $cookiejar);
+               $curlResult = DI::httpRequest()->fetchFull($url, 0, '', $cookiejar);
                $attachments[$url] = [
                        'data' => $curlResult->getBody(),
                        'guid' => hash("crc32", $url),
@@ -227,7 +214,7 @@ function mailstream_subject($item) {
        $parent = $item['thr-parent'];
        // Don't look more than 100 levels deep for a subject, in case of loops
        for ($i = 0; ($i < 100) && $parent; $i++) {
-               $parent_item = Item::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
+               $parent_item = Post::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
                if (!DBA::isResult($parent_item)) {
                        break;
                }
@@ -345,13 +332,13 @@ function mailstream_cron($a, $b) {
        // send the email itself before cron jumps in.  Only if
        // mailstream_post_remote_hook fails for some reason will this get
        // used, and in that case it's worth holding off a bit anyway.
-       $ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
+       $ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `post-view`.`id` FROM `mailstream_item` JOIN `post-view` ON (`mailstream_item`.`uid` = `post-view`.`uid` AND `mailstream_item`.`uri` = `post-view`.`uri` AND `mailstream_item`.`contact-id` = `post-view`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `post-view`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
        Logger::debug('mailstream_cron processing ' . count($ms_item_ids) . ' items');
        foreach ($ms_item_ids as $ms_item_id) {
                if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
                        Logger::info('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id');
                }
-               $item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
+               $item = Post::selectFirst([], ['id' => $ms_item_id['id']]);
                $users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
                $user = $users[0];
                if ($user && $item) {
@@ -359,7 +346,7 @@ function mailstream_cron($a, $b) {
                }
                else {
                        Logger::info('mailstream_cron: Unable to find item ' . $ms_item_id['id']);
-                       q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id']));
+                       q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item_id['message-id']));
                }
        }
        mailstream_tidy();