harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change flags for one-way connections from hidden to unconnected so we can still use hidden for - well hiding connections

Browse Source
This commit is contained in:
friendica
2014-03-04 14:35:42 -08:00
parent f2c8559170
commit 86d60f572f
5 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/zot.php
View File

@@ -351,7 +351,10 @@ function zot_refresh($them,$channel = null, $force = false) {
intval(ABOOK_FLAG_SELF)
);
if($r) {
if($r) {
$current_abook_connected = (($r[0]['abook_flags'] & ABOOK_FLAG_UNCONNECTED) ? 0 : 1);
$y = q("update abook set abook_their_perms = %d
where abook_xchan = '%s' and abook_channel = %d
and not (abook_flags & %d) limit 1",
@@ -360,14 +363,16 @@ function zot_refresh($them,$channel = null, $force = false) {
intval($channel['channel_id']),
intval(ABOOK_FLAG_SELF)
);
if($connected_set === 0) {
// if they are in your address book but you aren't in theirs, mark their address book entry hidden.
if(($connected_set === 0 || $connected_set === 1) && ($connected_set !== $current_abook_unconnected)) {
$y1 = q("update abook set abook_flags = (abook_flags | %d)
// if they are in your address book but you aren't in theirs, and/or this does not
// match your current connected state setting, toggle it.
$y1 = q("update abook set abook_flags = (abook_flags ^ %d)
where abook_xchan = '%s' and abook_channel = %d
and not (abook_flags & %d) limit 1",
intval(ABOOK_FLAG_HIDDEN),
intval(ABOOK_FLAG_UNCONNECTED),
dbesc($x['hash']),
intval($channel['channel_id']),
intval(ABOOK_FLAG_SELF)