From 16b1fcd2719b744c81851e778df2519dc0131010 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sat, 16 Sep 2017 16:27:48 +0200
Subject: Handle incoming emoji.

---
 test/fixtures/incoming_note_activity.xml | 2 ++
 test/web/ostatus/ostatus_test.exs        | 1 +
 2 files changed, 3 insertions(+)

(limited to 'test')

diff --git a/test/fixtures/incoming_note_activity.xml b/test/fixtures/incoming_note_activity.xml
index e54b25e39..21eda2d30 100644
--- a/test/fixtures/incoming_note_activity.xml
+++ b/test/fixtures/incoming_note_activity.xml
@@ -4,6 +4,8 @@
  <title>New note by lambda</title>
  <content type="html">@&lt;a href=&quot;http://pleroma.example.org:4000/users/lain3&quot; class=&quot;h-card mention&quot;&gt;lain3&lt;/a&gt;</content>
  <link rel="alternate" type="text/html" href="http://gs.example.org:4040/index.php/notice/29"/>
+ <link name="marko" rel="emoji" href="marko.png" />
+ <link name="reimu" rel="emoji" href="reimu.png" />
  <status_net notice_id="29"></status_net>
  <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
  <published>2017-04-23T14:51:03+00:00</published>
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index ee2b79ffa..95038b73c 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -24,6 +24,7 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["published"] == "2017-04-23T14:51:03+00:00"
     assert activity.data["context"] == "tag:gs.example.org:4040,2017-04-23:objectType=thread:nonce=f09e22f58abd5c7b"
     assert "http://pleroma.example.org:4000/users/lain3" in activity.data["to"]
+    assert activity.data["object"]["emoji"] == %{ "marko" => "marko.png", "reimu" => "reimu.png" }
     assert activity.local == false
   end
 
-- 
cgit v1.2.3