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

Merge pull request #4865 from annando/dfrn-reshare 

Diaspora: Improved reshared coding
This commit is contained in:
Tobias Diekershoff 2018-04-19 08:43:18 +02:00 committed by GitHub
parent 10465110c1 c507cdf946
commit ab82c6df03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/Protocol/Diaspora.php
View File

@ -1528,36 +1528,29 @@ class Diaspora
*/ */
private static function plink($addr, $guid, $parent_guid = '') private static function plink($addr, $guid, $parent_guid = '')
{ {
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr)); $contact = Contact::getDetailsByAddr($addr);
// Fallback // Fallback
if (!DBM::is_result($r)) { if (!$contact) {
if ($parent_guid != '') { if ($parent_guid != '') {
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid; return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else { } else {
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid; return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
} }
} }
// Friendica contacts are often detected as Diaspora contacts in the "fcontact" table if ($contact["network"] == NETWORK_DFRN) {
// So we try another way as well. return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/");
$s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
if (DBM::is_result($s)) {
$r[0]["network"] = $s[0]["network"];
} }
if ($r[0]["network"] == NETWORK_DFRN) { if (self::isRedmatrix($contact["url"])) {
return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/"); return $contact["url"] . "/?f=&mid=" . $guid;
}
if (self::isRedmatrix($r[0]["url"])) {
return $r[0]["url"]."/?f=&mid=".$guid;
} }
if ($parent_guid != '') { if ($parent_guid != '') {
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid; return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else { } else {
return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid; return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
} }
} }
@ -2744,35 +2737,33 @@ class Diaspora
* *
* @return array The fetched item * @return array The fetched item
*/ */
private static function originalItem($guid, $orig_author, $author) public static function originalItem($guid, $orig_author)
{ {
// Do we already have this item? // Do we already have this item?
$r = q( $fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
"SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`, 'author-name', 'author-link', 'author-avatar'];
`author-name`, `author-link`, `author-avatar` $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false];
FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1", $item = dba::selectfirst('item', $fields, $condition);
dbesc($guid)
);
if (DBM::is_result($r)) { if (DBM::is_result($item)) {
logger("reshared message ".$guid." already exists on system."); logger("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item? // Maybe it is already a reshared item?
// Then refetch the content, if it is a reshare from a reshare. // Then refetch the content, if it is a reshare from a reshare.
// If it is a reshared post from another network then reformat to avoid display problems with two share elements // If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::isReshare($r[0]["body"], true)) { if (self::isReshare($item["body"], true)) {
$r = []; $r = [];
} elseif (self::isReshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) { } elseif (self::isReshare($item["body"], false) || strstr($item["body"], "[share")) {
$r[0]["body"] = Markdown::toBBCode(BBCode::toMarkdown($r[0]["body"])); $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
$r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]); $item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
// Add OEmbed and other information to the body // Add OEmbed and other information to the body
$r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true); $item["body"] = add_page_info_to_body($item["body"], false, true);
return $r[0]; return $item;
} else { } else {
return $r[0]; return $item;
} }
} }
@ -2788,21 +2779,19 @@ class Diaspora
} }
if ($item_id) { if ($item_id) {
$r = q( $fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
"SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`, 'author-name', 'author-link', 'author-avatar'];
`author-name`, `author-link`, `author-avatar` $condition = ['id' => $item_id, 'visible' => true, 'deleted' => false];
FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1", $item = dba::selectfirst('item', $fields, $condition);
intval($item_id)
);
if (DBM::is_result($r)) { if (DBM::is_result($item)) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements // If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::isReshare($r[0]["body"], false)) { if (self::isReshare($item["body"], false)) {
$r[0]["body"] = Markdown::toBBCode(BBCode::toMarkdown($r[0]["body"])); $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
$r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]); $item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
} }
return $r[0]; return $item;
} }
} }
} }
@ -2838,7 +2827,7 @@ class Diaspora
return true; return true;
} }
$original_item = self::originalItem($root_guid, $root_author, $author); $original_item = self::originalItem($root_guid, $root_author);
if (!$original_item) { if (!$original_item) {
return false; return false;
} }
@ -3556,24 +3545,21 @@ class Diaspora
// Skip if it isn't a pure repeated messages // Skip if it isn't a pure repeated messages
// Does it start with a share? // Does it start with a share?
if ((strpos($body, "[share") > 0) && $complete) { if ((strpos($body, "[share") > 0) && $complete) {
return(false); return false;
} }
// Does it end with a share? // Does it end with a share?
if (strlen($body) > (strrpos($body, "[/share]") + 8)) { if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
return(false); return false;
} }
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body); $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there // Skip if there is no shared message in there
if ($body == $attributes) { if ($body == $attributes) {
return(false); return false;
} }
// If we don't do the complete check we quit here // If we don't do the complete check we quit here
if (!$complete) {
return true;
}
$guid = ""; $guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches); preg_match("/guid='(.*?)'/ism", $attributes, $matches);
@ -3586,18 +3572,14 @@ class Diaspora
$guid = $matches[1]; $guid = $matches[1];
} }
if ($guid != "") { if (($guid != "") && $complete) {
$r = q( $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
"SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1", $item = dba::selectFirst('item', ['contact-id'], $condition);
dbesc($guid), if (DBM::is_result($item)) {
NETWORK_DFRN,
NETWORK_DIASPORA
);
if ($r) {
$ret= []; $ret= [];
$ret["root_handle"] = self::handleFromContact($r[0]["contact-id"]); $ret["root_handle"] = self::handleFromContact($item["contact-id"]);
$ret["root_guid"] = $guid; $ret["root_guid"] = $guid;
return($ret); return $ret;
} }
} }
@ -3614,28 +3596,22 @@ class Diaspora
$ret= []; $ret= [];
$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); if ($profile != "") {
if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) { if (Contact::getIdForURL($profile)) {
return(false); $author = Contact::getDetailsByURL($profile);
$ret["root_handle"] = $author['addr'];
}
} }
$link = ""; if (!empty($guid)) {
preg_match("/link='(.*?)'/ism", $attributes, $matches); $ret["root_guid"] = $guid;
if ($matches[1] != "") {
$link = $matches[1];
} }
preg_match('/link="(.*?)"/ism', $attributes, $matches); if (empty($ret) && !$complete) {
if ($matches[1] != "") { return true;
$link = $matches[1];
} }
$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link); return $ret;
if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == "")) {
return(false);
}
return($ret);
} }
/** /**