Merge pull request #14345 from annando/stats

Statistics: Inbound/Outbound for more protocols

src/Module/Feed.php

@@ -22,6 +22,8 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Protocol;
+use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Feed as ProtocolFeed;
@@ -68,6 +70,8 @@ class Feed extends BaseModule
 			throw new HTTPException\UnauthorizedException($this->t('Access to this profile has been restricted.'));
 		}
 
+		Item::incrementOutbound(Protocol::FEED);
+
 		$feed = ProtocolFeed::atom($owner, $last_update, 10, $type);
 
 		$this->httpExit($feed, Response::TYPE_ATOM);

src/Module/Stats.php

@@ -23,6 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\L10n;
@@ -82,7 +83,7 @@ class Stats extends BaseModule
 		$statistics = [
 			'cron' => [
 				'lastExecution' => [
-					'datetime'  => DateTimeFormat::utc($this->keyValue->get('last_cron'), DateTimeFormat::JSON),
+					'datetime'  => date(DateTimeFormat::JSON, (int)$this->keyValue->get('last_cron')),
 					'timestamp' => (int)$this->keyValue->get('last_cron'),
 				],
 			],
@@ -123,12 +124,16 @@ class Stats extends BaseModule
 					Protocol::DFRN        => intval($this->keyValue->get('stats_packets_inbound_' . Protocol::DFRN) ?? 0),
 					Protocol::DIASPORA    => intval($this->keyValue->get('stats_packets_inbound_' . Protocol::DIASPORA) ?? 0),
 					Protocol::OSTATUS     => intval($this->keyValue->get('stats_packets_inbound_' . Protocol::OSTATUS) ?? 0),
+					Protocol::FEED        => intval($this->keyValue->get('stats_packets_inbound_' . Protocol::FEED) ?? 0),
+					Protocol::MAIL        => intval($this->keyValue->get('stats_packets_inbound_' . Protocol::MAIL) ?? 0),
 				],
 				'outbound' => [
 					Protocol::ACTIVITYPUB => intval($this->keyValue->get('stats_packets_outbound_' . Protocol::ACTIVITYPUB) ?? 0),
 					Protocol::DFRN        => intval($this->keyValue->get('stats_packets_outbound_' . Protocol::DFRN) ?? 0),
 					Protocol::DIASPORA    => intval($this->keyValue->get('stats_packets_outbound_' . Protocol::DIASPORA) ?? 0),
 					Protocol::OSTATUS     => intval($this->keyValue->get('stats_packets_outbound_' . Protocol::OSTATUS) ?? 0),
+					Protocol::FEED        => intval($this->keyValue->get('stats_packets_outbound_' . Protocol::FEED) ?? 0),
+					Protocol::MAIL        => intval($this->keyValue->get('stats_packets_outbound_' . Protocol::MAIL) ?? 0),
 				]
 			],
 			'reports' => [
@@ -141,6 +146,15 @@ class Stats extends BaseModule
 			]
 		];
 
+		if (Addon::isEnabled('bluesky')) {
+			$statistics['packets']['inbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::BLUESKY) ?? 0);
+			$statistics['packets']['outbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_outbound_' . Protocol::BLUESKY) ?? 0);
+		}
+		if (Addon::isEnabled('tumblr')) {
+			$statistics['packets']['inbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::TUMBLR) ?? 0);
+			$statistics['packets']['outbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_outbound_' . Protocol::TUMBLR) ?? 0);
+		}
+
 		$statistics = $this->getJobsPerPriority($statistics);
 
 		$this->jsonExit($statistics);

src/Protocol/Email.php

@@ -25,6 +25,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
+use Friendica\Core\Protocol;
 use Friendica\Model\Item;
 use Friendica\Util\Strings;
 use \IMAP\Connection;
@@ -47,6 +48,7 @@ class Email
 			return false;
 		}
 
+		Item::incrementInbound(Protocol::MAIL);
 		$mbox = @imap_open($mailbox, $username, $password);
 
 		$errors = imap_errors();
@@ -74,6 +76,7 @@ class Email
 			return [];
 		}
 
+		Item::incrementInbound(Protocol::MAIL);
 		$search1 = @imap_search($mbox, 'UNDELETED FROM "' . $email_addr . '"', SE_UID);
 		if (!$search1) {
 			$search1 = [];
@@ -81,6 +84,7 @@ class Email
 			Logger::debug("Found mails from ".$email_addr);
 		}
 
+		Item::incrementInbound(Protocol::MAIL);
 		$search2 = @imap_search($mbox, 'UNDELETED TO "' . $email_addr . '"', SE_UID);
 		if (!$search2) {
 			$search2 = [];
@@ -88,6 +92,7 @@ class Email
 			Logger::debug("Found mails to ".$email_addr);
 		}
 
+		Item::incrementInbound(Protocol::MAIL);
 		$search3 = @imap_search($mbox, 'UNDELETED CC "' . $email_addr . '"', SE_UID);
 		if (!$search3) {
 			$search3 = [];
@@ -136,7 +141,7 @@ class Email
 	public static function getMessage($mbox, int $uid, string $reply, array $item): array
 	{
 		$ret = $item;
-
+		Item::incrementInbound(Protocol::MAIL);
 		$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null);
 
 		if (!$struc) {
@@ -403,6 +408,7 @@ class Email
 		//$message = '<html><body>' . $html . '</body></html>';
 		//$message = html2plain($html);
 		Logger::notice('notifier: email delivery to ' . $addr);
+		Item::incrementOutbound(Protocol::MAIL);
 		return mail($addr, $subject, $body, $headers);
 	}
 

src/Worker/OnePoll.php

@@ -165,6 +165,7 @@ class OnePoll
 		}
 
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
+		Item::incrementInbound(Protocol::FEED);
 		$curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar, HttpClientOptions::REQUEST => HttpClientRequest::FEEDFETCHER]);
 		unlink($cookiejar);