clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to repair OStatus subscriptions

Browse Source
This commit is contained in:
Michael Vogel
2015-09-03 22:18:25 +02:00
parent ffc9f94149
commit fd239ebf7b
5 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/follow.php
View File

@@ -170,6 +170,11 @@ function new_contact($uid,$url,$interactive = false) {
dbesc($ret['network'])
);
if(!count($r))
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
);
if(count($r)) {
// update contact
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
@@ -180,7 +185,6 @@ function new_contact($uid,$url,$interactive = false) {
intval($uid)
);
}
} else {
@@ -285,7 +289,7 @@ function new_contact($uid,$url,$interactive = false) {
// pull feed and consume it, which should subscribe to the hub.
proc_run('php',"include/poller.php","$contact_id");
proc_run('php',"include/onepoll.php","$contact_id", "force");
// create a follow slap