clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Likes would now work with unlikes and with likes on comments.

This commit is contained in:
Michael Vogel 2016-03-01 23:21:56 +01:00
parent 009cadf63b
commit f1dae26df8
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/diaspora2.php
View File

@ -104,7 +104,8 @@ class diaspora {
//return self::import_comment($importer, $sender, $fields); //return self::import_comment($importer, $sender, $fields);
case "conversation": case "conversation":
return self::import_conversation($importer, $fields); return true;
//return self::import_conversation($importer, $fields);
case "like": case "like":
return true; return true;
@ -138,8 +139,8 @@ class diaspora {
return self::import_retraction($importer, $fields); return self::import_retraction($importer, $fields);
case "status_message": case "status_message":
return true; //return true;
//return self::import_status_message($importer, $fields, $msg, $data2); return self::import_status_message($importer, $fields);
default: default:
logger("Unknown message type ".$type); logger("Unknown message type ".$type);
@ -246,7 +247,7 @@ class diaspora {
} }
// Only some message types have signatures. So we quit here for the other types. // Only some message types have signatures. So we quit here for the other types.
if (!in_array($type, array("comment", "conversation", "message", "like"))) if (!in_array($type, array("comment", "message", "like")))
return true; return true;
// No author_signature? This is a must, so we quit. // No author_signature? This is a must, so we quit.
@ -691,7 +692,7 @@ class diaspora {
$messages = $xml->message; $messages = $xml->message;
if(! count($messages)) { if(! count($messages)) {
logger('diaspora_conversation: empty conversation'); logger('empty conversation');
return; return;
} }
@ -874,14 +875,10 @@ EOT;
$author = notags(unxmlify($data->author)); $author = notags(unxmlify($data->author));
// likes on comments aren't supported by Diaspora - only on posts // likes on comments aren't supported by Diaspora - only on posts
if ($parent_type !== "Post") // But maybe this will be supported in the future, so we will accept it.
if (!in_array($parent_type, array("Post", "Comment")))
return false; return false;
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
if ($positive === "false") {
return false;
}
$contact = self::get_allowed_contact_by_handle($importer, $sender, true); $contact = self::get_allowed_contact_by_handle($importer, $sender, true);
if (!$contact) if (!$contact)
return false; return false;
@ -902,6 +899,13 @@ EOT;
// Fetch the contact id - if we know this contact // Fetch the contact id - if we know this contact
$author_contact = self::get_author_contact_by_url($contact, $person, $importer["uid"]); $author_contact = self::get_author_contact_by_url($contact, $person, $importer["uid"]);
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
// We would accept this anyhow.
if ($positive === "true")
$verb = ACTIVITY_LIKE;
else
$verb = ACTIVITY_DISLIKE;
$datarray = array(); $datarray = array();
$datarray["uid"] = $importer["uid"]; $datarray["uid"] = $importer["uid"];
@ -920,7 +924,7 @@ EOT;
$datarray["uri"] = $author.":".$guid; $datarray["uri"] = $author.":".$guid;
$datarray["type"] = "activity"; $datarray["type"] = "activity";
$datarray["verb"] = ACTIVITY_LIKE; $datarray["verb"] = $verb;
$datarray["gravity"] = GRAVITY_LIKE; $datarray["gravity"] = GRAVITY_LIKE;
$datarray["parent-uri"] = $parent_item["uri"]; $datarray["parent-uri"] = $parent_item["uri"];
@ -1429,18 +1433,18 @@ print_r($data);
$created_at = notags(unxmlify($data->created_at)); $created_at = notags(unxmlify($data->created_at));
$provider_display_name = notags(unxmlify($data->provider_display_name)); $provider_display_name = notags(unxmlify($data->provider_display_name));
/// @todo enable support for polls
if ($data->poll) {
foreach ($data->poll AS $poll)
print_r($poll);
die("poll!\n");
}
$contact = self::get_allowed_contact_by_handle($importer, $author, false); $contact = self::get_allowed_contact_by_handle($importer, $author, false);
if (!$contact) if (!$contact)
return false; return false;
if (self::message_exists($importer["uid"], $guid)) //if (self::message_exists($importer["uid"], $guid))
return false; // return false;
/// @todo enable support for polls
// if ($data->poll) {
// print_r($data->poll);
// die("poll!\n");
// }
$address = array(); $address = array();
if ($data->location) if ($data->location)
@ -1450,8 +1454,8 @@ print_r($data);
$body = diaspora2bb($raw_message); $body = diaspora2bb($raw_message);
if ($data->photo) if ($data->photo)
for ($i = 0; $i < count($data->photo); $i++) foreach ($data->photo AS $photo)
$body = "[img]".$data->photo[$i]->remote_photo_path.$data->photo[$i]->remote_photo_name."[/img]\n".$body; $body = "[img]".$photo->remote_photo_path.$photo->remote_photo_name."[/img]\n".$body;
$datarray = array(); $datarray = array();