Merge remote-tracking branch 'origin/develop' into matrixmatrix

1 files changed, 0 insertions, 72 deletions

diff --git a/test/fixtures/mastodon-problematic.xml b/test/fixtures/mastodon-problematic.xml
deleted file mode 100644
index a39e72759..000000000
--- a/test/fixtures/mastodon-problematic.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
-  <id>https://icosahedron.website/users/shel.atom</id>
-  <title>shel🍖‼️</title>
-  <subtitle>Gay jackal dog, poet, future librarian. 
-
-http://datapup.info
-avatar: @puppytube@twitter.com</subtitle>
-  <updated>2017-05-02T23:26:01Z</updated>
-  <logo>https://icosahedron.website/system/accounts/avatars/000/001/207/original/b1e07b09ae1cc787.png?1493767561</logo>
-  <author>
-    <id>https://icosahedron.website/users/shel</id>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-    <uri>https://icosahedron.website/users/shel</uri>
-    <name>shel</name>
-    <email>shel@icosahedron.website</email>
-    <summary type="html">&lt;p&gt;Gay jackal dog, poet, future librarian. &lt;/p&gt;&lt;p&gt;&lt;a href="http://datapup.info/" rel="nofollow noopener" target="_blank"&gt;&lt;span class="invisible"&gt;http://&lt;/span&gt;&lt;span class=""&gt;datapup.info/&lt;/span&gt;&lt;span class="invisible"&gt;&lt;/span&gt;&lt;/a&gt;&lt;br /&gt;avatar: @puppytube@twitter.com&lt;/p&gt;</summary>
-    <link rel="alternate" type="text/html" href="https://icosahedron.website/@shel"/>
-    <link rel="avatar" type="image/png" media:width="120" media:height="120" href="https://icosahedron.website/system/accounts/avatars/000/001/207/original/b1e07b09ae1cc787.png?1493767561"/>
-    <link rel="header" type="image/jpeg" media:width="700" media:height="335" href="https://icosahedron.website/system/accounts/headers/000/001/207/original/13e50e0ddfe359fd.jpg?1493767561"/>
-    <poco:preferredUsername>shel</poco:preferredUsername>
-    <poco:displayName>shel🍖‼️</poco:displayName>
-    <poco:note>Gay jackal dog, poet, future librarian. 
-
-http://datapup.info
-avatar: @puppytube@twitter.com</poco:note>
-    <mastodon:scope>public</mastodon:scope>
-  </author>
-  <link rel="alternate" type="text/html" href="https://icosahedron.website/@shel"/>
-  <link rel="self" type="application/atom+xml" href="https://icosahedron.website/users/shel.atom"/>
-  <link rel="hub" href="https://icosahedron.website/api/push"/>
-  <link rel="salmon" href="https://icosahedron.website/api/salmon/1207"/>
-  <entry>
-    <id>tag:icosahedron.website,2017-05-10:objectId=1414013:objectType=Status</id>
-    <published>2017-05-10T17:16:24Z</published>
-    <updated>2017-05-10T17:16:24Z</updated>
-    <title>shel shared a status by instance_names@cybre.space</title>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb>
-    <activity:object>
-      <id>tag:cybre.space,2017-05-10:objectId=946671:objectType=Status</id>
-      <published>2017-05-10T17:15:51Z</published>
-      <updated>2017-05-10T17:15:52Z</updated>
-      <title>New status by instance_names@cybre.space</title>
-      <author>
-        <id>https://cybre.space/users/instance_names</id>
-        <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-        <uri>https://cybre.space/users/instance_names</uri>
-        <name>instance_names</name>
-        <email>instance_names@cybre.space</email>
-        <summary type="html">&lt;p&gt;name ideas for your new mastodon instance. made by &lt;span class="h-card"&gt;&lt;a href="https://witches.town/@lycaon"&gt;@&lt;span&gt;lycaon&lt;/span&gt;&lt;/a&gt;&lt;/span&gt; source available at &lt;a href="https://github.com/LycaonIsAWolf/instance_names"&gt;&lt;span class="invisible"&gt;https://&lt;/span&gt;&lt;span class="ellipsis"&gt;github.com/LycaonIsAWolf/insta&lt;/span&gt;&lt;span class="invisible"&gt;nce_names&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</summary>
-        <link rel="alternate" type="text/html" href="https://cybre.space/@instance_names"/>
-        <link rel="avatar" type="image/jpeg" media:width="120" media:height="120" href="https://icosahedron.website/system/accounts/avatars/000/011/176/original/3845c33e63aa28bd.jpg?1492882822"/>
-        <link rel="header" type="image/png" media:width="700" media:height="335" href="https://icosahedron.website/system/accounts/headers/000/011/176/original/a7810908beeeef7e.png?1492882825"/>
-        <poco:preferredUsername>instance_names</poco:preferredUsername>
-        <poco:displayName>instance names</poco:displayName>
-        <poco:note>name ideas for your new mastodon instance. made by @lycaon source available at https://github.com/LycaonIsAWolf/instance_names</poco:note>
-        <mastodon:scope>public</mastodon:scope>
-      </author>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-      <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-      <content type="html" xml:lang="fr">&lt;p&gt;dildo.codes&lt;/p&gt;</content>
-      <mastodon:scope>unlisted</mastodon:scope>
-      <link rel="alternate" type="text/html" href="https://cybre.space/users/instance_names/updates/37775"/>
-    </activity:object>
-    <content type="html" xml:lang="en">&lt;p&gt;dildo.codes&lt;/p&gt;</content>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
-    <mastodon:scope>public</mastodon:scope>
-    <link rel="alternate" type="text/html" href="https://icosahedron.website/users/shel/updates/47932"/>
-    <link rel="self" type="application/atom+xml" href="https://icosahedron.website/users/shel/updates/47932.atom"/>
-  </entry>
-</feed>