X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=a99487738d3ef0785afbd94753f133e45aab0ec0;hb=a5c9dd0a2aa792ed075c6ff83b1de262a1529026;hp=e8fc9c29148527dcb36bfcd73e5f86326bfe30e6;hpb=634c0c52a1281e1576d028c74ee77fd05abe09de;p=akkoma diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index e8fc9c291..a99487738 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -157,8 +157,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, delete} <- CommonAPI.delete(id, user) do - render(conn, ActivityView, "activity.json", %{activity: delete, for: user}) + with {:ok, activity} <- TwitterAPI.delete(user, id) do + render(conn, ActivityView, "activity.json", %{activity: activity, for: user}) end end @@ -347,7 +347,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def update_profile(%{assigns: %{user: user}} = conn, params) do params = if bio = params["description"] do - bio_brs = Regex.replace(~r/\r?\n/,bio,"
") + bio_brs = Regex.replace(~r/\r?\n/, bio, "
") Map.put(params, "bio", bio_brs) else params