X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Ftests%2Fslap.php;h=e3f5439aed69bd239da22149538dfbbade619819;hb=ab93bb009c8533c8847aafe76ba9774d9d74e7ca;hp=b5f9d3e073ae90847c70f22c3abb65ca2a8fe049;hpb=2a59453d4c07ac4bb804a64e8252dd4960983595;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/tests/slap.php b/plugins/OStatus/tests/slap.php
old mode 100644
new mode 100755
index b5f9d3e073..e3f5439aed
--- a/plugins/OStatus/tests/slap.php
+++ b/plugins/OStatus/tests/slap.php
@@ -43,7 +43,7 @@ if (!have_option('--notice')) {
 
 $notice_id = get_option_value('--notice');
 
-$notice = Notice::staticGet('id', $notice_id);
+$notice = Notice::getKV('id', $notice_id);
 $profile = $notice->getProfile();
 $entry = $notice->asAtomEntry(true);
 
@@ -51,15 +51,18 @@ echo "== Original entry ==\n\n";
 print $entry;
 print "\n\n";
 
-$salmon = new Salmon();
-$envelope = $salmon->createMagicEnv($entry, $profile);
+$magic_env = MagicEnvelope::signAsUser($entry, $profile->getUser());
+$envxml = $magic_env->toXML();
 
 echo "== Signed envelope ==\n\n";
-print $envelope;
+print $envxml;
 print "\n\n";
 
 echo "== Testing local verification ==\n\n";
-$ok = $salmon->verifyMagicEnv($envelope);
+$magic_env = new MagicEnvelope($envxml);
+$activity = new Activity($magic_env->getPayload()->documentElement);
+$actprofile = Profile::fromUri($activity->actor->id);
+$ok = $magic_env->verify($actprofile);
 if ($ok) {
     print "OK\n\n";
 } else {
@@ -72,7 +75,7 @@ if (have_option('--verify')) {
     print "Sending for verification to $url ...\n";
 
     $client = new HTTPClient();
-    $response = $client->post($url, array(), array('magic_env' => $envelope));
+    $response = $client->post($url, array(), array('magic_env' => $envxml));
 
     print $response->getStatus() . "\n\n";
     print $response->getBody() . "\n\n";
@@ -83,7 +86,7 @@ if (have_option('--slap')) {
     echo "== Remote salmon slap ==\n\n";
     print "Sending signed Salmon slap to $url ...\n";
 
-    $ok = $salmon->post($url, $entry, $profile);
+    $ok = Salmon::post($url, $entry, $profile->getUser());
     if ($ok) {
         print "OK\n\n";
     } else {