aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex12
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex10
2 files changed, 14 insertions, 8 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 16e05ded3..9e3251df6 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -6,15 +6,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def create_status(user = %User{}, data = %{}) do
activity = %{
- type: "Create",
- to: [
+ "type" => "Create",
+ "to" => [
User.ap_followers(user),
"https://www.w3.org/ns/activitystreams#Public"
],
- actor: User.ap_id(user),
- object: %{
- type: "Note",
- content: data.status
+ "actor" => User.ap_id(user),
+ "object" => %{
+ "type" => "Note",
+ "content" => data["status"]
}
}
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 836013cff..1f0a547d0 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -1,7 +1,7 @@
defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
-
- alias Pleroma.Web.TwitterAPI.Representers.UserRepresenter
+ alias Pleroma.Web.TwitterAPI.TwitterAPI
+ alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
response = user |> UserRepresenter.to_json
@@ -10,6 +10,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, response)
end
+ def status_update(%{assigns: %{user: user}} = conn, status_data) do
+ {:ok, activity} = TwitterAPI.create_status(user, status_data)
+ conn
+ |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
+ end
+
defp json_reply(conn, status, json) do
conn
|> put_resp_content_type("application/json")