friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

statusnet improvements

This commit is contained in:
Friendika 2011-07-01 17:39:16 -07:00
parent 813d6c453c
commit 9816f14d40
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -1449,11 +1449,11 @@ function new_follower($importer,$contact,$datarray,$item) {
} }
else { else {
// create contact record - set to readonly // create contact record
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`,
`blocked`, `readonly`, `pending`, `writable` ) `blocked`, `readonly`, `pending`, `writable` )
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 1, 1, 1 ) ", VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
intval($importer['uid']), intval($importer['uid']),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($url), dbesc($url),

6
mod/salmon.php
View File

@ -183,7 +183,11 @@ function salmon_post(&$a) {
if(! count($r)) { if(! count($r)) {
logger('mod-salmon: Author unknown to us.'); logger('mod-salmon: Author unknown to us.');
} }
if((count($r)) && ($r[0]['readonly'])) {
// is this a follower? Or have we ignored the person?
// If so we can not accept this post.
if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP)) {
logger('mod-salmon: Ignoring this author.'); logger('mod-salmon: Ignoring this author.');
salmon_return(202); salmon_return(202);
// NOTREACHED // NOTREACHED