friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Just another commit message :-)

pull/2418/head
Michael Vogel 2016-03-01 19:10:35 +01:00
parent b48880fe52
commit 009cadf63b
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);
}
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");

8
include/diaspora2.php
View File

@ -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;
}