diff --git a/doc/FAQ.md b/doc/FAQ.md index 0819ab288..44679db64 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -200,6 +200,7 @@ Here is a list of known working clients: * [Tooot](https://tooot.app/) * [Tusky](https://tusky.app) * [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android)) +* [TwidereX](https://github.com/TwidereProject/TwidereX-Android) * [twitlatte](https://github.com/moko256/twitlatte) * [Yuito](https://github.com/accelforce/Yuito) diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md index be1605df9..d9f1742c8 100644 --- a/doc/de/FAQ.md +++ b/doc/de/FAQ.md @@ -212,6 +212,7 @@ Hier ist eine Liste von Clients, die speziell für Friendica entwickelt werden o * [Tooot](https://tooot.app/) * [Tusky](https://tusky.app) * [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android)) +* [TwidereX](https://github.com/TwidereProject/TwidereX-Android) * [twitlatte](https://github.com/moko256/twitlatte) * [Yuito](https://github.com/accelforce/Yuito) diff --git a/src/Object/Api/Mastodon/Token.php b/src/Object/Api/Mastodon/Token.php index 8bcb837ec..e69d6ca6e 100644 --- a/src/Object/Api/Mastodon/Token.php +++ b/src/Object/Api/Mastodon/Token.php @@ -22,12 +22,11 @@ namespace Friendica\Object\Api\Mastodon; use Friendica\BaseDataTransferObject; -use Friendica\Util\DateTimeFormat; /** - * Class Error + * Class Token * - * @see https://docs.joinmastodon.org/entities/error + * @see https://docs.joinmastodon.org/entities/token/ */ class Token extends BaseDataTransferObject { @@ -37,7 +36,7 @@ class Token extends BaseDataTransferObject protected $token_type; /** @var string */ protected $scope; - /** @var string (Datetime) */ + /** @var int (timestamp) */ protected $created_at; /** @@ -53,6 +52,6 @@ class Token extends BaseDataTransferObject $this->access_token = $access_token; $this->token_type = $token_type; $this->scope = $scope; - $this->created_at = DateTimeFormat::utc($created_at, DateTimeFormat::JSON); + $this->created_at = strtotime($created_at); } }