From 0a5904a0017f18c409240083d60598ed3c4ee45b Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 18 Jun 2021 03:21:38 +0000 Subject: [PATCH 1/4] API: "created_at" is timestamp --- src/Object/Api/Mastodon/Token.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Object/Api/Mastodon/Token.php b/src/Object/Api/Mastodon/Token.php index 8bcb837ec..0924e8bb2 100644 --- a/src/Object/Api/Mastodon/Token.php +++ b/src/Object/Api/Mastodon/Token.php @@ -37,7 +37,7 @@ class Token extends BaseDataTransferObject protected $token_type; /** @var string */ protected $scope; - /** @var string (Datetime) */ + /** @var int (timestamp) */ protected $created_at; /** @@ -53,6 +53,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); } } From 7d835ad79038fdc902c242eda10dde332eaa8ef3 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 18 Jun 2021 03:32:20 +0000 Subject: [PATCH 2/4] Unused "use" removed --- src/Object/Api/Mastodon/Token.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Object/Api/Mastodon/Token.php b/src/Object/Api/Mastodon/Token.php index 0924e8bb2..c6ba4076e 100644 --- a/src/Object/Api/Mastodon/Token.php +++ b/src/Object/Api/Mastodon/Token.php @@ -22,7 +22,6 @@ namespace Friendica\Object\Api\Mastodon; use Friendica\BaseDataTransferObject; -use Friendica\Util\DateTimeFormat; /** * Class Error From 09609c40a404a088bb736622e9b7757c55155f70 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 18 Jun 2021 05:50:52 +0000 Subject: [PATCH 3/4] Classname fixed --- src/Object/Api/Mastodon/Token.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Object/Api/Mastodon/Token.php b/src/Object/Api/Mastodon/Token.php index c6ba4076e..e69d6ca6e 100644 --- a/src/Object/Api/Mastodon/Token.php +++ b/src/Object/Api/Mastodon/Token.php @@ -24,9 +24,9 @@ namespace Friendica\Object\Api\Mastodon; use Friendica\BaseDataTransferObject; /** - * Class Error + * Class Token * - * @see https://docs.joinmastodon.org/entities/error + * @see https://docs.joinmastodon.org/entities/token/ */ class Token extends BaseDataTransferObject { From f344d56316f222ab8fe76b5f0e261c571ee74e04 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 18 Jun 2021 09:04:11 +0000 Subject: [PATCH 4/4] TwidereX added --- doc/FAQ.md | 1 + doc/de/FAQ.md | 1 + 2 files changed, 2 insertions(+) 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)