From b4cbf620ab715273d770cc3195a07d38fedbab14 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 21 Mar 2016 12:12:24 +0100 Subject: [PATCH 1/2] woops, accidentally deleted updates-from rel on mass Google-deletion --- plugins/LRDD/lib/discovery.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/LRDD/lib/discovery.php b/plugins/LRDD/lib/discovery.php index 9825ea3cb7..4049113408 100644 --- a/plugins/LRDD/lib/discovery.php +++ b/plugins/LRDD/lib/discovery.php @@ -37,6 +37,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } class Discovery { const LRDD_REL = 'lrdd'; + const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from'; const HCARD = 'http://microformats.org/profile/hcard'; const MF2_HCARD = 'http://microformats.org/profile/h-card'; // microformats2 h-card From afdd6d39ec90515e58c5bf601bead9081ebe3d03 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 21 Mar 2016 12:25:04 +0100 Subject: [PATCH 2/2] 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 --- plugins/OStatus/lib/magicenvelope.php | 1 + plugins/OStatus/tests/MagicEnvelopeTest.php | 1 + .../webfinger/example@example.com.xml | 4 ++++ tests/ActivityParseTests.php | 16 ++++++++++++---- 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"/> + +