From 0284ed6bb3399bf9da40657810e873f207850703 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 3 Dec 2018 08:43:54 +0900
Subject: [PATCH] =?UTF-8?q?(Misskey)=E6=8A=95=E7=A8=BF=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E3=81=AE=E6=AE=8B=E3=82=8A=E6=96=87=E5=AD=97=E6=95=B0=E3=82=92?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=81=8B=E3=82=89=E8=AA=AD=E3=82=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jp/juggler/subwaytooter/ActPost.kt    | 13 ++++++++++---
 .../juggler/subwaytooter/api/entity/TootInstance.kt |  5 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
index 334938b6..5f96705a 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
@@ -983,8 +983,6 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 		when{
 			account == null || account.isPseudo -> {}
 
-			account.isMisskey ->return 3000
-
 			else->{
 				val info = account.instance
 
@@ -1000,7 +998,14 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 							var newInfo : TootInstance? = null
 							
 							override fun background(client : TootApiClient) : TootApiResult? {
-								val result = client.request("/api/v1/instance")
+								val result = if( account.isMisskey){
+									client.request(
+										"/api/meta",
+										account.putMisskeyApiToken().toPostRequestBuilder()
+									)
+								}else{
+									client.request("/api/v1/instance")
+								}
 								newInfo = TootParser(this@ActPost, account).instance(result?.jsonObject)
 								return result
 							}
@@ -1095,6 +1100,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 				)
 			}
 		}
+		updateTextCount()
 	}
 	
 	private fun performAccountChooser() {
@@ -1177,6 +1183,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
 		}
 		showVisibility()
 		showQuotedRenote()
+		updateTextCount()
 	}
 	
 	@SuppressLint("StaticFieldLeak")
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt
index 3cb15493..5c556102 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt
@@ -61,7 +61,6 @@ class TootInstance(parser : TootParser, src : JSONObject) {
 	
 	// インスタンスの種別
 	enum class InstanceType {
-		
 		Mastodon,
 		Pleroma,
 		Misskey
@@ -87,9 +86,9 @@ class TootInstance(parser : TootParser, src : JSONObject) {
 			this.decoded_version = VersionString(version)
 			this.stats = null
 			this.thumbnail = null
-			this.max_toot_chars = 1000
+			this.max_toot_chars = src.parseInt("maxNoteTextLength")
 			this.instanceType = InstanceType.Misskey
-			this.languages = ArrayList<String>().also{ it.add("?")}
+			this.languages = src.optJSONArray("langs")?.toStringArrayList() ?: ArrayList()
 			this.contact_account = null
 			
 		}else {