From cbf6d80fed43c7ddc0a3f9c9e6a86e51870a9760 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 29 Nov 2023 19:37:16 +0100 Subject: [PATCH 1/2] don't rehide filtered posts on interaction --- .../main/java/com/keylesspalace/tusky/db/TimelineDao.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt index 621851bd56..74210ed221 100644 --- a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt +++ b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt @@ -113,8 +113,7 @@ AND muted = status.muted, pinned = status.pinned ?: false, card = gson.toJson(status.card), - language = status.language, - filtered = status.filtered + language = status.language ) } @@ -139,8 +138,7 @@ AND muted = :muted, pinned = :pinned, card = :card, - language = :language, - filtered = :filtered + language = :language WHERE timelineUserId = :accountId AND (serverId = :statusId OR reblogServerId = :statusId)""" ) @TypeConverters(Converters::class) @@ -166,8 +164,7 @@ AND muted: Boolean?, pinned: Boolean, card: String?, - language: String?, - filtered: List? + language: String? ) @Query( From fd3cd7e09c5918c5cf69cd634405fdfd855c7337 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 29 Nov 2023 20:29:24 +0100 Subject: [PATCH 2/2] remove unused import --- app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt index 74210ed221..2d9d0bac82 100644 --- a/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt +++ b/app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt @@ -22,7 +22,6 @@ import androidx.room.OnConflictStrategy.Companion.REPLACE import androidx.room.Query import androidx.room.TypeConverters import com.google.gson.Gson -import com.keylesspalace.tusky.entity.FilterResult import com.keylesspalace.tusky.entity.Status @Dao