From 9cefbaf01625cbb4b892ce2b767f79ceb155110b Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 18 Sep 2017 11:39:57 +0200
Subject: Start of HTTP Signatures.

---
 lib/pleroma/web/http_signatures/http_signatures.ex | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lib/pleroma/web/http_signatures/http_signatures.ex

(limited to 'lib')

diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
new file mode 100644
index 000000000..e2210285e
--- /dev/null
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -0,0 +1,27 @@
+# https://tools.ietf.org/html/draft-cavage-http-signatures-08
+defmodule Pleroma.Web.HTTPSignatures do
+  def split_signature(sig) do
+    default = %{"headers" => ["date"]}
+
+    sig
+    |> String.trim()
+    |> String.split(",")
+    |> Enum.reduce(default, fn(part, acc) ->
+      [key | rest] = String.split(part, "=")
+      value = Enum.join(rest, "=")
+      Map.put(acc, key, String.trim(value, "\""))
+    end)
+  end
+
+  def validate(headers, signature, public_key) do
+    sigstring = build_signing_string(headers, signature["headers"])
+    {:ok, sig} = Base.decode64(signature["signature"])
+    verify = :public_key.verify(sigstring, :sha256, sig, public_key)
+  end
+
+  def build_signing_string(headers, used_headers) do
+    used_headers
+    |> Enum.map(fn (header) -> "#{header}: #{headers[header]}" end)
+    |> Enum.join("\n")
+  end
+end
-- 
cgit v1.2.3


From 6268b7e0eb400c1b5e227a73e6faee0f1e476db4 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 18 Sep 2017 18:10:21 +0200
Subject: HTTP Signatures: Work with all test vectors.

---
 lib/pleroma/web/http_signatures/http_signatures.ex | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index e2210285e..65a344e0b 100644
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -1,9 +1,9 @@
 # https://tools.ietf.org/html/draft-cavage-http-signatures-08
 defmodule Pleroma.Web.HTTPSignatures do
   def split_signature(sig) do
-    default = %{"headers" => ["date"]}
+    default = %{"headers" => "date"}
 
-    sig
+    sig = sig
     |> String.trim()
     |> String.split(",")
     |> Enum.reduce(default, fn(part, acc) ->
@@ -11,6 +11,8 @@ defmodule Pleroma.Web.HTTPSignatures do
       value = Enum.join(rest, "=")
       Map.put(acc, key, String.trim(value, "\""))
     end)
+
+    Map.put(sig, "headers", String.split(sig["headers"], ~r/\s/))
   end
 
   def validate(headers, signature, public_key) do
-- 
cgit v1.2.3


From 25118aeef7efa9e5d85db735ab5360857d8f5a71 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sat, 9 Dec 2017 15:34:43 +0100
Subject: Add link to AP address in webfinger.

---
 lib/pleroma/web/web_finger/web_finger.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 026d2f98b..11b36d6ac 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -44,7 +44,8 @@ defmodule Pleroma.Web.WebFinger do
         {:Link, %{rel: "http://schemas.google.com/g/2010#updates-from", type: "application/atom+xml", href: OStatus.feed_path(user)}},
         {:Link, %{rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: user.ap_id}},
         {:Link, %{rel: "salmon", href: OStatus.salmon_path(user)}},
-        {:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}}
+        {:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}},
+        {:Link, %{rel: "self", type: "application/activity+json", href: user.ap_id}}
       ]
     }
     |> XmlBuilder.to_doc
-- 
cgit v1.2.3


From 5599c5920c293ac993146e21a73520213bbe2a8a Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 11 Dec 2017 10:37:22 +0100
Subject: Basic incoming AP support.

---
 .../web/activity_pub/activity_pub_controller.ex    | 17 ++++++++
 lib/pleroma/web/activity_pub/views/user_view.ex    | 51 ++++++++++++++++++++++
 lib/pleroma/web/ostatus/ostatus_controller.ex      |  4 +-
 lib/pleroma/web/router.ex                          | 10 ++++-
 4 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 lib/pleroma/web/activity_pub/activity_pub_controller.ex
 create mode 100644 lib/pleroma/web/activity_pub/views/user_view.ex

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
new file mode 100644
index 000000000..738e4ba33
--- /dev/null
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -0,0 +1,17 @@
+defmodule Pleroma.Web.ActivityPub.ActivityPubController do
+  use Pleroma.Web, :controller
+  alias Pleroma.{User, Repo}
+  alias Pleroma.Web.ActivityPub.UserView
+  alias Pleroma.Web.ActivityPub.ActivityPub
+
+  def user(conn, %{"nickname" => nickname}) do
+    with %User{} = user <- User.get_cached_by_nickname(nickname) do
+      json(conn, UserView.render("user.json", %{user: user}))
+    end
+  end
+
+  def inbox(conn, params) do
+    {:ok, activity} = ActivityPub.insert(params, false)
+    json(conn, "ok")
+  end
+end
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
new file mode 100644
index 000000000..5303455a8
--- /dev/null
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -0,0 +1,51 @@
+defmodule Pleroma.Web.ActivityPub.UserView do
+  use Pleroma.Web, :view
+  alias Pleroma.Web.Salmon
+  alias Pleroma.User
+
+  def render("user.json", %{user: user}) do
+    {:ok, _, public_key} = Salmon.keys_from_pem(user.info["keys"])
+    public_key = :public_key.pem_entry_encode(:RSAPublicKey, public_key)
+    public_key = :public_key.pem_encode([public_key])
+    %{
+      "@context": [
+        "https://www.w3.org/ns/activitystreams",
+        "https://w3id.org/security/v1",
+        %{
+          "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+          "sensitive": "as:sensitive",
+          "Hashtag": "as:Hashtag",
+          "ostatus": "http://ostatus.org#",
+          "atomUri": "ostatus:atomUri",
+          "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+          "conversation": "ostatus:conversation",
+          "toot": "http://joinmastodon.org/ns#",
+          "Emoji": "toot:Emoji"
+        }
+      ],
+      "id": user.ap_id,
+      "type": "Person",
+      "following": "#{user.ap_id}/following",
+      "followers": "#{user.ap_id}/followers",
+      "inbox": "#{user.ap_id}/inbox",
+      "outbox": "#{user.ap_id}/outbox",
+      "preferredUsername": user.nickname,
+      "name": user.name,
+      "summary": user.bio,
+      "url": user.ap_id,
+      "manuallyApprovesFollowers": false,
+      "publicKey": %{
+        "id": "#{user.ap_id}#main-key",
+        "owner": user.ap_id,
+        "publicKeyPem": public_key
+      },
+      "endpoints": %{
+        "sharedInbox": "#{Pleroma.Web.Endpoint.url}/inbox"
+      },
+      "icon": %{
+        "type": "Image",
+        "url": User.avatar_url(user)
+      }
+    }
+  end
+end
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index d442d16fd..778495a3e 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -6,13 +6,15 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.Repo
   alias Pleroma.Web.{OStatus, Federator}
   alias Pleroma.Web.XML
+  alias Pleroma.Web.ActivityPub.ActivityPubController
   import Ecto.Query
 
-  def feed_redirect(conn, %{"nickname" => nickname}) do
+  def feed_redirect(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
 
     case get_format(conn) do
       "html" -> Fallback.RedirectController.redirector(conn, nil)
+      "activity+json" -> ActivityPubController.user(conn, params)
       _ -> redirect conn, external: OStatus.feed_path(user)
     end
   end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6806e8a75..4803a6370 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -199,7 +199,7 @@ defmodule Pleroma.Web.Router do
   end
 
   pipeline :ostatus do
-    plug :accepts, ["xml", "atom", "html"]
+    plug :accepts, ["xml", "atom", "html", "activity+json"]
   end
 
   scope "/", Pleroma.Web do
@@ -217,6 +217,14 @@ defmodule Pleroma.Web.Router do
     post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
   end
 
+  pipeline :activitypub do
+    plug :accepts, ["activity+json"]
+  end
+
+  scope "/", Pleroma.Web.ActivityPub do
+    post "/users/:nickname/inbox", ActivityPubController, :inbox
+  end
+
   scope "/.well-known", Pleroma.Web do
     pipe_through :well_known
 
-- 
cgit v1.2.3


From c3bcafc51bdf17db1bab157524b42b4fc46690b1 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 11 Dec 2017 10:37:40 +0100
Subject: HTTPSig: Add method to validate conn

---
 lib/pleroma/web/http_signatures/http_signatures.ex | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index 65a344e0b..8603cb671 100644
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -21,6 +21,12 @@ defmodule Pleroma.Web.HTTPSignatures do
     verify = :public_key.verify(sigstring, :sha256, sig, public_key)
   end
 
+  def validate_conn(conn, public_key) do
+    headers = Enum.into(conn.req_headers, %{})
+    signature = split_signature(headers["signature"])
+    validate(headers, signature, public_key)
+  end
+
   def build_signing_string(headers, used_headers) do
     used_headers
     |> Enum.map(fn (header) -> "#{header}: #{headers[header]}" end)
-- 
cgit v1.2.3


From da005d333296c626e29216f800e5ffd92e93dab0 Mon Sep 17 00:00:00 2001
From: Lain Iwakura <lain@soykaf.club>
Date: Mon, 11 Dec 2017 18:19:46 +0100
Subject: ActivityPub: Add Objects View.

---
 lib/pleroma/web/activity_pub/views/object_view.ex | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 lib/pleroma/web/activity_pub/views/object_view.ex

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/views/object_view.ex b/lib/pleroma/web/activity_pub/views/object_view.ex
new file mode 100644
index 000000000..403f8cb17
--- /dev/null
+++ b/lib/pleroma/web/activity_pub/views/object_view.ex
@@ -0,0 +1,26 @@
+defmodule Pleroma.Web.ActivityPub.ObjectView do
+  use Pleroma.Web, :view
+
+  def render("object.json", %{object: object}) do
+    base = %{
+      "@context" => [
+        "https://www.w3.org/ns/activitystreams",
+        "https://w3id.org/security/v1",
+        %{
+          "manuallyApprovesFollowers" => "as:manuallyApprovesFollowers",
+          "sensitive" => "as:sensitive",
+          "Hashtag" => "as:Hashtag",
+          "ostatus" => "http://ostatus.org#",
+          "atomUri" => "ostatus:atomUri",
+          "inReplyToAtomUri" => "ostatus:inReplyToAtomUri",
+          "conversation" => "ostatus:conversation",
+          "toot" => "http://joinmastodon.org/ns#",
+          "Emoji" => "toot:Emoji"
+        }
+      ]
+    }
+
+    additional = Map.take(object.data, ["id", "to", "cc", "actor", "content", "summary", "type"])
+    Map.merge(base, additional)
+  end
+end
-- 
cgit v1.2.3


From a89a613e4e070e09e0dd5d040060ace622aac6aa Mon Sep 17 00:00:00 2001
From: Lain Iwakura <lain@soykaf.club>
Date: Mon, 11 Dec 2017 18:20:41 +0100
Subject: ActivityPub: Use only string keys in views.

---
 lib/pleroma/web/activity_pub/views/user_view.ex | 60 ++++++++++++-------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 5303455a8..b3b02c4fb 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -8,43 +8,43 @@ defmodule Pleroma.Web.ActivityPub.UserView do
     public_key = :public_key.pem_entry_encode(:RSAPublicKey, public_key)
     public_key = :public_key.pem_encode([public_key])
     %{
-      "@context": [
+      "@context" => [
         "https://www.w3.org/ns/activitystreams",
         "https://w3id.org/security/v1",
         %{
-          "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-          "sensitive": "as:sensitive",
-          "Hashtag": "as:Hashtag",
-          "ostatus": "http://ostatus.org#",
-          "atomUri": "ostatus:atomUri",
-          "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-          "conversation": "ostatus:conversation",
-          "toot": "http://joinmastodon.org/ns#",
-          "Emoji": "toot:Emoji"
+          "manuallyApprovesFollowers" => "as:manuallyApprovesFollowers",
+          "sensitive" => "as:sensitive",
+          "Hashtag" => "as:Hashtag",
+          "ostatus" => "http://ostatus.org#",
+          "atomUri" => "ostatus:atomUri",
+          "inReplyToAtomUri" => "ostatus:inReplyToAtomUri",
+          "conversation" => "ostatus:conversation",
+          "toot" => "http://joinmastodon.org/ns#",
+          "Emoji" => "toot:Emoji"
         }
       ],
-      "id": user.ap_id,
-      "type": "Person",
-      "following": "#{user.ap_id}/following",
-      "followers": "#{user.ap_id}/followers",
-      "inbox": "#{user.ap_id}/inbox",
-      "outbox": "#{user.ap_id}/outbox",
-      "preferredUsername": user.nickname,
-      "name": user.name,
-      "summary": user.bio,
-      "url": user.ap_id,
-      "manuallyApprovesFollowers": false,
-      "publicKey": %{
-        "id": "#{user.ap_id}#main-key",
-        "owner": user.ap_id,
-        "publicKeyPem": public_key
+      "id" => user.ap_id,
+      "type" => "Person",
+      "following" => "#{user.ap_id}/following",
+      "followers" => "#{user.ap_id}/followers",
+      "inbox" => "#{user.ap_id}/inbox",
+      "outbox" => "#{user.ap_id}/outbox",
+      "preferredUsername" => user.nickname,
+      "name" => user.name,
+      "summary" => user.bio,
+      "url" => user.ap_id,
+      "manuallyApprovesFollowers" => false,
+      "publicKey" => %{
+        "id" => "#{user.ap_id}#main-key",
+        "owner" => user.ap_id,
+        "publicKeyPem" => public_key
       },
-      "endpoints": %{
-        "sharedInbox": "#{Pleroma.Web.Endpoint.url}/inbox"
+      "endpoints" => %{
+        "sharedInbox" => "#{Pleroma.Web.Endpoint.url}/inbox"
       },
-      "icon": %{
-        "type": "Image",
-        "url": User.avatar_url(user)
+      "icon" => %{
+        "type" => "Image",
+        "url" => User.avatar_url(user)
       }
     }
   end
-- 
cgit v1.2.3


From 64330d9455684e417d014cb6f21ce7f52620b9db Mon Sep 17 00:00:00 2001
From: Lain Iwakura <lain@soykaf.club>
Date: Mon, 11 Dec 2017 18:21:33 +0100
Subject: ActivityPub: Add object routes / controller.

---
 .../web/activity_pub/activity_pub_controller.ex        | 14 +++++++++++---
 lib/pleroma/web/ostatus/ostatus_controller.ex          | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 738e4ba33..a9c0401bc 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,15 +1,23 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
-  alias Pleroma.{User, Repo}
-  alias Pleroma.Web.ActivityPub.UserView
+  alias Pleroma.{User, Repo, Object}
+  alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   def user(conn, %{"nickname" => nickname}) do
-    with %User{} = user <- User.get_cached_by_nickname(nickname) do
+    with %User{} = user <- User.get_cached_by_nickname(nickname),
+         {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
       json(conn, UserView.render("user.json", %{user: user}))
     end
   end
 
+  def object(conn, %{"uuid" => uuid}) do
+    with ap_id <- o_status_url(conn, :object, uuid),
+         %Object{} = object <- Object.get_cached_by_ap_id(ap_id) do
+      json(conn, ObjectView.render("object.json", %{object: object}))
+    end
+  end
+
   def inbox(conn, params) do
     {:ok, activity} = ActivityPub.insert(params, false)
     json(conn, "ok")
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 778495a3e..e5f99c66c 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -66,13 +66,17 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     |> send_resp(200, "")
   end
 
-  def object(conn, %{"uuid" => uuid}) do
-    with id <- o_status_url(conn, :object, uuid),
-         %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
-         %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      case get_format(conn) do
-        "html" -> redirect(conn, to: "/notice/#{activity.id}")
-        _ -> represent_activity(conn, activity, user)
+  def object(conn, %{"uuid" => uuid} = params) do
+    if get_format(conn) == "activity+json" do
+      ActivityPubController.object(conn, params)
+    else
+      with id <- o_status_url(conn, :object, uuid),
+           %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
+             %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
+        case get_format(conn) do
+          "html" -> redirect(conn, to: "/notice/#{activity.id}")
+          _ -> represent_activity(conn, activity, user)
+        end
       end
     end
   end
-- 
cgit v1.2.3


From a9c23e1c321c1bee5f315604358f3208a95784bb Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 12 Dec 2017 10:17:21 +0100
Subject: Add plug to validate signed http requests.

---
 lib/pleroma/plugs/http_signature.ex                | 19 +++++++++++++++++++
 lib/pleroma/user.ex                                | 10 ++++++++++
 lib/pleroma/web/http_signatures/http_signatures.ex | 15 ++++++++++++++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 lib/pleroma/plugs/http_signature.ex

(limited to 'lib')

diff --git a/lib/pleroma/plugs/http_signature.ex b/lib/pleroma/plugs/http_signature.ex
new file mode 100644
index 000000000..17030cdbf
--- /dev/null
+++ b/lib/pleroma/plugs/http_signature.ex
@@ -0,0 +1,19 @@
+defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
+  alias Pleroma.Web.HTTPSignatures
+  import Plug.Conn
+
+  def init(options) do
+    options
+  end
+
+  def call(conn, opts) do
+    if get_req_header(conn, "signature") do
+      conn = conn
+      |> put_req_header("(request-target)", String.downcase("#{conn.method} #{conn.request_path}"))
+
+      assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
+    else
+      conn
+    end
+  end
+end
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 09bcf0cb4..4580f30fb 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -376,4 +376,14 @@ defmodule Pleroma.User do
 
     :ok
   end
+
+  def get_public_key_for_ap_id(ap_id) do
+    with %User{} = user <- get_cached_by_ap_id(ap_id),
+         %{info: %{"magic_key" => magic_key}} <- user,
+         public_key <- Pleroma.Web.Salmon.decode_key(magic_key) do
+      {:ok, public_key}
+    else
+      _ -> :error
+    end
+  end
 end
diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index 8603cb671..830ddf64d 100644
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -1,5 +1,7 @@
 # https://tools.ietf.org/html/draft-cavage-http-signatures-08
 defmodule Pleroma.Web.HTTPSignatures do
+  alias Pleroma.User
+
   def split_signature(sig) do
     default = %{"headers" => "date"}
 
@@ -18,7 +20,18 @@ defmodule Pleroma.Web.HTTPSignatures do
   def validate(headers, signature, public_key) do
     sigstring = build_signing_string(headers, signature["headers"])
     {:ok, sig} = Base.decode64(signature["signature"])
-    verify = :public_key.verify(sigstring, :sha256, sig, public_key)
+    :public_key.verify(sigstring, :sha256, sig, public_key)
+  end
+
+  def validate_conn(conn) do
+    # TODO: How to get the right key and see if it is actually valid for that request.
+    # For now, fetch the key for the actor.
+    with actor_id <- conn.params["actor"],
+         {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
+      validate_conn(conn, public_key)
+    else
+      _ -> false
+    end
   end
 
   def validate_conn(conn, public_key) do
-- 
cgit v1.2.3


From 888ec9e579169e899b58344b18fce860477d9bfc Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 12 Dec 2017 10:17:50 +0100
Subject: ActivityPub: Check inbox requests for valid signature.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 3 ++-
 lib/pleroma/web/router.ex                               | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index a9c0401bc..0f631dd4b 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -18,7 +18,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     end
   end
 
-  def inbox(conn, params) do
+  # TODO: Move signature failure halt into plug
+  def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
     {:ok, activity} = ActivityPub.insert(params, false)
     json(conn, "ok")
   end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 4803a6370..4f9ebf5e8 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -219,9 +219,11 @@ defmodule Pleroma.Web.Router do
 
   pipeline :activitypub do
     plug :accepts, ["activity+json"]
+    plug Pleroma.Web.Plugs.HTTPSignaturePlug
   end
 
   scope "/", Pleroma.Web.ActivityPub do
+    pipe_through :activitypub
     post "/users/:nickname/inbox", ActivityPubController, :inbox
   end
 
-- 
cgit v1.2.3


From 4a13b8488787773d09f67d1a436d5906e2f5b171 Mon Sep 17 00:00:00 2001
From: Lain Iwakura <lain@soykaf.club>
Date: Tue, 12 Dec 2017 18:07:14 +0100
Subject: Add recipients field to activities.

Also do some very basic checks for AP message insertion.
---
 lib/pleroma/activity.ex                               |  1 +
 lib/pleroma/web/activity_pub/activity_pub.ex          | 19 ++++++++++++++++++-
 .../web/activity_pub/activity_pub_controller.ex       |  6 ++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index afd09982f..a8154859a 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Activity do
     field :data, :map
     field :local, :boolean, default: true
     field :actor, :string
+    field :recipients, {:array, :string}
     has_many :notifications, Notification, on_delete: :delete_all
 
     timestamps()
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 421fd5cd7..7b85770b7 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,14 +1,19 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
+  alias Pleroma.Web.OStatus
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
 
+  def get_recipients(data) do
+    (data["to"] || []) ++ (data["cc"] || [])
+  end
+
   def insert(map, local \\ true) when is_map(map) do
     with nil <- Activity.get_by_ap_id(map["id"]),
          map <- lazy_put_activity_defaults(map),
          :ok <- insert_full_object(map) do
-      {:ok, activity} = Repo.insert(%Activity{data: map, local: local, actor: map["actor"]})
+      {:ok, activity} = Repo.insert(%Activity{data: map, local: local, actor: map["actor"], recipients: get_recipients(map)})
       Notification.create_notifications(activity)
       stream_out(activity)
       {:ok, activity}
@@ -215,4 +220,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     data = Upload.store(file)
     Repo.insert(%Object{data: data})
   end
+
+  def prepare_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+    with {:ok, user} <- OStatus.find_or_make_user(data["actor"]) do
+      data
+    else
+      _e -> :error
+    end
+  end
+
+  def prepare_incoming(_) do
+    :error
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 0f631dd4b..0d3e8f44c 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -20,7 +20,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   # TODO: Move signature failure halt into plug
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    {:ok, activity} = ActivityPub.insert(params, false)
-    json(conn, "ok")
+    with {:ok, data} <- ActivityPub.prepare_incoming(params),
+         {:ok, activity} <- ActivityPub.insert(data, false) do
+      json(conn, "ok")
+    end
   end
 end
-- 
cgit v1.2.3


From ae1ec858f442aba7c2b2aea12dd60585517be17a Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 11 Feb 2018 17:20:02 +0100
Subject: Basic AP user building.

---
 lib/pleroma/user.ex                          | 17 ++++++++++++++---
 lib/pleroma/web/activity_pub/activity_pub.ex | 20 ++++++++++++++++++++
 lib/pleroma/web/ostatus/ostatus.ex           |  7 +------
 3 files changed, 35 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index e544d3772..47aefaeba 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -80,9 +80,15 @@ defmodule Pleroma.User do
     |> validate_length(:name, max: 100)
     |> put_change(:local, false)
     if changes.valid? do
-      followers = User.ap_followers(%User{nickname: changes.changes[:nickname]})
-      changes
-      |> put_change(:follower_address, followers)
+      case changes.changes[:info]["source_data"] do
+        %{"followers" => followers} ->
+          changes
+          |> put_change(:follower_address, followers)
+        _ ->
+          followers = User.ap_followers(%User{nickname: changes.changes[:nickname]})
+          changes
+          |> put_change(:follower_address, followers)
+      end
     else
       changes
     end
@@ -386,4 +392,9 @@ defmodule Pleroma.User do
       _ -> :error
     end
   end
+
+  def insert_or_update_user(data) do
+    cs = User.remote_user_creation(data)
+    Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 7b85770b7..4d0de71e4 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -5,6 +5,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   import Pleroma.Web.ActivityPub.Utils
   require Logger
 
+  @httpoison Application.get_env(:pleroma, :httpoison)
+
   def get_recipients(data) do
     (data["to"] || []) ++ (data["cc"] || [])
   end
@@ -232,4 +234,22 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def prepare_incoming(_) do
     :error
   end
+
+  def make_user_from_ap_id(ap_id) do
+    with {:ok, %{status_code: 200, body: body}} <- @httpoison.get(ap_id, ["Accept": "application/activity+json"]),
+    {:ok, data} <- Poison.decode(body)
+      do
+      user_data = %{
+        ap_id: data["id"],
+        info: %{
+          "ap_enabled" => true,
+          "source_data" => data
+        },
+        nickname: "#{data["preferredUsername"]}@#{URI.parse(ap_id).host}",
+        name: data["name"]
+      }
+
+      User.insert_or_update_user(user_data)
+    end
+  end
 end
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index c35ba42be..91c4474c5 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -218,11 +218,6 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
-  def insert_or_update_user(data) do
-    cs = User.remote_user_creation(data)
-    Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
-  end
-
   def make_user(uri, update \\ false) do
     with {:ok, info} <- gather_user_info(uri) do
       data = %{
@@ -236,7 +231,7 @@ defmodule Pleroma.Web.OStatus do
       with false <- update,
            %User{} = user <- User.get_by_ap_id(data.ap_id) do
         {:ok, user}
-      else _e -> insert_or_update_user(data)
+      else _e -> User.insert_or_update_user(data)
       end
     end
   end
-- 
cgit v1.2.3


From ce31f3a922cab93d13c50a2fcec0f383631a13d0 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 11 Feb 2018 17:21:06 +0100
Subject: Twitter Representers: Handle Mastodon attachments.

---
 .../web/twitter_api/representers/object_representer.ex   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/representers/object_representer.ex b/lib/pleroma/web/twitter_api/representers/object_representer.ex
index 69eaeb36c..e2d653ba8 100644
--- a/lib/pleroma/web/twitter_api/representers/object_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/object_representer.ex
@@ -2,9 +2,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
   alias Pleroma.Object
 
-  def to_map(%Object{} = object, _opts) do
+  def to_map(%Object{data: %{"url" => [url | _]}} = object, _opts) do
     data = object.data
-    url = List.first(data["url"])
     %{
       url: url["href"] |> Pleroma.Web.MediaProxy.url(),
       mimetype: url["mediaType"],
@@ -13,6 +12,19 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
     }
   end
 
+  def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
+    %{
+      url: url |> Pleroma.Web.MediaProxy.url(),
+      mimetype: data["mediaType"],
+      id: data["uuid"],
+      oembed: false
+    }
+  end
+
+  def to_map(%Object{}, _opts) do
+    %{}
+  end
+
   # If we only get the naked data, wrap in an object
   def to_map(%{} = data, opts) do
     to_map(%Object{data: data}, opts)
-- 
cgit v1.2.3


From 8cf97ee8e15a36cbbf0964d5be53c88d29798163 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 11 Feb 2018 20:43:33 +0100
Subject: ActivityPub: Basic note federation with Mastodon.

---
 lib/pleroma/user.ex                                | 29 ++++++++++++--
 lib/pleroma/web/activity_pub/activity_pub.ex       | 44 ++++++++++++++++------
 .../web/activity_pub/activity_pub_controller.ex    |  2 +
 lib/pleroma/web/federator/federator.ex             |  3 ++
 lib/pleroma/web/http_signatures/http_signatures.ex | 30 ++++++++++++++-
 5 files changed, 92 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 47aefaeba..ddf66cee9 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -383,10 +383,33 @@ defmodule Pleroma.User do
     :ok
   end
 
+  def get_or_fetch_by_ap_id(ap_id) do
+    if user = get_by_ap_id(ap_id) do
+      user
+    else
+      with {:ok, user} <- ActivityPub.make_user_from_ap_id(ap_id) do
+        user
+      end
+    end
+  end
+
+  # AP style
+  def public_key_from_info(%{"source_data" => %{"publicKey" => %{"publicKeyPem" => public_key_pem}}}) do
+     key = :public_key.pem_decode(public_key_pem)
+     |> hd()
+     |> :public_key.pem_entry_decode()
+
+     {:ok, key}
+  end
+
+  # OStatus Magic Key
+  def public_key_from_info(%{"magic_key" => magic_key}) do
+    {:ok, Pleroma.Web.Salmon.decode_key(magic_key)}
+  end
+
   def get_public_key_for_ap_id(ap_id) do
-    with %User{} = user <- get_cached_by_ap_id(ap_id),
-         %{info: %{"magic_key" => magic_key}} <- user,
-         public_key <- Pleroma.Web.Salmon.decode_key(magic_key) do
+    with %User{} = user <- get_or_fetch_by_ap_id(ap_id),
+         {:ok, public_key} <- public_key_from_info(user.info) do
       {:ok, public_key}
     else
       _ -> :error
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4d0de71e4..6e29768d1 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -223,18 +223,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Repo.insert(%Object{data: data})
   end
 
-  def prepare_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
-    with {:ok, user} <- OStatus.find_or_make_user(data["actor"]) do
-      data
-    else
-      _e -> :error
-    end
-  end
-
-  def prepare_incoming(_) do
-    :error
-  end
-
   def make_user_from_ap_id(ap_id) do
     with {:ok, %{status_code: 200, body: body}} <- @httpoison.get(ap_id, ["Accept": "application/activity+json"]),
     {:ok, data} <- Poison.decode(body)
@@ -252,4 +240,36 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       User.insert_or_update_user(user_data)
     end
   end
+
+  # TODO: Extract to own module, align as close to Mastodon format as possible.
+  def sanitize_outgoing_activity_data(data) do
+    data
+    |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+  end
+
+  def prepare_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+    with {:ok, user} <- OStatus.find_or_make_user(data["actor"]) do
+      {:ok, data}
+    else
+      _e -> :error
+    end
+  end
+
+  def prepare_incoming(_) do
+    :error
+  end
+
+  def publish(actor, activity) do
+    remote_users = Pleroma.Web.Salmon.remote_users(activity)
+    data = sanitize_outgoing_activity_data(activity.data)
+    Enum.each remote_users, fn(user) ->
+      if user.info["ap_enabled"] do
+        inbox = user.info["source_data"]["inbox"]
+        Logger.info("Federating #{activity.data["id"]} to #{inbox}")
+        host = URI.parse(inbox).host
+        signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host})
+        @httpoison.post(inbox, Poison.encode!(data), [{"Content-Type", "application/activity+json"}, {"signature", signature}])
+      end
+    end
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 0d3e8f44c..35723f75c 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -23,6 +23,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     with {:ok, data} <- ActivityPub.prepare_incoming(params),
          {:ok, activity} <- ActivityPub.insert(data, false) do
       json(conn, "ok")
+    else
+      e -> IO.inspect(e)
     end
   end
 end
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index c9f9dc7a1..68e5544e7 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -47,6 +47,9 @@ defmodule Pleroma.Web.Federator do
 
       Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
       Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
+
+      Logger.debug(fn -> "Sending #{activity.data["id"]} out via AP" end)
+      Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
     end
   end
 
diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index 830ddf64d..cdc5e1f3f 100644
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -1,6 +1,7 @@
 # https://tools.ietf.org/html/draft-cavage-http-signatures-08
 defmodule Pleroma.Web.HTTPSignatures do
   alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.ActivityPub
 
   def split_signature(sig) do
     default = %{"headers" => "date"}
@@ -28,7 +29,16 @@ defmodule Pleroma.Web.HTTPSignatures do
     # For now, fetch the key for the actor.
     with actor_id <- conn.params["actor"],
          {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
-      validate_conn(conn, public_key)
+      if validate_conn(conn, public_key) do
+        true
+      else
+        # Fetch user anew and try one more time
+        with actor_id <- conn.params["actor"],
+             {:ok, _user} <- ActivityPub.make_user_from_ap_id(actor_id),
+             {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
+          validate_conn(conn, public_key)
+        end
+      end
     else
       _ -> false
     end
@@ -45,4 +55,22 @@ defmodule Pleroma.Web.HTTPSignatures do
     |> Enum.map(fn (header) -> "#{header}: #{headers[header]}" end)
     |> Enum.join("\n")
   end
+
+  def sign(user, headers) do
+    with {:ok, %{info: %{"keys" => keys}}} <- Pleroma.Web.WebFinger.ensure_keys_present(user),
+         {:ok, private_key, _} = Pleroma.Web.Salmon.keys_from_pem(keys) do
+      sigstring = build_signing_string(headers, Map.keys(headers))
+      signature = :public_key.sign(sigstring, :sha256, private_key)
+      |> Base.encode64()
+
+      [
+        keyId: user.ap_id <> "#main-key",
+        algorithm: "rsa-sha256",
+        headers: Map.keys(headers) |> Enum.join(" "),
+        signature: signature
+      ]
+      |> Enum.map(fn({k, v}) -> "#{k}=\"#{v}\"" end)
+      |> Enum.join(",")
+    end
+  end
 end
-- 
cgit v1.2.3


From 38b61fddfef6548f6c5999b9dc2b992a0db1a5d8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 15 Feb 2018 19:58:26 +0100
Subject: HttpSignature Plug: Skip if already valid.

---
 lib/pleroma/plugs/http_signature.ex | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/plugs/http_signature.ex b/lib/pleroma/plugs/http_signature.ex
index 17030cdbf..b1e0d91a7 100644
--- a/lib/pleroma/plugs/http_signature.ex
+++ b/lib/pleroma/plugs/http_signature.ex
@@ -6,6 +6,10 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
     options
   end
 
+  def call(%{assigns: %{valid_signature: true}} = conn, opts) do
+    conn
+  end
+
   def call(conn, opts) do
     if get_req_header(conn, "signature") do
       conn = conn
-- 
cgit v1.2.3


From ae266043787ca4b9bcbe5162f12598286a44cae2 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 15 Feb 2018 19:59:03 +0100
Subject: ActivityPub: Refactor create function.

---
 lib/pleroma/web/activity_pub/activity_pub.ex     | 19 +++++--------------
 lib/pleroma/web/common_api/common_api.ex         |  2 +-
 lib/pleroma/web/ostatus/handlers/note_handler.ex |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 6e29768d1..a7b2988b9 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,6 +1,5 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
-  alias Pleroma.Web.OStatus
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
@@ -37,7 +36,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
-  def create(to, actor, context, object, additional \\ %{}, published \\ nil, local \\ true) do
+  def create(%{to: to, actor: actor, context: context, object: object} = params) do
+    additional = params[:additional] || %{}
+    local = !(params[:local] == false) # only accept false as false value
+    published = params[:published]
+
     with create_data <- make_create_data(%{to: to, actor: actor, published: published, context: context, object: object}, additional),
          {:ok, activity} <- insert(create_data, local),
          :ok <- maybe_federate(activity) do
@@ -247,18 +250,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
   end
 
-  def prepare_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
-    with {:ok, user} <- OStatus.find_or_make_user(data["actor"]) do
-      {:ok, data}
-    else
-      _e -> :error
-    end
-  end
-
-  def prepare_incoming(_) do
-    :error
-  end
-
   def publish(actor, activity) do
     remote_users = Pleroma.Web.Salmon.remote_users(activity)
     data = sanitize_outgoing_activity_data(activity.data)
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index d3a9f7b85..f3060bd89 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -61,7 +61,7 @@ defmodule Pleroma.Web.CommonAPI do
          cw <- data["spoiler_text"],
          object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw),
          object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do
-      res = ActivityPub.create(to, user, context, object)
+      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object})
       User.increase_note_count(user)
       res
     end
diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index 8747dbb67..7b7ed2d5a 100644
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -112,7 +112,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
          # TODO: Handle this case in make_note_data
          note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note)
       do
-      res = ActivityPub.create(to, actor, context, note, %{}, date, false)
+      res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false})
       User.increase_note_count(actor)
       res
     else
-- 
cgit v1.2.3


From ef0300889db32be5e781fd2fa3a59e2d94f5eccd Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 15 Feb 2018 20:00:06 +0100
Subject: Transmogrifier: Handle basic notice creation.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 44 ++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 lib/pleroma/web/activity_pub/transmogrifier.ex

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
new file mode 100644
index 000000000..3e302f5b2
--- /dev/null
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -0,0 +1,44 @@
+defmodule Pleroma.Web.ActivityPub.Transmogrifier do
+  @moduledoc """
+  A module to handle coding from internal to wire ActivityPub and back.
+  """
+  alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.ActivityPub
+
+  @doc """
+  Modifies an incoming AP object (mastodon format) to our internal format.
+  """
+  def fix_object(object) do
+    object
+    |> Map.put("actor", object["attributedTo"])
+  end
+
+  # TODO: validate those with a Ecto scheme
+  # - tags
+  # - emoji
+  def handle_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+    with %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
+      object = fix_object(data["object"])
+      params = %{
+        to: data["to"],
+        object: object,
+        actor: user,
+        context: data["object"]["conversation"],
+        local: false,
+        published: data["published"],
+        additional: Map.take(data, [
+              "cc",
+              "id"
+            ])
+      }
+
+      ActivityPub.create(params)
+    else
+      _e -> :error
+    end
+  end
+
+  def prepare_incoming(_) do
+    :error
+  end
+end
-- 
cgit v1.2.3


From 5454ec6a6ccedb2647cb765251e4cef3df2fcaf3 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 15 Feb 2018 20:00:43 +0100
Subject: ActivityPubController: Handle inbox data.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 16 ++++++++++++----
 lib/pleroma/web/activity_pub/utils.ex                   |  1 -
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 35723f75c..a4472a832 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,9 +1,11 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
   alias Pleroma.{User, Repo, Object}
-  alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
+  alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
 
+  action_fallback :errors
+
   def user(conn, %{"nickname" => nickname}) do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
@@ -18,13 +20,19 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     end
   end
 
-  # TODO: Move signature failure halt into plug
+  # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    with {:ok, data} <- ActivityPub.prepare_incoming(params),
-         {:ok, activity} <- ActivityPub.insert(data, false) do
+    # File.write("/tmp/incoming.json", Poison.encode!(params))
+    with {:ok, activity} <- Transmogrifier.handle_incoming(params) do
       json(conn, "ok")
     else
       e -> IO.inspect(e)
     end
   end
+
+  def errors(conn, _e) do
+    conn
+    |> put_status(500)
+    |> json("error")
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index ac20a2822..b32b7240e 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -205,7 +205,6 @@ defmodule Pleroma.Web.ActivityPub.Utils do
 
   def make_create_data(params, additional) do
     published = params.published || make_date()
-
     %{
       "type" => "Create",
       "to" => params.to |> Enum.uniq,
-- 
cgit v1.2.3


From 7851b9ba816148706328b7d16eef383ea9256795 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 15 Feb 2018 20:32:07 +0100
Subject: ActivityPub: Use recipients fields.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a7b2988b9..4848cc542 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -140,11 +140,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   defp restrict_tag(query, _), do: query
 
   defp restrict_recipients(query, recipients) do
-    Enum.reduce(recipients, query, fn (recipient, q) ->
-      map = %{ to: [recipient] }
-      from activity in q,
-      or_where: fragment(~s(? @> ?), activity.data, ^map)
-    end)
+    from activity in query,
+     where: fragment("? && ?", ^recipients, activity.recipients)
   end
 
   defp restrict_local(query, %{"local_only" => true}) do
-- 
cgit v1.2.3


From 5a371892a031ecc7359ff45d1119ae41a20f46dd Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 10:26:44 +0100
Subject: Fix specs.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4848cc542..b6a2d6c5e 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -139,6 +139,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
   defp restrict_tag(query, _), do: query
 
+  defp restrict_recipients(query, []), do: query
   defp restrict_recipients(query, recipients) do
     from activity in query,
      where: fragment("? && ?", ^recipients, activity.recipients)
-- 
cgit v1.2.3


From 05ba6ca1b8a792dfaa8e636a964a09b766afb4d6 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 14:11:20 +0100
Subject: Do some transmogrifying for the output.

---
 lib/pleroma/web/activity_pub/activity_pub.ex   |  9 ++-----
 lib/pleroma/web/activity_pub/transmogrifier.ex | 35 ++++++++++++++++++++++++--
 lib/pleroma/web/common_api/common_api.ex       |  2 +-
 3 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index b6a2d6c5e..8e15fde4a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,5 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
+  alias Pleroma.Web.ActivityPub.Transmogrifier
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
@@ -242,15 +243,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
-  # TODO: Extract to own module, align as close to Mastodon format as possible.
-  def sanitize_outgoing_activity_data(data) do
-    data
-    |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
-  end
-
   def publish(actor, activity) do
     remote_users = Pleroma.Web.Salmon.remote_users(activity)
-    data = sanitize_outgoing_activity_data(activity.data)
+    {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
     Enum.each remote_users, fn(user) ->
       if user.info["ap_enabled"] do
         inbox = user.info["source_data"]["inbox"]
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 3e302f5b2..74d25786f 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -38,7 +38,38 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
-  def prepare_incoming(_) do
-    :error
+  @doc
+  """
+  internal -> Mastodon
+  """
+  def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+    object = object
+    |> add_mention_tags
+    |> add_attributed_to
+
+    data = data
+    |> Map.put("object", object)
+    |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+
+    {:ok, data}
+  end
+
+  def add_mention_tags(object) do
+    mentions = object["to"]
+    |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
+    |> Enum.filter(&(&1))
+    |> Enum.map(fn(user) -> %{"type" => "mention", "href" => user.ap_id, "name" => "@#{user.nickname}"} end)
+
+    tags = object["tags"] || []
+
+    object
+    |> Map.put("tags", tags ++ mentions)
+  end
+
+  def add_attributed_to(object) do
+    attributedTo = object["attributedTo"] || object["actor"]
+
+    object
+    |> Map.put("attributedTo", attributedTo)
   end
 end
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index f3060bd89..bc1bb1892 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -61,7 +61,7 @@ defmodule Pleroma.Web.CommonAPI do
          cw <- data["spoiler_text"],
          object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw),
          object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do
-      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object})
+      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => to}})
       User.increase_note_count(user)
       res
     end
-- 
cgit v1.2.3


From 5682e48a253e40791b0b723f8cebf605c9cf7b63 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 14:20:53 +0100
Subject: ActivityPub: tags -> tag.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 74d25786f..c4b6a79e0 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -58,12 +58,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     mentions = object["to"]
     |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
     |> Enum.filter(&(&1))
-    |> Enum.map(fn(user) -> %{"type" => "mention", "href" => user.ap_id, "name" => "@#{user.nickname}"} end)
+    |> Enum.map(fn(user) -> %{"type" => "Mention", "href" => user.ap_id, "name" => "@#{user.nickname}"} end)
 
-    tags = object["tags"] || []
+    tags = object["tag"] || []
 
     object
-    |> Map.put("tags", tags ++ mentions)
+    |> Map.put("tag", tags ++ mentions)
   end
 
   def add_attributed_to(object) do
-- 
cgit v1.2.3


From e7b73359e352ed585613feeb61a48df3dd6d2cb3 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 14:55:44 +0100
Subject: ActivityPub: Partly handle incoming follows.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index c4b6a79e0..f4af3aed3 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -38,6 +38,20 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  def handle_incoming(%{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id}) do
+    with %User{} = followed <- User.get_cached_by_ap_id(followed),
+         %User{} = follower <- User.get_or_fetch_by_ap_id(follower),
+         {:ok, activity} <- ActivityPub.follow(follower, followed, id, false) do
+      # TODO: Send an "Accept" activity.
+      User.follow(follower, followed)
+      {:ok, activity}
+    else
+      _e -> :error
+    end
+  end
+
+  def handle_incoming(_), do: :error
+
   @doc
   """
   internal -> Mastodon
-- 
cgit v1.2.3


From 7b26443a7656163a1ecca6196b745e3393b606f1 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 16:08:55 +0100
Subject: ActivityPub: Send out Accept after Follow.

---
 lib/pleroma/user.ex                            |  5 ++++-
 lib/pleroma/web/activity_pub/activity_pub.ex   | 16 +++++++++++++++-
 lib/pleroma/web/activity_pub/transmogrifier.ex | 13 ++++++++++---
 lib/pleroma/web/salmon/salmon.ex               | 10 +++++++++-
 lib/pleroma/web/websub/websub.ex               | 11 ++++++++++-
 5 files changed, 48 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index ddf66cee9..61bca3afd 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -150,11 +150,12 @@ defmodule Pleroma.User do
 
   def follow(%User{} = follower, %User{info: info} = followed) do
     ap_followers = followed.follower_address
+
     if following?(follower, followed) or info["deactivated"] do
       {:error,
        "Could not follow user: #{followed.nickname} is already on your list."}
     else
-      if !followed.local && follower.local do
+      if !followed.local && follower.local && !ap_enabled?(followed) do
         Websub.subscribe(follower, followed)
       end
 
@@ -420,4 +421,6 @@ defmodule Pleroma.User do
     cs = User.remote_user_creation(data)
     Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
   end
+
+  def ap_enabled?(%User{info: %{"ap_enabled" => ap}}), do: ap
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 8e15fde4a..0c1b6cb28 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -49,6 +49,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  def accept(%{to: to, actor: actor, object: object} = params) do
+    local = !(params[:local] == false) # only accept false as false value
+
+    with data <- %{"to" => to, "type" => "Accept", "actor" => actor, "object" => object},
+         {:ok, activity} <- insert(data, local),
+         :ok <- maybe_federate(activity) do
+      {:ok, activity}
+    end
+  end
+
   # TODO: This is weird, maybe we shouldn't check here if we can make the activity.
   def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => _}} = object, activity_id \\ nil, local \\ true) do
     with nil <- get_existing_like(ap_id, object),
@@ -244,7 +254,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def publish(actor, activity) do
-    remote_users = Pleroma.Web.Salmon.remote_users(activity)
+    {:ok, followers} = User.get_followers(actor)
+
+    remote_users = Pleroma.Web.Salmon.remote_users(activity) ++ followers
+    |> Enum.uniq
+
     {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
     Enum.each remote_users, fn(user) ->
       if user.info["ap_enabled"] do
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index f4af3aed3..76f04e8a3 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -38,11 +38,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
-  def handle_incoming(%{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id}) do
-    with %User{} = followed <- User.get_cached_by_ap_id(followed),
+  def handle_incoming(%{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id} = data) do
+    with %User{local: true} = followed <- User.get_cached_by_ap_id(followed),
          %User{} = follower <- User.get_or_fetch_by_ap_id(follower),
          {:ok, activity} <- ActivityPub.follow(follower, followed, id, false) do
-      # TODO: Send an "Accept" activity.
+      ActivityPub.accept(%{to: [follower.ap_id], actor: followed.ap_id, object: data, local: true})
       User.follow(follower, followed)
       {:ok, activity}
     else
@@ -68,6 +68,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
+  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept"] do
+    data = data
+    |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
+
+    {:ok, data}
+  end
+
   def add_mention_tags(object) do
     mentions = object["to"]
     |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 81b864582..806f3c3c0 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -154,8 +154,16 @@ defmodule Pleroma.Web.Salmon do
 
   defp send_to_user(_,_,_), do: nil
 
+  @supported_activities [
+    "Create",
+    "Follow",
+    "Like",
+    "Announce",
+    "Undo",
+    "Delete"
+  ]
   def publish(user, activity, poster \\ &@httpoison.post/4)
-  def publish(%{info: %{"keys" => keys}} = user, activity, poster) do
+  def publish(%{info: %{"keys" => keys}} = user, %{data: %{"type" => type}} = activity, poster) when type in @supported_activities do
     feed = ActivityRepresenter.to_simple_form(activity, user, true)
     |> ActivityRepresenter.wrap_with_entry
     |> :xmerl.export_simple(:xmerl_xml)
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index db1577a93..47a01849d 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -38,7 +38,15 @@ defmodule Pleroma.Web.Websub do
     end
   end
 
-  def publish(topic, user, activity) do
+  @supported_activities [
+    "Create",
+    "Follow",
+    "Like",
+    "Announce",
+    "Undo",
+    "Delete"
+  ]
+  def publish(topic, user, %{data: %{"type" => type}} = activity) when type in @supported_activities do
     # TODO: Only send to still valid subscriptions.
     query = from sub in WebsubServerSubscription,
     where: sub.topic == ^topic and sub.state == "active"
@@ -58,6 +66,7 @@ defmodule Pleroma.Web.Websub do
       Pleroma.Web.Federator.enqueue(:publish_single_websub, data)
     end)
   end
+  def publish(_,_,_), do: ""
 
   def sign(secret, doc) do
     :crypto.hmac(:sha, secret, to_string(doc)) |> Base.encode16 |> String.downcase
-- 
cgit v1.2.3


From c2d0cb1a295c46ebb425405a2b38c1c2fe3e6ae1 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 16:18:10 +0100
Subject: ActivtyPub Delivery: Use shared inbox if possible.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 0c1b6cb28..3d476d729 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -256,18 +256,20 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def publish(actor, activity) do
     {:ok, followers} = User.get_followers(actor)
 
-    remote_users = Pleroma.Web.Salmon.remote_users(activity) ++ followers
+    remote_inboxes = Pleroma.Web.Salmon.remote_users(activity) ++ followers
+    |> Enum.filter(fn (user) -> User.ap_enabled?(user) end)
+    |> Enum.map(fn (%{info: %{"source_data" => data}}) ->
+      (data["endpoints"] && data["endpoints"]["sharedInbox"]) ||data["inbox"]
+    end)
     |> Enum.uniq
 
     {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
-    Enum.each remote_users, fn(user) ->
-      if user.info["ap_enabled"] do
-        inbox = user.info["source_data"]["inbox"]
-        Logger.info("Federating #{activity.data["id"]} to #{inbox}")
-        host = URI.parse(inbox).host
-        signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host})
-        @httpoison.post(inbox, Poison.encode!(data), [{"Content-Type", "application/activity+json"}, {"signature", signature}])
-      end
+
+    Enum.each remote_inboxes, fn(inbox) ->
+      Logger.info("Federating #{activity.data["id"]} to #{inbox}")
+      host = URI.parse(inbox).host
+      signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host})
+      @httpoison.post(inbox, Poison.encode!(data), [{"Content-Type", "application/activity+json"}, {"signature", signature}])
     end
   end
 end
-- 
cgit v1.2.3


From fb7b926be385da563f29f2a7134f965fcba36b3c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 18:15:48 +0100
Subject: Handle black name fields on incoming users.

---
 lib/pleroma/user.ex | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 61bca3afd..ab29fe6f4 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -417,7 +417,12 @@ defmodule Pleroma.User do
     end
   end
 
+  defp blank?(""), do: nil
+  defp blank?(n), do: n
+
   def insert_or_update_user(data) do
+    data = data
+    |> Map.put(:name, blank?(data[:name]) || data[:nickname])
     cs = User.remote_user_creation(data)
     Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
   end
-- 
cgit v1.2.3


From ab27c90c9fccd20cacad86a5c5f9a48314884d53 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 18:38:58 +0100
Subject: ActivityPub: Handle attachments.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 76f04e8a3..6cf7cfe35 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -11,6 +11,18 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   def fix_object(object) do
     object
     |> Map.put("actor", object["attributedTo"])
+    |> fix_attachments
+  end
+
+  def fix_attachments(object) do
+    attachments = object["attachment"] || []
+    |> Enum.map(fn (data) ->
+      url = [%{"type" => "Link", "mediaType" => data["mediaType"], "url" => data["url"]}]
+      Map.put(data, "url", url)
+    end)
+
+    object
+    |> Map.put("attachment", attachments)
   end
 
   # TODO: validate those with a Ecto scheme
@@ -60,6 +72,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     object = object
     |> add_mention_tags
     |> add_attributed_to
+    |> prepare_attachments
 
     data = data
     |> Map.put("object", object)
@@ -93,4 +106,15 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     object
     |> Map.put("attributedTo", attributedTo)
   end
+
+  def prepare_attachments(object) do
+    attachments = (object["attachment"] || [])
+    |> Enum.map(fn (data) ->
+      [%{"mediaType" => media_type, "href" => href} | _] = data["url"]
+      %{"url" => href, "mediaType" => media_type, "name" => data["name"], "type" => "Document"}
+    end)
+
+    object
+    |> Map.put("attachment", attachments)
+  end
 end
-- 
cgit v1.2.3


From 1f98de20793b60fa16a10f4bb21dc017a96ae122 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 18:39:12 +0100
Subject: ActivityPub: Use shared inbox.

---
 lib/pleroma/web/router.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6455ff108..8d93e1ea6 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -245,6 +245,7 @@ defmodule Pleroma.Web.Router do
   scope "/", Pleroma.Web.ActivityPub do
     pipe_through :activitypub
     post "/users/:nickname/inbox", ActivityPubController, :inbox
+    post "/inbox", ActivityPubController, :inbox
   end
 
   scope "/.well-known", Pleroma.Web do
-- 
cgit v1.2.3


From e1b12a778211378534fa176bbc4456c3a100b23f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 20:13:12 +0100
Subject: ActivityPub: Handle incoming likes.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 6cf7cfe35..82fcf0898 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   A module to handle coding from internal to wire ActivityPub and back.
   """
   alias Pleroma.User
+  alias Pleroma.Object
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   @doc """
@@ -62,6 +63,20 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  def handle_incoming(%{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = data) do
+    with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
+         %Object{} = object <- Object.get_by_ap_id(object_id),
+         {:ok, activity, object} <- ActivityPub.like(actor, object, id, false) do
+      {:ok, activity}
+    else
+      _e -> :error
+    end
+  end
+
+  # TODO
+  # Accept
+  # Undo
+
   def handle_incoming(_), do: :error
 
   @doc
-- 
cgit v1.2.3


From 32b995fbb6488e64d8caefe1d2ef270a83fbe3c2 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 20:22:14 +0100
Subject: ActivityPub: Implement outgoing likes.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 82fcf0898..b5a126cb6 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -96,7 +96,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
-  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept"] do
+  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept", "Like"] do
     data = data
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
 
-- 
cgit v1.2.3


From 0f2ad25a7b1125c1e945d474a1873773fdfee26a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 20:47:45 +0100
Subject: AcitvityPub: Outgoing Announces.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex    | 2 +-
 lib/pleroma/web/activity_pub/views/object_view.ex | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index b5a126cb6..c1d7cb3ae 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -96,7 +96,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
-  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept", "Like"] do
+  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept", "Like", "Announce"] do
     data = data
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
 
diff --git a/lib/pleroma/web/activity_pub/views/object_view.ex b/lib/pleroma/web/activity_pub/views/object_view.ex
index 403f8cb17..c39f99454 100644
--- a/lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/lib/pleroma/web/activity_pub/views/object_view.ex
@@ -21,6 +21,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do
     }
 
     additional = Map.take(object.data, ["id", "to", "cc", "actor", "content", "summary", "type"])
+    |> Map.put("attributedTo", object.data["actor"])
     Map.merge(base, additional)
   end
 end
-- 
cgit v1.2.3


From 5e36b750c1f98c440f4edcb9bb5bac5e6f93278f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 21:56:33 +0100
Subject: ActivityPub: Fetch an object from an id.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 3d476d729..7c9ddcfe7 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -272,4 +272,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       @httpoison.post(inbox, Poison.encode!(data), [{"Content-Type", "application/activity+json"}, {"signature", signature}])
     end
   end
+
+  def fetch_object_from_id(id) do
+    if object = Object.get_cached_by_ap_id(id) do
+      {:ok, object}
+    else
+      with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(id, [Accept: "application/activity+json"], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
+           {:ok, data} <- Poison.decode(body),
+           data <- Transmogrifier.fix_object(data),
+           %User{} <- User.get_or_fetch_by_ap_id(data["attributedTo"]) do
+        Object.create(data)
+      end
+    end
+  end
 end
-- 
cgit v1.2.3


From 81ea359a7ce62a0d761b1b0348a1fccf5fe8e106 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 17 Feb 2018 21:57:31 +0100
Subject: ActivityPub: Handle incoming announces.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index c1d7cb3ae..1dc86fa85 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -73,6 +73,16 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  def handle_incoming(%{"type" => "Announce", "object" => object_id, "actor" => actor, "id" => id} = data) do
+    with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
+         {:ok, object} <- ActivityPub.fetch_object_from_id(object_id),
+         {:ok, activity, object} <- ActivityPub.announce(actor, object, id, false) do
+      {:ok, activity}
+    else
+      _e -> :error
+    end
+  end
+
   # TODO
   # Accept
   # Undo
-- 
cgit v1.2.3


From 77c6c424a66b4bfc418e43054eaa695ae3e22231 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 11:24:54 +0100
Subject: ActivityPub: Make fake Create activities for objects without one.

---
 lib/pleroma/web/activity_pub/activity_pub.ex   | 11 +++++++++--
 lib/pleroma/web/activity_pub/transmogrifier.ex |  7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 7c9ddcfe7..a5e8b98e9 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -273,6 +273,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  # TODO:
+  # This will create a Create activity, which we need internally at the moment.
   def fetch_object_from_id(id) do
     if object = Object.get_cached_by_ap_id(id) do
       {:ok, object}
@@ -280,8 +282,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(id, [Accept: "application/activity+json"], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
            {:ok, data} <- Poison.decode(body),
            data <- Transmogrifier.fix_object(data),
-           %User{} <- User.get_or_fetch_by_ap_id(data["attributedTo"]) do
-        Object.create(data)
+           nil <- Object.get_by_ap_id(data["id"]),
+           %User{} = user <- User.get_or_fetch_by_ap_id(data["attributedTo"]),
+           {:ok, activity} = create(%{to: data["to"], actor: user, context: data["context"], object: data, local: false, additional: %{"cc" => data["cc"]}}) do
+        {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
+      else
+        object = %Object{} -> {:ok, object}
+        e -> e
       end
     end
   end
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 1dc86fa85..62e43526e 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -4,6 +4,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   """
   alias Pleroma.User
   alias Pleroma.Object
+  alias Pleroma.Activity
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   @doc """
@@ -75,7 +76,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   def handle_incoming(%{"type" => "Announce", "object" => object_id, "actor" => actor, "id" => id} = data) do
     with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
-         {:ok, object} <- ActivityPub.fetch_object_from_id(object_id),
+         {:ok, object} <- get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
          {:ok, activity, object} <- ActivityPub.announce(actor, object, id, false) do
       {:ok, activity}
     else
@@ -89,6 +90,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   def handle_incoming(_), do: :error
 
+  def get_obj_helper(id) do
+    if object = Object.get_by_ap_id(id), do: {:ok, object}, else: nil
+  end
+
   @doc
   """
   internal -> Mastodon
-- 
cgit v1.2.3


From 68752b20475162705837421e446166892421cf21 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 12:04:59 +0100
Subject: Switch protocols to AP when post come in through AP.

---
 lib/pleroma/user.ex                                     |  2 +-
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index ab29fe6f4..2ca4d406b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -427,5 +427,5 @@ defmodule Pleroma.User do
     Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
   end
 
-  def ap_enabled?(%User{info: %{"ap_enabled" => ap}}), do: ap
+  def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index a4472a832..8080a2b1e 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -23,13 +23,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
     # File.write("/tmp/incoming.json", Poison.encode!(params))
-    with {:ok, activity} <- Transmogrifier.handle_incoming(params) do
+    with {:ok, _user} <- ap_enabled_actor(params["actor"]),
+         {:ok, activity} <- Transmogrifier.handle_incoming(params) do
       json(conn, "ok")
     else
       e -> IO.inspect(e)
     end
   end
 
+  def ap_enabled_actor(id) do
+    user = User.get_by_ap_id(id)
+    if User.ap_enabled?(user) do
+      {:ok, user}
+    else
+      ActivityPub.make_user_from_ap_id(id)
+    end
+  end
+
   def errors(conn, _e) do
     conn
     |> put_status(500)
-- 
cgit v1.2.3


From b99eeb2bdf9224727b8acb2db596d1b851550e55 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 12:27:05 +0100
Subject: Try to fetch AP user data first.

---
 lib/pleroma/user.ex                          | 11 ++++++++++-
 lib/pleroma/web/activity_pub/activity_pub.ex |  7 +++++++
 lib/pleroma/web/web_finger/web_finger.ex     |  4 +++-
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 2ca4d406b..f88c1240a 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -228,12 +228,21 @@ defmodule Pleroma.User do
     Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
   end
 
+  def fetch_by_nickname(nickname) do
+    ap_try = ActivityPub.make_user_from_nickname(nickname)
+
+    case ap_try do
+      {:ok, user} -> {:ok, user}
+      _ -> OStatus.make_user(nickname)
+    end
+  end
+
   def get_or_fetch_by_nickname(nickname) do
     with %User{} = user <- get_by_nickname(nickname)  do
       user
     else _e ->
       with [_nick, _domain] <- String.split(nickname, "@"),
-           {:ok, user} <- OStatus.make_user(nickname) do
+           {:ok, user} <- fetch_by_nickname(nickname) do
         user
       else _e -> nil
       end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a5e8b98e9..d171913f8 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
   alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.WebFinger
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
@@ -253,6 +254,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  def make_user_from_nickname(nickname) do
+    with {:ok, %{"ap_id" => ap_id}} when not is_nil(ap_id) <- WebFinger.finger(nickname) do
+      make_user_from_ap_id(ap_id)
+    end
+  end
+
   def publish(actor, activity) do
     {:ok, followers} = User.get_followers(actor)
 
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 09957e133..54cbf4cea 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -71,12 +71,14 @@ defmodule Pleroma.Web.WebFinger do
     subject = XML.string_from_xpath("//Subject", doc)
     salmon = XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc)
     subscribe_address = XML.string_from_xpath(~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template}, doc)
+    ap_id = XML.string_from_xpath(~s{//Link[@rel="self" and @type="application/activity+json"]/@href}, doc)
     data = %{
       "magic_key" => magic_key,
       "topic" => topic,
       "subject" => subject,
       "salmon" => salmon,
-      "subscribe_address" => subscribe_address
+      "subscribe_address" => subscribe_address,
+      "ap_id" => ap_id
     }
     {:ok, data}
   end
-- 
cgit v1.2.3


From 6352dffd13f0ae7db0e4b5452294567524e05a00 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 12:51:35 +0100
Subject: Drop unhandle activities.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 8080a2b1e..f4e5ae9eb 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -4,6 +4,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
 
+  require Logger
+
   action_fallback :errors
 
   def user(conn, %{"nickname" => nickname}) do
@@ -27,7 +29,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
          {:ok, activity} <- Transmogrifier.handle_incoming(params) do
       json(conn, "ok")
     else
-      e -> IO.inspect(e)
+      e ->
+        # Just drop those for now
+        Logger.info("Unhandled activity")
+        Logger.info(Poison.encode!(params, [pretty: 2]))
+        json(conn, "ok")
     end
   end
 
-- 
cgit v1.2.3


From 6046f10431390fa2ecef4b8d8a95b5d8db03fd2d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 13:03:40 +0100
Subject: Actually fix incoming attachments.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 62e43526e..af6b5befc 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -17,9 +17,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   end
 
   def fix_attachments(object) do
-    attachments = object["attachment"] || []
+    attachments = (object["attachment"] || [])
     |> Enum.map(fn (data) ->
-      url = [%{"type" => "Link", "mediaType" => data["mediaType"], "url" => data["url"]}]
+      url = [%{"type" => "Link", "mediaType" => data["mediaType"], "href" => data["url"]}]
       Map.put(data, "url", url)
     end)
 
-- 
cgit v1.2.3


From 6ab0aba50a1b41c027c0c23cc6342719ba439e06 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 13:51:03 +0100
Subject: Transmogrify outgoing hashtags.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index af6b5befc..3781b212a 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -100,6 +100,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   """
   def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
     object = object
+    |> add_hashtags
     |> add_mention_tags
     |> add_attributed_to
     |> prepare_attachments
@@ -118,6 +119,14 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
+  def add_hashtags(object) do
+    tags = (object["tag"] || [])
+    |> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end
+
+    object
+    |> Map.put("tag", tags)
+  end
+
   def add_mention_tags(object) do
     mentions = object["to"]
     |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
-- 
cgit v1.2.3


From 912ca56e59884de2111272efc74bf75894f5ca02 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 13:51:51 +0100
Subject: Mastodon StatusView: Return correct visibility.

---
 lib/pleroma/web/mastodon_api/views/status_view.ex | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 64f315597..e205a420d 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -96,7 +96,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       muted: false,
       sensitive: sensitive,
       spoiler_text: object["summary"] || "",
-      visibility: "public",
+      visibility: get_visibility(object),
       media_attachments: attachments |> Enum.take(4),
       mentions: mentions,
       tags: [], # fix,
@@ -109,7 +109,20 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     }
   end
 
+  def get_visibility(object) do
+    public = "https://www.w3.org/ns/activitystreams#Public"
+    to = object["to"] || []
+    cc = object["cc"] || []
+    cond do
+      public in to -> "public"
+      public in cc -> "unlisted"
+      [] == cc -> "direct"
+      true -> "private"
+    end
+  end
+
   def render("attachment.json", %{attachment: attachment}) do
+    IO.inspect(attachment)
     [%{"mediaType" => media_type, "href" => href} | _] = attachment["url"]
 
     type = cond do
-- 
cgit v1.2.3


From 8ca66b596120024b5141ce68c7614e762358c2a1 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 13:58:52 +0100
Subject: ActivityPub: Add conversation id.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 3781b212a..17cd3b1c2 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -104,6 +104,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> add_mention_tags
     |> add_attributed_to
     |> prepare_attachments
+    |> set_conversation
 
     data = data
     |> Map.put("object", object)
@@ -139,6 +140,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> Map.put("tag", tags ++ mentions)
   end
 
+  def set_conversation(object) do
+    Map.put(object, "conversation", object["context"])
+  end
+
   def add_attributed_to(object) do
     attributedTo = object["attributedTo"] || object["actor"]
 
-- 
cgit v1.2.3


From 20e6190ead59eb9bd83887b8239cab73c17a961b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 14:07:13 +0100
Subject: Transmogrify outgoing nsfw.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 17cd3b1c2..fc04cc9a1 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -100,6 +100,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   """
   def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
     object = object
+    |> set_sensitive
     |> add_hashtags
     |> add_mention_tags
     |> add_attributed_to
@@ -144,6 +145,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     Map.put(object, "conversation", object["context"])
   end
 
+  def set_sensitive(object) do
+    tags = object["tag"] || []
+    Map.put(object, "sensitive", "nsfw" in tags)
+  end
+
   def add_attributed_to(object) do
     attributedTo = object["attributedTo"] || object["actor"]
 
-- 
cgit v1.2.3


From 539340d914e5c124d3583abe1ee4e6a69620b873 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 14:14:16 +0100
Subject: Handle sensitive property.

---
 lib/pleroma/web/mastodon_api/views/status_view.ex                | 2 +-
 lib/pleroma/web/twitter_api/representers/activity_representer.ex | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index e205a420d..d859fc851 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -58,7 +58,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     announcement_count = object["announcement_count"] || 0
 
     tags = object["tag"] || []
-    sensitive = Enum.member?(tags, "nsfw")
+    sensitive = object["sensitive"] || Enum.member?(tags, "nsfw")
 
     mentions = activity.data["to"]
     |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 1f11bc9ac..f9f9bd7b4 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -133,7 +133,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
     conversation_id = conversation_id(activity)
 
     tags = activity.data["object"]["tag"] || []
-    possibly_sensitive = Enum.member?(tags, "nsfw")
+    possibly_sensitive = activity.data["object"]["sensitive"] || Enum.member?(tags, "nsfw")
+
+    tags = if possibly_sensitive, do: ["nsfw" | tags], else: tags
 
     summary = activity.data["object"]["summary"]
     content = if !!summary and summary != "" do
-- 
cgit v1.2.3


From d4b08dd838e06d302e0089bb2155bf5b56e5fbbe Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 14:45:08 +0100
Subject: MastodonAPI: Post with visibility settings

---
 lib/pleroma/web/common_api/common_api.ex          |  7 +++--
 lib/pleroma/web/common_api/utils.ex               | 36 +++++++++++++++++------
 lib/pleroma/web/mastodon_api/views/status_view.ex |  4 +--
 3 files changed, 33 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index bc1bb1892..b682f95bb 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -49,19 +49,20 @@ defmodule Pleroma.Web.CommonAPI do
   @instance Application.get_env(:pleroma, :instance)
   @limit Keyword.get(@instance, :limit)
   def post(user, %{"status" => status} = data) do
+    visibility = data["visibility"] || "public"
     with status <- String.trim(status),
          length when length in 1..@limit <- String.length(status),
          attachments <- attachments_from_ids(data["media_ids"]),
          mentions <- Formatter.parse_mentions(status),
          inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
-         to <- to_for_user_and_mentions(user, mentions, inReplyTo),
+         {to, cc} <- to_for_user_and_mentions(user, mentions, inReplyTo, visibility),
          tags <- Formatter.parse_tags(status, data),
          content_html <- make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]),
          context <- make_context(inReplyTo),
          cw <- data["spoiler_text"],
-         object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw),
+         object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw, cc),
          object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do
-      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => to}})
+      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => cc}})
       User.increase_note_count(user)
       res
     end
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 2b359dd72..ea95c134c 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -24,17 +24,34 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end)
   end
 
-  def to_for_user_and_mentions(user, mentions, inReplyTo) do
-    default_to = [
-      user.follower_address,
-      "https://www.w3.org/ns/activitystreams#Public"
-    ]
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
+    to = ["https://www.w3.org/ns/activitystreams#Public"]
 
-    to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+    cc = [user.follower_address | mentioned_users]
     if inReplyTo do
-      Enum.uniq([inReplyTo.data["actor"] | to])
+      {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
     else
-      to
+      {to, cc}
+    end
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "unlisted") do
+    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "public")
+    {cc, to}
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "private") do
+    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "direct")
+    {[user.follower_address | to], cc}
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+    if inReplyTo do
+      {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
+    else
+      {mentioned_users, []}
     end
   end
 
@@ -99,10 +116,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end)
   end
 
-  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil) do
+  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil, cc \\ []) do
       object = %{
         "type" => "Note",
         "to" => to,
+        "cc" => cc,
         "content" => content_html,
         "summary" => cw,
         "context" => context,
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index d859fc851..b4ce735eb 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -116,8 +116,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     cond do
       public in to -> "public"
       public in cc -> "unlisted"
-      [] == cc -> "direct"
-      true -> "private"
+      Enum.any?(to, &(String.contains?(&1, "/followers"))) -> "private"
+      true -> "direct"
     end
   end
 
-- 
cgit v1.2.3


From 2997fe1ba9bf47bf8f78eee471b1dda76426ac91 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:04:26 +0100
Subject: CommonAPI: If no visibility is given, return parent visibility.

---
 lib/pleroma/web/common_api/common_api.ex | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index b682f95bb..c6657b8e8 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -46,10 +46,17 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
+  def get_visibility(%{"visibility" => visibility}), do: visibility
+  def get_visibility(%{"in_reply_to_status_id" => status_id}) do
+    inReplyTo = get_replied_to_activity(status_id)
+    Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
+  end
+  def get_visibility(_), do: "public"
+
   @instance Application.get_env(:pleroma, :instance)
   @limit Keyword.get(@instance, :limit)
   def post(user, %{"status" => status} = data) do
-    visibility = data["visibility"] || "public"
+    visibility = get_visibility(data)
     with status <- String.trim(status),
          length when length in 1..@limit <- String.length(status),
          attachments <- attachments_from_ids(data["media_ids"]),
-- 
cgit v1.2.3


From 44586f2967cf035f47cb63d9c74f0bb4c9b3ddb8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:20:03 +0100
Subject: ActivityPub: Fallback for unhandled outgoing activities.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index fc04cc9a1..076bd2ea8 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -114,7 +114,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
-  def prepare_outgoing(%{"type" => type} = data) when type in ["Follow", "Accept", "Like", "Announce"] do
+  def prepare_outgoing(%{"type" => type} = data) do
     data = data
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
 
-- 
cgit v1.2.3


From c974f6544f6315a49e51632c862f1e66b750ffff Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:20:36 +0100
Subject: Show users their own posts in timeline.

---
 lib/pleroma/web/activity_pub/activity_pub.ex            | 11 ++++++++---
 lib/pleroma/web/common_api/utils.ex                     |  4 ++--
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex |  1 +
 lib/pleroma/web/twitter_api/twitter_api.ex              |  5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index d171913f8..406207f62 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -151,11 +151,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
   defp restrict_tag(query, _), do: query
 
-  defp restrict_recipients(query, []), do: query
-  defp restrict_recipients(query, recipients) do
+  defp restrict_recipients(query, [], user), do: query
+  defp restrict_recipients(query, recipients, nil) do
     from activity in query,
      where: fragment("? && ?", ^recipients, activity.recipients)
   end
+  defp restrict_recipients(query, recipients, user) do
+    from activity in query,
+      where: fragment("? && ?", ^recipients, activity.recipients),
+      or_where: activity.actor == ^user.ap_id
+  end
 
   defp restrict_local(query, %{"local_only" => true}) do
     from activity in query, where: activity.local == true
@@ -216,7 +221,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       order_by: [fragment("? desc nulls last", activity.id)]
 
     base_query
-    |> restrict_recipients(recipients)
+    |> restrict_recipients(recipients, opts["user"])
     |> restrict_tag(opts)
     |> restrict_since(opts)
     |> restrict_local(opts)
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index ea95c134c..75c63e5f4 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -27,7 +27,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
     to = ["https://www.w3.org/ns/activitystreams#Public"]
 
-    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
     cc = [user.follower_address | mentioned_users]
     if inReplyTo do
       {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
@@ -47,7 +47,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   end
 
   def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
-    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
     if inReplyTo do
       {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
     else
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index e16a2a092..f52ac58de 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -150,6 +150,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     params = params
     |> Map.put("type", ["Create", "Announce"])
     |> Map.put("blocking_user", user)
+    |> Map.put("user", user)
 
     activities = ActivityPub.fetch_activities([user.ap_id | user.following], params)
     |> Enum.reverse
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index faecebde0..57795edba 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -13,7 +13,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def fetch_friend_statuses(user, opts \\ %{}) do
-    opts = Map.put(opts, "blocking_user", user)
+    opts = opts
+    |> Map.put("blocking_user", user)
+    |> Map.put("user", user)
+
     ActivityPub.fetch_activities([user.ap_id | user.following], opts)
     |> activities_to_statuses(%{for: user})
   end
-- 
cgit v1.2.3


From 5729233c367c051dc2deabfa370479a11858c4cd Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:32:11 +0100
Subject: Don't show unlisted in public.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 406207f62..b85f8eb8a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -136,8 +136,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def fetch_public_activities(opts \\ %{}) do
-    public = ["https://www.w3.org/ns/activitystreams#Public"]
-    fetch_activities(public, opts)
+    public = %{to: ["https://www.w3.org/ns/activitystreams#Public"]}
+    q = fetch_activities_query([], opts)
+    q = from activity in q,
+      where: fragment(~s(? @> ?), activity.data, ^public)
+    q
+    |> Repo.all
+    |> Enum.reverse
   end
 
   defp restrict_since(query, %{"since_id" => since_id}) do
@@ -215,7 +220,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
   defp restrict_blocked(query, _), do: query
 
-  def fetch_activities(recipients, opts \\ %{}) do
+  def fetch_activities_query(recipients, opts \\ %{}) do
     base_query = from activity in Activity,
       limit: 20,
       order_by: [fragment("? desc nulls last", activity.id)]
@@ -232,6 +237,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     |> restrict_recent(opts)
     |> restrict_blocked(opts)
     |> restrict_media(opts)
+  end
+
+  def fetch_activities(recipients, opts \\ %{}) do
+    fetch_activities_query(recipients, opts)
     |> Repo.all
     |> Enum.reverse
   end
-- 
cgit v1.2.3


From 5d89997a700bdcaecad10b9a3005e8071b9f6ba5 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:50:34 +0100
Subject: Respect visibility in API.

---
 lib/pleroma/web/activity_pub/activity_pub.ex            | 13 ++++++++++++-
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex |  5 +++--
 lib/pleroma/web/twitter_api/twitter_api.ex              |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index b85f8eb8a..8f660a334 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -131,7 +131,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     query = from activity in Activity,
       where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
       order_by: [desc: :id]
-    query = restrict_blocked(query, opts)
+    query = query
+      |> restrict_blocked(opts)
+      |> restrict_recipients(["https://www.w3.org/ns/activitystreams#Public"], opts["user"])
     Repo.all(query)
   end
 
@@ -313,4 +315,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       end
     end
   end
+
+  def visible_for_user?(activity, nil) do
+    "https://www.w3.org/ns/activitystreams#Public" in (activity.data["to"] ++ (activity.data["cc"] || []))
+  end
+  def visible_for_user?(activity, user) do
+    x = [user.ap_id | user.following]
+    y = (activity.data["to"] ++ (activity.data["cc"] || []))
+    visible_for_user?(activity, nil) || Enum.any?(x, &(&1 in y))
+  end
 end
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index f52ac58de..45b4d24c6 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -190,14 +190,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   end
 
   def get_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    with %Activity{} = activity <- Repo.get(Activity, id) do
+    with %Activity{} = activity <- Repo.get(Activity, id),
+         true <- ActivityPub.visible_for_user?(activity, user) do
       render conn, StatusView, "status.json", %{activity: activity, for: user}
     end
   end
 
   def get_context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     with %Activity{} = activity <- Repo.get(Activity, id),
-         activities <- ActivityPub.fetch_activities_for_context(activity.data["object"]["context"], %{"blocking_user" => user}),
+         activities <- ActivityPub.fetch_activities_for_context(activity.data["object"]["context"], %{"blocking_user" => user, "user" => user}),
          activities <- activities |> Enum.filter(fn (%{id: aid}) -> to_string(aid) != to_string(id) end),
          activities <- activities |> Enum.filter(fn (%{data: %{"type" => type}}) -> type == "Create" end),
          grouped_activities <- Enum.group_by(activities, fn (%{id: id}) -> id < activity.id end) do
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 57795edba..174a79484 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -56,7 +56,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def fetch_status(user, id) do
-    with %Activity{} = activity <- Repo.get(Activity, id) do
+    with %Activity{} = activity <- Repo.get(Activity, id),
+         true <- ActivityPub.visible_for_user?(activity, user) do
       activity_to_status(activity, %{for: user})
     end
   end
-- 
cgit v1.2.3


From 4bc57ef20c7dda871c13946aac6461298a6404ea Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:58:18 +0100
Subject: Don't relay non-public messages.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 8f660a334..a0b51da89 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -84,7 +84,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def announce(%User{ap_id: _} = user, %Object{data: %{"id" => _}} = object, activity_id \\ nil, local \\ true) do
-    with announce_data <- make_announce_data(user, object, activity_id),
+    with true <- is_public?(object),
+         announce_data <- make_announce_data(user, object, activity_id),
          {:ok, activity} <- insert(announce_data, local),
          {:ok, object} <- add_announce_to_object(activity, object),
          :ok <- maybe_federate(activity) do
@@ -316,9 +317,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
-  def visible_for_user?(activity, nil) do
+  def is_public?(activity) do
     "https://www.w3.org/ns/activitystreams#Public" in (activity.data["to"] ++ (activity.data["cc"] || []))
   end
+
+  def visible_for_user?(activity, nil) do
+    is_public?(activity)
+  end
   def visible_for_user?(activity, user) do
     x = [user.ap_id | user.following]
     y = (activity.data["to"] ++ (activity.data["cc"] || []))
-- 
cgit v1.2.3


From 803bdc1a6759fe9f46a9dcdb0ffa18d294198c9d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 16:05:25 +0100
Subject: Federate non-public over ActivityPub only, do some better signing.

---
 lib/pleroma/web/activity_pub/activity_pub.ex |  6 +++---
 lib/pleroma/web/federator/federator.ex       | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a0b51da89..1a795bad1 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -288,12 +288,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     |> Enum.uniq
 
     {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
-
+    json = Poison.encode!(data)
     Enum.each remote_inboxes, fn(inbox) ->
       Logger.info("Federating #{activity.data["id"]} to #{inbox}")
       host = URI.parse(inbox).host
-      signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host})
-      @httpoison.post(inbox, Poison.encode!(data), [{"Content-Type", "application/activity+json"}, {"signature", signature}])
+      signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host, "content-length": byte_size(json)})
+      @httpoison.post(inbox, json, [{"Content-Type", "application/activity+json"}, {"signature", signature}])
     end
   end
 
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 68e5544e7..042c202be 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -2,6 +2,7 @@ defmodule Pleroma.Web.Federator do
   use GenServer
   alias Pleroma.User
   alias Pleroma.Web.{WebFinger, Websub}
+  alias Pleroma.Web.ActivityPub.ActivityPub
   require Logger
 
   @websub Application.get_env(:pleroma, :websub)
@@ -42,11 +43,13 @@ defmodule Pleroma.Web.Federator do
     Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)
     with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
       {:ok, actor} = WebFinger.ensure_keys_present(actor)
-      Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
-      Pleroma.Web.Salmon.publish(actor, activity)
+      if ActivityPub.is_public?(activity) do
+        Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
+        Pleroma.Web.Salmon.publish(actor, activity)
 
-      Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
-      Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
+        Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
+        Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
+      end
 
       Logger.debug(fn -> "Sending #{activity.data["id"]} out via AP" end)
       Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
-- 
cgit v1.2.3


From 8567feed474c2bebcc02c7ab177e18d35c26aec6 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 16:15:04 +0100
Subject: Salmon is ok!

---
 lib/pleroma/web/federator/federator.ex | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 042c202be..e65916c47 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -44,14 +44,14 @@ defmodule Pleroma.Web.Federator do
     with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
       {:ok, actor} = WebFinger.ensure_keys_present(actor)
       if ActivityPub.is_public?(activity) do
-        Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
-        Pleroma.Web.Salmon.publish(actor, activity)
-
-        Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
         Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
       end
 
-      Logger.debug(fn -> "Sending #{activity.data["id"]} out via AP" end)
+      Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
+      Pleroma.Web.Salmon.publish(actor, activity)
+
+      Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
       Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
     end
   end
-- 
cgit v1.2.3


From deaad6d97a6850a01ce450c7442629ebb3a52f26 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 16:59:41 +0100
Subject: Fix delivery to CC.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 4 ++--
 lib/pleroma/web/salmon/salmon.ex             | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 1a795bad1..4bfcd3234 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -280,10 +280,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def publish(actor, activity) do
     {:ok, followers} = User.get_followers(actor)
 
-    remote_inboxes = Pleroma.Web.Salmon.remote_users(activity) ++ followers
+    remote_inboxes = (Pleroma.Web.Salmon.remote_users(activity) ++ followers)
     |> Enum.filter(fn (user) -> User.ap_enabled?(user) end)
     |> Enum.map(fn (%{info: %{"source_data" => data}}) ->
-      (data["endpoints"] && data["endpoints"]["sharedInbox"]) ||data["inbox"]
+      (data["endpoints"] && data["endpoints"]["sharedInbox"]) || data["inbox"]
     end)
     |> Enum.uniq
 
diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 806f3c3c0..4e95a5b25 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -138,7 +138,8 @@ defmodule Pleroma.Web.Salmon do
     {:ok, salmon}
   end
 
-  def remote_users(%{data: %{"to" => to}}) do
+  def remote_users(%{data: %{"to" => to} = data}) do
+    to = to ++ (data["cc"] || [])
     to
     |> Enum.map(fn(id) -> User.get_cached_by_ap_id(id) end)
     |> Enum.filter(fn(user) -> user && !user.local end)
-- 
cgit v1.2.3


From 010f818a29d813e912cc38b3bdc259bed9837ed9 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 20:52:07 +0100
Subject: Fix conversations.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 13 +++++++++----
 lib/pleroma/web/twitter_api/twitter_api.ex   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4bfcd3234..fb33f2e3e 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -129,12 +129,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def fetch_activities_for_context(context, opts \\ %{}) do
-    query = from activity in Activity,
-      where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
-      order_by: [desc: :id]
+    public = ["https://www.w3.org/ns/activitystreams#Public"]
+    recipients = if opts["user"], do: [opts["user"].ap_id | opts["user"].following] ++ public, else: public
+
+    query = from activity in Activity
     query = query
       |> restrict_blocked(opts)
-      |> restrict_recipients(["https://www.w3.org/ns/activitystreams#Public"], opts["user"])
+      |> restrict_recipients(recipients, opts["user"])
+
+   query = from activity in query,
+      where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
+      order_by: [desc: :id]
     Repo.all(query)
   end
 
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 174a79484..411c2f812 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -46,7 +46,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def fetch_conversation(user, id) do
     with context when is_binary(context) <- conversation_id_to_context(id),
-         activities <- ActivityPub.fetch_activities_for_context(context, %{"blocking_user" => user}),
+         activities <- ActivityPub.fetch_activities_for_context(context, %{"blocking_user" => user, "user" => user}),
          statuses <- activities |> activities_to_statuses(%{for: user})
     do
       statuses
-- 
cgit v1.2.3


From 76e71f47d3324e2718c37713a5ee03d9e3f2b7fa Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 22:37:44 +0100
Subject: Inbox: Don't add the same thing twice.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index f4e5ae9eb..da4973fe5 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,6 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
-  alias Pleroma.{User, Repo, Object}
+  alias Pleroma.{User, Repo, Object, Activity}
   alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
 
@@ -26,9 +26,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
     # File.write("/tmp/incoming.json", Poison.encode!(params))
     with {:ok, _user} <- ap_enabled_actor(params["actor"]),
+         nil <- Activity.get_by_ap_id(params["id"]),
          {:ok, activity} <- Transmogrifier.handle_incoming(params) do
       json(conn, "ok")
     else
+      %Activity{} ->
+        Logger.info("Already had #{params["id"]}")
+        json(conn, "ok")
       e ->
         # Just drop those for now
         Logger.info("Unhandled activity")
-- 
cgit v1.2.3


From e368b68dcfea8f12fe0343bd16b035272f67f615 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 22:40:08 +0100
Subject: Log but ignore signature errors.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index da4973fe5..7c4f7d249 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -41,6 +41,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     end
   end
 
+  def inbox(conn, params) do
+    Logger.info("Signature error.")
+    Logger.info(conn.req_headers)
+    json(conn, "ok")
+  end
   def ap_enabled_actor(id) do
     user = User.get_by_ap_id(id)
     if User.ap_enabled?(user) do
-- 
cgit v1.2.3


From dc1d3ceb724bb3a23e407ed2affa43e1a81d844d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 22:41:38 +0100
Subject: Fix log.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 7c4f7d249..8ba15d73e 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -43,9 +43,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   def inbox(conn, params) do
     Logger.info("Signature error.")
-    Logger.info(conn.req_headers)
+    Logger.info(inspect(conn.req_headers))
     json(conn, "ok")
   end
+
   def ap_enabled_actor(id) do
     user = User.get_by_ap_id(id)
     if User.ap_enabled?(user) do
-- 
cgit v1.2.3


From 78516a8daa7094506e0247e8bdaddfde77a4ba67 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 22:57:07 +0100
Subject: Salmon: Take both versions of public keys.

---
 lib/pleroma/web/salmon/salmon.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 4e95a5b25..46ca645d1 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -29,7 +29,8 @@ defmodule Pleroma.Web.Salmon do
     with [data, _, _, _, _] <- decode(salmon),
          doc <- XML.parse_document(data),
          uri when not is_nil(uri) <- XML.string_from_xpath("/entry/author[1]/uri", doc),
-         {:ok, %{info: %{"magic_key" => magic_key}}} <- Pleroma.Web.OStatus.find_or_make_user(uri) do
+         {:ok, public_key} <- User.get_public_key_for_ap_id(uri),
+         magic_key <- encode_key(public_key) do
       {:ok, magic_key}
     end
   end
-- 
cgit v1.2.3


From 342d0b01d17b3035378d6906672e1e8c4008ff4c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 23:01:37 +0100
Subject: Only push to followers if they are addressed.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index fb33f2e3e..168653035 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -283,7 +283,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def publish(actor, activity) do
-    {:ok, followers} = User.get_followers(actor)
+    followers = if user.follower_address in activity.recipients do
+      {:ok, followers} = User.get_followers(actor)
+      followers
+    else
+      []
+    end
 
     remote_inboxes = (Pleroma.Web.Salmon.remote_users(activity) ++ followers)
     |> Enum.filter(fn (user) -> User.ap_enabled?(user) end)
-- 
cgit v1.2.3


From decbf3a47fbcaea9ebc6b5ab9348260289100faf Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 23:02:44 +0100
Subject: fix typo.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 168653035..a0d36d03a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -283,7 +283,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def publish(actor, activity) do
-    followers = if user.follower_address in activity.recipients do
+    followers = if actor.follower_address in activity.recipients do
       {:ok, followers} = User.get_followers(actor)
       followers
     else
-- 
cgit v1.2.3


From 8b1154633430d2f2c0cb7375bec66cf7f0f35583 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 23:11:31 +0100
Subject: For existing users, just replace info.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a0d36d03a..4e46e80ea 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -273,6 +273,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       }
 
       User.insert_or_update_user(user_data)
+      if user = User.get_by_ap_id(ap_id) do
+        User.info_changeset(user, user_data}
+        |> Repo.update
+      else
+        User.insert_or_update_user(user_data)
+      end
     end
   end
 
-- 
cgit v1.2.3


From 932d346d35e0b16537ee2527ca2253f00c214c12 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 23:13:19 +0100
Subject: fix typo.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4e46e80ea..18c2c1900 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -272,9 +272,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         name: data["name"]
       }
 
-      User.insert_or_update_user(user_data)
       if user = User.get_by_ap_id(ap_id) do
-        User.info_changeset(user, user_data}
+        User.info_changeset(user, user_data)
         |> Repo.update
       else
         User.insert_or_update_user(user_data)
-- 
cgit v1.2.3


From 313f186a66fd89bda36c684a926d3118a489064a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 08:34:55 +0100
Subject: Ostatus: Use all recipients as mentions.

---
 lib/pleroma/web/ostatus/activity_representer.ex | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index aa2b1df39..33e5e0009 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -76,7 +76,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     in_reply_to = get_in_reply_to(activity.data)
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
-    mentions = activity.data["to"] |> get_mentions
+    mentions = activity.recipients |> get_mentions
 
     categories = (activity.data["object"]["tag"] || [])
     |> Enum.map(fn (tag) -> {:category, [term: to_charlist(tag)], []} end)
@@ -110,7 +110,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     _in_reply_to = get_in_reply_to(activity.data)
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
-    mentions = activity.data["to"] |> get_mentions
+    mentions = activity.recipients |> get_mentions
 
     [
       {:"activity:verb", ['http://activitystrea.ms/schema/1.0/favorite']},
@@ -144,7 +144,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true)
 
-    mentions = activity.data["to"] |> get_mentions
+    mentions = activity.recipients |> get_mentions
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
       {:"activity:verb", ['http://activitystrea.ms/schema/1.0/share']},
@@ -168,7 +168,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
 
-    mentions = (activity.data["to"] || []) |> get_mentions
+    mentions = (activity.recipients || []) |> get_mentions
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
       {:"activity:verb", ['http://activitystrea.ms/schema/1.0/follow']},
@@ -196,7 +196,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
     follow_activity = Activity.get_by_ap_id(activity.data["object"])
 
-    mentions = (activity.data["to"] || []) |> get_mentions
+    mentions = (activity.recipients || []) |> get_mentions
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
       {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},
-- 
cgit v1.2.3


From 1633470e4af885527eac4a6e4076acf14616d4d9 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 09:50:41 +0100
Subject: TwitterAPI: Only fetch creates, announces, follows.

---
 lib/pleroma/web/twitter_api/twitter_api.ex | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 411c2f812..a8bdbe716 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -16,26 +16,34 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     opts = opts
     |> Map.put("blocking_user", user)
     |> Map.put("user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
 
     ActivityPub.fetch_activities([user.ap_id | user.following], opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_public_statuses(user, opts \\ %{}) do
-    opts = Map.put(opts, "local_only", true)
-    opts = Map.put(opts, "blocking_user", user)
+    opts = opts
+    |> Map.put("local_only", true)
+    |> Map.put("blocking_user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
+
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_public_and_external_statuses(user, opts \\ %{}) do
-    opts = Map.put(opts, "blocking_user", user)
+    opts = opts
+    |> Map.put("blocking_user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
+
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_user_statuses(user, opts \\ %{}) do
     ActivityPub.fetch_activities([], opts)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
     |> activities_to_statuses(%{for: user})
   end
 
-- 
cgit v1.2.3


From 01faa7c555061aed79ec932c0065bf77818f3125 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 09:50:57 +0100
Subject: TwitterAPI: support follow activities without published date.

---
 lib/pleroma/web/twitter_api/representers/activity_representer.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index f9f9bd7b4..98be18c98 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -56,7 +56,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
     }
   end
 
-  def to_map(%Activity{data: %{"type" => "Follow", "published" => created_at, "object" => followed_id}} = activity, %{user: user} = opts) do
+  def to_map(%Activity{data: %{"type" => "Follow", "object" => followed_id}} = activity, %{user: user} = opts) do
+    created_at = activity.data["published"] || (DateTime.to_iso8601(activity.inserted_at))
     created_at = created_at |> Utils.date_to_asctime
 
     followed = User.get_cached_by_ap_id(followed_id)
-- 
cgit v1.2.3


From 6b32b9e3466016f457fd257e7cc18d85fa075a93 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 10:05:26 +0100
Subject: Notifications: Use all recipients, not just "to".

---
 lib/pleroma/user.ex                                     | 4 ++--
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f88c1240a..bc7f2601f 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -304,7 +304,7 @@ defmodule Pleroma.User do
     update_and_set_cache(cs)
   end
 
-  def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
+  def get_notified_from_activity(%Activity{recipients: to}) do
     query = from u in User,
       where: u.ap_id in ^to,
       where: u.local == true
@@ -312,7 +312,7 @@ defmodule Pleroma.User do
     Repo.all(query)
   end
 
-  def get_recipients_from_activity(%Activity{data: %{"to" => to}}) do
+  def get_recipients_from_activity(%Activity{recipients: to}) do
     query = from u in User,
       where: u.ap_id in ^to,
       or_where: fragment("? \\\?| ?", u.following, ^to)
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 8ba15d73e..1a6d7ec7a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -25,6 +25,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
     # File.write("/tmp/incoming.json", Poison.encode!(params))
+    Logger.info(Poison.encode!(params, [pretty: 2]))
     with {:ok, _user} <- ap_enabled_actor(params["actor"]),
          nil <- Activity.get_by_ap_id(params["id"]),
          {:ok, activity} <- Transmogrifier.handle_incoming(params) do
-- 
cgit v1.2.3


From 6b6ab592ab18f8db68431e74a4ec4c785d394756 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 10:39:03 +0100
Subject: AP: Fix incoming conversations.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 076bd2ea8..075250aa5 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -14,6 +14,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     object
     |> Map.put("actor", object["attributedTo"])
     |> fix_attachments
+    |> fix_context
+  end
+
+  def fix_context(object) do
+    object
+    |> Map.put("context", object["conversation"])
   end
 
   def fix_attachments(object) do
@@ -130,7 +136,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   end
 
   def add_mention_tags(object) do
-    mentions = object["to"]
+    recipients = object["to"] ++ (object["cc"] || [])
+    mentions = recipients
     |> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
     |> Enum.filter(&(&1))
     |> Enum.map(fn(user) -> %{"type" => "Mention", "href" => user.ap_id, "name" => "@#{user.nickname}"} end)
-- 
cgit v1.2.3


From ffa2f57c36af7f8a2f5a09fef219376eb18888ef Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 11:14:46 +0100
Subject: Salmons can't carry private information.

---
 lib/pleroma/web/federator/federator.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index e65916c47..a13126048 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -46,10 +46,10 @@ defmodule Pleroma.Web.Federator do
       if ActivityPub.is_public?(activity) do
         Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
         Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
-      end
 
-      Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
-      Pleroma.Web.Salmon.publish(actor, activity)
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
+        Pleroma.Web.Salmon.publish(actor, activity)
+      end
 
       Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
       Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
-- 
cgit v1.2.3


From 297a2c7d3f2f4e79d05ed799e7bb20ed27b35a9c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 17:37:45 +0100
Subject: Ignore duplicate create activities.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 2 +-
 lib/pleroma/web/activity_pub/transmogrifier.ex          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 1a6d7ec7a..835e8bd9d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -25,7 +25,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
     # File.write("/tmp/incoming.json", Poison.encode!(params))
-    Logger.info(Poison.encode!(params, [pretty: 2]))
+    # Logger.info(Poison.encode!(params, [pretty: 2]))
     with {:ok, _user} <- ap_enabled_actor(params["actor"]),
          nil <- Activity.get_by_ap_id(params["id"]),
          {:ok, activity} <- Transmogrifier.handle_incoming(params) do
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 075250aa5..e53957fbf 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -37,7 +37,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   # - tags
   # - emoji
   def handle_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
-    with %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
+    with nil <- Activity.get_create_activity_by_object_ap_id(object["id"]),
+         %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
       object = fix_object(data["object"])
       params = %{
         to: data["to"],
@@ -54,6 +55,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
       ActivityPub.create(params)
     else
+      %Activity{} = activity -> {:ok, activity}
       _e -> :error
     end
   end
-- 
cgit v1.2.3


From 9c899169692661a99ccb8a5e607b17788d3eec55 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 20 Feb 2018 08:51:19 +0100
Subject: ActivityPub: One queue item per server.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 13 +++++++++----
 lib/pleroma/web/federator/federator.ex       |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 18c2c1900..cc2019791 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -2,6 +2,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.WebFinger
+  alias Pleroma.Web.Federator
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
@@ -305,13 +306,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
     json = Poison.encode!(data)
     Enum.each remote_inboxes, fn(inbox) ->
-      Logger.info("Federating #{activity.data["id"]} to #{inbox}")
-      host = URI.parse(inbox).host
-      signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host, "content-length": byte_size(json)})
-      @httpoison.post(inbox, json, [{"Content-Type", "application/activity+json"}, {"signature", signature}])
+      Federator.enqueue(:publish_single_ap, %{inbox: inbox, json: json, actor: actor, id: activity.data["id"]})
     end
   end
 
+  def publish_one(%{inbox: inbox, json: json, actor: actor, id: id}) do
+    Logger.info("Federating #{id} to #{inbox}")
+    host = URI.parse(inbox).host
+    signature = Pleroma.Web.HTTPSignatures.sign(actor, %{host: host, "content-length": byte_size(json)})
+    @httpoison.post(inbox, json, [{"Content-Type", "application/activity+json"}, {"signature", signature}])
+  end
+
   # TODO:
   # This will create a Create activity, which we need internally at the moment.
   def fetch_object_from_id(id) do
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index a13126048..b64b43c56 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -66,6 +66,10 @@ defmodule Pleroma.Web.Federator do
     @ostatus.handle_incoming(doc)
   end
 
+  def handle(:publish_single_ap, params) do
+    ActivityPub.publish_one(params)
+  end
+
   def handle(:publish_single_websub, %{xml: xml, topic: topic, callback: callback, secret: secret}) do
     signature = @websub.sign(secret || "", xml)
     Logger.debug(fn -> "Pushing #{topic} to #{callback}" end)
-- 
cgit v1.2.3


From 486e2058103fe02832dfb869d5725f643f8fca26 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 20 Feb 2018 08:52:31 +0100
Subject: Remove some noise.

---
 lib/pleroma/web/mastodon_api/mastodon_socket.ex   | 1 -
 lib/pleroma/web/mastodon_api/views/status_view.ex | 1 -
 2 files changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/mastodon_api/mastodon_socket.ex b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
index fe71ea271..c3bae5935 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -25,7 +25,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   def id(_), do: nil
 
   def handle(:text, message, _state) do
-    IO.inspect message
     #| :ok
     #| state
     #| {:text, message}
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index b4ce735eb..4f395d0f7 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -122,7 +122,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   end
 
   def render("attachment.json", %{attachment: attachment}) do
-    IO.inspect(attachment)
     [%{"mediaType" => media_type, "href" => href} | _] = attachment["url"]
 
     type = cond do
-- 
cgit v1.2.3


From fd95075e328048ccc48d451a367820ac40e9ccd2 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 20 Feb 2018 19:50:34 +0100
Subject: TwitterAPI: Fix mentions.

---
 lib/pleroma/web/twitter_api/representers/activity_representer.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 98be18c98..b0dfeaf39 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -126,7 +126,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
 
     mentions = opts[:mentioned] || []
 
-    attentions = activity.data["to"]
+    attentions = activity.recipients
     |> Enum.map(fn (ap_id) -> Enum.find(mentions, fn(user) -> ap_id == user.ap_id end) end)
     |> Enum.filter(&(&1))
     |> Enum.map(fn (user) -> UserView.render("show.json", %{user: user, for: opts[:for]}) end)
-- 
cgit v1.2.3


From 391b3e3586c65b4dc8ce515721e0fff877e854fb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 08:16:04 +0100
Subject: TwitterAPI: Fix some bugz.

---
 lib/pleroma/web/twitter_api/twitter_api.ex | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index a8bdbe716..80c4ec192 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     opts = opts
     |> Map.put("blocking_user", user)
     |> Map.put("user", user)
-    |> Map.put("type", ["Create", "Announce", "Follow"])
+    |> Map.put("type", ["Create", "Announce", "Follow", "Like"])
 
     ActivityPub.fetch_activities([user.ap_id | user.following], opts)
     |> activities_to_statuses(%{for: user})
@@ -42,8 +42,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def fetch_user_statuses(user, opts \\ %{}) do
-    ActivityPub.fetch_activities([], opts)
+    opts = opts
     |> Map.put("type", ["Create", "Announce", "Follow"])
+    ActivityPub.fetch_activities([], opts)
     |> activities_to_statuses(%{for: user})
   end
 
-- 
cgit v1.2.3


From b52672294e8cbc6f1ff53b9c7193e55781db84a6 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 08:51:03 +0100
Subject: Move incoming AP to Federator.

---
 .../web/activity_pub/activity_pub_controller.ex    | 28 +++-------------------
 lib/pleroma/web/federator/federator.ex             | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 835e8bd9d..513758176 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   alias Pleroma.{User, Repo, Object, Activity}
   alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.Federator
 
   require Logger
 
@@ -24,22 +25,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    # File.write("/tmp/incoming.json", Poison.encode!(params))
-    # Logger.info(Poison.encode!(params, [pretty: 2]))
-    with {:ok, _user} <- ap_enabled_actor(params["actor"]),
-         nil <- Activity.get_by_ap_id(params["id"]),
-         {:ok, activity} <- Transmogrifier.handle_incoming(params) do
-      json(conn, "ok")
-    else
-      %Activity{} ->
-        Logger.info("Already had #{params["id"]}")
-        json(conn, "ok")
-      e ->
-        # Just drop those for now
-        Logger.info("Unhandled activity")
-        Logger.info(Poison.encode!(params, [pretty: 2]))
-        json(conn, "ok")
-    end
+    Federator.enqeue(:incoming_ap_doc, params)
+    json(conn, "ok")
   end
 
   def inbox(conn, params) do
@@ -48,15 +35,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     json(conn, "ok")
   end
 
-  def ap_enabled_actor(id) do
-    user = User.get_by_ap_id(id)
-    if User.ap_enabled?(user) do
-      {:ok, user}
-    else
-      ActivityPub.make_user_from_ap_id(id)
-    end
-  end
-
   def errors(conn, _e) do
     conn
     |> put_status(500)
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index b64b43c56..9f81264e4 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.Federator do
   alias Pleroma.User
   alias Pleroma.Web.{WebFinger, Websub}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Transmogrifier
   require Logger
 
   @websub Application.get_env(:pleroma, :websub)
@@ -66,6 +67,20 @@ defmodule Pleroma.Web.Federator do
     @ostatus.handle_incoming(doc)
   end
 
+  def handle(:incoming_ap_doc, params) do
+    with {:ok, _user} <- ap_enabled_actor(params["actor"]),
+         nil <- Activity.get_by_ap_id(params["id"]),
+         {:ok, activity} <- Transmogrifier.handle_incoming(params) do
+    else
+      %Activity{} ->
+        Logger.info("Already had #{params["id"]}")
+      e ->
+        # Just drop those for now
+        Logger.info("Unhandled activity")
+        Logger.info(Poison.encode!(params, [pretty: 2]))
+    end
+  end
+
   def handle(:publish_single_ap, params) do
     ActivityPub.publish_one(params)
   end
@@ -145,4 +160,13 @@ defmodule Pleroma.Web.Federator do
   def queue_pop([%{item: element} | queue]) do
     {element, queue}
   end
+
+  def ap_enabled_actor(id) do
+    user = User.get_by_ap_id(id)
+    if User.ap_enabled?(user) do
+      {:ok, user}
+    else
+      ActivityPub.make_user_from_ap_id(id)
+    end
+  end
 end
-- 
cgit v1.2.3


From 66aa35903e6b1108ceab7b6bea2cb7d895eb315e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 08:51:50 +0100
Subject: Add missing alias.

---
 lib/pleroma/web/federator/federator.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 9f81264e4..7c43152c3 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.Federator do
   use GenServer
   alias Pleroma.User
+  alias Pleroma.Activity
   alias Pleroma.Web.{WebFinger, Websub}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Transmogrifier
-- 
cgit v1.2.3


From 279e1ce556f063fa9725375622896f8f091be3c4 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 08:54:48 +0100
Subject: Typo.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 513758176..f0dc86a7f 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -25,7 +25,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   # TODO: Ensure that this inbox is a recipient of the message
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    Federator.enqeue(:incoming_ap_doc, params)
+    Federator.enqueue(:incoming_ap_doc, params)
     json(conn, "ok")
   end
 
-- 
cgit v1.2.3


From 92021fd00c538ac24f68dcd95ee18bef9de6cc0e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 08:57:14 +0100
Subject: Logging, put incoming ap docs into incoming queue.

---
 lib/pleroma/web/federator/federator.ex | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 7c43152c3..0b9808b8f 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -64,11 +64,12 @@ defmodule Pleroma.Web.Federator do
   end
 
   def handle(:incoming_doc, doc) do
-    Logger.debug("Got document, trying to parse")
+    Logger.info("Got document, trying to parse")
     @ostatus.handle_incoming(doc)
   end
 
   def handle(:incoming_ap_doc, params) do
+    Logger.info("Handling incoming ap activity")
     with {:ok, _user} <- ap_enabled_actor(params["actor"]),
          nil <- Activity.get_by_ap_id(params["id"]),
          {:ok, activity} <- Transmogrifier.handle_incoming(params) do
@@ -124,7 +125,7 @@ defmodule Pleroma.Web.Federator do
     end
   end
 
-  def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc] do
+  def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc, :incoming_ap_doc] do
     %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
     i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
     {i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)
-- 
cgit v1.2.3


From 947ba6495d556f621d0e0b517993f8200be9ccd9 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 10:31:13 +0100
Subject: More TwAPI fixes.

---
 lib/pleroma/web/twitter_api/twitter_api.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 80c4ec192..ccd79625c 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -289,7 +289,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     actor = get_in(activity.data, ["actor"])
     user = User.get_cached_by_ap_id(actor)
     # mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
-    mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
+    mentioned_users = Enum.map(activity.recipients || [], fn (ap_id) ->
       if ap_id do
         User.get_cached_by_ap_id(ap_id)
       else
-- 
cgit v1.2.3


From 810cf8618faf1e2e668d8cef03a2847e850c432b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 15:22:24 +0100
Subject: ActivityPub: Fetch missing activities on reply.

---
 lib/pleroma/web/activity_pub/activity_pub.ex   | 13 +++++++++----
 lib/pleroma/web/activity_pub/transmogrifier.ex |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index cc2019791..4fe99d55a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.WebFinger
   alias Pleroma.Web.Federator
+  alias Pleroma.Web.OStatus
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
@@ -325,14 +326,18 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     else
       with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(id, [Accept: "application/activity+json"], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
            {:ok, data} <- Poison.decode(body),
-           data <- Transmogrifier.fix_object(data),
            nil <- Object.get_by_ap_id(data["id"]),
-           %User{} = user <- User.get_or_fetch_by_ap_id(data["attributedTo"]),
-           {:ok, activity} = create(%{to: data["to"], actor: user, context: data["context"], object: data, local: false, additional: %{"cc" => data["cc"]}}) do
+           params <- %{"type" => "Create", "to" => data["to"], "cc" => data["cc"], "actor" => data["attributedTo"], "object" => data},
+           {:ok, activity} <- Transmogrifier.handle_incoming(params) do
         {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
       else
         object = %Object{} -> {:ok, object}
-        e -> e
+      e ->
+        Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
+        case OStatus.fetch_activity_from_url(id) do
+          {:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
+          _ -> e
+        end
       end
     end
   end
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index e53957fbf..eb2569ef2 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -53,6 +53,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
             ])
       }
 
+      if object["inReplyTo"] do
+        {:ok, object} = ActivityPub.fetch_object_from_id(object["inReplyTo"])
+      end
+
       ActivityPub.create(params)
     else
       %Activity{} = activity -> {:ok, activity}
-- 
cgit v1.2.3


From 67afd024a719251c95fe3d67b6d7909e1a75f26c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 15:44:00 +0100
Subject: Streamer: Make it less chatty.

---
 lib/pleroma/web/streamer.ex | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index d64e6c393..a417178ba 100644
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -74,7 +74,6 @@ defmodule Pleroma.Web.Streamer do
     sockets_for_topic = Enum.uniq([socket | sockets_for_topic])
     sockets = Map.put(sockets, topic, sockets_for_topic)
     Logger.debug("Got new conn for #{topic}")
-    IO.inspect(sockets)
     {:noreply, sockets}
   end
 
@@ -84,12 +83,11 @@ defmodule Pleroma.Web.Streamer do
     sockets_for_topic = List.delete(sockets_for_topic, socket)
     sockets = Map.put(sockets, topic, sockets_for_topic)
     Logger.debug("Removed conn for #{topic}")
-    IO.inspect(sockets)
     {:noreply, sockets}
   end
 
   def handle_cast(m, state) do
-    IO.inspect("Unknown: #{inspect(m)}, #{inspect(state)}")
+    Logger.info("Unknown: #{inspect(m)}, #{inspect(state)}")
     {:noreply, state}
   end
 
-- 
cgit v1.2.3


From a06b9a3e0b5639dfc3a975c7a5f3ea11a05a286f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 16:22:20 +0100
Subject: Logging.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4fe99d55a..554d3a008 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -324,6 +324,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     if object = Object.get_cached_by_ap_id(id) do
       {:ok, object}
     else
+      Logger.info("Fetching #{id} via AP")
       with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(id, [Accept: "application/activity+json"], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
            {:ok, data} <- Poison.decode(body),
            nil <- Object.get_by_ap_id(data["id"]),
-- 
cgit v1.2.3


From f48bc5c3e1507c485d0515a4800e2123f848705f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 22:20:29 +0100
Subject: Make User.following a postgres array.

---
 lib/pleroma/user.ex | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index bc7f2601f..a902c57e3 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -249,10 +249,9 @@ defmodule Pleroma.User do
     end
   end
 
-  # TODO: these queries could be more efficient if the type in postgresql wasn't map, but array.
   def get_followers(%User{id: id, follower_address: follower_address}) do
     q = from u in User,
-      where: fragment("? @> ?", u.following, ^follower_address ),
+      where: ^follower_address in u.following,
       where: u.id != ^id
 
     {:ok, Repo.all(q)}
@@ -291,7 +290,7 @@ defmodule Pleroma.User do
 
   def update_follower_count(%User{} = user) do
     follower_count_query = from u in User,
-      where: fragment("? @> ?", u.following, ^user.follower_address),
+      where: ^user.follower_address in u.following,
       where: u.id != ^user.id,
       select: count(u.id)
 
-- 
cgit v1.2.3


From 4816b09fa787cc27b5a0a4b0bdd5dcda4fe06ee2 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 22:21:40 +0100
Subject: Add user upgrade function.

---
 lib/pleroma/user.ex                            |  9 ++++++++
 lib/pleroma/web/activity_pub/activity_pub.ex   | 20 +++++++++++-----
 lib/pleroma/web/activity_pub/transmogrifier.ex | 32 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index a902c57e3..1d9f40ee0 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -103,6 +103,15 @@ defmodule Pleroma.User do
     |> validate_length(:name, min: 1, max: 100)
   end
 
+  def upgrade_changeset(struct, params \\ %{}) do
+    struct
+    |> cast(params, [:bio, :name, :info, :follower_address])
+    |> unique_constraint(:nickname)
+    |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
+    |> validate_length(:bio, min: 1, max: 1000)
+    |> validate_length(:name, min: 1, max: 100)
+  end
+
   def password_update_changeset(struct, params) do
     changeset = struct
     |> cast(params, [:password, :password_confirmation])
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 554d3a008..0de730410 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -260,7 +260,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Repo.insert(%Object{data: data})
   end
 
-  def make_user_from_ap_id(ap_id) do
+  def fetch_and_prepare_user_from_ap_id(ap_id) do
     with {:ok, %{status_code: 200, body: body}} <- @httpoison.get(ap_id, ["Accept": "application/activity+json"]),
     {:ok, data} <- Poison.decode(body)
       do
@@ -271,14 +271,22 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
           "source_data" => data
         },
         nickname: "#{data["preferredUsername"]}@#{URI.parse(ap_id).host}",
-        name: data["name"]
+        name: data["name"],
+        follower_address: data["followers"]
       }
 
-      if user = User.get_by_ap_id(ap_id) do
-        User.info_changeset(user, user_data)
-        |> Repo.update
+      {:ok, user_data}
+    end
+  end
+
+  def make_user_from_ap_id(ap_id) do
+    if user = User.get_by_ap_id(ap_id) do
+      Transmogrifier.upgrade_user_from_ap_id(ap_id)
+    else
+      with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id) do
+        User.insert_or_update_user(data)
       else
-        User.insert_or_update_user(user_data)
+        e -> e
       end
     end
   end
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index eb2569ef2..395436c5c 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -5,8 +5,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   alias Pleroma.User
   alias Pleroma.Object
   alias Pleroma.Activity
+  alias Pleroma.Repo
   alias Pleroma.Web.ActivityPub.ActivityPub
 
+  import Ecto.Query
+
   @doc """
   Modifies an incoming AP object (mastodon format) to our internal format.
   """
@@ -180,4 +183,33 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     object
     |> Map.put("attachment", attachments)
   end
+
+  def upgrade_user_from_ap_id(ap_id) do
+    with %User{} = user <- User.get_by_ap_id(ap_id),
+         {:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do
+      data = data
+      |> Map.put(:info, Map.merge(user.info, data[:info]))
+
+      old_follower_address = user.follower_address
+      {:ok, user} = User.upgrade_changeset(user, data)
+      |> Repo.update()
+
+      # This could potentially take a long time, do it in the background
+      Task.start(fn ->
+        q  = from a in Activity,
+        where: ^old_follower_address in a.recipients,
+        update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]]
+        Repo.update_all(q, [])
+
+        q  = from u in User,
+        where: ^old_follower_address in u.following,
+        update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]]
+        Repo.update_all(q, [])
+      end)
+
+      {:ok, user}
+    else
+      e -> e
+    end
+  end
 end
-- 
cgit v1.2.3


From 8895088029ff0b573803bbd853987e24bb7a4038 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 22:27:16 +0100
Subject: Fix for following type change.

---
 lib/pleroma/user.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 1d9f40ee0..f97dbb387 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -323,7 +323,7 @@ defmodule Pleroma.User do
   def get_recipients_from_activity(%Activity{recipients: to}) do
     query = from u in User,
       where: u.ap_id in ^to,
-      or_where: fragment("? \\\?| ?", u.following, ^to)
+      or_where: fragment("? && ?", u.following, ^to)
 
     query = from u in query,
       where: u.local == true
-- 
cgit v1.2.3


From 1555b7fab56e404bc6fae775c5d91e705c9df3f5 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 21 Feb 2018 22:59:00 +0100
Subject: Add AP fixup task.

---
 lib/mix/tasks/fix_ap_users.ex | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 lib/mix/tasks/fix_ap_users.ex

(limited to 'lib')

diff --git a/lib/mix/tasks/fix_ap_users.ex b/lib/mix/tasks/fix_ap_users.ex
new file mode 100644
index 000000000..09a2c0424
--- /dev/null
+++ b/lib/mix/tasks/fix_ap_users.ex
@@ -0,0 +1,20 @@
+defmodule Mix.Tasks.FixApUsers do
+  use Mix.Task
+  import Mix.Ecto
+  import Ecto.Query
+  alias Pleroma.{Repo, User}
+
+  @shortdoc "Grab all ap users again"
+  def run([]) do
+    Mix.Task.run("app.start")
+
+    q = from u in User,
+      where: fragment("? @> ?", u.info, ^%{"ap_enabled" => true})
+    users = Repo.all(q)
+
+    Enum.each(users, fn(user) ->
+      IO.puts("Fetching #{user.nickname}")
+      Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id)
+    end)
+  end
+end
-- 
cgit v1.2.3


From 37e406ae36e4b7f922cb46d7873ec584768a721b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 22 Feb 2018 08:14:15 +0100
Subject: Get avatar and banner from AP users.

---
 lib/pleroma/user.ex                          |  2 +-
 lib/pleroma/web/activity_pub/activity_pub.ex | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f97dbb387..8c1c524ff 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -105,7 +105,7 @@ defmodule Pleroma.User do
 
   def upgrade_changeset(struct, params \\ %{}) do
     struct
-    |> cast(params, [:bio, :name, :info, :follower_address])
+    |> cast(params, [:bio, :name, :info, :follower_address, :avatar])
     |> unique_constraint(:nickname)
     |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
     |> validate_length(:bio, min: 1, max: 1000)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 0de730410..d59346042 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -264,15 +264,27 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     with {:ok, %{status_code: 200, body: body}} <- @httpoison.get(ap_id, ["Accept": "application/activity+json"]),
     {:ok, data} <- Poison.decode(body)
       do
+      avatar = %{
+        "type" => "Image",
+        "url" => [%{"href" => data["icon"]["url"]}]
+      }
+
+      banner = %{
+        "type" => "Image",
+        "url" => [%{"href" => data["image"]["url"]}]
+      }
+
       user_data = %{
         ap_id: data["id"],
         info: %{
           "ap_enabled" => true,
-          "source_data" => data
+          "source_data" => data,
+          "banner" => banner
         },
+        avatar: avatar,
         nickname: "#{data["preferredUsername"]}@#{URI.parse(ap_id).host}",
         name: data["name"],
-        follower_address: data["followers"]
+        follower_address: data["followers"],
       }
 
       {:ok, user_data}
-- 
cgit v1.2.3


From c443aec83d31d838c50fb888d585f5266091b09b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 22 Feb 2018 08:24:18 +0100
Subject: Add banner image to user json.

---
 lib/pleroma/web/activity_pub/views/user_view.ex | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index b3b02c4fb..b96ac7b27 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -45,6 +45,10 @@ defmodule Pleroma.Web.ActivityPub.UserView do
       "icon" => %{
         "type" => "Image",
         "url" => User.avatar_url(user)
+      },
+      "image" => %{
+        "type" => "Image",
+        "url" => User.banner_url(user)
       }
     }
   end
-- 
cgit v1.2.3


From 5dc68d303b8ee07604e89fafb8c18d051e395bff Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 22 Feb 2018 09:02:34 +0100
Subject: Get objects that people you know favorite.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 395436c5c..a845d64b5 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -81,7 +81,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   def handle_incoming(%{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = data) do
     with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
-         %Object{} = object <- Object.get_by_ap_id(object_id),
+         {:ok, object} <- get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
          {:ok, activity, object} <- ActivityPub.like(actor, object, id, false) do
       {:ok, activity}
     else
-- 
cgit v1.2.3


From 2757682894412451f01134aa37d55e0f1f1dc377 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 22 Feb 2018 14:57:35 +0100
Subject: More logging.

---
 lib/pleroma/plugs/http_signature.ex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/plugs/http_signature.ex b/lib/pleroma/plugs/http_signature.ex
index b1e0d91a7..7f40a20c0 100644
--- a/lib/pleroma/plugs/http_signature.ex
+++ b/lib/pleroma/plugs/http_signature.ex
@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
   alias Pleroma.Web.HTTPSignatures
   import Plug.Conn
+  require Logger
 
   def init(options) do
     options
@@ -11,6 +12,8 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
   end
 
   def call(conn, opts) do
+    user = conn.params["actor"]
+    Logger.debug("Checking sig for #{user}")
     if get_req_header(conn, "signature") do
       conn = conn
       |> put_req_header("(request-target)", String.downcase("#{conn.method} #{conn.request_path}"))
-- 
cgit v1.2.3


From 95e6e82138c875ef640e0fc4db681747a86e57fb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 22 Feb 2018 19:22:10 +0100
Subject: Correctly display accounts without name.

---
 lib/pleroma/web/mastodon_api/views/account_view.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index d2a4dd366..f378bb36e 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
       id: to_string(user.id),
       username: hd(String.split(user.nickname, "@")),
       acct: user.nickname,
-      display_name: user.name,
+      display_name: user.name || user.nickname,
       locked: false,
       created_at: Utils.to_masto_date(user.inserted_at),
       followers_count: user_info.follower_count,
-- 
cgit v1.2.3


From 2583a9f6e85dcc83940c763f83bea6a48c6d3528 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 23 Feb 2018 15:00:19 +0100
Subject: More logging.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 14 ++++++++------
 lib/pleroma/web/ostatus/ostatus.ex           | 10 ++++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index d59346042..c27ec2c6b 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -288,6 +288,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       }
 
       {:ok, user_data}
+    else
+      e -> Logger.error("Could not user at fetch #{ap_id}, #{inspect(e)}")
     end
   end
 
@@ -353,12 +355,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
       else
         object = %Object{} -> {:ok, object}
-      e ->
-        Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
-        case OStatus.fetch_activity_from_url(id) do
-          {:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
-          _ -> e
-        end
+        e ->
+          Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
+          case OStatus.fetch_activity_from_url(id) do
+            {:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
+            e -> e
+          end
       end
     end
   end
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 91c4474c5..3f5cfdc8a 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -292,7 +292,10 @@ defmodule Pleroma.Web.OStatus do
     with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(url, [Accept: "application/atom+xml"], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
       Logger.debug("Got document from #{url}, handling...")
       handle_incoming(body)
-    else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+    else
+      e ->
+        Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+        e
     end
   end
 
@@ -301,7 +304,10 @@ defmodule Pleroma.Web.OStatus do
     with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
          {:ok, atom_url} <- get_atom_url(body) do
         fetch_activity_from_atom_url(atom_url)
-    else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+    else
+      e ->
+        Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+        e
     end
   end
 
-- 
cgit v1.2.3


From aa79d64e0d278e30cb05cc3145a9539ea684bc6f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 23 Feb 2018 15:00:41 +0100
Subject: Correctly stitch mastodon -> ostatus replies.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index a845d64b5..a3bbae2a5 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -10,6 +10,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   import Ecto.Query
 
+  require Logger
+
   @doc """
   Modifies an incoming AP object (mastodon format) to our internal format.
   """
@@ -43,6 +45,20 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     with nil <- Activity.get_create_activity_by_object_ap_id(object["id"]),
          %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
       object = fix_object(data["object"])
+
+      replied_to_id = if object["inReplyTo"] do
+        case ActivityPub.fetch_object_from_id(object["inReplyTo"]) do
+          {:ok, object} -> object.data["id"]
+          e ->
+            Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
+            nil
+        end
+      else
+        nil
+      end
+
+      object = Map.put(object, "inReplyTo", replied_to_id || object["inReplyTo"])
+
       params = %{
         to: data["to"],
         object: object,
@@ -56,9 +72,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
             ])
       }
 
-      if object["inReplyTo"] do
-        {:ok, object} = ActivityPub.fetch_object_from_id(object["inReplyTo"])
-      end
 
       ActivityPub.create(params)
     else
-- 
cgit v1.2.3


From 1331a39d3997cd93ae08b778a793ea0f2a3b8523 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 23 Feb 2018 16:55:12 +0100
Subject: Webfinger: Remove leading @s.

---
 lib/pleroma/web/web_finger/web_finger.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 54cbf4cea..bbd65da61 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -105,6 +105,7 @@ defmodule Pleroma.Web.WebFinger do
   end
 
   def finger(account) do
+    account = String.trim_leading(account, "@")
     domain = with [_name, domain] <- String.split(account, "@") do
                domain
              else _e ->
-- 
cgit v1.2.3


From efd4d049331462c234de7364ee194f5a0559e70f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 10:28:38 +0100
Subject: Fix user upgrading code.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index a3bbae2a5..fcf3804d5 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -209,15 +209,18 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
       # This could potentially take a long time, do it in the background
       Task.start(fn ->
-        q  = from a in Activity,
-        where: ^old_follower_address in a.recipients,
-        update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]]
-        Repo.update_all(q, [])
-
         q  = from u in User,
         where: ^old_follower_address in u.following,
         update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]]
         Repo.update_all(q, [])
+
+        # Only do this for recent activties, don't go through the whole db.
+        since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
+        q  = from a in Activity,
+        where: ^old_follower_address in a.recipients,
+        where: a.id > ^since,
+        update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]]
+        Repo.update_all(q, [])
       end)
 
       {:ok, user}
-- 
cgit v1.2.3


From 01d5ef65faa8d5e333fdca72c7b779cb0d03c7db Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 10:42:47 +0100
Subject: More fixes to user upgrading.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index fcf3804d5..62c229050 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -203,7 +203,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       data = data
       |> Map.put(:info, Map.merge(user.info, data[:info]))
 
-      old_follower_address = user.follower_address
+      old_follower_address = User.ap_followers(user)
       {:ok, user} = User.upgrade_changeset(user, data)
       |> Repo.update()
 
-- 
cgit v1.2.3


From 541a4cbbb6c075ebdd50023ed99243e9eca2001a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 10:51:15 +0100
Subject: Oh no! More fixes!

---
 lib/mix/tasks/fix_ap_users.ex                  |  2 +-
 lib/pleroma/web/activity_pub/transmogrifier.ex | 40 +++++++++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/mix/tasks/fix_ap_users.ex b/lib/mix/tasks/fix_ap_users.ex
index 09a2c0424..a0038d5e8 100644
--- a/lib/mix/tasks/fix_ap_users.ex
+++ b/lib/mix/tasks/fix_ap_users.ex
@@ -14,7 +14,7 @@ defmodule Mix.Tasks.FixApUsers do
 
     Enum.each(users, fn(user) ->
       IO.puts("Fetching #{user.nickname}")
-      Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id)
+      Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id, false)
     end)
   end
 end
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 62c229050..25c6bad06 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -197,31 +197,39 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> Map.put("attachment", attachments)
   end
 
-  def upgrade_user_from_ap_id(ap_id) do
+  defp user_upgrade_task(user) do
+    old_follower_address = User.ap_followers(user)
+    q  = from u in User,
+    where: ^old_follower_address in u.following,
+    update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]]
+    Repo.update_all(q, [])
+
+    # Only do this for recent activties, don't go through the whole db.
+    since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
+    q  = from a in Activity,
+    where: ^old_follower_address in a.recipients,
+    where: a.id > ^since,
+    update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]]
+    Repo.update_all(q, [])
+  end
+
+  def upgrade_user_from_ap_id(ap_id, async \\ true) do
     with %User{} = user <- User.get_by_ap_id(ap_id),
          {:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do
       data = data
       |> Map.put(:info, Map.merge(user.info, data[:info]))
 
-      old_follower_address = User.ap_followers(user)
       {:ok, user} = User.upgrade_changeset(user, data)
       |> Repo.update()
 
       # This could potentially take a long time, do it in the background
-      Task.start(fn ->
-        q  = from u in User,
-        where: ^old_follower_address in u.following,
-        update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]]
-        Repo.update_all(q, [])
-
-        # Only do this for recent activties, don't go through the whole db.
-        since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
-        q  = from a in Activity,
-        where: ^old_follower_address in a.recipients,
-        where: a.id > ^since,
-        update: [set: [recipients: fragment("array_replace(?,?,?)", a.recipients, ^old_follower_address, ^user.follower_address)]]
-        Repo.update_all(q, [])
-      end)
+      if async do
+        Task.start(fn ->
+          user_upgrade_task(user)
+        end)
+      else
+        user_upgrade_task(user)
+      end
 
       {:ok, user}
     else
-- 
cgit v1.2.3


From 42f30d67fa298212e85b9d2fd73de287255d8e8b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 10:52:12 +0100
Subject: Fixes Christmas Special

---
 lib/mix/tasks/fix_ap_users.ex | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/mix/tasks/fix_ap_users.ex b/lib/mix/tasks/fix_ap_users.ex
index a0038d5e8..ae3475777 100644
--- a/lib/mix/tasks/fix_ap_users.ex
+++ b/lib/mix/tasks/fix_ap_users.ex
@@ -13,8 +13,12 @@ defmodule Mix.Tasks.FixApUsers do
     users = Repo.all(q)
 
     Enum.each(users, fn(user) ->
-      IO.puts("Fetching #{user.nickname}")
-      Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id, false)
+      try do
+        IO.puts("Fetching #{user.nickname}")
+        Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(user.ap_id, false)
+      rescue
+        e -> IO.inspect(e)
+      end
     end)
   end
 end
-- 
cgit v1.2.3


From 6744710908a7943da0de15b2b944dd318a96be76 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 10:58:16 +0100
Subject: Fixes 4: In Da Hood.

---
 lib/mix/tasks/fix_ap_users.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/mix/tasks/fix_ap_users.ex b/lib/mix/tasks/fix_ap_users.ex
index ae3475777..ff09074c3 100644
--- a/lib/mix/tasks/fix_ap_users.ex
+++ b/lib/mix/tasks/fix_ap_users.ex
@@ -9,7 +9,8 @@ defmodule Mix.Tasks.FixApUsers do
     Mix.Task.run("app.start")
 
     q = from u in User,
-      where: fragment("? @> ?", u.info, ^%{"ap_enabled" => true})
+      where: fragment("? @> ?", u.info, ^%{"ap_enabled" => true}),
+      where: u.local == false
     users = Repo.all(q)
 
     Enum.each(users, fn(user) ->
-- 
cgit v1.2.3


From 06b512acf15a41053fd087d16f5d3f886cb23b27 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 12:05:40 +0100
Subject: Never update local users from foreign sources.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 25c6bad06..b64b69565 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -214,7 +214,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   end
 
   def upgrade_user_from_ap_id(ap_id, async \\ true) do
-    with %User{} = user <- User.get_by_ap_id(ap_id),
+    with %User{local: false} = user <- User.get_by_ap_id(ap_id),
          {:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do
       data = data
       |> Map.put(:info, Map.merge(user.info, data[:info]))
-- 
cgit v1.2.3


From 9a4d400ff4d2c5c860bcb6582db01879cafd7467 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 12:49:56 +0100
Subject: Fix remote following.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index f0dc86a7f..1e0509702 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -12,14 +12,18 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   def user(conn, %{"nickname" => nickname}) do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
-      json(conn, UserView.render("user.json", %{user: user}))
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(UserView.render("user.json", %{user: user}))
     end
   end
 
   def object(conn, %{"uuid" => uuid}) do
     with ap_id <- o_status_url(conn, :object, uuid),
          %Object{} = object <- Object.get_cached_by_ap_id(ap_id) do
-      json(conn, ObjectView.render("object.json", %{object: object}))
+      conn
+      |> put_resp_header("content-type", "application/activity+json")
+      |> json(ObjectView.render("object.json", %{object: object}))
     end
   end
 
-- 
cgit v1.2.3


From fb02300234f547363242f0a768b6d35e7a1a87be Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 13:06:53 +0100
Subject: Pleroma AP detection mechanism.

---
 lib/pleroma/web/ostatus/ostatus.ex          | 7 +++++++
 lib/pleroma/web/ostatus/user_representer.ex | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 3f5cfdc8a..66e119212 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -177,6 +177,13 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def maybe_update(doc, user) do
+    if "true" == string_from_xpath("//author[1]/ap_enabled", doc) do
+      Transmogrifier.upgrade_user_from_ap_id(user.ap_id)
+    else
+      maybe_update_ostatus(doc, user)
+    end
+  end
+  def maybe_update_ostatus(doc, user) do
     old_data = %{
       avatar: user.avatar,
       bio: user.bio,
diff --git a/lib/pleroma/web/ostatus/user_representer.ex b/lib/pleroma/web/ostatus/user_representer.ex
index 20ebb3e08..5af439c9d 100644
--- a/lib/pleroma/web/ostatus/user_representer.ex
+++ b/lib/pleroma/web/ostatus/user_representer.ex
@@ -12,6 +12,12 @@ defmodule Pleroma.Web.OStatus.UserRepresenter do
       []
     end
 
+    ap_enabled = if user.local do
+      [{:ap_enabled, ['true']}]
+    else
+      []
+    end
+
     [
       {:id, [ap_id]},
       {:"activity:object", ['http://activitystrea.ms/schema/1.0/person']},
@@ -22,6 +28,6 @@ defmodule Pleroma.Web.OStatus.UserRepresenter do
       {:summary, [bio]},
       {:name, [nickname]},
       {:link, [rel: 'avatar', href: avatar_url], []}
-    ] ++ banner
+    ] ++ banner ++ ap_enabled
   end
 end
-- 
cgit v1.2.3


From fa3aa59248fb3a4d7202f55209ace86e6ebcef66 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 13:11:39 +0100
Subject: Add missing alias.

---
 lib/pleroma/web/ostatus/ostatus.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 66e119212..bed15e8c0 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -9,6 +9,7 @@ defmodule Pleroma.Web.OStatus do
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.{WebFinger, Websub}
   alias Pleroma.Web.OStatus.{FollowHandler, NoteHandler, DeleteHandler}
+  alias Pleroma.Web.ActivityPub.Transmogrifier
 
   def feed_path(user) do
     "#{user.ap_id}/feed.atom"
-- 
cgit v1.2.3


From e5fcc51a067dd420d37c68f9eabe0b7df2e048d5 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 17:36:02 +0100
Subject: Remove unneccesary subscriptions on update.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index b64b69565..2e5ca70fd 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -204,6 +204,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]]
     Repo.update_all(q, [])
 
+    maybe_retire_websub(user.ap_id)
+
     # Only do this for recent activties, don't go through the whole db.
     since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
     q  = from a in Activity,
@@ -236,4 +238,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       e -> e
     end
   end
+
+  def maybe_retire_websub(ap_id) do
+    # some sanity checks
+    if is_binary(ap_id) && (String.length(ap_id) > 8) do
+      q = from ws in Pleroma.Web.Websub.WebsubClientSubscription,
+        where: fragment("? like ?", ws.topic, ^"#{ap_id}%")
+      Repo.delete_all(q)
+    end
+  end
 end
-- 
cgit v1.2.3


From ac67453e8afc57fc0d31806a0318d35a4d6f704e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 17:36:26 +0100
Subject: More logging for signature problems.

---
 lib/pleroma/plugs/http_signature.ex                | 1 +
 lib/pleroma/web/http_signatures/http_signatures.ex | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/plugs/http_signature.ex b/lib/pleroma/plugs/http_signature.ex
index 7f40a20c0..9236c501c 100644
--- a/lib/pleroma/plugs/http_signature.ex
+++ b/lib/pleroma/plugs/http_signature.ex
@@ -20,6 +20,7 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
 
       assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
     else
+      Logger.debug("No signature header!")
       conn
     end
   end
diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index cdc5e1f3f..93c7c310d 100644
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -2,6 +2,7 @@
 defmodule Pleroma.Web.HTTPSignatures do
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
+  require Logger
 
   def split_signature(sig) do
     default = %{"headers" => "date"}
@@ -32,6 +33,7 @@ defmodule Pleroma.Web.HTTPSignatures do
       if validate_conn(conn, public_key) do
         true
       else
+        Logger.debug("Could not validate, re-fetching user and trying one more time.")
         # Fetch user anew and try one more time
         with actor_id <- conn.params["actor"],
              {:ok, _user} <- ActivityPub.make_user_from_ap_id(actor_id),
@@ -40,7 +42,8 @@ defmodule Pleroma.Web.HTTPSignatures do
         end
       end
     else
-      _ -> false
+      e ->
+        Logger.debug("Could not public key!")
     end
   end
 
-- 
cgit v1.2.3


From fb5add56fad1fba70111f8d72e0225517febb12a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 18:01:49 +0100
Subject: Bit more signature debugging.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 1e0509702..a8dfccc40 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -35,6 +35,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   def inbox(conn, params) do
     Logger.info("Signature error.")
+    Logger.info("Could not validate #{params["actor"]}")
     Logger.info(inspect(conn.req_headers))
     json(conn, "ok")
   end
-- 
cgit v1.2.3


From a7c3ead9e6a18e79e463b54e361baad54b26572c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 18:23:47 +0100
Subject: Invalidate user after key creation.

---
 lib/pleroma/web/web_finger/web_finger.ex | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index bbd65da61..3cd849de4 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -60,6 +60,8 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
+      Cachex.del(:user_cache, "ap_id:#{user.ap_id}")
+      Cachex.del(:user_cache, "nickname:#{user.nickname}")
       Repo.update(Ecto.Changeset.change(user, info: info))
     end
   end
-- 
cgit v1.2.3


From 59ad395ffa7def7e1dea782120a107c91b4f4746 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 18:47:08 +0100
Subject: Better signature errors messages.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index a8dfccc40..4d0d900ac 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -34,9 +34,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   end
 
   def inbox(conn, params) do
-    Logger.info("Signature error.")
-    Logger.info("Could not validate #{params["actor"]}")
-    Logger.info(inspect(conn.req_headers))
+    if !(String.contains(conn.req_headers["signature"] || "", params["actor"])) do
+      Logger.info("Signature not from author, relayed message, ignoring.")
+    else
+      Logger.info("Signature error.")
+      Logger.info("Could not validate #{params["actor"]}")
+      Logger.info(inspect(conn.req_headers))
+    end
+
     json(conn, "ok")
   end
 
-- 
cgit v1.2.3


From 5bc7628022f45abd241ad5185feb1154d1442109 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 18:49:09 +0100
Subject: Fix.

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 4d0d900ac..17c3ca638 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -34,7 +34,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   end
 
   def inbox(conn, params) do
-    if !(String.contains(conn.req_headers["signature"] || "", params["actor"])) do
+    headers = Enum.into(conn.req_headers, %{})
+    if !(String.contains(headers["signature"] || "", params["actor"])) do
       Logger.info("Signature not from author, relayed message, ignoring.")
     else
       Logger.info("Signature error.")
-- 
cgit v1.2.3


From df73a9c6d68429d92805eae7e918461cc720e092 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 18:50:02 +0100
Subject: .

---
 lib/pleroma/web/activity_pub/activity_pub_controller.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 17c3ca638..edbcb938a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -35,7 +35,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   def inbox(conn, params) do
     headers = Enum.into(conn.req_headers, %{})
-    if !(String.contains(headers["signature"] || "", params["actor"])) do
+    if !(String.contains?(headers["signature"] || "", params["actor"])) do
       Logger.info("Signature not from author, relayed message, ignoring.")
     else
       Logger.info("Signature error.")
-- 
cgit v1.2.3


From 2b5d2659543e3484973b0eb5eb975f4a9fb298df Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 19:04:56 +0100
Subject: Don't deliver to local followers.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index c27ec2c6b..a2f8ada9c 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -314,7 +314,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def publish(actor, activity) do
     followers = if actor.follower_address in activity.recipients do
       {:ok, followers} = User.get_followers(actor)
-      followers
+      followers |> Enum.filter(&(!&1.local))
     else
       []
     end
-- 
cgit v1.2.3


From 82e34cae95a204475f4419758c980ddd922be095 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 20:16:41 +0100
Subject: Unify object representation.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex    | 17 +++++++++++------
 lib/pleroma/web/activity_pub/views/object_view.ex |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 2e5ca70fd..698cfa0a9 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -122,18 +122,23 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     if object = Object.get_by_ap_id(id), do: {:ok, object}, else: nil
   end
 
-  @doc
-  """
-  internal -> Mastodon
-  """
-  def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
-    object = object
+  def prepare_object(object) do
+    object
     |> set_sensitive
     |> add_hashtags
     |> add_mention_tags
     |> add_attributed_to
     |> prepare_attachments
     |> set_conversation
+  end
+
+  @doc
+  """
+  internal -> Mastodon
+  """
+  def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+    object = object
+    |> prepare_object
 
     data = data
     |> Map.put("object", object)
diff --git a/lib/pleroma/web/activity_pub/views/object_view.ex b/lib/pleroma/web/activity_pub/views/object_view.ex
index c39f99454..cc0b0556b 100644
--- a/lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/lib/pleroma/web/activity_pub/views/object_view.ex
@@ -1,5 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.ObjectView do
   use Pleroma.Web, :view
+  alias Pleroma.Web.ActivityPub.Transmogrifier
 
   def render("object.json", %{object: object}) do
     base = %{
@@ -20,8 +21,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do
       ]
     }
 
-    additional = Map.take(object.data, ["id", "to", "cc", "actor", "content", "summary", "type"])
-    |> Map.put("attributedTo", object.data["actor"])
+    additional = Transmogrifier.prepare_object(object.data)
     Map.merge(base, additional)
   end
 end
-- 
cgit v1.2.3


From 7e0ce32f4d9693e475c03b1ea60ba63fe75ba7bb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 20:29:57 +0100
Subject: Fix external url in twitterapi.

---
 lib/pleroma/web/twitter_api/representers/activity_representer.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index b0dfeaf39..8970b7c68 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -164,7 +164,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "repeat_num" => announcement_count,
       "favorited" => to_boolean(favorited),
       "repeated" => to_boolean(repeated),
-      "external_url" => object["external_url"],
+      "external_url" => object["external_url"] || object["id"],
       "tags" => tags,
       "activity_type" => "post",
       "possibly_sensitive" => possibly_sensitive
-- 
cgit v1.2.3


From 0e9bd6d1485e56f81da8fcde6b40d8981f63b113 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Feb 2018 22:28:22 +0100
Subject: Hotfix for tag problems.

---
 lib/pleroma/web/ostatus/activity_representer.ex | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 33e5e0009..c8ade52a4 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -79,7 +79,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     mentions = activity.recipients |> get_mentions
 
     categories = (activity.data["object"]["tag"] || [])
-    |> Enum.map(fn (tag) -> {:category, [term: to_charlist(tag)], []} end)
+    |> Enum.map(fn (tag) ->
+      if is_binary(tag) do
+        {:category, [term: to_charlist(tag)], []}
+      else
+        nil
+      end
+    end)
+    |> Enum.filter(&(&1))
 
     emoji_links = get_emoji_links(activity.data["object"]["emoji"] || %{})
 
-- 
cgit v1.2.3


From b76de1ecd3def57fb716ca25d44bee398ee4d8e1 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 10:56:01 +0100
Subject: Some fixes to AP fetching.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 30 ++++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 698cfa0a9..464842f69 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -20,8 +20,24 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> Map.put("actor", object["attributedTo"])
     |> fix_attachments
     |> fix_context
+    |> fix_in_reply_to
   end
 
+  def fix_in_reply_to(%{"inReplyTo" => in_reply_to_id} = object) when not is_nil(in_reply_to_id) do
+    case ActivityPub.fetch_object_from_id(object["inReplyToAtomUri"] || in_reply_to_id) do
+      {:ok, replied_object} ->
+        activity = Activity.get_create_activity_by_object_ap_id(replied_object.data["id"])
+        object
+        |> Map.put("inReplyTo", replied_object.data["id"])
+        |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id)
+        |> Map.put("inReplyToStatusId", activity.id)
+      e ->
+        Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
+        object
+    end
+  end
+  def fix_in_reply_to(object), do: object
+
   def fix_context(object) do
     object
     |> Map.put("context", object["conversation"])
@@ -46,19 +62,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
          %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
       object = fix_object(data["object"])
 
-      replied_to_id = if object["inReplyTo"] do
-        case ActivityPub.fetch_object_from_id(object["inReplyTo"]) do
-          {:ok, object} -> object.data["id"]
-          e ->
-            Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
-            nil
-        end
-      else
-        nil
-      end
-
-      object = Map.put(object, "inReplyTo", replied_to_id || object["inReplyTo"])
-
       params = %{
         to: data["to"],
         object: object,
@@ -139,7 +142,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
     object = object
     |> prepare_object
-
     data = data
     |> Map.put("object", object)
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
-- 
cgit v1.2.3


From dd97193311fec3c1fc44f9b503cdf5d4aa7da376 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 13:35:08 +0100
Subject: Set conversation to parent conversation.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 464842f69..6714319fb 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -31,6 +31,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         |> Map.put("inReplyTo", replied_object.data["id"])
         |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id)
         |> Map.put("inReplyToStatusId", activity.id)
+        |> Map.put("conversation", replied_object.data["conversation"])
+        |> Map.put("context", replied_object.data["conversation"])
       e ->
         Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
         object
-- 
cgit v1.2.3


From e3629af4daaa8ea44d8fea53d426db6527cdc358 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 16:14:25 +0100
Subject: Handle remote update activities.

---
 lib/pleroma/user.ex                            | 11 +++--
 lib/pleroma/web/activity_pub/activity_pub.ex   | 66 ++++++++++++++++----------
 lib/pleroma/web/activity_pub/transmogrifier.ex | 24 +++++++++-
 lib/pleroma/web/web_finger/web_finger.ex       |  6 +--
 4 files changed, 74 insertions(+), 33 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 8c1c524ff..2ae01c2cc 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -99,7 +99,7 @@ defmodule Pleroma.User do
     |> cast(params, [:bio, :name])
     |> unique_constraint(:nickname)
     |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
-    |> validate_length(:bio, min: 1, max: 1000)
+    |> validate_length(:bio, min: 1, max: 5000)
     |> validate_length(:name, min: 1, max: 100)
   end
 
@@ -108,8 +108,8 @@ defmodule Pleroma.User do
     |> cast(params, [:bio, :name, :info, :follower_address, :avatar])
     |> unique_constraint(:nickname)
     |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
-    |> validate_length(:bio, min: 1, max: 1000)
-    |> validate_length(:name, min: 1, max: 100)
+    |> validate_length(:bio, max: 5000)
+    |> validate_length(:name, max: 100)
   end
 
   def password_update_changeset(struct, params) do
@@ -218,6 +218,11 @@ defmodule Pleroma.User do
     end
   end
 
+  def invalidate_cache(user) do
+    Cachex.del(:user_cache, "ap_id:#{user.ap_id}")
+    Cachex.del(:user_cache, "nickname:#{user.nickname}")
+  end
+
   def get_cached_by_ap_id(ap_id) do
     key = "ap_id:#{ap_id}"
     Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a2f8ada9c..87ad45249 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -62,6 +62,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  def update(%{to: to, cc: cc, actor: actor, object: object} = params) do
+    local = !(params[:local] == false) # only accept false as false value
+
+    with data <- %{"to" => to, "cc" => cc, "type" => "Update", "actor" => actor, "object" => object},
+         {:ok, activity} <- insert(data, local),
+         :ok <- maybe_federate(activity) do
+      {:ok, activity}
+    end
+  end
+
   # TODO: This is weird, maybe we shouldn't check here if we can make the activity.
   def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => _}} = object, activity_id \\ nil, local \\ true) do
     with nil <- get_existing_like(ap_id, object),
@@ -260,34 +270,38 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Repo.insert(%Object{data: data})
   end
 
+  def user_data_from_user_object(data) do
+    avatar = data["icon"]["url"] && %{
+      "type" => "Image",
+      "url" => [%{"href" => data["icon"]["url"]}]
+    }
+
+    banner = data["image"]["url"] && %{
+      "type" => "Image",
+      "url" => [%{"href" => data["image"]["url"]}]
+    }
+
+    user_data = %{
+      ap_id: data["id"],
+      info: %{
+        "ap_enabled" => true,
+        "source_data" => data,
+        "banner" => banner
+      },
+      avatar: avatar,
+      nickname: "#{data["preferredUsername"]}@#{URI.parse(data["id"]).host}",
+      name: data["name"],
+      follower_address: data["followers"],
+      bio: data["summary"]
+    }
+
+    {:ok, user_data}
+  end
+
   def fetch_and_prepare_user_from_ap_id(ap_id) do
     with {:ok, %{status_code: 200, body: body}} <- @httpoison.get(ap_id, ["Accept": "application/activity+json"]),
-    {:ok, data} <- Poison.decode(body)
-      do
-      avatar = %{
-        "type" => "Image",
-        "url" => [%{"href" => data["icon"]["url"]}]
-      }
-
-      banner = %{
-        "type" => "Image",
-        "url" => [%{"href" => data["image"]["url"]}]
-      }
-
-      user_data = %{
-        ap_id: data["id"],
-        info: %{
-          "ap_enabled" => true,
-          "source_data" => data,
-          "banner" => banner
-        },
-        avatar: avatar,
-        nickname: "#{data["preferredUsername"]}@#{URI.parse(ap_id).host}",
-        name: data["name"],
-        follower_address: data["followers"],
-      }
-
-      {:ok, user_data}
+    {:ok, data} <- Poison.decode(body) do
+      user_data_from_user_object(data)
     else
       e -> Logger.error("Could not user at fetch #{ap_id}, #{inspect(e)}")
     end
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 6714319fb..0d73ddc5d 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -24,7 +24,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   end
 
   def fix_in_reply_to(%{"inReplyTo" => in_reply_to_id} = object) when not is_nil(in_reply_to_id) do
-    case ActivityPub.fetch_object_from_id(object["inReplyToAtomUri"] || in_reply_to_id) do
+    case ActivityPub.fetch_object_from_id(in_reply_to_id) do
       {:ok, replied_object} ->
         activity = Activity.get_create_activity_by_object_ap_id(replied_object.data["id"])
         object
@@ -117,6 +117,28 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  def handle_incoming(%{"type" => "Update", "object" => %{"type" => "Person"} = object, "actor" => actor_id} = data) do
+    with %User{ap_id: ^actor_id} = actor <- User.get_by_ap_id(object["id"]) do
+      {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object)
+
+      banner = new_user_data[:info]["banner"]
+      update_data = new_user_data
+      |> Map.take([:name, :bio, :avatar])
+      |> Map.put(:info, Map.merge(actor.info, %{"banner" => banner}))
+
+      actor
+      |> User.upgrade_changeset(update_data)
+      |> Repo.update
+
+      User.invalidate_cache(actor)
+      ActivityPub.update(%{local: false, to: data["to"] || [], cc: data["cc"] || [], object: object, actor: actor_id})
+    else
+      e ->
+        Logger.error(e)
+        :error
+    end
+  end
+
   # TODO
   # Accept
   # Undo
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 3cd849de4..7576ea28a 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -60,9 +60,9 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
-      Cachex.del(:user_cache, "ap_id:#{user.ap_id}")
-      Cachex.del(:user_cache, "nickname:#{user.nickname}")
-      Repo.update(Ecto.Changeset.change(user, info: info))
+      res = Repo.update(Ecto.Changeset.change(user, info: info))
+      User.invalidate_cache(user)
+      res
     end
   end
 
-- 
cgit v1.2.3


From dfaddeb765cdc7b5253663d7173aca52371e48bd Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 16:34:24 +0100
Subject: Use update_and_set cache.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex        |  3 +--
 lib/pleroma/web/twitter_api/twitter_api_controller.ex | 10 +++++-----
 lib/pleroma/web/web_finger/web_finger.ex              |  5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 0d73ddc5d..6974c39b1 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -128,9 +128,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
       actor
       |> User.upgrade_changeset(update_data)
-      |> Repo.update
+      |> User.update_and_set_cache()
 
-      User.invalidate_cache(actor)
       ActivityPub.update(%{local: false, to: data["to"] || [], cc: data["cc"] || [], object: object, actor: actor_id})
     else
       e ->
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 5284a8847..3eb4f5d63 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -207,7 +207,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   def update_avatar(%{assigns: %{user: user}} = conn, params) do
     {:ok, object} = ActivityPub.upload(params)
     change = Changeset.change(user, %{avatar: object.data})
-    {:ok, user} = Repo.update(change)
+    {:ok, user} = User.update_and_set_cache(change)
 
     render(conn, UserView, "show.json", %{user: user, for: user})
   end
@@ -216,7 +216,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}),
          new_info <- Map.put(user.info, "banner", object.data),
          change <- User.info_changeset(user, %{info: new_info}),
-         {:ok, _user} <- Repo.update(change) do
+         {:ok, _user} <- User.update_and_set_cache(change) do
       %{"url" => [ %{ "href" => href } | _ ]} = object.data
       response = %{ url: href } |> Poison.encode!
       conn
@@ -228,7 +228,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     with {:ok, object} <- ActivityPub.upload(params),
          new_info <- Map.put(user.info, "background", object.data),
          change <- User.info_changeset(user, %{info: new_info}),
-         {:ok, _user} <- Repo.update(change) do
+         {:ok, _user} <- User.update_and_set_cache(change) do
       %{"url" => [ %{ "href" => href } | _ ]} = object.data
       response = %{ url: href } |> Poison.encode!
       conn
@@ -255,7 +255,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
          mrn <- max(id, user.info["most_recent_notification"] || 0),
          updated_info <- Map.put(info, "most_recent_notification", mrn),
          changeset <- User.info_changeset(user, %{info: updated_info}),
-         {:ok, _user} <- Repo.update(changeset) do
+         {:ok, _user} <- User.update_and_set_cache(changeset) do
       conn
       |> json_reply(200, Poison.encode!(mrn))
     else
@@ -305,7 +305,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
 
     with changeset <- User.update_changeset(user, params),
-         {:ok, user} <- Repo.update(changeset) do
+         {:ok, user} <- User.update_and_set_cache(changeset) do
       render(conn, UserView, "user.json", %{user: user, for: user})
     else
       error ->
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 7576ea28a..c59a7e82d 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -60,9 +60,8 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
-      res = Repo.update(Ecto.Changeset.change(user, info: info))
-      User.invalidate_cache(user)
-      res
+      Ecto.Changeset.change(user, info: info)
+      |> User.update_and_set_cache()
     end
   end
 
-- 
cgit v1.2.3


From 8e7f63afde9ea0fcc3d7955b850ce8564f4eb6e9 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 16:40:37 +0100
Subject: Fix specs.

---
 lib/pleroma/user.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 2ae01c2cc..b16c1e342 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -450,4 +450,5 @@ defmodule Pleroma.User do
   end
 
   def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
+  def ap_enabled?(_), do: false
 end
-- 
cgit v1.2.3


From 4d13cc0dc6290abe3cc99a9de52bd929af317389 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 16:52:33 +0100
Subject: Fix specs.

---
 lib/pleroma/web/activity_pub/activity_pub.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 87ad45249..667f8fc15 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -314,7 +314,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id) do
         User.insert_or_update_user(data)
       else
-        e -> e
+        e -> {:error, e}
       end
     end
   end
@@ -322,6 +322,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def make_user_from_nickname(nickname) do
     with {:ok, %{"ap_id" => ap_id}} when not is_nil(ap_id) <- WebFinger.finger(nickname) do
       make_user_from_ap_id(ap_id)
+    else
+      _e -> {:error, "No ap id in webfinger"}
     end
   end
 
-- 
cgit v1.2.3


From d3b01678545dc4ebb9f5ad883b734f25fd74328c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 17:06:12 +0100
Subject: Fix salmon tests.

---
 lib/pleroma/user.ex | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index b16c1e342..c3fce17de 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -410,8 +410,15 @@ defmodule Pleroma.User do
     if user = get_by_ap_id(ap_id) do
       user
     else
-      with {:ok, user} <- ActivityPub.make_user_from_ap_id(ap_id) do
-        user
+      ap_try = ActivityPub.make_user_from_ap_id(ap_id)
+
+      case ap_try do
+        {:ok, user} -> user
+        _ ->
+          case OStatus.make_user(ap_id) do
+            {:ok, user} -> user
+            _ -> {:error, "Could not fetch by ap id"}
+          end
       end
     end
   end
-- 
cgit v1.2.3


From 4ea2a41014c71cd4b60d62a2d013840ad98d8600 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 17:48:31 +0100
Subject: Fix more specs.

---
 lib/pleroma/web/twitter_api/representers/activity_representer.ex | 2 +-
 lib/pleroma/web/twitter_api/twitter_api.ex                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 8970b7c68..5199cef8e 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -136,7 +136,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
     tags = activity.data["object"]["tag"] || []
     possibly_sensitive = activity.data["object"]["sensitive"] || Enum.member?(tags, "nsfw")
 
-    tags = if possibly_sensitive, do: ["nsfw" | tags], else: tags
+    tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
 
     summary = activity.data["object"]["summary"]
     content = if !!summary and summary != "" do
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index ccd79625c..34e3d75af 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -44,7 +44,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   def fetch_user_statuses(user, opts \\ %{}) do
     opts = opts
     |> Map.put("type", ["Create", "Announce", "Follow"])
-    ActivityPub.fetch_activities([], opts)
+    ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
-- 
cgit v1.2.3


From 8a47974217de4f714af11de7e5cb9b13e074d6ba Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 18:08:41 +0100
Subject: Fix specs.

---
 lib/pleroma/web/common_api/common_api.ex                | 2 +-
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 5bd6e136f..d85a7cf5e 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -47,7 +47,7 @@ defmodule Pleroma.Web.CommonAPI do
   end
 
   def get_visibility(%{"visibility" => visibility}), do: visibility
-  def get_visibility(%{"in_reply_to_status_id" => status_id}) do
+  def get_visibility(%{"in_reply_to_status_id" => status_id}) when status_id do
     inReplyTo = get_replied_to_activity(status_id)
     Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
   end
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 45b4d24c6..1f010a8ee 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -182,7 +182,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
       |> Map.put("actor_id", ap_id)
       |> Map.put("whole_db", true)
 
-      activities = ActivityPub.fetch_activities([], params)
+      activities = ActivityPub.fetch_public_activities(params)
       |> Enum.reverse
 
       render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity}
@@ -465,12 +465,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   end
 
   def favourites(%{assigns: %{user: user}} = conn, _) do
-    params = conn
+    params = %{}
     |> Map.put("type", "Create")
     |> Map.put("favorited_by", user.ap_id)
     |> Map.put("blocking_user", user)
 
-    activities = ActivityPub.fetch_activities([], params)
+    activities = ActivityPub.fetch_public_activities(params)
     |> Enum.reverse
 
     conn
-- 
cgit v1.2.3


From f61fd00db52d5f1d007a7c37ea7b3d10c4d2a503 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 18:20:06 +0100
Subject: Make likes and announces public.

---
 lib/pleroma/web/activity_pub/utils.ex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index b32b7240e..919cd0bd5 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -109,6 +109,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
       "actor" => ap_id,
       "object" => id,
       "to" => [actor.follower_address, object.data["actor"]],
+      "cc" => ["https://www.w3.org/ns/activitystreams#Public"],
       "context" => object.data["context"]
     }
 
@@ -150,6 +151,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
       "type" => "Follow",
       "actor" => follower_id,
       "to" => [followed_id],
+      "cc" => ["https://www.w3.org/ns/activitystreams#Public"],
       "object" => followed_id
     }
 
@@ -177,6 +179,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
       "actor" => ap_id,
       "object" => id,
       "to" => [user.follower_address, object.data["actor"]],
+      "cc" => ["https://www.w3.org/ns/activitystreams#Public"],
       "context" => object.data["context"]
     }
 
-- 
cgit v1.2.3


From 5ea6d96dbe37d7ded83a2ca52714fe9b33e44c67 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 20:15:04 +0100
Subject: Fix signing bug.

---
 lib/pleroma/plugs/http_signature.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/plugs/http_signature.ex b/lib/pleroma/plugs/http_signature.ex
index 9236c501c..d2d4bdd63 100644
--- a/lib/pleroma/plugs/http_signature.ex
+++ b/lib/pleroma/plugs/http_signature.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
     Logger.debug("Checking sig for #{user}")
     if get_req_header(conn, "signature") do
       conn = conn
-      |> put_req_header("(request-target)", String.downcase("#{conn.method} #{conn.request_path}"))
+      |> put_req_header("(request-target)", String.downcase("#{conn.method}") <> " #{conn.request_path}")
 
       assign(conn, :valid_signature, HTTPSignatures.validate_conn(conn))
     else
-- 
cgit v1.2.3


From e9de04b74bb772fc1b2bff5201195e63eee198be Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 21:02:44 +0100
Subject: Add support for outgoing update.

---
 lib/pleroma/web/activity_pub/utils.ex                   |  2 +-
 lib/pleroma/web/activity_pub/views/user_view.ex         |  2 ++
 lib/pleroma/web/common_api/common_api.ex                |  4 ++++
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 10 +++++++---
 lib/pleroma/web/twitter_api/twitter_api_controller.ex   |  5 ++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 919cd0bd5..cda106283 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -68,7 +68,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   @doc """
   Inserts a full object if it is contained in an activity.
   """
-  def insert_full_object(%{"object" => object_data}) when is_map(object_data) do
+  def insert_full_object(%{"object" => %{"type" => type} = object_data}) when is_map(object_data) and type in ["Note"] do
     with {:ok, _} <- Object.create(object_data) do
       :ok
     end
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index b96ac7b27..179636884 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -1,9 +1,11 @@
 defmodule Pleroma.Web.ActivityPub.UserView do
   use Pleroma.Web, :view
   alias Pleroma.Web.Salmon
+  alias Pleroma.Web.WebFinger
   alias Pleroma.User
 
   def render("user.json", %{user: user}) do
+    {:ok, user} = WebFinger.ensure_keys_present(user)
     {:ok, _, public_key} = Salmon.keys_from_pem(user.info["keys"])
     public_key = :public_key.pem_entry_encode(:RSAPublicKey, public_key)
     public_key = :public_key.pem_encode([public_key])
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index d85a7cf5e..0f84542f0 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -74,4 +74,8 @@ defmodule Pleroma.Web.CommonAPI do
       res
     end
   end
+
+  def update(user) do
+    ActivityPub.update(%{local: true, to: [user.follower_address], cc: [], actor: user.ap_id, object: Pleroma.Web.ActivityPub.UserView.render("user.json", %{user: user})})
+  end
 end
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 1f010a8ee..ca1f8154c 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -24,6 +24,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   end
 
   def update_credentials(%{assigns: %{user: user}} = conn, params) do
+    original_user = user
     params = if bio = params["note"] do
       Map.put(params, "bio", bio)
     else
@@ -40,7 +41,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
       with %Plug.Upload{} <- avatar,
            {:ok, object} <- ActivityPub.upload(avatar),
            change = Ecto.Changeset.change(user, %{avatar: object.data}),
-           {:ok, user} = Repo.update(change) do
+           {:ok, user} = User.update_and_set_cache(change) do
         user
       else
         _e -> user
@@ -54,7 +55,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
            {:ok, object} <- ActivityPub.upload(banner),
            new_info <- Map.put(user.info, "banner", object.data),
            change <- User.info_changeset(user, %{info: new_info}),
-           {:ok, user} <- Repo.update(change) do
+           {:ok, user} <- User.update_and_set_cache(change) do
         user
       else
         _e -> user
@@ -64,7 +65,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     end
 
     with changeset <- User.update_changeset(user, params),
-         {:ok, user} <- Repo.update(changeset) do
+         {:ok, user} <- User.update_and_set_cache(changeset) do
+      if original_user != user do
+        CommonAPI.update(user)
+      end
       json conn, AccountView.render("account.json", %{user: user})
     else
       _e ->
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 3eb4f5d63..848ec218f 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -208,6 +208,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     {:ok, object} = ActivityPub.upload(params)
     change = Changeset.change(user, %{avatar: object.data})
     {:ok, user} = User.update_and_set_cache(change)
+    CommonAPI.update(user)
 
     render(conn, UserView, "show.json", %{user: user, for: user})
   end
@@ -216,7 +217,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}),
          new_info <- Map.put(user.info, "banner", object.data),
          change <- User.info_changeset(user, %{info: new_info}),
-         {:ok, _user} <- User.update_and_set_cache(change) do
+         {:ok, user} <- User.update_and_set_cache(change) do
+      CommonAPI.update(user)
       %{"url" => [ %{ "href" => href } | _ ]} = object.data
       response = %{ url: href } |> Poison.encode!
       conn
@@ -306,6 +308,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
     with changeset <- User.update_changeset(user, params),
          {:ok, user} <- User.update_and_set_cache(changeset) do
+      CommonAPI.update(user)
       render(conn, UserView, "user.json", %{user: user, for: user})
     else
       error ->
-- 
cgit v1.2.3


From e1b0ccce7733578512078fdcf33ab0bec3087179 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 21:25:33 +0100
Subject: Mastodon API context fix.

---
 lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index ca1f8154c..fbf8c1915 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -202,7 +202,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
 
   def get_context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     with %Activity{} = activity <- Repo.get(Activity, id),
-         activities <- ActivityPub.fetch_activities_for_context(activity.data["object"]["context"], %{"blocking_user" => user, "user" => user}),
+         activities <- ActivityPub.fetch_activities_for_context(activity.data["context"], %{"blocking_user" => user, "user" => user}),
          activities <- activities |> Enum.filter(fn (%{id: aid}) -> to_string(aid) != to_string(id) end),
          activities <- activities |> Enum.filter(fn (%{data: %{"type" => type}}) -> type == "Create" end),
          grouped_activities <- Enum.group_by(activities, fn (%{id: id}) -> id < activity.id end) do
-- 
cgit v1.2.3


From 8c712b319899dd596ad89cf18b1a40c5d65d400d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 21:42:28 +0100
Subject: Fix context stitching.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 6974c39b1..a9d9674d6 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -31,8 +31,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         |> Map.put("inReplyTo", replied_object.data["id"])
         |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id)
         |> Map.put("inReplyToStatusId", activity.id)
-        |> Map.put("conversation", replied_object.data["conversation"])
-        |> Map.put("context", replied_object.data["conversation"])
+        |> Map.put("conversation", replied_object.data["context"])
+        |> Map.put("context", replied_object.data["context"])
       e ->
         Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
         object
-- 
cgit v1.2.3


From 0d69bbc1fbfe2eef205b910d3e5b3b1503e02cef Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 22:20:38 +0100
Subject: One more fix.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index a9d9674d6..abc9b786e 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -31,8 +31,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         |> Map.put("inReplyTo", replied_object.data["id"])
         |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id)
         |> Map.put("inReplyToStatusId", activity.id)
-        |> Map.put("conversation", replied_object.data["context"])
-        |> Map.put("context", replied_object.data["context"])
+        |> Map.put("conversation", replied_object.data["context"] || object["conversation"])
+        |> Map.put("context", replied_object.data["context"] || object["conversation"])
       e ->
         Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
         object
-- 
cgit v1.2.3


From 82df16f7c30251e64eaa28fb20c752e61e04cd2e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 22:28:53 +0100
Subject: Actual real fix.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index abc9b786e..f3e869f4d 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -68,7 +68,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         to: data["to"],
         object: object,
         actor: user,
-        context: data["object"]["conversation"],
+        context: object["conversation"],
         local: false,
         published: data["published"],
         additional: Map.take(data, [
-- 
cgit v1.2.3


From a17ba0ee0df07c0ce12dd8773a974c45a1e539a4 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 26 Feb 2018 09:02:14 +0100
Subject: Only return posts in TwAPI user view.

---
 lib/pleroma/web/twitter_api/twitter_api.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 34e3d75af..987a960bb 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -43,7 +43,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def fetch_user_statuses(user, opts \\ %{}) do
     opts = opts
-    |> Map.put("type", ["Create", "Announce", "Follow"])
+    |> Map.put("type", ["Create"])
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
-- 
cgit v1.2.3


From 1377b2e569e91b4f51ba4715b343e1a8a7feb8ba Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 26 Feb 2018 10:09:30 +0100
Subject: Restrict public by recipients.

This is much faster than going through the json. This does break
unlisted, for which we'll probably have to add another table field.
---
 lib/pleroma/web/activity_pub/activity_pub.ex | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 667f8fc15..965f2cc9b 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -155,11 +155,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     Repo.all(query)
   end
 
+  # TODO: Make this work properly with unlisted.
   def fetch_public_activities(opts \\ %{}) do
-    public = %{to: ["https://www.w3.org/ns/activitystreams#Public"]}
-    q = fetch_activities_query([], opts)
-    q = from activity in q,
-      where: fragment(~s(? @> ?), activity.data, ^public)
+    q = fetch_activities_query(["https://www.w3.org/ns/activitystreams#Public"], opts)
     q
     |> Repo.all
     |> Enum.reverse
-- 
cgit v1.2.3


From d2ad99298e095f8c738efc95d0f8f077f8bfa23a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 3 Mar 2018 18:37:40 +0100
Subject: Handle incoming deletes.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index f3e869f4d..54468b5f9 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -138,6 +138,21 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  # TODO: Make secure.
+  def handle_incoming(%{"type" => "Delete", "object" => object_id, "actor" => actor, "id" => id} = data) do
+    object_id = case object_id do
+                  %{"id" => id} -> id
+                  id -> id
+                end
+    with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
+         {:ok, object} <- get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
+         {:ok, activity} <- ActivityPub.delete(object, false) do
+      {:ok, activity}
+    else
+      e -> :error
+    end
+  end
+
   # TODO
   # Accept
   # Undo
-- 
cgit v1.2.3


From b82637f32df75142439269e56be448e0dd193901 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 6 Mar 2018 16:04:29 +0100
Subject: Don't use special query for feed.

---
 lib/pleroma/web/ostatus/ostatus_controller.ex | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 4388217d1..cb435e031 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.Web.{OStatus, Federator}
   alias Pleroma.Web.XML
   alias Pleroma.Web.ActivityPub.ActivityPubController
+  alias Pleroma.Web.ActivityPub.ActivityPub
   import Ecto.Query
 
   def feed_redirect(conn, %{"nickname" => nickname} = params) do
@@ -21,14 +22,9 @@ defmodule Pleroma.Web.OStatus.OStatusController do
 
   def feed(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
-    query = from activity in Activity,
-      where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id),
-      limit: 20,
-      order_by: [desc: :id]
 
-    activities = query
-    |> restrict_max(params)
-    |> Repo.all
+    activities = ActivityPub.fetch_public_activities(%{"whole_db" => true, "actor_id" => user.ap_id})
+    |> Enum.reverse
 
     response = user
     |> FeedRepresenter.to_simple_form(activities, [user])
@@ -57,11 +53,6 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  defp restrict_max(query, %{"max_id" => max_id}) do
-    from activity in query, where: activity.id < ^max_id
-  end
-  defp restrict_max(query, _), do: query
-
   def salmon_incoming(conn, _) do
     {:ok, body, _conn} = read_body(conn)
     {:ok, doc} = decode_or_retry(body)
@@ -72,6 +63,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     |> send_resp(200, "")
   end
 
+  # TODO: Data leak
   def object(conn, %{"uuid" => uuid} = params) do
     if get_format(conn) == "activity+json" do
       ActivityPubController.object(conn, params)
@@ -87,6 +79,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
+  # TODO: Data leak
   def activity(conn, %{"uuid" => uuid}) do
     with id <- o_status_url(conn, :activity, uuid),
          %Activity{} = activity <- Activity.get_by_ap_id(id),
@@ -98,6 +91,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
+  # TODO: Data leak
   def notice(conn, %{"id" => id}) do
      with %Activity{} = activity <- Repo.get(Activity, id),
           %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-- 
cgit v1.2.3


From fcf1937a408101a4e15207bdecc36cc90f63031c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 7 Mar 2018 15:45:13 +0100
Subject: Correctly handle unlisted messages coming in through Ostatus.

---
 lib/pleroma/web/ostatus/handlers/note_handler.ex | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index 7b7ed2d5a..38f9fc478 100644
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -88,6 +88,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
     end
   end
 
+  # TODO: Clean this up a bit.
   def handle_note(entry, doc \\ nil) do
     with id <- XML.string_from_xpath("//id", entry),
          activity when is_nil(activity) <- Activity.get_create_activity_by_object_ap_id(id),
@@ -104,15 +105,18 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
          mentions <- get_mentions(entry),
          to <- make_to_list(actor, mentions),
          date <- XML.string_from_xpath("//published", entry),
+         unlisted <- XML.string_from_xpath("//mastodon:scope", entry) == "unlisted",
+         cc <- if(unlisted, do: ["https://www.w3.org/ns/activitystreams#Public"], else: []),
          note <- CommonAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, [], cw),
          note <- note |> Map.put("id", id) |> Map.put("tag", tags),
          note <- note |> Map.put("published", date),
          note <- note |> Map.put("emoji", get_emoji(entry)),
          note <- add_external_url(note, entry),
+         note <- note |> Map.put("cc", cc),
          # TODO: Handle this case in make_note_data
          note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note)
       do
-      res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false})
+      res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false, additional: %{"cc" => cc}})
       User.increase_note_count(actor)
       res
     else
-- 
cgit v1.2.3


From 8228ae96d87fa9a8dc6c2603767ab8f094703e9e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 7 Mar 2018 20:19:48 +0100
Subject: Only run the fix-up tasks once.

---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 54468b5f9..37db67798 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -266,16 +266,19 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       data = data
       |> Map.put(:info, Map.merge(user.info, data[:info]))
 
+      already_ap = User.ap_enabled?(user)
       {:ok, user} = User.upgrade_changeset(user, data)
       |> Repo.update()
 
-      # This could potentially take a long time, do it in the background
-      if async do
-        Task.start(fn ->
+      if !already_ap do
+        # This could potentially take a long time, do it in the background
+        if async do
+          Task.start(fn ->
+            user_upgrade_task(user)
+          end)
+        else
           user_upgrade_task(user)
-        end)
-      else
-        user_upgrade_task(user)
+        end
       end
 
       {:ok, user}
-- 
cgit v1.2.3