aboutsummaryrefslogtreecommitdiffstats
path: root/include/follow.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-24 17:52:26 -0700
committerfriendica <info@friendica.com>2014-08-24 17:52:26 -0700
commite0ee66d0b40247e05d4cbc1ca7687b74b1bc88d9 (patch)
treec02e97ee4c3b3cd587843edc6eb58bf86f86f6f5 /include/follow.php
parentd57c57ad59f311aa8d1488a6985874bae7beae38 (diff)
downloadvolse-hubzilla-e0ee66d0b40247e05d4cbc1ca7687b74b1bc88d9.tar.gz
volse-hubzilla-e0ee66d0b40247e05d4cbc1ca7687b74b1bc88d9.tar.bz2
volse-hubzilla-e0ee66d0b40247e05d4cbc1ca7687b74b1bc88d9.zip
Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRUCK ALONE until the feature is stable. I won't help you if you try this and end up with a borked site. You are completely on your own.
Diffstat (limited to 'include/follow.php')
-rw-r--r--include/follow.php17
1 files changed, 14 insertions, 3 deletions
diff --git a/include/follow.php b/include/follow.php
index d98a58198..55249db2b 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -117,14 +117,25 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
}
else {
- // attempt network auto-discovery
-
$my_perms = 0;
$their_perms = 0;
$xchan_hash = '';
-
+ $r = q("select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($url)
+ );
+ if(! $r) {
+ // attempt network auto-discovery
+ if(strpos($url,'@')) {
+ $r = discover_by_webbie($url);
+ }
+ }
+ if($r) {
+ $xchan_hash = $url;
+ $their_perms = 0;
+ $my_perms = PERMS_W_STREAM|PERMS_W_MAIL;
+ }
}