projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TwitterAPI: Don't put follows into the public tls.
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api_controller.ex
diff --git
a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index fb09deada7325745d517999c27837f840c12cc62..5f44e46c058b097c55230717fc97fa145e3a7fd3 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@
-1,7
+1,6
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView}
defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView}
- alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
alias Pleroma.Web.CommonAPI
alias Pleroma.{Repo, Activity, User}
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.{Repo, Activity, User}
alias Pleroma.Web.ActivityPub.ActivityPub
@@
-46,7
+45,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
def public_and_external_timeline(%{assigns: %{user: user}} = conn, params) do
params =
params
def public_and_external_timeline(%{assigns: %{user: user}} = conn, params) do
params =
params
- |> Map.put("type", ["Create", "Announce"
, "Follow"
])
+ |> Map.put("type", ["Create", "Announce"])
|> Map.put("blocking_user", user)
activities = ActivityPub.fetch_public_activities(params)
|> Map.put("blocking_user", user)
activities = ActivityPub.fetch_public_activities(params)
@@
-58,7
+57,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
def public_timeline(%{assigns: %{user: user}} = conn, params) do
params =
params
def public_timeline(%{assigns: %{user: user}} = conn, params) do
params =
params
- |> Map.put("type", ["Create", "Announce"
, "Follow"
])
+ |> Map.put("type", ["Create", "Announce"])
|> Map.put("local_only", true)
|> Map.put("blocking_user", user)
|> Map.put("local_only", true)
|> Map.put("blocking_user", user)
@@
-152,10
+151,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
with {:ok, delete} <- CommonAPI.delete(id, user) do
def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
with {:ok, delete} <- CommonAPI.delete(id, user) do
- json = ActivityRepresenter.to_json(delete, %{user: user, for: user})
-
- conn
- |> json_reply(200, json)
+ render(conn, ActivityView, "activity.json", %{activity: delete, for: user})
end
end
end
end
@@
-216,20
+212,20
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
end
def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
end
def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
- with {:ok,
status
} <- TwitterAPI.fav(user, id) do
-
json(conn, status
)
+ with {:ok,
activity
} <- TwitterAPI.fav(user, id) do
+
render(conn, ActivityView, "activity.json", %{activity: activity, for: user}
)
end
end
def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
end
end
def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
- with {:ok,
status
} <- TwitterAPI.unfav(user, id) do
-
json(conn, status
)
+ with {:ok,
activity
} <- TwitterAPI.unfav(user, id) do
+
render(conn, ActivityView, "activity.json", %{activity: activity, for: user}
)
end
end
def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
end
end
def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
- with {:ok,
status
} <- TwitterAPI.repeat(user, id) do
-
json(conn, status
)
+ with {:ok,
activity
} <- TwitterAPI.repeat(user, id) do
+
render(conn, ActivityView, "activity.json", %{activity: activity, for: user}
)
end
end
end
end