"fetchFull" is replaced by "get"

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index cc283789d3fdbfd3d2e3bbd3d96099d8a6160dd9..ae57c4dd8c66dabb6ee0d65d141e19614cd7c999 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -6,7 +6,6 @@
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -16,12 +15,11 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
 
 /**
  * Sets up the addon hooks and the database table
@@ -53,10 +51,12 @@ function mailstream_addon_admin(string &$o)
 {
        $frommail = DI::config()->get('mailstream', 'frommail');
        $template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
-       $config = ['frommail',
+       $config = [
+               'frommail',
                DI::l10n()->t('From Address'),
                $frommail,
-               DI::l10n()->t('Email address that stream items will appear to be from.')];
+               DI::l10n()->t('Email address that stream items will appear to be from.')
+       ];
        $o .= Renderer::replaceMacros($template, [
                '$frommail' => $config,
                '$submit' => DI::l10n()->t('Save Settings')
@@ -101,7 +101,7 @@ function mailstream_send_hook(array $data)
 
        $user = User::getById($item['uid']);
        if (empty($user)) {
-                       Logger::error('could not find user', ['uid' => $item['uid']]);
+               Logger::error('could not find user', ['uid' => $item['uid']]);
                return;
        }
 
@@ -198,10 +198,13 @@ function mailstream_do_images(array &$item, array &$attachments)
 
                $cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
                try {
-                       $curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+                       $curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
                        if (!$curlResult->isSuccess()) {
                                Logger::debug('mailstream: fetch image url failed', [
-                                       'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
+                                       'url' => $url,
+                                       'item_id' => $item['id'],
+                                       'return_code' => $curlResult->getReturnCode()
+                               ]);
                                continue;
                        }
                } catch (InvalidArgumentException $e) {
@@ -361,7 +364,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
                return true;
        }
 
-       require_once (dirname(__file__) . '/phpmailer/class.phpmailer.php');
+       require_once(dirname(__file__) . '/phpmailer/class.phpmailer.php');
 
        $item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
@@ -406,10 +409,11 @@ function mailstream_send(string $message_id, array $item, array $user): bool
                $item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS);
                $item['url'] = DI::baseUrl() . '/display/' . $item['guid'];
                $mail->Body = Renderer::replaceMacros($template, [
-                                                '$upstream' => DI::l10n()->t('Upstream'),
-                                                '$uri' => DI::l10n()->t('URI'),
-                                                '$local' => DI::l10n()->t('Local'),
-                                                '$item' => $item]);
+                       '$upstream' => DI::l10n()->t('Upstream'),
+                       '$uri' => DI::l10n()->t('URI'),
+                       '$local' => DI::l10n()->t('Local'),
+                       '$item' => $item
+               ]);
                $mail->Body = mailstream_html_wrap($mail->Body);
                if (!$mail->Send()) {
                        throw new Exception($mail->ErrorInfo);

diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index 561262f13979bdcc39805665704ef2927779c7f0..fcb8feeaac417cced4d992e37be3a9b01b50c587 100644 (file)
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Name: Mastodon Custom Emojis
  * Description: Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images.
@@ -9,7 +8,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
@@ -78,7 +76,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 
        $api_url = $api_base_url . '/api/v1/custom_emojis';
 
-       $fetchResult = DI::httpClient()->fetchFull($api_url);
+       $fetchResult = DI::httpClient()->get($api_url);
 
        if ($fetchResult->isSuccess()) {
                $emojis_array = json_decode($fetchResult->getBodyString(), true);