mirror of
https://github.com/friendica/friendica
synced 2024-11-20 13:43:41 +00:00
implement contact block/ignore for NETWORK_FACEBOOK
This commit is contained in:
parent
0377b6cdad
commit
38cb0a3295
1 changed files with 3 additions and 3 deletions
|
@ -594,7 +594,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
|
||||||
if($from->id == $self_id)
|
if($from->id == $self_id)
|
||||||
$datarray['contact-id'] = $self[0]['id'];
|
$datarray['contact-id'] = $self[0]['id'];
|
||||||
else {
|
else {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
|
||||||
dbesc($from->id),
|
dbesc($from->id),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
@ -671,7 +671,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
|
||||||
if($likes->id == $self_id)
|
if($likes->id == $self_id)
|
||||||
$likedata['contact-id'] = $self[0]['id'];
|
$likedata['contact-id'] = $self[0]['id'];
|
||||||
else {
|
else {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
|
||||||
dbesc($likes->id),
|
dbesc($likes->id),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
@ -724,7 +724,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
|
||||||
elseif(is_array($orig_post) && (x($orig_post,'contact-id')))
|
elseif(is_array($orig_post) && (x($orig_post,'contact-id')))
|
||||||
$cmntdata['contact-id'] = $orig_post['contact-id'];
|
$cmntdata['contact-id'] = $orig_post['contact-id'];
|
||||||
else {
|
else {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
|
||||||
dbesc($cmnt->from->id),
|
dbesc($cmnt->from->id),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue