From: Art4 <art4@wlabs.de>
Date: Tue, 14 Jan 2025 09:16:06 +0000 (+0000)
Subject: Merge branch 'develop' into refactor-logger-class-with-logger-object
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=04161a0a5ff5393a33f398f12eb7a341e68e2dd8;p=friendica.git

Merge branch 'develop' into refactor-logger-class-with-logger-object
---

04161a0a5ff5393a33f398f12eb7a341e68e2dd8
diff --cc src/Module/Photo.php
index e176efbddf,c3582ee655..8843e82b0a
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@@ -107,12 -109,12 +108,12 @@@ class Photo extends BaseAp
  				throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo is not available.'));
  			}
  
 -			$photo = self::getPhotoById($id, $this->parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
 +			$photo = $this->getPhotoById($id, $this->parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
  		} else {
  			$photoid = pathinfo($this->parameters['name'], PATHINFO_FILENAME);
- 			$scale = 0;
+ 			$scale   = 0;
  			if (substr($photoid, -2, 1) == '-') {
- 				$scale = intval(substr($photoid, -1, 1));
+ 				$scale   = intval(substr($photoid, -1, 1));
  				$photoid = substr($photoid, 0, -2);
  			}
  
@@@ -171,10 -173,10 +172,10 @@@
  		$data = microtime(true) - $stamp;
  
  		if (empty($imgdata)) {
 -			Logger::warning('Invalid photo', ['id' => $photo['id']]);
 +			$this->logger->warning('Invalid photo', ['id' => $photo['id']]);
  			if (in_array($photo['backend-class'], [ExternalResource::NAME])) {
  				$reference = json_decode($photo['backend-ref'], true);
- 				$error = DI::l10n()->t('Invalid external resource with url %s.', $reference['url']);
+ 				$error     = DI::l10n()->t('Invalid external resource with url %s.', $reference['url']);
  			} else {
  				$error = DI::l10n()->t('Invalid photo with id %s.', $photo['id']);
  			}
@@@ -228,13 -230,13 +229,13 @@@
  		$output = microtime(true) - $stamp;
  
  		$total = microtime(true) - $totalstamp;
- 		$rest = $total - ($fetch + $data + $checksum + $output);
+ 		$rest  = $total - ($fetch + $data + $checksum + $output);
  
  		if (!is_null($scale) && ($scale < 4)) {
 -			Logger::debug('Performance:', [
 +			$this->logger->debug('Performance:', [
- 				'scale' => $scale, 'resource' => $photo['resource-id'],
- 				'total' => number_format($total, 3), 'fetch' => number_format($fetch, 3),
- 				'data' => number_format($data, 3), 'checksum' => number_format($checksum, 3),
+ 				'scale'  => $scale, 'resource' => $photo['resource-id'],
+ 				'total'  => number_format($total, 3), 'fetch' => number_format($fetch, 3),
+ 				'data'   => number_format($data, 3), 'checksum' => number_format($checksum, 3),
  				'output' => number_format($output, 3), 'rest' => number_format($rest, 3)
  			]);
  		}
@@@ -354,11 -356,11 +355,11 @@@
  					} else {
  						// Only update federated accounts that hadn't failed before and hadn't been updated recently
  						$update = in_array($contact['network'], Protocol::FEDERATED) && !$contact['failed']
- 							&& ((time() - strtotime($contact['updated']) > 86400));
+ 							&& ($contact['next-update'] < DateTimeFormat::utcNow());
  						if ($update) {
  							$curlResult = DI::httpClient()->head($url, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::IMAGE, HttpClientOptions::REQUEST => HttpClientRequest::CONTENTTYPE]);
- 							$update = !$curlResult->isSuccess() && ($curlResult->getReturnCode() == 404);
+ 							$update     = !$curlResult->isSuccess() && ($curlResult->getReturnCode() == 404);
 -							Logger::debug('Got return code for avatar', ['return code' => $curlResult->getReturnCode(), 'cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
 +							$this->logger->debug('Got return code for avatar', ['return code' => $curlResult->getReturnCode(), 'cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
  						}
  						if ($update) {
  							try {
diff --cc src/Worker/UpdateContact.php
index 059a8134c5,ded4679fe6..88f157ad51
--- a/src/Worker/UpdateContact.php
+++ b/src/Worker/UpdateContact.php
@@@ -51,6 -51,7 +51,7 @@@ class UpdateContac
  			return 0;
  		}
  
 -		Logger::debug('Update contact', ['id' => $contact_id]);
++		DI::logger()->debug('Update contact', ['id' => $contact_id]);
  		return Worker::add($run_parameters, 'UpdateContact', $contact_id);
  	}
  }