tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Better reshare detection

Browse source
This commit is contained in:
Michael Vogel 2016-03-16 21:27:07 +01:00 committed by Roland Haeder
parent 3d8770a9da
commit cc7b34b7e6
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/diaspora.php
View file

@ -1600,7 +1600,7 @@ class diaspora {
// Maybe it is already a reshared item?
// Then refetch the content, since there can be many side effects with reshared posts from other networks or reshares from reshares
if (self::is_reshare($r[0]["body"]))
if (self::is_reshare($r[0]["body"], false))
$r = array();
else
return $r[0];
@ -2130,7 +2130,7 @@ class diaspora {
return self::build_and_transmit($owner, $contact, "retraction", $message);
}
public static function is_reshare($body) {
public static function is_reshare($body, $complete = true) {
$body = trim($body);
// Skip if it isn't a pure repeated messages
@ -2147,6 +2147,10 @@ class diaspora {
if ($body == $attributes)
return(false);
// If we don't do the complete check we quit here
if (!$complete)
return true;
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")