From: Hank Grabowski <hankgrabowski@gmail.com>
Date: Tue, 28 Feb 2023 01:20:40 +0000 (-0500)
Subject: Merge branch 'develop' into mastodon-timeline-temporal-paging
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ffd3a3f8ce4f1b08d51e710fbb228ad23957f7a;p=friendica.git

Merge branch 'develop' into mastodon-timeline-temporal-paging
---

6ffd3a3f8ce4f1b08d51e710fbb228ad23957f7a
diff --cc src/Object/Api/Mastodon/Status.php
index 3fbd009a6e,2e7a0877d4..cefae5d212
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@@ -151,24 -151,9 +151,24 @@@ class Status extends BaseDataTransferOb
  		$this->emojis = [];
  		$this->card = $card->toArray() ?: null;
  		$this->poll = $poll;
- 		$this->friendica = new FriendicaExtension($item['title'], $counts->dislikes);
+ 		$this->friendica = $friendica;
  	}
  
 +	/**
 +	 * Returns the current created_at DateTime as an integer timestamp
 +	 * @return int
 +	 * @throws \Exception
 +	 */
 +	public function createdAtTimestamp(): int
 +	{
 +		$result = strtotime($this->created_at);
 +		if (!$result) {
 +			throw new \Exception('Unknown date-time format');
 +		}
 +
 +		return $result;
 +	}
 +
  	/**
  	 * Returns the current entity as an array
  	 *