Improve Akkoma support for bubble timeline and feature detection

Author: ihateblueb

shared/src/commonMain/kotlin/site/remlit/snowdrop/api/timeline/getBubbleTimelike.kt

@@ -0,0 +1,54 @@
+package site.remlit.snowdrop.api.timeline
+
+import com.russhwolf.settings.ExperimentalSettingsApi
+import io.ktor.client.request.get
+import io.ktor.client.request.header
+import io.ktor.client.request.parameter
+import site.remlit.snowdrop.model.ApiResponse
+import site.remlit.snowdrop.model.Status
+import site.remlit.snowdrop.util.config.endOfRequest
+import site.remlit.snowdrop.util.getCurrentAccountHost
+import site.remlit.snowdrop.util.getCurrentAccountId
+import site.remlit.snowdrop.util.config.httpClient
+import site.remlit.snowdrop.util.getFeature
+import site.remlit.snowdrop.util.safeApiRequest
+import site.remlit.snowdrop.util.settings
+
+@OptIn(ExperimentalSettingsApi::class)
+suspend fun getBubbleTimeline(
+	limit: Int = 30,
+
+	maxId: String? = null,
+	sinceId: String? = null,
+	offset: Int? = null,
+	minId: String? = null,
+
+	local: Boolean? = null,
+	remote: Boolean? = null,
+	onlyMedia: Boolean? = null
+): ApiResponse<List<Status>> = safeApiRequest {
+	if (getFeature("bubble_timeline_chuckya")) {
+		return getPublicTimeline(maxId = maxId, minId = minId, sinceId = sinceId, bubble = true)
+	}
+
+	val accountId = getCurrentAccountId()
+	val host = getCurrentAccountHost()
+	val token = settings.getString("account_${accountId}_token", "")
+
+	val req = httpClient.get("https://$host/api/v1/timelines/bubble") {
+		header("Authorization", "Bearer $token")
+
+		parameter("limit", limit)
+
+		if (maxId != null) parameter("max_id", maxId)
+		if (sinceId != null) parameter("since_id", sinceId)
+		if (offset != null) parameter("offset", offset)
+		if (minId != null) parameter("min_id", minId)
+
+		if (local != null) parameter("local", local)
+		if (remote != null) parameter("remote", remote)
+		if (onlyMedia != null) parameter("only_media", onlyMedia)
+	}
+
+	endOfRequest(req)
+}

shared/src/commonMain/kotlin/site/remlit/snowdrop/model/InstanceV1.kt

@@ -26,7 +26,7 @@ data class InstanceV1(
 	val urls: Urls? = null,
 	val configuration: Configuration? = null,
 
-	val rules: List<Rule>,
+	val rules: List<Rule> = emptyList(),
 	val thumbnail: String? = null
 ) {
 	@Serializable

shared/src/commonMain/kotlin/site/remlit/snowdrop/util/Features.kt

@@ -69,18 +69,23 @@ suspend fun determineFeatures() {
 	) putFeature("reactions", true)
 	else putFeature("reactions", false)
 
+	// sharkey has a bubble tl but its unlikely it has good mastoapi support
 	if (
-		software == Software.Akkoma ||
 		software == Software.Chuckya ||
 		software == Software.IceshrimpJS ||
 		software == Software.IceshrimpNET
 	) putFeature("bubble_timeline", true)
 	else putFeature("bubble_timeline", false)
 
+	// and akkoma has a different route!
+	if (
+		software == Software.Akkoma
+	) putFeature("bubble_timeline_akkoma", true)
+	else putFeature("bubble_timeline_akkoma", false)
+
 	if (
 		software == Software.IceshrimpNET
-	)
-	putFeature("biting", true)
+	) putFeature("biting", true)
 	else putFeature("biting", false)
 
 	determiningFeatures = false

shared/src/commonMain/kotlin/site/remlit/snowdrop/view/TimelineView.kt

@@ -34,6 +34,7 @@ import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import site.remlit.snowdrop.SettingsRoute
 import site.remlit.snowdrop.api.getBookmarks
+import site.remlit.snowdrop.api.timeline.getBubbleTimeline
 import site.remlit.snowdrop.api.timeline.getHomeTimeline
 import site.remlit.snowdrop.api.timeline.getPublicTimeline
 import site.remlit.snowdrop.component.RefreshableTimeline
@@ -97,7 +98,8 @@ fun TimelineView() = ViewSurface {
 			return when (timelineType) {
 				0 -> getHomeTimeline(maxId = maxId, minId = minId, sinceId = sinceId)
 				1 -> getPublicTimeline(maxId = maxId, minId = minId, sinceId = sinceId, local = true)
-				2 -> getPublicTimeline(maxId = maxId, minId = minId, sinceId = sinceId, bubble = true)
+				2 -> if (getFeature("bubble_timeline_akkoma")) getBubbleTimeline(maxId = maxId, minId = minId, sinceId = sinceId)
+					else getPublicTimeline(maxId = maxId, minId = minId, sinceId = sinceId, bubble = true)
 				3 -> getPublicTimeline(maxId = maxId, minId = minId, sinceId = sinceId, remote = true)
 
 				else -> getBookmarks(maxId = maxId, minId = minId, sinceId = sinceId) // else 4
@@ -132,7 +134,7 @@ fun TimelineView() = ViewSurface {
 					text = { Text(stringResource(Res.string.local)) },
 					onClick = { blockingSettings.putInt("timeline", 1); timelinePickerOpen = false }
 				)
-				if (getFeature("bubble_timeline"))
+				if (getFeature("bubble_timeline") || getFeature("bubble_timeline_akkoma"))
 					DropdownMenuItem(
 						leadingIcon = { RenderTimelineTypeIcon(2) },
 						text = { Text(stringResource(Res.string.bubble)) },