MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Just another commit message :-)

Browse source
This commit is contained in:
Michael Vogel 2016-03-01 19:10:35 +01:00 committed by Roland Haeder
parent 558f13e322
commit c88fd73b80
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/diaspora.php
View file

@ -146,9 +146,9 @@ function diaspora_dispatch($importer,$msg,$attempt=1) {
$ret = diaspora_participation($importer,$xmlbase->participation); $ret = diaspora_participation($importer,$xmlbase->participation);
} }
elseif($xmlbase->poll_participation) { elseif($xmlbase->poll_participation) {
$tempfile = tempnam(get_temppath(), "diaspora-poll_participation"); //$tempfile = tempnam(get_temppath(), "diaspora-poll_participation");
file_put_contents($tempfile, json_encode($data)); //file_put_contents($tempfile, json_encode($data));
$ret = diaspora_participation($importer,$xmlbase->participation); $ret = diaspora_participation($importer,$xmlbase->poll_participation);
} }
else { else {
$tempfile = tempnam(get_temppath(), "diaspora-unknown"); $tempfile = tempnam(get_temppath(), "diaspora-unknown");

8
include/diaspora2.php
View file

@ -131,7 +131,8 @@ class diaspora {
return self::import_request($importer, $fields); return self::import_request($importer, $fields);
case "reshare": case "reshare":
return self::import_reshare($importer, $fields); return true;
//return self::import_reshare($importer, $fields);
case "retraction": case "retraction":
return self::import_retraction($importer, $fields); return self::import_retraction($importer, $fields);
@ -676,6 +677,8 @@ class diaspora {
} }
private function import_conversation($importer, $data) { private function import_conversation($importer, $data) {
print_r($data);
die();
/* /*
$guid = notags(unxmlify($xml->guid)); $guid = notags(unxmlify($xml->guid));
$subject = notags(unxmlify($xml->subject)); $subject = notags(unxmlify($xml->subject));
@ -874,9 +877,8 @@ EOT;
if ($parent_type !== "Post") if ($parent_type !== "Post")
return false; 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") { if ($positive === "false") {
logger("Received a like with positive set to 'false' - this shouldn't exist at all");
return false; return false;
} }