aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Nordfeldth <mmn@hethane.se>2016-03-21 12:25:04 +0100
committerMikael Nordfeldth <mmn@hethane.se>2016-03-21 12:25:04 +0100
commitafdd6d39ec90515e58c5bf601bead9081ebe3d03 (patch)
treec010cd75473e2fa4238a69d67a3472eaa9ea4aca
parentb4cbf620ab715273d770cc3195a07d38fedbab14 (diff)
downloadgnu-social-afdd6d39ec90515e58c5bf601bead9081ebe3d03.tar
gnu-social-afdd6d39ec90515e58c5bf601bead9081ebe3d03.zip
Some Google stuff that need to be there (or comments)
Note that these won't be shown to the enduser and will never be accessed automatically. We should put the salmon-protocol stuff on ostatus.org
-rw-r--r--plugins/OStatus/lib/magicenvelope.php1
-rw-r--r--plugins/OStatus/tests/MagicEnvelopeTest.php1
-rw-r--r--socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml4
-rw-r--r--tests/ActivityParseTests.php16
4 files changed, 18 insertions, 4 deletions
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 579659fa51..27ff0de5bf 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -107,6 +107,7 @@ class MagicEnvelope
* you'll only get the public key ;)
*
* The string will (hopefully) be formatted as described in Magicsig specification:
+ * https://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html
*
* @return string formatted as Magicsig keypair
*/
diff --git a/plugins/OStatus/tests/MagicEnvelopeTest.php b/plugins/OStatus/tests/MagicEnvelopeTest.php
index a64a1cfbfb..fd5ad54129 100644
--- a/plugins/OStatus/tests/MagicEnvelopeTest.php
+++ b/plugins/OStatus/tests/MagicEnvelopeTest.php
@@ -27,6 +27,7 @@ class MagicEnvelopeTest extends PHPUnit_Framework_TestCase
static public function provider()
{
// Sample case given in spec:
+ // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-00.html#signing
$magic_env = new MagicEnvelope();
$magic_env->data = 'Tm90IHJlYWxseSBBdG9t';
$magic_env->data_type = 'application/atom+xml';
diff --git a/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml b/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml
index 76d02a98ed..3e8c9de678 100644
--- a/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml
+++ b/socialfy-another-domain/dot-well-known/webfinger/example@example.com.xml
@@ -7,6 +7,10 @@
type="text/html"
href="https://social.example.com/user/1"/>
+ <Link rel="http://schemas.google.com/g/2010#updates-from"
+ type="application/atom+xml"
+ href="https://social.example.com/api/statuses/user_timeline/1.atom"/>
+
<!-- Is this/was this ever supported?
<Link rel="http://microformats.org/profile/hcard"
type="text/html"
diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index 37dbbd61e4..90d214c54d 100644
--- a/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -795,7 +795,7 @@ EXAMPLE8;
$_example9 = <<<EXAMPLE9
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:media="http://search.yahoo.com/mrss" xmlns:activity="http://activitystrea.ms/spec/1.0/">
- <link rel="self" type="application/atom+xml" href=""/>
+ <link rel="self" type="application/atom+xml" href="http://"/>
<link rel="hub" href="http://pubsubhubbub.appspot.com/"/>
<title type="text">Test</title>
<updated>2010-03-22T01:55:53.596Z</updated>
@@ -806,8 +806,8 @@ $_example9 = <<<EXAMPLE9
<summary type="text">IMG_1366</summary>
<published>2010-03-18T04:29:23.000Z</published>
<updated>2010-03-18T05:14:03.325Z</updated>
- <id></id>
- <link rel="alternate" type="text/html" href=""/>
+ <id>test53725745374entry</id>
+ <link rel="alternate" type="text/html" href="http://buzz.example/117848251937215158042/ZU7b6mHJEmC/IMG-1366"/>
<author>
<name>Zach Copley</name>
<uri>https://mywebsite.net/profiles/zcopley</uri>
@@ -824,7 +824,15 @@ $_example9 = <<<EXAMPLE9
<media:player url="http://farm5.static.flickr.com/4043/4442630390_62da5560ae_o.jpg" height="1200" width="1600"/>
</media:content>
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
- <link rel="replies" type="application/atom+xml" href="" thr:count="0"/>
+ <activity:object>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/photo</activity:object-type>
+ <id>test53725745374entry</id>
+ <title>Buzz by Zach Copley from Flickr</title>
+ <content type="html">&lt;div&gt;IMG_1366&lt;/div&gt;</content>
+ <link rel="enclosure" href="http://www.flickr.com/photos/22823034@N00/4442630700" type="image/jpeg" title="IMG_1366"/>
+ <link rel="enclosure" href="http://www.flickr.com/photos/22823034@N00/4442630390" type="image/jpeg" title="IMG_1365"/>
+ </activity:object>
+ <link rel="replies" type="application/atom+xml" href="http://buzz.example/test53725745374/comments" thr:count="0"/>
<thr:total>0</thr:total>
</entry>
</feed>