From 246af224a9de1e3e352a05823cd2547719cf36e1 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Tue, 23 Mar 2021 15:40:15 +0900
Subject: [PATCH] =?UTF-8?q?=E6=9F=90=E3=81=AEAPI=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E4=BF=AE=E6=AD=A3=20see=20?=
 =?UTF-8?q?https://github.com/Kinoshita0623/MisskeyAndroidClient/issues/55?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jp/juggler/subwaytooter/api/entity/TootInstance.kt     | 1 +
 .../jp/juggler/subwaytooter/streaming/StreamConnection.kt  | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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 dcfbb44c..a7e04cf8 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
@@ -244,6 +244,7 @@ class TootInstance(parser: TootParser, src: JsonObject) {
 
         val MISSKEY_VERSION_11 = VersionString("11.0")
         val MISSKEY_VERSION_12 = VersionString("12.0")
+        val MISSKEY_VERSION_12_75_0 = VersionString("12.75.0")
 
         private val reDigits = """(\d+)""".asciiPattern()
 
diff --git a/app/src/main/java/jp/juggler/subwaytooter/streaming/StreamConnection.kt b/app/src/main/java/jp/juggler/subwaytooter/streaming/StreamConnection.kt
index 18fb7356..85792d0b 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/streaming/StreamConnection.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/streaming/StreamConnection.kt
@@ -475,12 +475,17 @@ class StreamConnection(
         val socket = socket.get()
         if (isDisposed.get() || socket == null) return
 
+        val type  = when{
+            acctGroup.ti.versionGE(TootInstance.MISSKEY_VERSION_12_75_0) -> "sr"
+            else -> "subNote"
+        }
+
         for (id in list) {
             if (id.isDefault) continue
             synchronized(capturedId) {
                 if (capturedId.contains(id)) return
                 try {
-                    if (socket.send("""{"type":"subNote","body": {"id":"$id"}}""")) {
+                    if (socket.send("""{"type":"$type","body":{"id":"$id"}}""")) {
                         capturedId.add(id)
                     } else {
                         log.w("capture failed.")