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

lib/pleroma/user.ex

@@ -65,6 +65,7 @@ def register_changeset(struct, params \\ %{}) do
     |> validate_confirmation(:password)
     |> unique_constraint(:email)
     |> unique_constraint(:nickname)
+    |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
 
     if changeset.valid? do
       hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password])

lib/pleroma/web/ostatus/activity_representer.ex

@@ -19,7 +19,9 @@ def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user)
       {:title, ['New note by #{user.nickname}']},
       {:content, [type: 'html'], h.(activity.data["object"]["content"])},
       {:published, h.(inserted_at)},
-      {:updated, h.(updated_at)}
+      {:updated, h.(updated_at)},
+      {:"ostatus:conversation", [], h.(activity.data["context"])},
+      {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}
     ] ++ attachments
   end
 

lib/pleroma/web/ostatus/feed_representer.ex

@@ -17,7 +17,8 @@ def to_simple_form(user, activities, users) do
       :feed, [
         xmlns: 'http://www.w3.org/2005/Atom',
         "xmlns:activity": 'http://activitystrea.ms/spec/1.0/',
-        "xmlns:poco": 'http://portablecontacts.net/spec/1.0'
+        "xmlns:poco": 'http://portablecontacts.net/spec/1.0',
+        "xmlns:ostatus": 'http://ostatus.org/schema/1.0'
       ], [
         {:id, h.(OStatus.feed_path(user))},
         {:title, ['#{user.nickname}\'s timeline']},

lib/pleroma/web/twitter_api/twitter_api.ex

@@ -124,9 +124,9 @@ def fetch_status(user, id) do
     end
   end
 
-  def follow(%User{} = follower, followed_id) do
+  def follow(%User{} = follower, params) do
-    with %User{} = followed <- Repo.get(User, followed_id),
+    with { :ok, %User{} = followed } <- get_user(params),
-    { :ok, follower } <- User.follow(follower, followed),
+         { :ok, follower } <- User.follow(follower, followed),
          { :ok, activity } <- ActivityPub.insert(%{
            "type" => "Follow",
            "actor" => follower.ap_id,
@@ -140,11 +140,11 @@ def follow(%User{} = follower, followed_id) do
     end
   end
 
-  def unfollow(%User{} = follower, followed_id) do
+  def unfollow(%User{} = follower, params) do
-    with %User{} = followed <- Repo.get(User, followed_id),
+    with { :ok, %User{} = unfollowed } <- get_user(params),
-         { :ok, follower } <- User.unfollow(follower, followed)
+         { :ok, follower } <- User.unfollow(follower, unfollowed)
     do
-      { :ok, follower, followed }
+      { :ok, follower, unfollowed}
     else
       err -> err
     end
@@ -257,7 +257,7 @@ def register_user(params) do
     end
   end
 
-  def get_user(user, params) do
+  def get_user(user \\ nil, params) do
     case params do
       %{ "user_id" => user_id } ->
         case target = Repo.get(User, user_id) do

lib/pleroma/web/twitter_api/twitter_api_controller.ex

@@ -12,11 +12,23 @@ def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
     |> json_reply(200, response)
   end
 
-  def status_update(%{assigns: %{user: user}} = conn, status_data) do
+  def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
-    media_ids = extract_media_ids(status_data)
+    if status_text |> String.trim |> String.length != 0 do
-    {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids ))
+      media_ids = extract_media_ids(status_data)
-    conn
+      {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids ))
-    |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
+      conn
+      |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
+    else
+      empty_status_reply(conn)
+    end
+  end
+
+  def status_update(conn, _status_data) do
+    empty_status_reply(conn)
+  end
+
+  defp empty_status_reply(conn) do
+    bad_request_reply(conn, "Client must provide a 'status' parameter with a value.")
   end
 
   defp extract_media_ids(status_data) do
@@ -65,8 +77,8 @@ def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
     |> json_reply(200, json)
   end
 
-  def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+  def follow(%{assigns: %{user: user}} = conn, params) do
-    case TwitterAPI.follow(user, followed_id) do
+    case TwitterAPI.follow(user, params) do
       { :ok, user, followed, _activity } ->
         response = followed |> UserRepresenter.to_json(%{for: user})
         conn
@@ -75,11 +87,10 @@ def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
     end
   end
 
-  def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+  def unfollow(%{assigns: %{user: user}} = conn, params) do
-    case TwitterAPI.unfollow(user, followed_id) do
+    case TwitterAPI.unfollow(user, params) do
-      { :ok, user, followed } ->
+      { :ok, user, unfollowed, } ->
-        response = followed |> UserRepresenter.to_json(%{for: user})
+        response = unfollowed |> UserRepresenter.to_json(%{for: user})
-
         conn
         |> json_reply(200, response)
       { :error, msg } -> forbidden_json_reply(conn, msg)
@@ -152,11 +163,16 @@ def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
 
   def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     activity = Repo.get(Activity, id)
-    {:ok, status} = TwitterAPI.retweet(user, activity)
+    if activity.data["actor"] == user.ap_id do
-    response = Poison.encode!(status)
+      bad_request_reply(conn, "You cannot repeat your own notice.")
+    else
+      {:ok, status} = TwitterAPI.retweet(user, activity)
+      response = Poison.encode!(status)
 
-    conn
+      conn
-    |> json_reply(200, response)
+
+      |> json_reply(200, response)
+    end
   end
 
   def register(conn, params) do
@@ -183,7 +199,7 @@ def update_avatar(%{assigns: %{user: user}} = conn, params) do
   end
 
   defp bad_request_reply(conn, error_message) do
-    json = Poison.encode!(%{"error" => error_message})
+    json = error_json(conn, error_message)
     json_reply(conn, 400, json)
   end
 
@@ -194,9 +210,11 @@ defp json_reply(conn, status, json) do
   end
 
   defp forbidden_json_reply(conn, error_message) do
-    json = %{"error" => error_message, "request" => conn.request_path}
+    json = error_json(conn, error_message)
-    |> Poison.encode!
-
     json_reply(conn, 403, json)
   end
+
+  defp error_json(conn, error_message) do
+    %{"error" => error_message, "request" => conn.request_path} |> Poison.encode!
+  end
 end

test/support/factory.ex

@@ -24,7 +24,8 @@ def note_factory do
       "to" => ["https://www.w3.org/ns/activitystreams#Public"],
       "published_at" => DateTime.utc_now() |> DateTime.to_iso8601,
       "likes" => [],
-      "like_count" => 0
+      "like_count" => 0,
+      "context" => "2hu"
     }
 
     %Pleroma.Object{
@@ -40,7 +41,8 @@ def note_activity_factory do
       "actor" => note.data["actor"],
       "to" => note.data["to"],
       "object" => note.data,
-      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "context" => note.data["context"]
     }
 
     %Pleroma.Activity{

test/web/ostatus/activity_representer_test.exs

@@ -23,6 +23,8 @@ test "a note activity" do
     <content type="html">#{note_activity.data["object"]["content"]}</content>
     <published>#{inserted_at}</published>
     <updated>#{updated_at}</updated>
+    <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
+    <link href="#{note_activity.data["context"]}" rel="ostatus:conversation" />
     """
 
     tuple = ActivityRepresenter.to_simple_form(note_activity, user)

test/web/ostatus/feed_representer_test.exs

@@ -22,7 +22,7 @@ test "returns a feed of the last 20 items of the user" do
     |> :xmerl.export_simple_content(:xmerl_xml)
 
     expected = """
-    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0">
+    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0">
       <id>#{OStatus.feed_path(user)}</id>
       <title>#{user.nickname}'s timeline</title>
       <updated>#{most_recent_update}</updated>

test/web/twitter_api/twitter_api_controller_test.exs

@@ -31,10 +31,21 @@ test "without valid credentials", %{conn: conn} do
     end
 
     test "with credentials", %{conn: conn, user: user} do
-      conn = conn
+      conn_with_creds = conn |> with_credentials(user.nickname, "test")
-        |> with_credentials(user.nickname, "test")
+      request_path = "/api/statuses/update.json"
-        |> post("/api/statuses/update.json", %{ status: "Nice meme." })
 
+      error_response = %{"request" => request_path,
+                         "error" => "Client must provide a 'status' parameter with a value."}
+      conn = conn_with_creds |> post(request_path)
+      assert json_response(conn, 400) == error_response
+
+      conn = conn_with_creds |> post(request_path, %{ status: "" })
+      assert json_response(conn, 400) == error_response
+
+      conn = conn_with_creds |> post(request_path, %{ status: " " })
+      assert json_response(conn, 400) == error_response
+
+      conn =  conn_with_creds |> post(request_path, %{ status: "Nice meme." })
       assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})
     end
   end
@@ -139,7 +150,7 @@ test "with credentials", %{conn: conn, user: current_user} do
     setup [:valid_user]
     test "without any params", %{conn: conn} do
       conn = get(conn, "/api/statuses/user_timeline.json")
-      assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id"}
+      assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id", "request" => "/api/statuses/user_timeline.json"}
     end
 
     test "with user_id", %{conn: conn} do
@@ -320,11 +331,21 @@ test "without valid credentials", %{conn: conn} do
     test "with credentials", %{conn: conn, user: current_user} do
       note_activity = insert(:note_activity)
 
-      conn = conn
+      request_path = "/api/statuses/retweet/#{note_activity.id}.json"
-      |> with_credentials(current_user.nickname, "test")
-      |> post("/api/statuses/retweet/#{note_activity.id}.json")
 
-      assert json_response(conn, 200)
+      user = Repo.get_by(User, ap_id: note_activity.data["actor"])
+      response = conn
+      |> with_credentials(user.nickname, "test")
+      |> post(request_path)
+      assert json_response(response, 400) == %{"error" => "You cannot repeat your own notice.",
+                                               "request" => request_path}
+
+      response = conn
+      |> with_credentials(current_user.nickname, "test")
+      |> post(request_path)
+      activity = Repo.get(Activity, note_activity.id)
+      activity_user = Repo.get_by(User, ap_id: note_activity.data["actor"])
+      assert json_response(response, 200) == ActivityRepresenter.to_map(activity, %{user: activity_user, for: current_user})
     end
   end
 

test/web/twitter_api/twitter_api_test.exs

@@ -155,32 +155,47 @@ test "fetch a single status" do
     assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
   end
 
-  test "Follow another user" do
+  test "Follow another user using user_id" do
     user = insert(:user)
     followed = insert(:user)
 
-    { :ok, user, followed, activity } = TwitterAPI.follow(user, followed.id)
+    {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id})
-
-    user = Repo.get(User, user.id)
-    follow = Repo.get(Activity, activity.id)
-
     assert user.following == [User.ap_followers(followed)]
-    assert follow == activity
 
-    { :error, msg } = TwitterAPI.follow(user, followed.id)
+    { :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id})
     assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
 
-  test "Unfollow another user" do
+  test "Follow another user using screen_name" do
+    user = insert(:user)
     followed = insert(:user)
-    user = insert(:user, %{following: [User.ap_followers(followed)]})
 
-    { :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id)
+    {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
+    assert user.following == [User.ap_followers(followed)]
 
-    user = Repo.get(User, user.id)
+    { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
+    assert msg == "Could not follow user: #{followed.nickname} is already on your list."
+  end
 
+  test "Unfollow another user using user_id" do
+    unfollowed = insert(:user)
+    user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
+
+    {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
     assert user.following == []
-    { :error, msg } = TwitterAPI.unfollow(user, followed.id)
+
+    { :error, msg } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+    assert msg == "Not subscribed!"
+  end
+
+  test "Unfollow another user using screen_name" do
+    unfollowed = insert(:user)
+    user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
+
+    {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
+    assert user.following == []
+
+    { :error, msg } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
     assert msg == "Not subscribed!"
   end