Attachment parsing, better magic key fetching.
This commit is contained in:
Roger Braun
parent
16afea399d
commit
8141024259
12 changed files with 161 additions and 84 deletions
59
test/fixtures/incoming_websub_gnusocial_attachments.xml
vendored
Normal file
59
test/fixtures/incoming_websub_gnusocial_attachments.xml
vendored
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<?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-05-02T20:29:35+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-05-02:noticeId=2020923:objectType=note</id>
|
||||
<title>New note by lambadalambda</title>
|
||||
<content type="html">Okay gonna stream some cool games!! <a href="https://social.heldscal.la/file/7ed5ee508e6376a6e3dd581e17e7ed0b7b638147c7e86784bf83abc2641ee3d4.gif" title="https://social.heldscal.la/file/7ed5ee508e6376a6e3dd581e17e7ed0b7b638147c7e86784bf83abc2641ee3d4.gif" rel="nofollow external noreferrer" class="attachment" id="attachment-423842">https://social.heldscal.la/attachment/423842</a> <a href="https://social.heldscal.la/file/4c209099cadfc5afd3e27a334aa0db96b3a7510dde1603305d68a2707e59a11f.png" title="https://social.heldscal.la/file/4c209099cadfc5afd3e27a334aa0db96b3a7510dde1603305d68a2707e59a11f.png" rel="nofollow external noreferrer" class="attachment" id="attachment-423843">https://social.heldscal.la/attachment/423843</a></content>
|
||||
<link rel="alternate" type="text/html" href="https://social.heldscal.la/notice/2020923"/>
|
||||
<status_net notice_id="2020923"></status_net>
|
||||
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
|
||||
<published>2017-05-02T20:29:35+00:00</published>
|
||||
<updated>2017-05-02T20:29:35+00:00</updated>
|
||||
<link rel="ostatus:conversation" href="https://social.heldscal.la/conversation/1038558"/>
|
||||
<ostatus:conversation href="https://social.heldscal.la/conversation/1038558" local_id="1038558" ref="tag:social.heldscal.la,2017-05-02:objectType=thread:nonce=26c7afdcbcf4ebd4">tag:social.heldscal.la,2017-05-02:objectType=thread:nonce=26c7afdcbcf4ebd4</ostatus:conversation>
|
||||
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
|
||||
<link rel="enclosure" href="https://social.heldscal.la/file/7ed5ee508e6376a6e3dd581e17e7ed0b7b638147c7e86784bf83abc2641ee3d4.gif" type="image/gif" length="17283"/>
|
||||
<link rel="enclosure" href="https://social.heldscal.la/file/4c209099cadfc5afd3e27a334aa0db96b3a7510dde1603305d68a2707e59a11f.png" type="image/png" length="6965"/>
|
||||
<link rel="self" type="application/atom+xml" href="https://social.heldscal.la/api/statuses/show/2020923.atom"/>
|
||||
<link rel="edit" type="application/atom+xml" href="https://social.heldscal.la/api/statuses/show/2020923.atom"/>
|
||||
<statusnet:notice_info local_id="2020923" source="Pleroma FE"></statusnet:notice_info>
|
||||
</entry>
|
||||
</feed>
|
||||
|
|
@ -111,5 +111,15 @@ defmodule Pleroma.UserTest do
|
|||
assert fetched_user == nil
|
||||
end
|
||||
end
|
||||
|
||||
test "returns an ap_id for a user" do
|
||||
user = insert(:user)
|
||||
assert User.ap_id(user) == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname)
|
||||
end
|
||||
|
||||
test "returns an ap_followers link for a user" do
|
||||
user = insert(:user)
|
||||
assert User.ap_followers(user) == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname) <> "/followers"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,16 @@ defmodule Pleroma.Web.OStatusTest do
|
|||
assert activity.data["object"]["content"] == "Will it blend?"
|
||||
end
|
||||
|
||||
test "handle incoming notes with attachments - GS, subscription" do
|
||||
incoming = File.read!("test/fixtures/incoming_websub_gnusocial_attachments.xml")
|
||||
{:ok, [activity]} = OStatus.handle_incoming(incoming)
|
||||
|
||||
assert activity.data["type"] == "Create"
|
||||
assert activity.data["object"]["type"] == "Note"
|
||||
assert activity.data["object"]["actor"] == "https://social.heldscal.la/user/23211"
|
||||
assert activity.data["object"]["attachment"] |> length == 2
|
||||
end
|
||||
|
||||
test "handle incoming notes - Mastodon, salmon, reply" do
|
||||
# It uses the context of the replied to object
|
||||
Repo.insert!(%Object{
|
||||
|
|
@ -118,17 +128,17 @@ defmodule Pleroma.Web.OStatusTest do
|
|||
{:ok, data} = OStatus.gather_user_info(user)
|
||||
|
||||
expected = %{
|
||||
hub: "https://social.heldscal.la/main/push/hub",
|
||||
magic_key: "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB",
|
||||
name: "shp",
|
||||
nickname: "shp",
|
||||
salmon: "https://social.heldscal.la/main/salmon/user/29191",
|
||||
subject: "acct:shp@social.heldscal.la",
|
||||
topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
|
||||
uri: "https://social.heldscal.la/user/29191",
|
||||
host: "social.heldscal.la",
|
||||
fqn: user,
|
||||
avatar: %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
|
||||
"hub" => "https://social.heldscal.la/main/push/hub",
|
||||
"magic_key" => "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB",
|
||||
"name" => "shp",
|
||||
"nickname" => "shp",
|
||||
"salmon" => "https://social.heldscal.la/main/salmon/user/29191",
|
||||
"subject" => "acct:shp@social.heldscal.la",
|
||||
"topic" => "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
|
||||
"uri" => "https://social.heldscal.la/user/29191",
|
||||
"host" => "social.heldscal.la",
|
||||
"fqn" => user,
|
||||
"avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
|
||||
}
|
||||
assert data == expected
|
||||
end
|
||||
|
|
@ -140,17 +150,17 @@ defmodule Pleroma.Web.OStatusTest do
|
|||
{:ok, data} = OStatus.gather_user_info(user)
|
||||
|
||||
expected = %{
|
||||
hub: "https://social.heldscal.la/main/push/hub",
|
||||
magic_key: "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB",
|
||||
name: "shp",
|
||||
nickname: "shp",
|
||||
salmon: "https://social.heldscal.la/main/salmon/user/29191",
|
||||
subject: "https://social.heldscal.la/user/29191",
|
||||
topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
|
||||
uri: "https://social.heldscal.la/user/29191",
|
||||
host: "social.heldscal.la",
|
||||
fqn: user,
|
||||
avatar: %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
|
||||
"hub" => "https://social.heldscal.la/main/push/hub",
|
||||
"magic_key" => "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB",
|
||||
"name" => "shp",
|
||||
"nickname" => "shp",
|
||||
"salmon" => "https://social.heldscal.la/main/salmon/user/29191",
|
||||
"subject" => "https://social.heldscal.la/user/29191",
|
||||
"topic" => "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
|
||||
"uri" => "https://social.heldscal.la/user/29191",
|
||||
"host" => "social.heldscal.la",
|
||||
"fqn" => user,
|
||||
"avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
|
||||
}
|
||||
assert data == expected
|
||||
end
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
|
|||
test "it gets a magic key" do
|
||||
# TODO: Make test local
|
||||
salmon = File.read!("test/fixtures/salmon2.xml")
|
||||
key = Salmon.fetch_magic_key(salmon)
|
||||
{:ok, key} = Salmon.fetch_magic_key(salmon)
|
||||
|
||||
assert key == "RSA.uzg6r1peZU0vXGADWxGJ0PE34WvmhjUmydbX5YYdOiXfODVLwCMi1umGoqUDm-mRu4vNEdFBVJU1CpFA7dKzWgIsqsa501i2XqElmEveXRLvNRWFB6nG03Q5OUY2as8eE54BJm0p20GkMfIJGwP6TSFb-ICp3QjzbatuSPJ6xCE=.AQAB"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ defmodule Pleroma.Web.WebFingerTest do
|
|||
test "works for fqns" do
|
||||
user = insert(:user)
|
||||
|
||||
{:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.host}")
|
||||
{:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}")
|
||||
assert is_binary(result)
|
||||
end
|
||||
|
||||
|
|
@ -37,10 +37,10 @@ defmodule Pleroma.Web.WebFingerTest do
|
|||
|
||||
{:ok, data} = WebFinger.finger(user, getter)
|
||||
|
||||
assert data.magic_key == "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB"
|
||||
assert data.topic == "https://social.heldscal.la/api/statuses/user_timeline/29191.atom"
|
||||
assert data.subject == "acct:shp@social.heldscal.la"
|
||||
assert data.salmon == "https://social.heldscal.la/main/salmon/user/29191"
|
||||
assert data["magic_key"] == "RSA.wQ3i9UA0qmAxZ0WTIp4a-waZn_17Ez1pEEmqmqoooRsG1_BvpmOvLN0G2tEcWWxl2KOtdQMCiPptmQObeZeuj48mdsDZ4ArQinexY2hCCTcbV8Xpswpkb8K05RcKipdg07pnI7tAgQ0VWSZDImncL6YUGlG5YN8b5TjGOwk2VG8=.AQAB"
|
||||
assert data["topic"] == "https://social.heldscal.la/api/statuses/user_timeline/29191.atom"
|
||||
assert data["subject"] == "acct:shp@social.heldscal.la"
|
||||
assert data["salmon"] == "https://social.heldscal.la/main/salmon/user/29191"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -115,12 +115,12 @@ defmodule Pleroma.Web.WebsubTest do
|
|||
|
||||
{:ok, discovered} = Websub.gather_feed_data(topic, getter)
|
||||
expected = %{
|
||||
hub: "https://mastodon.social/api/push",
|
||||
uri: "https://mastodon.social/users/lambadalambda",
|
||||
nickname: "lambadalambda",
|
||||
name: "Critical Value",
|
||||
host: "mastodon.social",
|
||||
avatar: %{"type" => "Image", "url" => [%{"href" => "https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif?1492379244", "mediaType" => "image/gif", "type" => "Link"}]}
|
||||
"hub" => "https://mastodon.social/api/push",
|
||||
"uri" => "https://mastodon.social/users/lambadalambda",
|
||||
"nickname" => "lambadalambda",
|
||||
"name" => "Critical Value",
|
||||
"host" => "mastodon.social",
|
||||
"avatar" => %{"type" => "Image", "url" => [%{"href" => "https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif?1492379244", "mediaType" => "image/gif", "type" => "Link"}]}
|
||||
}
|
||||
|
||||
assert expected == discovered
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue