From beb7b0ef07f880b6eecc01d04980b38ba8521a81 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 18 May 2017 15:58:18 +0200
Subject: [PATCH] Handle incoming tags.

---
 lib/pleroma/web/ostatus/ostatus.ex          | 10 +++-
 test/fixtures/ostatus_incoming_post_tag.xml | 58 +++++++++++++++++++++
 test/web/ostatus/ostatus_test.exs           |  7 +++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/ostatus_incoming_post_tag.xml

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 949b36664..e913e389f 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -133,6 +133,11 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
+  def get_tags(entry) do
+    :xmerl_xpath.string('//category', entry)
+    |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) end)
+  end
+
   def handle_note(entry, doc \\ nil) do
     content_html = get_content(entry)
 
@@ -163,6 +168,8 @@ defmodule Pleroma.Web.OStatus do
                 end
               end
 
+    tags = get_tags(entry)
+
     to = [
       "https://www.w3.org/ns/activitystreams#Public",
       User.ap_followers(actor)
@@ -184,7 +191,8 @@ defmodule Pleroma.Web.OStatus do
       "published" => date,
       "context" => context,
       "actor" => actor.ap_id,
-      "attachment" => attachments
+      "attachment" => attachments,
+      "tag" => tags
     }
 
     object = if inReplyTo do
diff --git a/test/fixtures/ostatus_incoming_post_tag.xml b/test/fixtures/ostatus_incoming_post_tag.xml
new file mode 100644
index 000000000..695766d73
--- /dev/null
+++ b/test/fixtures/ostatus_incoming_post_tag.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="https://gnu.io/social" version="1.0.2-dev">GNU social</generator>
+ <id>https://social.heldscal.la/api/statuses/user_timeline/23211.atom</id>
+ <title>lambadalambda timeline</title>
+ <subtitle>Updates from lambadalambda on social.heldscal.la!</subtitle>
+ <logo>https://social.heldscal.la/avatar/23211-96-20170416114255.jpeg</logo>
+ <updated>2017-04-29T18:25:38+00:00</updated>
+<author>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+ <uri>https://social.heldscal.la/user/23211</uri>
+ <name>lambadalambda</name>
+ <summary>Call me Deacon Blues.</summary>
+ <link rel="alternate" type="text/html" href="https://social.heldscal.la/lambadalambda"/>
+ <link rel="avatar" type="image/jpeg" media:width="236" media:height="236" href="https://social.heldscal.la/avatar/23211-original-20170416114255.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="https://social.heldscal.la/avatar/23211-96-20170416114255.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="https://social.heldscal.la/avatar/23211-48-20170416114255.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="https://social.heldscal.la/avatar/23211-24-20170416114257.jpeg"/>
+ <poco:preferredUsername>lambadalambda</poco:preferredUsername>
+ <poco:displayName>Constance Variable</poco:displayName>
+ <poco:note>Call me Deacon Blues.</poco:note>
+ <poco:address>
+  <poco:formatted>Berlin</poco:formatted>
+ </poco:address>
+ <poco:urls>
+  <poco:type>homepage</poco:type>
+  <poco:value>https://heldscal.la</poco:value>
+  <poco:primary>true</poco:primary>
+ </poco:urls>
+ <followers url="https://social.heldscal.la/lambadalambda/subscribers"></followers>
+ <statusnet:profile_info local_id="23211"></statusnet:profile_info>
+</author>
+ <link href="https://social.heldscal.la/lambadalambda" rel="alternate" type="text/html"/>
+ <link href="https://social.heldscal.la/main/sup" rel="http://api.friendfeed.com/2008/03#sup" type="application/json"/>
+ <link href="https://social.heldscal.la/main/push/hub" rel="hub"/>
+ <link href="https://social.heldscal.la/main/salmon/user/23211" rel="salmon"/>
+ <link href="https://social.heldscal.la/main/salmon/user/23211" rel="http://salmon-protocol.org/ns/salmon-replies"/>
+ <link href="https://social.heldscal.la/main/salmon/user/23211" rel="http://salmon-protocol.org/ns/salmon-mention"/>
+ <link href="https://social.heldscal.la/api/statuses/user_timeline/23211.atom" rel="self" type="application/atom+xml"/>
+<entry>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+ <id>tag:social.heldscal.la,2017-04-29:noticeId=1967725:objectType=note</id>
+ <title>New note by lambadalambda</title>
+ <content type="html">Will it blend?</content>
+ <category term="nsfw"/>
+ <link rel="alternate" type="text/html" href="https://social.heldscal.la/notice/1967725"/>
+ <status_net notice_id="1967725"></status_net>
+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+ <published>2017-04-29T18:25:38+00:00</published>
+ <updated>2017-04-29T18:25:38+00:00</updated>
+ <link rel="ostatus:conversation" href="https://social.heldscal.la/conversation/1007861"/>
+ <ostatus:conversation href="https://social.heldscal.la/conversation/1007861" local_id="1007861" ref="tag:social.heldscal.la,2017-04-29:objectType=thread:nonce=3f3a9dd83acc4e35">tag:social.heldscal.la,2017-04-29:objectType=thread:nonce=3f3a9dd83acc4e35</ostatus:conversation>
+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
+ <link rel="self" type="application/atom+xml" href="https://social.heldscal.la/api/statuses/show/1967725.atom"/>
+ <link rel="edit" type="application/atom+xml" href="https://social.heldscal.la/api/statuses/show/1967725.atom"/>
+ <statusnet:notice_info local_id="1967725" source="Pleroma FE"></statusnet:notice_info>
+</entry>
+</feed>
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index e38a195d9..6599b00b3 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -46,6 +46,13 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["attachment"] |> length == 2
   end
 
+  test "handle incoming notes with tags" do
+    incoming = File.read!("test/fixtures/ostatus_incoming_post_tag.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["object"]["tag"] == ["nsfw"]
+  end
+
   test "handle incoming notes - Mastodon, salmon, reply" do
     # It uses the context of the replied to object
     Repo.insert!(%Object{