feat: NoteクラスのgetOriginUrlを使用するようにした

pantasystem · Jan 6, 2024 · 7dc246c · 7dc246c
1 parent e3f5836
commit 7dc246c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...les/features/note/src/main/java/net/pantasystem/milktea/note/detail/NoteDetailFragment.kt b/...les/features/note/src/main/java/net/pantasystem/milktea/note/detail/NoteDetailFragment.kt
@@ -118,8 +118,10 @@ class NoteDetailFragment : Fragment(R.layout.fragment_note_detail) {
 
  binding.showInBrowser.setOnClickListener {
  viewLifecycleOwner.lifecycleScope.launch {
- val url = noteDetailViewModel.getUrl()
- showShareLink(url)
+ noteDetailViewModel.getUrl().onSuccess { url ->
+ showShareLink(url)
+ }
+
  }
  }
 

diff --git a/...s/note/src/main/java/net/pantasystem/milktea/note/detail/viewmodel/NoteDetailViewModel.kt b/...s/note/src/main/java/net/pantasystem/milktea/note/detail/viewmodel/NoteDetailViewModel.kt
@@ -8,7 +8,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import net.pantasystem.milktea.common.Logger
-import net.pantasystem.milktea.model.account.Account
+import net.pantasystem.milktea.common.runCancellableCatching
 import net.pantasystem.milktea.model.account.AccountRepository
 import net.pantasystem.milktea.model.account.CurrentAccountWatcher
 import net.pantasystem.milktea.model.account.page.Pageable
@@ -126,12 +126,11 @@ class NoteDetailViewModel @Inject constructor(
 
  }
 
- suspend fun getUrl(): String {
+ suspend fun getUrl(): Result<String> = runCancellableCatching {
  val account = currentAccountWatcher.getAccount()
- return when(account.instanceType) {
- Account.InstanceType.MISSKEY, Account.InstanceType.FIREFISH -> "${account.normalizedInstanceUri}/notes/${pageable.noteId}"
- Account.InstanceType.PLEROMA, Account.InstanceType.MASTODON -> "${account.normalizedInstanceUri}/web/statuses/${pageable.noteId}"
- }
+ val note = noteRepository.find(Note.Id(account.accountId, pageable.noteId))
+ .getOrThrow()
+ note.getOriginUrl(account)
  }