]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into mastodon-timeline-temporal-paging
authorHank Grabowski <hankgrabowski@gmail.com>
Tue, 28 Feb 2023 01:20:40 +0000 (20:20 -0500)
committerHank Grabowski <hankgrabowski@gmail.com>
Tue, 28 Feb 2023 01:20:40 +0000 (20:20 -0500)
1  2 
src/Object/Api/Mastodon/Status.php

index 3fbd009a6efb74d419706e5b3d84fac57f989506,2e7a0877d46a32b35502f25271c80e36dc840ee5..cefae5d2129cbdb8574c977fcc63c128800d0053
@@@ -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
         *