X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fhandlers%2Fnote_handler.ex;h=5aeed46f0570eb238c9b044e1683543156ae43f1;hb=1b1e92866742e75de84201b079ffee48c769886e;hp=7b7ed2d5a4a09078b1dd5761849867deefd918e7;hpb=ae266043787ca4b9bcbe5162f12598286a44cae2;p=akkoma

diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index 7b7ed2d5a..5aeed46f0 100644
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -1,7 +1,11 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.OStatus.NoteHandler do
   require Logger
   alias Pleroma.Web.{XML, OStatus}
-  alias Pleroma.{Object, User, Activity}
+  alias Pleroma.{Object, Activity}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
@@ -13,49 +17,56 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
   3. A newly generated context id.
   """
   def get_context(entry, inReplyTo) do
-    context = (
-      XML.string_from_xpath("//ostatus:conversation[1]", entry)
-      || XML.string_from_xpath("//ostatus:conversation[1]/@ref", entry)
-      || "") |> String.trim
+    context =
+      (XML.string_from_xpath("//ostatus:conversation[1]", entry) ||
+         XML.string_from_xpath("//ostatus:conversation[1]/@ref", entry) || "")
+      |> String.trim()
 
     with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do
       context
-    else _e ->
-      if String.length(context) > 0 do
-        context
-      else
-        Utils.generate_context_id
-      end
+    else
+      _e ->
+        if String.length(context) > 0 do
+          context
+        else
+          Utils.generate_context_id()
+        end
     end
   end
 
   def get_people_mentions(entry) do
-    :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry)
-    |> Enum.map(fn(person) -> XML.string_from_xpath("@href", person) end)
+    :xmerl_xpath.string(
+      '//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]',
+      entry
+    )
+    |> Enum.map(fn person -> XML.string_from_xpath("@href", person) end)
   end
 
   def get_collection_mentions(entry) do
     transmogrify = fn
-      ("http://activityschema.org/collection/public") ->
+      "http://activityschema.org/collection/public" ->
         "https://www.w3.org/ns/activitystreams#Public"
-      (group) ->
+
+      group ->
         group
     end
 
-    :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"]', entry)
-    |> Enum.map(fn(collection) -> XML.string_from_xpath("@href", collection) |> transmogrify.() end)
+    :xmerl_xpath.string(
+      '//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"]',
+      entry
+    )
+    |> Enum.map(fn collection -> XML.string_from_xpath("@href", collection) |> transmogrify.() end)
   end
 
   def get_mentions(entry) do
-    (get_people_mentions(entry)
-      ++ get_collection_mentions(entry))
-    |> Enum.filter(&(&1))
+    (get_people_mentions(entry) ++ get_collection_mentions(entry))
+    |> Enum.filter(& &1)
   end
 
   def get_emoji(entry) do
     try do
       :xmerl_xpath.string('//link[@rel="emoji"]', entry)
-      |> Enum.reduce(%{}, fn(emoji, acc) ->
+      |> Enum.reduce(%{}, fn emoji, acc ->
         Map.put(acc, XML.string_from_xpath("@name", emoji), XML.string_from_xpath("@href", emoji))
       end)
     rescue
@@ -79,7 +90,8 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
       activity
     else
       _e ->
-        with inReplyToHref when not is_nil(inReplyToHref) <- XML.string_from_xpath("//thr:in-reply-to[1]/@href", entry),
+        with inReplyToHref when not is_nil(inReplyToHref) <-
+               XML.string_from_xpath("//thr:in-reply-to[1]/@href", entry),
              {:ok, [activity | _]} <- OStatus.fetch_activity_from_url(inReplyToHref) do
           activity
         else
@@ -88,6 +100,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,17 +117,40 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
          mentions <- get_mentions(entry),
          to <- make_to_list(actor, mentions),
          date <- XML.string_from_xpath("//published", entry),
-         note <- CommonAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, [], cw),
+         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})
-      User.increase_note_count(actor)
-      res
+         note <-
+           if(
+             inReplyTo && !inReplyToActivity,
+             do: note |> Map.put("inReplyTo", inReplyTo),
+             else: note
+           ) do
+      ActivityPub.create(%{
+        to: to,
+        actor: actor,
+        context: context,
+        object: note,
+        published: date,
+        local: false,
+        additional: %{"cc" => cc}
+      })
     else
       %Activity{} = activity -> {:ok, activity}
       e -> {:error, e}