Bulk transmission for AP posts

[friendica.git] / src / Model / Profile.php

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 5c9c2db45c39318f5d76a415401d2568e038c051..5fbfc4ba5abe06881ab564dc189905cae582f37b 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -35,6 +35,8 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
@@ -362,7 +364,7 @@ class Profile
                }
 
                // Fetch the account type
-               $account_type = Contact::getAccountType($profile);
+               $account_type = Contact::getAccountType($profile['account-type']);
 
                if (!empty($profile['address']) || !empty($profile['location'])) {
                        $location = DI::l10n()->t('Location:');
@@ -477,12 +479,19 @@ class Profile
                return $o;
        }
 
-       public static function getBirthdays()
+       /**
+        * Returns the upcoming birthdays of contacts of the current user as HTML content
+        *
+        * @return string The upcoming birthdays (HTML)
+        *
+        * @throws HTTPException\InternalServerErrorException
+        * @throws HTTPException\ServiceUnavailableException
+        * @throws \ImagickException
+        */
+       public static function getBirthdays(): string
        {
-               $o = '';
-
                if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
-                       return $o;
+                       return '';
                }
 
                /*
@@ -494,8 +503,8 @@ class Profile
 
                $bd_short = DI::l10n()->t('F d');
 
-               $cachekey = 'get_birthdays:' . local_user();
-               $events   = DI::cache()->get($cachekey);
+               $cacheKey = 'get_birthdays:' . local_user();
+               $events   = DI::cache()->get($cacheKey);
                if (is_null($events)) {
                        $result = DBA::p(
                                "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
@@ -517,53 +526,53 @@ class Profile
                        );
                        if (DBA::isResult($result)) {
                                $events = DBA::toArray($result);
-                               DI::cache()->set($cachekey, $events, Duration::HOUR);
+                               DI::cache()->set($cacheKey, $events, Duration::HOUR);
                        }
                }
 
                $total      = 0;
-               $classtoday = '';
+               $classToday = '';
                $tpl_events = [];
                if (DBA::isResult($events)) {
                        $now  = strtotime('now');
                        $cids = [];
 
-                       $istoday = false;
-                       foreach ($events as $rr) {
-                               if (strlen($rr['name'])) {
-                                       $total ++;
+                       $isToday = false;
+                       foreach ($events as $event) {
+                               if (strlen($event['name'])) {
+                                       $total++;
                                }
-                               if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) {
-                                       $istoday = true;
+                               if ((strtotime($event['start'] . ' +00:00') < $now) && (strtotime($event['finish'] . ' +00:00') > $now)) {
+                                       $isToday = true;
                                }
                        }
-                       $classtoday = $istoday ? ' birthday-today ' : '';
+                       $classToday = $isToday ? ' birthday-today ' : '';
                        if ($total) {
-                               foreach ($events as $rr) {
-                                       if (!strlen($rr['name'])) {
+                               foreach ($events as $event) {
+                                       if (!strlen($event['name'])) {
                                                continue;
                                        }
 
                                        // avoid duplicates
-                                       if (in_array($rr['cid'], $cids)) {
+                                       if (in_array($event['cid'], $cids)) {
                                                continue;
                                        }
-                                       $cids[] = $rr['cid'];
+                                       $cids[] = $event['cid'];
 
-                                       $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
+                                       $today = (strtotime($event['start'] . ' +00:00') < $now) && (strtotime($event['finish'] . ' +00:00') > $now);
 
                                        $tpl_events[] = [
-                                               'id'    => $rr['id'],
-                                               'link'  => Contact::magicLinkById($rr['cid']),
-                                               'title' => $rr['name'],
-                                               'date'  => DI::l10n()->getDay(DateTimeFormat::local($rr['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '')
+                                               'id'    => $event['id'],
+                                               'link'  => Contact::magicLinkById($event['cid']),
+                                               'title' => $event['name'],
+                                               'date'  => DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '')
                                        ];
                                }
                        }
                }
                $tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
                return Renderer::replaceMacros($tpl, [
-                       '$classtoday'      => $classtoday,
+                       '$classtoday'      => $classToday,
                        '$count'           => $total,
                        '$event_reminders' => DI::l10n()->t('Birthday Reminders'),
                        '$event_title'     => DI::l10n()->t('Birthdays this week:'),
@@ -742,7 +751,7 @@ class Profile
                        $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
                        // We have to check if the remote server does understand /magic without invoking something
-                       $serverret = DI::httpClient()->get($basepath . '/magic');
+                       $serverret = DI::httpClient()->head($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::HTML]);
                        if ($serverret->isSuccess()) {
                                Logger::info('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path);
                                System::externalRedirect($magic_path);