sekretaerbaer/friendica-addons-sekb
1
0
Fork 0
forked from Friendica/friendica-addons
Code Pull requests Activity

fbsync: Detection of comments to blocked accounts improved

Browse source
This commit is contained in:
Michael Vogel 2014-02-13 08:32:04 +01:00
parent 206f41ecf9
commit 80f6f22852
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fbsync/fbsync.php
View file

@ -392,6 +392,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
$parent_uri = ""; $parent_uri = "";
$parent_contact = 0; $parent_contact = 0;
$parent_nick = "";
// Fetch the parent uri (Checking if the parent exists) // Fetch the parent uri (Checking if the parent exists)
$r = q("SELECT `uri`, `contact-id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", $r = q("SELECT `uri`, `contact-id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
@ -426,17 +427,18 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
// Should only happen if someone deleted the contact manually // Should only happen if someone deleted the contact manually
if(!count($r)) { if(!count($r)) {
logger("fbsync_createcomment: Contact ".$parent_contact." doesn't seem to exist.", LOGGER_DEBUG); logger("fbsync_createcomment: UID ".$uid." - Contact ".$parent_contact." doesn't seem to exist.", LOGGER_DEBUG);
return; return;
} }
// Is blocked? Then return // Is blocked? Then return
if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) { if ($r[0]["readonly"] OR $r[0]["blocked"]) {
logger("fbsync_createcomment: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); logger("fbsync_createcomment: UID ".$uid." - Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
return; return;
} }
//logger("fbsync_createcomment: Contact '".$r[0]["nick"]."' isn't blocked.", LOGGER_DEBUG); $parent_nick = $r[0]["nick"];
logger("fbsync_createcomment: UID ".$uid." - Contact '".$r[0]["nick"]."' isn't blocked. ".print_r($r, true), LOGGER_DEBUG);
} }
$postarray = array(); $postarray = array();
@ -454,18 +456,24 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
$contact_id = fbsync_fetch_contact($uid, $contacts[$comment->fromid], array(), false); $contact_id = fbsync_fetch_contact($uid, $contacts[$comment->fromid], array(), false);
$contact_nick = $contacts[$comment->fromid]->name;
if ($contact_id == -1) { if ($contact_id == -1) {
logger('fbsync_createcomment: Contact was blocked. Comment not imported '.print_r($comment, true), LOGGER_DEBUG); logger('fbsync_createcomment: Contact was blocked. Comment not imported '.print_r($comment, true), LOGGER_DEBUG);
return; return;
} }
// If no contact was found, take it from the thread owner // If no contact was found, take it from the thread owner
if ($contact_id <= 0) if ($contact_id <= 0) {
$contact_id = $parent_contact; $contact_id = $parent_contact;
$contact_nick = $parent_nick;
}
// This case here should never happen // This case here should never happen
if ($contact_id <= 0) if ($contact_id <= 0) {
$contact_id = $self[0]["id"]; $contact_id = $self[0]["id"];
$contact_nick = $self[0]["nick"];
}
if ($comment->fromid != $self_id) { if ($comment->fromid != $self_id) {
$postarray['contact-id'] = $contact_id; $postarray['contact-id'] = $contact_id;
@ -477,6 +485,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
$postarray['owner-name'] = $self[0]["name"]; $postarray['owner-name'] = $self[0]["name"];
$postarray['owner-link'] = $self[0]["url"]; $postarray['owner-link'] = $self[0]["url"];
$postarray['owner-avatar'] = $self[0]["photo"]; $postarray['owner-avatar'] = $self[0]["photo"];
$contact_nick = $self[0]["nick"];
} }
$postarray['author-name'] = $postarray['owner-name']; $postarray['author-name'] = $postarray['owner-name'];
@ -500,7 +509,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
return; return;
$item = item_store($postarray); $item = item_store($postarray);
logger('fbsync_createcomment: User '.$self[0]["nick"].' posted comment '.$item, LOGGER_DEBUG); logger('fbsync_createcomment: UID '.$uid.' - CID '.$postarray['contact-id'].' - Nick '.$contact_nick.' posted comment '.$item, LOGGER_DEBUG);
if ($item == 0) if ($item == 0)
return; return;
@ -919,7 +928,7 @@ function fbsync_fetchfeed($a, $uid) {
$url = "https://graph.facebook.com/fql?q=".urlencode(json_encode($fql))."&access_token=".$access_token; $url = "https://graph.facebook.com/fql?q=".urlencode(json_encode($fql))."&access_token=".$access_token;
$feed = fetch_url($url); $feed = fetch_url($url);
//file_put_contents("/home/ike/pirati.ca/htdocs/fb.".$uid, $feed);
$data = json_decode($feed); $data = json_decode($feed);
if (!is_array($data->data)) { if (!is_array($data->data)) {