Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove duplicate strings from Filter.Action (#479) 

Simplify code that users `Filter.Action` by deserialising directly into
the type instead of storing / using strings throughout the API.
This commit is contained in:
Nik Clayton 2024-02-29 09:49:17 +01:00 committed by GitHub
parent af58de5a8f
commit fb66293713
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/pachli/StatusListActivity.kt
View File

@ -290,7 +290,7 @@ class StatusListActivity : BottomSheetActivity(), AppBarLayoutHost, ActionButton
mastodonApi.createFilter(
title = tagWithHash,
context = listOf(FilterContext.HOME),
filterAction = Filter.Action.WARN.action,
filterAction = Filter.Action.WARN,
expiresInSeconds = null,
).fold(
{ filter ->

6
app/src/main/java/app/pachli/components/filters/EditFilterViewModel.kt
View File

@ -87,7 +87,7 @@ class EditFilterViewModel @Inject constructor(val api: MastodonApi, val eventHub
val contexts = contexts.value
val title = title.value
val durationIndex = duration.value
val action = action.value.action
val action = action.value
return withContext(viewModelScope.coroutineContext) {
val success = originalFilter?.let { filter ->
@ -108,7 +108,7 @@ class EditFilterViewModel @Inject constructor(val api: MastodonApi, val eventHub
}
}
private suspend fun createFilter(title: String, contexts: List<FilterContext>, action: String, durationIndex: Int, context: Context): Boolean {
private suspend fun createFilter(title: String, contexts: List<FilterContext>, action: Filter.Action, durationIndex: Int, context: Context): Boolean {
val expiresInSeconds = EditFilterActivity.getSecondsForDurationIndex(durationIndex, context)
api.createFilter(
title = title,
@ -132,7 +132,7 @@ class EditFilterViewModel @Inject constructor(val api: MastodonApi, val eventHub
)
}
private suspend fun updateFilter(originalFilter: Filter, title: String, contexts: List<FilterContext>, action: String, durationIndex: Int, context: Context): Boolean {
private suspend fun updateFilter(originalFilter: Filter, title: String, contexts: List<FilterContext>, action: Filter.Action, durationIndex: Int, context: Context): Boolean {
val expiresInSeconds = EditFilterActivity.getSecondsForDurationIndex(durationIndex, context)
api.updateFilter(
id = originalFilter.id,

8
core/network/src/main/kotlin/app/pachli/core/network/model/Filter.kt
View File

@ -25,15 +25,15 @@ data class Filter(
// val statuses: List<FilterStatus>,
) : Parcelable {
@HasDefault
enum class Action(val action: String) {
enum class Action {
@Json(name = "none")
NONE("none"),
NONE,
@Json(name = "warn")
@Default
WARN("warn"),
WARN,
@Json(name = "hide")
HIDE("hide"),
HIDE,
}
}

4
core/network/src/main/kotlin/app/pachli/core/network/retrofit/MastodonApi.kt
View File

@ -642,7 +642,7 @@ interface MastodonApi {
suspend fun createFilter(
@Field("title") title: String,
@Field("context[]") context: List<FilterContext>,
@Field("filter_action") filterAction: String,
@Field("filter_action") filterAction: Filter.Action,
@Field("expires_in") expiresInSeconds: Int?,
): NetworkResult<Filter>
@ -652,7 +652,7 @@ interface MastodonApi {
@Path("id") id: String,
@Field("title") title: String? = null,
@Field("context[]") context: List<FilterContext>? = null,
@Field("filter_action") filterAction: String? = null,
@Field("filter_action") filterAction: Filter.Action? = null,
@Field("expires_in") expiresInSeconds: Int? = null,
): NetworkResult<Filter>