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

Merge pull request #1291 from Linkid/fix/mastodon_follow_remote 

Mastodon: remove the follows endpoint
This commit is contained in:
Suji Yan 2020-05-01 23:30:43 +08:00 committed by GitHub
parent 567dce9702 d29e102919
commit 3cafdacb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java
View File

@ -1,40 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mariotaku.microblog.library.api.mastodon;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.model.mastodon.Account;
import org.mariotaku.restfu.annotation.method.POST;
import org.mariotaku.restfu.annotation.param.Param;
/**
* Created by mariotaku on 2017/4/17.
*/
public interface FollowsResources {
/**
* Following a remote user
*
* @param uri {@code username@domain} of the person you want to follow
* @return The local representation of the followed account, as an {@link Account}.
*/
@POST("/v1/follows")
Account followRemoteUser(@Param("uri") String uri) throws MicroBlogException;
}

6
twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt
View File

@ -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)
}