diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-19 13:25:34 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-19 13:25:34 -0700 |
| commit | bced63e8237329ddaa6a5271589cbba50bd31448 (patch) | |
| tree | d34ce952b15993a6f3f9067f6f3a0831e681023d | |
| parent | 4500faf463e7fd6fcf9948666421c941a1292df9 (diff) | |
| download | volse-hubzilla-bced63e8237329ddaa6a5271589cbba50bd31448.tar.gz volse-hubzilla-bced63e8237329ddaa6a5271589cbba50bd31448.tar.bz2 volse-hubzilla-bced63e8237329ddaa6a5271589cbba50bd31448.zip | |
call the follow_accept hook when desired
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 54d609ad1..5f8490b06 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -161,7 +161,7 @@ class Notifier { $packet_type = 'keychange'; $normal_mode = false; } - elseif($cmd == 'permission_update' || $cmd == 'permission_reject' || $cmd == 'permission_accept' || $cmd == 'permission_create') { + elseif(in_array($cmd, [ 'permission_update', 'permission_reject', 'permission_accept', 'permission_create' ])) { // Get the (single) recipient $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0", intval($item_id) diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 0f18b432d..23c5282e3 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -248,6 +248,10 @@ class Connedit extends \Zotlabs\Web\Controller { notice( t('Failed to update connection record.') . EOL); if(! intval(\App::$poi['abook_self'])) { + if($new_friend) { + \Zotlabs\Daemon\Master::Summon( [ 'Notifier', 'permission_accept', $contact_id ] ); + } + \Zotlabs\Daemon\Master::Summon( [ 'Notifier', (($new_friend) ? 'permission_create' : 'permission_update'), |