Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

don't rehide filtered posts on interaction (#4130) 

closes #4125
This commit is contained in:
Konrad Pozniak 2023-12-05 19:29:01 +01:00 committed by GitHub
parent e1f2d639aa
commit 6463e99c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
View File

@ -22,7 +22,6 @@ import androidx.room.OnConflictStrategy.Companion.REPLACE
import androidx.room.Query import androidx.room.Query
import androidx.room.TypeConverters import androidx.room.TypeConverters
import com.google.gson.Gson import com.google.gson.Gson
import com.keylesspalace.tusky.entity.FilterResult
import com.keylesspalace.tusky.entity.Status import com.keylesspalace.tusky.entity.Status
@Dao @Dao
@ -113,8 +112,7 @@ AND
muted = status.muted, muted = status.muted,
pinned = status.pinned ?: false, pinned = status.pinned ?: false,
card = gson.toJson(status.card), card = gson.toJson(status.card),
language = status.language, language = status.language
filtered = status.filtered
) )
} }
@ -139,8 +137,7 @@ AND
muted = :muted, muted = :muted,
pinned = :pinned, pinned = :pinned,
card = :card, card = :card,
language = :language, language = :language
filtered = :filtered
WHERE timelineUserId = :accountId AND (serverId = :statusId OR reblogServerId = :statusId)""" WHERE timelineUserId = :accountId AND (serverId = :statusId OR reblogServerId = :statusId)"""
) )
@TypeConverters(Converters::class) @TypeConverters(Converters::class)
@ -166,8 +163,7 @@ AND
muted: Boolean?, muted: Boolean?,
pinned: Boolean, pinned: Boolean,
card: String?, card: String?,
language: String?, language: String?
filtered: List<FilterResult>?
) )
@Query( @Query(