Just another commit message :-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 4ec7489ca4e87a3cb71c962f9343cf3b68e62b51..9db9e6056e5c9f3c39fbe01eb0e3ad71920abb98 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -146,9 +146,9 @@ function diaspora_dispatch($importer,$msg,$attempt=1) {
                $ret = diaspora_participation($importer,$xmlbase->participation);
        }
        elseif($xmlbase->poll_participation) {
-               $tempfile = tempnam(get_temppath(), "diaspora-poll_participation");
-               file_put_contents($tempfile, json_encode($data));
-               $ret = diaspora_participation($importer,$xmlbase->participation);
+               //$tempfile = tempnam(get_temppath(), "diaspora-poll_participation");
+               //file_put_contents($tempfile, json_encode($data));
+               $ret = diaspora_participation($importer,$xmlbase->poll_participation);
        }
        else {
                $tempfile = tempnam(get_temppath(), "diaspora-unknown");

diff --git a/include/diaspora2.php b/include/diaspora2.php
index a1297c519318fbc65469ec6dde52aa359fc4448c..e8ed80ee8047836fd4d72bc706cc64145187576a 100644 (file)
--- a/include/diaspora2.php
+++ b/include/diaspora2.php
@@ -131,7 +131,8 @@ class diaspora {
                                return self::import_request($importer, $fields);
 
                        case "reshare":
-                               return self::import_reshare($importer, $fields);
+                               return true;
+                               //return self::import_reshare($importer, $fields);
 
                        case "retraction":
                                return self::import_retraction($importer, $fields);
@@ -676,6 +677,8 @@ class diaspora {
        }
 
        private function import_conversation($importer, $data) {
+               print_r($data);
+               die();
 /*
         $guid = notags(unxmlify($xml->guid));
         $subject = notags(unxmlify($xml->subject));
@@ -874,9 +877,8 @@ EOT;
                if ($parent_type !== "Post")
                        return false;
 
-               // "positive" = "false" doesn't seem to be supported by Diaspora
+               // "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
                if ($positive === "false") {
-                       logger("Received a like with positive set to 'false' - this shouldn't exist at all");
                        return false;
                }