Merge pull request #1291 from Linkid/fix/mastodon_follow_remote

Mastodon: remove the follows endpoint
TwidereProject · May 1, 2020 · 3cafdac · 3cafdac
2 parents 567dce9 + d29e102
commit 3cafdac
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 46 deletions.
diff --git a/...t.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java b/...t.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt
@@ -111,12 +111,6 @@ class FriendshipPromises private constructor(val application: Application) {
                     }
                     AccountType.MASTODON -> {
                         val mastodon = account.newMicroBlogInstance(application, Mastodon::class.java)
-                        if (account.key.host != userKey.host) {
-                            if (screenName == null)
-                                throw MicroBlogException("Screen name required to follow remote user")
-                            return@then mastodon.followRemoteUser("$screenName@${userKey.host}")
-                                    .toParcelable(account)
-                        }
                         mastodon.followUser(userKey.id)
                         return@then mastodon.getAccount(userKey.id).toParcelable(account)
                     }