move Html parsing to ViewData (#2414)

* move Html parsing to ViewData * refactor reports to use viewdata * cleanup code * refactor conversations * fix getEditableText * rename StatusParsingHelper * fix tests * commit db schema file * add file header * rename helper function to parseAsMastodonHtml * order imports correctly * move mapping off main thread to default dispatcher * fix ktlint
2022-04-15 13:20:27 +02:00 · 2022-04-15 13:20:27 +02:00 · 3e849244f9
commit 3e849244f9
parent ffbc4b6403
34 changed files with 1232 additions and 500 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationAdapter.kt
@ -26,7 +26,7 @@ import com.keylesspalace.tusky.util.StatusDisplayOptions
 class ConversationAdapter(
    private val statusDisplayOptions: StatusDisplayOptions,
    private val listener: StatusActionListener
-) : PagingDataAdapter<ConversationEntity, ConversationViewHolder>(CONVERSATION_COMPARATOR) {
+) : PagingDataAdapter<ConversationViewData, ConversationViewHolder>(CONVERSATION_COMPARATOR) {

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ConversationViewHolder {
        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_conversation, parent, false)
@ -37,17 +37,13 @@ class ConversationAdapter(
        holder.setupWithConversation(getItem(position))
    }

-    fun item(position: Int): ConversationEntity? {
-        return getItem(position)
-    }
-
    companion object {
-        val CONVERSATION_COMPARATOR = object : DiffUtil.ItemCallback<ConversationEntity>() {
-            override fun areItemsTheSame(oldItem: ConversationEntity, newItem: ConversationEntity): Boolean {
+        val CONVERSATION_COMPARATOR = object : DiffUtil.ItemCallback<ConversationViewData>() {
+            override fun areItemsTheSame(oldItem: ConversationViewData, newItem: ConversationViewData): Boolean {
                return oldItem.id == newItem.id
            }

-            override fun areContentsTheSame(oldItem: ConversationEntity, newItem: ConversationEntity): Boolean {
+            override fun areContentsTheSame(oldItem: ConversationViewData, newItem: ConversationViewData): Boolean {
                return oldItem == newItem
            }
        }
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
@ -15,7 +15,6 @@

 package com.keylesspalace.tusky.components.conversation

-import android.text.Spanned
 import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.TypeConverters
@ -27,7 +26,7 @@ import com.keylesspalace.tusky.entity.HashTag
 import com.keylesspalace.tusky.entity.Poll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.entity.TimelineAccount
-import com.keylesspalace.tusky.util.shouldTrimStatus
+import com.keylesspalace.tusky.viewdata.StatusViewData
 import java.util.Date

@Entity(primaryKeys = ["id", "accountId"])
@ -38,7 +37,16 @@ data class ConversationEntity(
    val accounts: List<ConversationAccountEntity>,
    val unread: Boolean,
    @Embedded(prefix = "s_") val lastStatus: ConversationStatusEntity
-)
+) {
+    fun toViewData(): ConversationViewData {
+        return ConversationViewData(
+            id = id,
+            accounts = accounts,
+            unread = unread,
+            lastStatus = lastStatus.toViewData()
+        )
+    }
+}

 data class ConversationAccountEntity(
    val id: String,
@ -67,7 +75,7 @@ data class ConversationStatusEntity(
    val inReplyToId: String?,
    val inReplyToAccountId: String?,
    val account: ConversationAccountEntity,
-    val content: Spanned,
+    val content: String,
    val createdAt: Date,
    val emojis: List<Emoji>,
    val favouritesCount: Int,
@ -80,95 +88,43 @@ data class ConversationStatusEntity(
    val tags: List<HashTag>?,
    val showingHiddenContent: Boolean,
    val expanded: Boolean,
-    val collapsible: Boolean,
    val collapsed: Boolean,
    val muted: Boolean,
    val poll: Poll?
 ) {
-    /** its necessary to override this because Spanned.equals does not work as expected  */
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false

-        other as ConversationStatusEntity
-
-        if (id != other.id) return false
-        if (url != other.url) return false
-        if (inReplyToId != other.inReplyToId) return false
-        if (inReplyToAccountId != other.inReplyToAccountId) return false
-        if (account != other.account) return false
-        if (content.toString() != other.content.toString()) return false
-        if (createdAt != other.createdAt) return false
-        if (emojis != other.emojis) return false
-        if (favouritesCount != other.favouritesCount) return false
-        if (favourited != other.favourited) return false
-        if (sensitive != other.sensitive) return false
-        if (spoilerText != other.spoilerText) return false
-        if (attachments != other.attachments) return false
-        if (mentions != other.mentions) return false
-        if (tags != other.tags) return false
-        if (showingHiddenContent != other.showingHiddenContent) return false
-        if (expanded != other.expanded) return false
-        if (collapsible != other.collapsible) return false
-        if (collapsed != other.collapsed) return false
-        if (muted != other.muted) return false
-        if (poll != other.poll) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id.hashCode()
-        result = 31 * result + (url?.hashCode() ?: 0)
-        result = 31 * result + (inReplyToId?.hashCode() ?: 0)
-        result = 31 * result + (inReplyToAccountId?.hashCode() ?: 0)
-        result = 31 * result + account.hashCode()
-        result = 31 * result + content.toString().hashCode()
-        result = 31 * result + createdAt.hashCode()
-        result = 31 * result + emojis.hashCode()
-        result = 31 * result + favouritesCount
-        result = 31 * result + favourited.hashCode()
-        result = 31 * result + sensitive.hashCode()
-        result = 31 * result + spoilerText.hashCode()
-        result = 31 * result + attachments.hashCode()
-        result = 31 * result + mentions.hashCode()
-        result = 31 * result + tags.hashCode()
-        result = 31 * result + showingHiddenContent.hashCode()
-        result = 31 * result + expanded.hashCode()
-        result = 31 * result + collapsible.hashCode()
-        result = 31 * result + collapsed.hashCode()
-        result = 31 * result + muted.hashCode()
-        result = 31 * result + poll.hashCode()
-        return result
-    }
-
-    fun toStatus(): Status {
-        return Status(
-            id = id,
-            url = url,
-            account = account.toAccount(),
-            inReplyToId = inReplyToId,
-            inReplyToAccountId = inReplyToAccountId,
-            content = content,
-            reblog = null,
-            createdAt = createdAt,
-            emojis = emojis,
-            reblogsCount = 0,
-            favouritesCount = favouritesCount,
-            reblogged = false,
-            favourited = favourited,
-            bookmarked = bookmarked,
-            sensitive = sensitive,
-            spoilerText = spoilerText,
-            visibility = Status.Visibility.DIRECT,
-            attachments = attachments,
-            mentions = mentions,
-            tags = tags,
-            application = null,
-            pinned = false,
-            muted = muted,
-            poll = poll,
-            card = null
+    fun toViewData(): StatusViewData.Concrete {
+        return StatusViewData.Concrete(
+            status = Status(
+                id = id,
+                url = url,
+                account = account.toAccount(),
+                inReplyToId = inReplyToId,
+                inReplyToAccountId = inReplyToAccountId,
+                content = content,
+                reblog = null,
+                createdAt = createdAt,
+                emojis = emojis,
+                reblogsCount = 0,
+                favouritesCount = favouritesCount,
+                reblogged = false,
+                favourited = favourited,
+                bookmarked = bookmarked,
+                sensitive = sensitive,
+                spoilerText = spoilerText,
+                visibility = Status.Visibility.DIRECT,
+                attachments = attachments,
+                mentions = mentions,
+                tags = tags,
+                application = null,
+                pinned = false,
+                muted = muted,
+                poll = poll,
+                card = null
+            ),
+            isExpanded = expanded,
+            isShowingContent = showingHiddenContent,
+            isCollapsed = collapsed
        )
    }
 }
@ -202,7 +158,6 @@ fun Status.toEntity() =
        tags = tags,
        showingHiddenContent = false,
        expanded = false,
-        collapsible = shouldTrimStatus(content),
        collapsed = true,
        muted = muted ?: false,
        poll = poll
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewData.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewData.kt
@ -0,0 +1,87 @@
+/* Copyright 2022 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.components.conversation
+
+import com.keylesspalace.tusky.entity.Poll
+import com.keylesspalace.tusky.viewdata.StatusViewData
+
+data class ConversationViewData(
+    val id: String,
+    val accounts: List<ConversationAccountEntity>,
+    val unread: Boolean,
+    val lastStatus: StatusViewData.Concrete
+) {
+    fun toEntity(
+        accountId: Long,
+        favourited: Boolean = lastStatus.status.favourited,
+        bookmarked: Boolean = lastStatus.status.bookmarked,
+        muted: Boolean = lastStatus.status.muted ?: false,
+        poll: Poll? = lastStatus.status.poll,
+        expanded: Boolean = lastStatus.isExpanded,
+        collapsed: Boolean = lastStatus.isCollapsed,
+        showingHiddenContent: Boolean = lastStatus.isShowingContent
+    ): ConversationEntity {
+        return ConversationEntity(
+            accountId = accountId,
+            id = id,
+            accounts = accounts,
+            unread = unread,
+            lastStatus = lastStatus.toConversationStatusEntity(
+                favourited = favourited,
+                bookmarked = bookmarked,
+                muted = muted,
+                poll = poll,
+                expanded = expanded,
+                collapsed = collapsed,
+                showingHiddenContent = showingHiddenContent
+            )
+        )
+    }
+}
+
+fun StatusViewData.Concrete.toConversationStatusEntity(
+    favourited: Boolean = status.favourited,
+    bookmarked: Boolean = status.bookmarked,
+    muted: Boolean = status.muted ?: false,
+    poll: Poll? = status.poll,
+    expanded: Boolean = isExpanded,
+    collapsed: Boolean = isCollapsed,
+    showingHiddenContent: Boolean = isShowingContent
+): ConversationStatusEntity {
+    return ConversationStatusEntity(
+        id = id,
+        url = status.url,
+        inReplyToId = status.inReplyToId,
+        inReplyToAccountId = status.inReplyToAccountId,
+        account = status.account.toEntity(),
+        content = status.content,
+        createdAt = status.createdAt,
+        emojis = status.emojis,
+        favouritesCount = status.favouritesCount,
+        favourited = favourited,
+        bookmarked = bookmarked,
+        sensitive = status.sensitive,
+        spoilerText = status.spoilerText,
+        attachments = status.attachments,
+        mentions = status.mentions,
+        tags = status.tags,
+        showingHiddenContent = showingHiddenContent,
+        expanded = expanded,
+        collapsed = collapsed,
+        muted = muted,
+        poll = poll
+    )
+}
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
@ -28,11 +28,14 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.adapter.StatusBaseViewHolder;
 import com.keylesspalace.tusky.entity.Attachment;
+import com.keylesspalace.tusky.entity.Status;
+import com.keylesspalace.tusky.entity.TimelineAccount;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.util.ImageLoadingHelper;
 import com.keylesspalace.tusky.util.SmartLengthInputFilter;
 import com.keylesspalace.tusky.util.StatusDisplayOptions;
 import com.keylesspalace.tusky.viewdata.PollViewDataKt;
+import com.keylesspalace.tusky.viewdata.StatusViewData;

 import java.util.List;

@ -69,11 +72,12 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
        return context.getResources().getDimensionPixelSize(R.dimen.status_media_preview_height);
    }

-    void setupWithConversation(ConversationEntity conversation) {
-        ConversationStatusEntity status = conversation.getLastStatus();
-        ConversationAccountEntity account = status.getAccount();
+    void setupWithConversation(ConversationViewData conversation) {
+        StatusViewData.Concrete statusViewData = conversation.getLastStatus();
+        Status status = statusViewData.getStatus();
+        TimelineAccount account = status.getAccount();

-        setupCollapsedState(status.getCollapsible(), status.getCollapsed(), status.getExpanded(), status.getSpoilerText(), listener);
+        setupCollapsedState(statusViewData.isCollapsible(), statusViewData.isCollapsed(), statusViewData.isExpanded(), statusViewData.getSpoilerText(), listener);

        setDisplayName(account.getDisplayName(), account.getEmojis(), statusDisplayOptions);
        setUsername(account.getUsername());
@ -84,7 +88,7 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
        List<Attachment> attachments = status.getAttachments();
        boolean sensitive = status.getSensitive();
        if (statusDisplayOptions.mediaPreviewEnabled() && hasPreviewableAttachment(attachments)) {
-            setMediaPreviews(attachments, sensitive, listener, status.getShowingHiddenContent(),
+            setMediaPreviews(attachments, sensitive, listener, statusViewData.isShowingContent(),
                    statusDisplayOptions.useBlurhash());

            if (attachments.size() == 0) {
@ -95,7 +99,7 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
                mediaLabel.setVisibility(View.GONE);
            }
        } else {
-            setMediaLabel(attachments, sensitive, listener, status.getShowingHiddenContent());
+            setMediaLabel(attachments, sensitive, listener, statusViewData.isShowingContent());
            // Hide all unused views.
            mediaPreviews[0].setVisibility(View.GONE);
            mediaPreviews[1].setVisibility(View.GONE);
@ -104,10 +108,10 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
            hideSensitiveMediaWarning();
        }

-        setupButtons(listener, account.getId(), status.getContent().toString(),
+        setupButtons(listener, account.getId(), statusViewData.getContent().toString(),
                statusDisplayOptions);

-        setSpoilerAndContent(status.getExpanded(), status.getContent(), status.getSpoilerText(),
+        setSpoilerAndContent(statusViewData.isExpanded(), statusViewData.getContent(), status.getSpoilerText(),
                status.getMentions(), status.getTags(), status.getEmojis(),
                PollViewDataKt.toViewData(status.getPoll()), statusDisplayOptions, listener);

--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
@ -153,24 +153,24 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
    }

    override fun onFavourite(favourite: Boolean, position: Int) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->
            viewModel.favourite(favourite, conversation)
        }
    }

    override fun onBookmark(favourite: Boolean, position: Int) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->
            viewModel.bookmark(favourite, conversation)
        }
    }

    override fun onMore(view: View, position: Int) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->

            val popup = PopupMenu(requireContext(), view)
            popup.inflate(R.menu.conversation_more)

-            if (conversation.lastStatus.muted) {
+            if (conversation.lastStatus.status.muted == true) {
                popup.menu.removeItem(R.id.status_mute_conversation)
            } else {
                popup.menu.removeItem(R.id.status_unmute_conversation)
@ -189,14 +189,14 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
    }

    override fun onViewMedia(position: Int, attachmentIndex: Int, view: View?) {
-        adapter.item(position)?.let { conversation ->
-            viewMedia(attachmentIndex, AttachmentViewData.list(conversation.lastStatus.toStatus()), view)
+        adapter.peek(position)?.let { conversation ->
+            viewMedia(attachmentIndex, AttachmentViewData.list(conversation.lastStatus.status), view)
        }
    }

    override fun onViewThread(position: Int) {
-        adapter.item(position)?.let { conversation ->
-            viewThread(conversation.lastStatus.id, conversation.lastStatus.url)
+        adapter.peek(position)?.let { conversation ->
+            viewThread(conversation.lastStatus.id, conversation.lastStatus.status.url)
        }
    }

@ -205,13 +205,13 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
    }

    override fun onExpandedChange(expanded: Boolean, position: Int) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->
            viewModel.expandHiddenStatus(expanded, conversation)
        }
    }

    override fun onContentHiddenChange(isShowing: Boolean, position: Int) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->
            viewModel.showContent(isShowing, conversation)
        }
    }
@ -221,7 +221,7 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
    }

    override fun onContentCollapsedChange(isCollapsed: Boolean, position: Int) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->
            viewModel.collapseLongStatus(isCollapsed, conversation)
        }
    }
@ -241,12 +241,12 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
    }

    override fun onReply(position: Int) {
-        adapter.item(position)?.let { conversation ->
-            reply(conversation.lastStatus.toStatus())
+        adapter.peek(position)?.let { conversation ->
+            reply(conversation.lastStatus.status)
        }
    }

-    private fun deleteConversation(conversation: ConversationEntity) {
+    private fun deleteConversation(conversation: ConversationViewData) {
        AlertDialog.Builder(requireContext())
            .setMessage(R.string.dialog_delete_conversation_warning)
            .setNegativeButton(android.R.string.cancel, null)
@ -268,7 +268,7 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
    }

    override fun onVoteInPoll(position: Int, choices: MutableList<Int>) {
-        adapter.item(position)?.let { conversation ->
+        adapter.peek(position)?.let { conversation ->
            viewModel.voteInPoll(choices, conversation)
        }
    }
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
@ -16,16 +16,18 @@
 package com.keylesspalace.tusky.components.conversation

 import android.util.Log
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
+import androidx.paging.map
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.network.TimelineCases
-import com.keylesspalace.tusky.util.RxAwareViewModel
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.rx3.await
 import javax.inject.Inject
@ -35,7 +37,7 @@ class ConversationsViewModel @Inject constructor(
    private val database: AppDatabase,
    private val accountManager: AccountManager,
    private val api: MastodonApi
-) : RxAwareViewModel() {
+) : ViewModel() {

    @OptIn(ExperimentalPagingApi::class)
    val conversationFlow = Pager(
@ -44,104 +46,117 @@ class ConversationsViewModel @Inject constructor(
        pagingSourceFactory = { database.conversationDao().conversationsForAccount(accountManager.activeAccount!!.id) }
    )
        .flow
+        .map { pagingData ->
+            pagingData.map { conversation -> conversation.toViewData() }
+        }
        .cachedIn(viewModelScope)

-    fun favourite(favourite: Boolean, conversation: ConversationEntity) {
+    fun favourite(favourite: Boolean, conversation: ConversationViewData) {
        viewModelScope.launch {
            try {
                timelineCases.favourite(conversation.lastStatus.id, favourite).await()

-                val newConversation = conversation.copy(
-                    lastStatus = conversation.lastStatus.copy(favourited = favourite)
+                val newConversation = conversation.toEntity(
+                    accountId = accountManager.activeAccount!!.id,
+                    favourited = favourite
                )

-                database.conversationDao().insert(newConversation)
+                saveConversationToDb(newConversation)
            } catch (e: Exception) {
                Log.w(TAG, "failed to favourite status", e)
            }
        }
    }

-    fun bookmark(bookmark: Boolean, conversation: ConversationEntity) {
+    fun bookmark(bookmark: Boolean, conversation: ConversationViewData) {
        viewModelScope.launch {
            try {
                timelineCases.bookmark(conversation.lastStatus.id, bookmark).await()

-                val newConversation = conversation.copy(
-                    lastStatus = conversation.lastStatus.copy(bookmarked = bookmark)
+                val newConversation = conversation.toEntity(
+                    accountId = accountManager.activeAccount!!.id,
+                    bookmarked = bookmark
                )

-                database.conversationDao().insert(newConversation)
+                saveConversationToDb(newConversation)
            } catch (e: Exception) {
                Log.w(TAG, "failed to bookmark status", e)
            }
        }
    }

-    fun voteInPoll(choices: List<Int>, conversation: ConversationEntity) {
+    fun voteInPoll(choices: List<Int>, conversation: ConversationViewData) {
        viewModelScope.launch {
            try {
-                val poll = timelineCases.voteInPoll(conversation.lastStatus.id, conversation.lastStatus.poll?.id!!, choices).await()
-                val newConversation = conversation.copy(
-                    lastStatus = conversation.lastStatus.copy(poll = poll)
+                val poll = timelineCases.voteInPoll(conversation.lastStatus.id, conversation.lastStatus.status.poll?.id!!, choices).await()
+                val newConversation = conversation.toEntity(
+                    accountId = accountManager.activeAccount!!.id,
+                    poll = poll
                )

-                database.conversationDao().insert(newConversation)
+                saveConversationToDb(newConversation)
            } catch (e: Exception) {
                Log.w(TAG, "failed to vote in poll", e)
            }
        }
    }

-    fun expandHiddenStatus(expanded: Boolean, conversation: ConversationEntity) {
+    fun expandHiddenStatus(expanded: Boolean, conversation: ConversationViewData) {
        viewModelScope.launch {
-            val newConversation = conversation.copy(
-                lastStatus = conversation.lastStatus.copy(expanded = expanded)
+            val newConversation = conversation.toEntity(
+                accountId = accountManager.activeAccount!!.id,
+                expanded = expanded
            )
            saveConversationToDb(newConversation)
        }
    }

-    fun collapseLongStatus(collapsed: Boolean, conversation: ConversationEntity) {
+    fun collapseLongStatus(collapsed: Boolean, conversation: ConversationViewData) {
        viewModelScope.launch {
-            val newConversation = conversation.copy(
-                lastStatus = conversation.lastStatus.copy(collapsed = collapsed)
+            val newConversation = conversation.toEntity(
+                accountId = accountManager.activeAccount!!.id,
+                collapsed = collapsed
            )
            saveConversationToDb(newConversation)
        }
    }

-    fun showContent(showing: Boolean, conversation: ConversationEntity) {
+    fun showContent(showing: Boolean, conversation: ConversationViewData) {
        viewModelScope.launch {
-            val newConversation = conversation.copy(
-                lastStatus = conversation.lastStatus.copy(showingHiddenContent = showing)
+            val newConversation = conversation.toEntity(
+                accountId = accountManager.activeAccount!!.id,
+                showingHiddenContent = showing
            )
            saveConversationToDb(newConversation)
        }
    }

-    fun remove(conversation: ConversationEntity) {
+    fun remove(conversation: ConversationViewData) {
        viewModelScope.launch {
            try {
                api.deleteConversation(conversationId = conversation.id)

-                database.conversationDao().delete(conversation)
+                database.conversationDao().delete(
+                    id = conversation.id,
+                    accountId = accountManager.activeAccount!!.id
+                )
            } catch (e: Exception) {
                Log.w(TAG, "failed to delete conversation", e)
            }
        }
    }

-    fun muteConversation(conversation: ConversationEntity) {
+    fun muteConversation(conversation: ConversationViewData) {
        viewModelScope.launch {
            try {
-                val newStatus = timelineCases.muteConversation(
+                timelineCases.muteConversation(
                    conversation.lastStatus.id,
-                    !conversation.lastStatus.muted
+                    !(conversation.lastStatus.status.muted ?: false)
                ).await()

-                val newConversation = conversation.copy(
-                    lastStatus = newStatus.toEntity()
+                val newConversation = conversation.toEntity(
+                    accountId = accountManager.activeAccount!!.id,
+                    muted = !(conversation.lastStatus.status.muted ?: false)
                )

                database.conversationDao().insert(newConversation)
@ -151,7 +166,7 @@ class ConversationsViewModel @Inject constructor(
        }
    }

-    suspend fun saveConversationToDb(conversation: ConversationEntity) {
+    private suspend fun saveConversationToDb(conversation: ConversationEntity) {
        database.conversationDao().insert(conversation)
    }