Merge remote-tracking branch 'origin/master' into ios/20250710

Author: 110

gradle/libs.versions.toml

@@ -22,7 +22,7 @@ kotlinx-datetime = "0.7.1-0.6.x-compat"
 kotlinx-collections-immutable = "0.4.0"
 kotlinx-serialization = "1.9.0"
 coil3 = "3.3.0"
-ktorfit = "2.6.1"
+ktorfit = "2.6.3"
 ktor = "3.2.2"
 reorderable = "2.5.1"
 stately = "2.1.0"
@@ -46,7 +46,7 @@ desugar_jdk_libs = "2.1.5"
 firebase-bom = "34.0.0"
 google-services = "4.4.3"
 firebase-crashlytics = "3.0.5"
-materialKolor = "3.0.0"
+materialKolor = "3.0.1"
 room = "2.7.2"
 sqlite = "2.5.2"
 compose-multiplatform = "1.8.2"

settings.gradle.kts

@@ -3,7 +3,6 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
-        maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }
 }
 dependencyResolutionManagement {
@@ -12,8 +11,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven("https://jitpack.io")
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-        maven("https://oss.sonatype.org/content/repositories/snapshots/")
+        maven("https://central.sonatype.com/repository/maven-snapshots/")
         maven("https://androidx.dev/snapshots/builds/13617490/artifacts/repository")
     }
 }

shared/src/commonMain/kotlin/dev/dimension/flare/data/network/misskey/api/model/Antenna.kt

@@ -26,16 +26,17 @@ internal data class Antenna(
     @SerialName(value = "id") val id: kotlin.String,
     @SerialName(value = "createdAt") val createdAt: kotlin.String,
     @SerialName(value = "name") val name: kotlin.String,
-    @SerialName(value = "keywords") val keywords: kotlin.collections.List<kotlin.collections.List<kotlin.String>>,
-    @SerialName(value = "excludeKeywords") val excludeKeywords: kotlin.collections.List<kotlin.collections.List<kotlin.String>>,
-    @SerialName(value = "src") val src: Antenna.Src,
+    @SerialName(value = "keywords") val keywords: kotlin.collections.List<kotlin.collections.List<kotlin.String>> = emptyList(),
+    @SerialName(value = "excludeKeywords") val excludeKeywords: kotlin.collections.List<kotlin.collections.List<kotlin.String>> =
+        emptyList(),
+//    @SerialName(value = "src") val src: Antenna.Src,
     @SerialName(value = "userListId") val userListId: kotlin.String? = null,
-    @SerialName(value = "users") val users: kotlin.collections.List<kotlin.String>,
+    @SerialName(value = "users") val users: kotlin.collections.List<kotlin.String> = emptyList(),
     @SerialName(value = "caseSensitive") val caseSensitive: kotlin.Boolean = false,
-    @SerialName(value = "notify") val notify: kotlin.Boolean,
+    @SerialName(value = "notify") val notify: kotlin.Boolean = false,
     @SerialName(value = "withReplies") val withReplies: kotlin.Boolean = false,
-    @SerialName(value = "withFile") val withFile: kotlin.Boolean,
-    @SerialName(value = "isActive") val isActive: kotlin.Boolean,
+    @SerialName(value = "withFile") val withFile: kotlin.Boolean = false,
+    @SerialName(value = "isActive") val isActive: kotlin.Boolean = false,
     @SerialName(value = "hasUnreadNote") val hasUnreadNote: kotlin.Boolean = false,
 ) {
     /**

shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt

@@ -108,7 +108,7 @@ internal fun TopLevel.renderNotifications(
                         else -> UiTimeline.TopMessage.Icon.Info
                     }
                 val tweet =
-                    notificationTweet?.lastOrNull()?.let {
+                    notificationTweet?.firstOrNull()?.let {
                         Tweet(
                             restId = it.idStr,
                             core =