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

a slight tweak to author_is_pmable hook to make it useful

Browse Source
This commit is contained in:
zotlabs 2017-05-31 18:14:12 -07:00
parent 98c18f416a
commit 35debe46bc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/hook/author_is_pmable.bb
View File

@ -6,7 +6,7 @@ By default author_is_pmable() returns true for 'zot' xchans, and false for all o
The plugin is passed an array The plugin is passed an array
[ 'xchan' => $author_xchan, 'result' => 'unset' ] [ 'xchan' => $author_xchan, 'abook' => abook record, 'result' => 'unset' ]
A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash. A value of false will disable the 'send mail' link. A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash. A value of false will disable the 'send mail' link.

10
include/conversation.php
View File

@ -909,9 +909,9 @@ function thread_action_menu($item,$mode = '') {
} }
function author_is_pmable($xchan) { function author_is_pmable($xchan, $abook) {
$x = [ 'xchan' => $xchan, 'result' => 'unset' ]; $x = [ 'xchan' => $xchan, 'abook' => $abook, 'result' => 'unset' ];
call_hooks('author_is_pmable',$x); call_hooks('author_is_pmable',$x);
if($x['result'] !== 'unset') if($x['result'] !== 'unset')
return $x['result']; return $x['result'];
@ -941,7 +941,7 @@ function thread_author_menu($item, $mode = '') {
} }
$profile_link = chanlink_hash($item['author_xchan']); $profile_link = chanlink_hash($item['author_xchan']);
$contact = false;
if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts)) if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts))
$contact = App::$contacts[$item['author_xchan']]; $contact = App::$contacts[$item['author_xchan']];
@ -950,9 +950,9 @@ function thread_author_menu($item, $mode = '') {
$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']); $follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
if($item['uid'] > 0 && author_is_pmable($item['author'])) if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']); $pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
}
if($contact) { if($contact) {