keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support for real repeated messages

Browse source
This commit is contained in:
Michael Vogel 2015-12-10 18:16:16 +01:00
parent 45f4af66e7
commit 6dd39760ac
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
include/ostatus.php
View file

@ -1354,9 +1354,9 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
if (!$toplevel AND !$repeat) { if (!$toplevel AND !$repeat) {
$entry = $doc->createElement("entry"); $entry = $doc->createElement("entry");
$title = sprintf("New note by %s", $owner["nick"]); $title = sprintf("New note by %s", $owner["nick"]);
//} elseif (!$toplevel AND $repeat) { } elseif (!$toplevel AND $repeat) {
// $entry = $doc->createElement("activity:object"); $entry = $doc->createElement("activity:object");
// $title = sprintf("New note by %s", $owner["nick"]); $title = sprintf("New note by %s", $owner["nick"]);
} else { } else {
$entry = $doc->createElementNS(NS_ATOM, "entry"); $entry = $doc->createElementNS(NS_ATOM, "entry");
@ -1392,10 +1392,10 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
// But: it seems as if it doesn't federate well between the GS servers // But: it seems as if it doesn't federate well between the GS servers
// So we just set it to "note" to be sure that it reaches their target systems // So we just set it to "note" to be sure that it reaches their target systems
//if (!$repeat) if (!$repeat)
xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
//else else
// xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity'); xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity');
xml_add_element($doc, $entry, "id", $item["uri"]); xml_add_element($doc, $entry, "id", $item["uri"]);
xml_add_element($doc, $entry, "title", $title); xml_add_element($doc, $entry, "title", $title);
@ -1421,20 +1421,30 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
//$repeated_item = $item; //$repeated_item = $item;
//$is_repeat = false; $is_repeat = false;
//if (!$repeat) /* if (!$repeat) {
// $is_repeat = api_share_as_retweet($repeated_item); $repeated_guid = get_reshared_guid($item);
//if (!$is_repeat) if ($repeated_guid != "") {
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($owner["uid"]), dbesc($repeated_guid));
if ($r) {
$repeated_item = $r[0];
$is_repeat = true;
}
}
}
*/
if (!$is_repeat)
xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
//else else
// xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE); xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE);
xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
/*if ($is_repeat) { if ($is_repeat) {
$repeated_owner = array(); $repeated_owner = array();
$repeated_owner["name"] = $repeated_item["author-name"]; $repeated_owner["name"] = $repeated_item["author-name"];
$repeated_owner["url"] = $repeated_item["author-link"]; $repeated_owner["url"] = $repeated_item["author-link"];
@ -1461,7 +1471,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
$profile["about"] = $owner["about"]; $profile["about"] = $owner["about"];
$author = ostatus_add_author($doc, $owner, $profile); $author = ostatus_add_author($doc, $owner, $profile);
$entry->appendChild($author); $entry->appendChild($author);
}*/ }
$mentioned = array(); $mentioned = array();
@ -1545,8 +1555,8 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
$attributes = array("local_id" => $item["id"], "source" => $app); $attributes = array("local_id" => $item["id"], "source" => $app);
//if ($is_repeat) if ($is_repeat)
// $attributes["repeat_of"] = $item["id"]; $attributes["repeat_of"] = $repeated_item["id"];
xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes); xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes);