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.")