Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop

2 files changed, 22 insertions, 1 deletions

diff --git a/lib/mix/tasks/register_user.ex b/lib/mix/tasks/register_user.ex
new file mode 100644
index 000000000..e2f36c34c
--- /dev/null
+++ b/lib/mix/tasks/register_user.ex
@@ -0,0 +1,21 @@
+defmodule Mix.Tasks.RegisterUser do
+  use Mix.Task
+  import Mix.Ecto
+  alias Pleroma.{Repo, User}
+
+  @shortdoc "Register user"
+  def run([name, nickname, email, bio, password]) do
+    ensure_started(Repo, [])
+    user = %User{
+      name: name,
+      nickname: nickname,
+      email: email,
+      password_hash: Comeonin.Pbkdf2.hashpwsalt(password),
+      bio: bio
+    }
+
+    user = %{ user | ap_id: User.ap_id(user) }
+
+    Repo.insert!(user)
+  end
+end
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index a13a205fc..f2c893e96 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def status_update(%{assigns: %{user: user}} = conn, status_data) do
     media_ids = extract_media_ids(status_data)
-    {:ok, activity} = TwitterAPI.create_status(user, %{ "status" => status_data["status"], "media_ids" => media_ids })
+    {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids ))
     conn
     |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
   end