mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 03:55:18 +00:00
d* PM cont.
This commit is contained in:
parent
509a85cb12
commit
ad86cc24c8
3 changed files with 11 additions and 4 deletions
|
@ -2668,7 +2668,7 @@ function diaspora_send_mail($item,$owner,$contact) {
|
|||
|
||||
$r = q("select * from conv where id = %d and uid = %d limit 1",
|
||||
intval($item['convid']),
|
||||
intval($item['uid'])
|
||||
intval($item['channel_id'])
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
|
@ -2685,6 +2685,15 @@ function diaspora_send_mail($item,$owner,$contact) {
|
|||
'participant_handles' => xmlify($cnv['recips'])
|
||||
);
|
||||
|
||||
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
|
||||
$key = get_config('system','prvkey');
|
||||
// if($item['title'])
|
||||
// $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
|
||||
if($item['body'])
|
||||
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
|
||||
}
|
||||
|
||||
|
||||
$body = bb2diaspora($item['body']);
|
||||
$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
|
||||
|
||||
|
|
|
@ -284,9 +284,7 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
|
|||
$r[$k]['to'] = find_xchan_in_array($rr['to_xchan'],$c);
|
||||
$r[$k]['seen'] = (($rr['mail_flags'] & MAIL_SEEN) ? 1 : 0);
|
||||
if($r[$k]['mail_flags'] & MAIL_OBSCURED) {
|
||||
logger('unencrypting');
|
||||
$key = get_config('system','prvkey');
|
||||
|
||||
if($r[$k]['title'])
|
||||
$r[$k]['title'] = crypto_unencapsulate(json_decode_plus($r[$k]['title']),$key);
|
||||
if($r[$k]['body'])
|
||||
|
|
|
@ -158,7 +158,7 @@ function notifier_run($argv, $argc){
|
|||
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
|
||||
intval($item_id)
|
||||
);
|
||||
if(! count($message)){
|
||||
if(! $message) {
|
||||
return;
|
||||
}
|
||||
xchan_mail_query($message[0]);
|
||||
|
|
Loading…
Reference in a new issue