data simplification

5 files changed, 18 insertions, 21 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
index cd41e980..c24eb5cd 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
@@ -84,7 +84,7 @@ object Partials {
             footerText += " (RT by ${tweet.user.screenName})"
         view.textview_status_footer.text = footerText
 
-        (view as TweetStateFrameLayout).isMention = tweet.mentions.contains(world.user.screenName)
+        (view as TweetStateFrameLayout).isMention = tweet.entities.mentions.contains(world.user.screenName)
         view.isRetweet = tweet.isRetweet
         view.isDirectMessage = false
         view.isMine = tweet.originalTweet.user == world.user
@@ -95,7 +95,7 @@ object Partials {
             view.tweet_retweet_count.visibility = View.VISIBLE
             view.tweet_retweet_count.text = tweet.retweetCount.toString()
             view.imageview_status_retweeted.visibility = View.VISIBLE
-            view.imageview_status_retweeted.isActivated = tweet.isRetweetedBy(world.id)
+            view.imageview_status_retweeted.isActivated = world.id in tweet.retweets
         } else {
             view.tweet_retweet_count.visibility = View.INVISIBLE
             view.imageview_status_retweeted.visibility = View.INVISIBLE
@@ -104,7 +104,7 @@ object Partials {
             view.tweet_favorite_count.visibility = View.VISIBLE
             view.tweet_favorite_count.text = tweet.favoriteCount.toString()
             view.imageview_status_favorited.visibility = View.VISIBLE
-            view.imageview_status_favorited.isActivated = tweet.isFavoritedBy(world.id)
+            view.imageview_status_favorited.isActivated = world.id in tweet.favoriters
         } else {
             view.tweet_favorite_count.visibility = View.INVISIBLE
             view.imageview_status_favorited.visibility = View.INVISIBLE
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt
index ef1d3482..233b0850 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt
@@ -69,7 +69,7 @@ class MessageDetailDialogFragment : StackableDialogFragment() {
         val users = mutableListOf<String>()
         if (message.sender !== message.recipient)
             users += message.recipient.screenName
-        users += message.mentions
+        users += message.entities.mentions
         for (screenName in users.distinct())
             view.embedded_menu_items.add("@$screenName") {
                 val ref = ref(activity as MainActivity)
@@ -82,12 +82,12 @@ class MessageDetailDialogFragment : StackableDialogFragment() {
                     }
                 }
             }
-        for (hashtag in message.hashtags)
+        for (hashtag in message.entities.hashtags)
             view.embedded_menu_items.add("#$hashtag") {
                 // XXX
                 (activity as MainActivity).openPostPageAndAppendText(" #$hashtag")
             }
-        for (url in message.urlsExpanded + message.mediaUrls)
+        for (url in message.entities.urlsExpanded + message.entities.mediaUrls)
             view.embedded_menu_items.add(url) {
                 activity.browse(url)
             }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
index 5fb37ced..9e589176 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
@@ -39,8 +39,8 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
         statusHeader.isClickable = false
 
         // XXX
-        view.button_status_detail_favorite.isActivated = tweet.isFavoritedBy(world.id)
-        view.button_status_detail_retweet.isActivated = tweet.isRetweetedBy(world.id)
+        view.button_status_detail_favorite.isActivated = world.id in tweet.favoriters
+        view.button_status_detail_retweet.isActivated = world.id in tweet.retweets
         updateViewButtons(view)
         setupViewMenu(view)
 
@@ -74,7 +74,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
             val builder = StringBuilder()
             builder.append("@${originalTweet.user.screenName} ")
 
-            for (screenName in originalTweet.mentions) {
+            for (screenName in originalTweet.entities.mentions) {
                 if (screenName != world.user.screenName)
                     builder.append("@$screenName ")
             }
@@ -85,10 +85,10 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
         }
         view.button_status_detail_retweet.setOnClickListener {
             confirm(R.string.dialog_confirm_commands) {
-                if (tweet.isRetweetedBy(world.id)) {
+                if (world.id in tweet.retweets) {
                     launchUi {
                         try {
-                            world.deleteTweetAsync(tweet.getRetweetIdBy(world.id)).await()
+                            world.deleteTweetAsync(tweet.retweets[world.id]!!).await()
                             world.notify(R.string.notice_status_delete_succeeded)
                             updateViewButtons(view)
                         } catch (e: TwitterTaskException) {
@@ -109,7 +109,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
             }
         }
         view.button_status_detail_favorite.setOnClickListener {
-            val favoriting = !tweet.isFavoritedBy(world.id)
+            val favoriting = world.id !in tweet.favoriters
 
             launchUi {
                 try {
@@ -153,14 +153,14 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
                 world.notify(R.string.notice_add_to_reply)
             }
             popup.add(R.string.command_status_open_in_browser) {
-                browse(tweet.originalTweet.twitterUrl)
+                browse("https://twitter.com/${tweet.originalTweet.user.screenName}/status/${tweet.originalTweet.id}")
             }
             popup.add(R.string.command_status_copy_text_to_clipboard) {
                 SystemServiceHelper.copyToClipboard(activity, "tweet text", tweet.originalTweet.text)
                 world.notify(R.string.notice_copy_clipboard)
             }
             popup.add(R.string.command_status_copy_url_to_clipboard) {
-                SystemServiceHelper.copyToClipboard(activity, "tweet url", tweet.originalTweet.twitterUrl)
+                SystemServiceHelper.copyToClipboard(activity, "tweet url", "https://twitter.com/${tweet.originalTweet.user.screenName}/status/${tweet.originalTweet.id}")
                 world.notify(R.string.notice_copy_clipboard)
             }
             popup.show()
@@ -171,7 +171,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
         val users = mutableListOf<String>()
         if (tweet.user !== tweet.originalTweet.user)
             users += tweet.user.screenName
-        users += tweet.mentions
+        users += tweet.entities.mentions
         for (screenName in users.distinct())
             view.embedded_menu_items.add("@$screenName") {
                 val ref = ref(activity as MainActivity)
@@ -184,12 +184,12 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
                     }
                 }
             }
-        for (hashtag in tweet.hashtags)
+        for (hashtag in tweet.entities.hashtags)
             view.embedded_menu_items.add("#$hashtag") {
                 // XXX
                 (activity as MainActivity).openPostPageAndAppendText(" #$hashtag")
             }
-        for (url in tweet.urlsExpanded + tweet.mediaUrls)
+        for (url in tweet.entities.urlsExpanded + tweet.entities.mediaUrls)
             view.embedded_menu_items.add(url) {
                 activity.browse(url)
             }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
index 52dc30d6..275f4a9c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
@@ -73,9 +73,6 @@ class UserDetailDialogFragment : StackableDialogFragment() {
                 }
             }
         }
-        popup.add(R.string.command_user_open_aclog) {
-            browse(user.aclogTimelineURL)
-        }
         popup.show()
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt
index 51102a54..74c70c35 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt
@@ -170,7 +170,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc
     private fun runRefreshTask(query: Query, onFinish: () -> Unit) = launchUi {
         try {
             val tweets = world.doSearch(query).await()
-            adapter.sortedList.addAll(tweets.filter { !it.isRetweet })
+            adapter.sortedList.addAll(tweets)
             onFinish()
         } catch (e: TwitterTaskException) {
             world.notifyError(R.string.notice_error_search)