strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1535 from annando/1504-matrix-detection

Browse source 
New function that detects red matrix accounts
This commit is contained in:
Tobias Diekershoff 2015-04-25 13:46:48 +02:00
commit 7e514d56fe
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/diaspora.php
View file

@ -779,6 +779,10 @@ function diaspora_post_allow($importer,$contact) {
return false; return false;
} }
function diaspora_is_redmatrix($url) {
return(strstr($url, "/channel/"));
}
function diaspora_plink($addr, $guid) { function diaspora_plink($addr, $guid) {
$r = q("SELECT `url`, `nick` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", $addr); $r = q("SELECT `url`, `nick` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", $addr);
@ -786,7 +790,7 @@ function diaspora_plink($addr, $guid) {
if (!$r) if (!$r)
return 'https://'.substr($addr,strpos($addr,'@')+1).'/posts/'.$guid; return 'https://'.substr($addr,strpos($addr,'@')+1).'/posts/'.$guid;
if (strstr($r[0]["url"], "/channel/")) if (diaspora_is_redmatrix($r[0]["url"]))
return $r[0]["url"]."/?f=&mid=".$guid; return $r[0]["url"]."/?f=&mid=".$guid;
return 'https://'.substr($addr,strpos($addr,'@')+1).'/posts/'.$guid; return 'https://'.substr($addr,strpos($addr,'@')+1).'/posts/'.$guid;
@ -841,7 +845,8 @@ function diaspora_post($importer,$xml,$msg) {
$body = diaspora2bb($xml->raw_message); $body = diaspora2bb($xml->raw_message);
// Add OEmbed and other information to the body // Add OEmbed and other information to the body
$body = add_page_info_to_body($body, false, true); if (!diaspora_is_redmatrix($contact['url']))
$body = add_page_info_to_body($body, false, true);
$datarray = array(); $datarray = array();

3
object/Item.php
View file

@ -82,6 +82,7 @@ class Item extends BaseObject {
*/ */
public function get_template_data($alike, $dlike, $thread_level=1) { public function get_template_data($alike, $dlike, $thread_level=1) {
require_once("mod/proxy.php"); require_once("mod/proxy.php");
require_once("include/diaspora.php");
$result = array(); $result = array();
@ -300,7 +301,7 @@ class Item extends BaseObject {
// Diaspora isn't able to do likes on comments - but red does // Diaspora isn't able to do likes on comments - but red does
if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
!strstr($item["owner-link"], "/channel/") AND isset($buttons["like"])) !diaspora_is_redmatrix($item["owner-link"]) AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
// Facebook can like comments - but it isn't programmed in the connector yet. // Facebook can like comments - but it isn't programmed in the connector yet.