alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add support for all status type (ostatus) and replase case with if

This commit is contained in:
Sachin Joshi 2019-04-02 12:15:41 +05:45
parent 6386c1c9c1
commit f20e8d28de
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View File

@ -74,13 +74,11 @@ def remote_subscribe(conn, %{"user" => %{"nickname" => nick, "profile" => profil
end end
def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
case is_status?(acct) do if is_status?(acct) do
true ->
{:ok, object} = ActivityPub.fetch_object_from_id(acct) {:ok, object} = ActivityPub.fetch_object_from_id(acct)
%Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"]) %Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"])
redirect(conn, to: "/notice/#{activity_id}") redirect(conn, to: "/notice/#{activity_id}")
else
false ->
{err, followee} = OStatus.find_or_make_user(acct) {err, followee} = OStatus.find_or_make_user(acct)
avatar = User.avatar_url(followee) avatar = User.avatar_url(followee)
name = followee.nickname name = followee.nickname
@ -104,8 +102,11 @@ def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
defp is_status?(acct) do defp is_status?(acct) do
case ActivityPub.fetch_and_contain_remote_object_from_id(acct) do case ActivityPub.fetch_and_contain_remote_object_from_id(acct) do
{:ok, %{"type" => "Note"}} -> true {:ok, %{"type" => type}} when type in ["Article", "Note", "Video", "Page", "Question"] ->
_ -> false true
_ ->
false
end end
end end