2011-08-26 16:29:22 +02:00
< ? php
2017-11-16 13:32:31 +01:00
/**
2021-03-29 08:40:20 +02:00
* @ copyright Copyright ( C ) 2010 - 2021 , the Friendica project
2020-02-09 16:18:46 +01:00
*
* @ license GNU AGPL version 3 or any later version
*
* This program is free software : you can redistribute it and / or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation , either version 3 of the
* License , or ( at your option ) any later version .
*
* This program is distributed in the hope that it will be useful ,
* but WITHOUT ANY WARRANTY ; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the
* GNU Affero General Public License for more details .
*
* You should have received a copy of the GNU Affero General Public License
* along with this program . If not , see < https :// www . gnu . org / licenses />.
*
2017-11-16 13:32:31 +01:00
*/
2020-02-09 16:18:46 +01:00
2017-11-19 19:59:55 +01:00
namespace Friendica\Worker ;
2018-10-29 22:20:46 +01:00
use Friendica\Core\Logger ;
2018-08-11 22:40:44 +02:00
use Friendica\Core\Protocol ;
2018-07-20 14:19:26 +02:00
use Friendica\Database\DBA ;
2019-12-15 22:34:11 +01:00
use Friendica\DI ;
2019-03-07 05:17:58 +01:00
use Friendica\Model ;
2017-11-08 04:57:46 +01:00
use Friendica\Protocol\DFRN ;
2018-01-31 03:14:44 +01:00
use Friendica\Protocol\Diaspora ;
2017-12-01 20:41:27 +01:00
use Friendica\Protocol\Email ;
2019-11-27 22:59:11 +01:00
use Friendica\Protocol\Activity ;
2018-11-22 23:09:22 +01:00
use Friendica\Util\Network ;
2019-04-04 22:51:12 +02:00
use Friendica\Core\Worker ;
2020-08-06 12:27:06 +02:00
use Friendica\Model\FContact ;
2021-02-13 20:56:03 +01:00
use Friendica\Model\Item ;
2020-11-16 00:28:05 +01:00
use Friendica\Protocol\Relay ;
2017-01-18 22:45:32 +01:00
2019-12-15 23:28:01 +01:00
class Delivery
2018-04-27 14:40:52 +02:00
{
2018-10-01 07:44:56 +02:00
const MAIL = 'mail' ;
const SUGGESTION = 'suggest' ;
const RELOCATION = 'relocate' ;
const DELETION = 'drop' ;
const POST = 'wall-new' ;
2019-06-06 06:26:02 +02:00
const POKE = 'poke' ;
2019-06-10 16:19:24 +02:00
const UPLINK = 'uplink' ;
2018-10-01 07:44:56 +02:00
const REMOVAL = 'removeme' ;
const PROFILEUPDATE = 'profileupdate' ;
2018-04-27 04:52:12 +02:00
2021-02-14 15:24:48 +01:00
public static function execute ( string $cmd , int $post_uriid , int $contact_id , int $sender_uid = 0 )
2018-04-27 14:40:52 +02:00
{
2021-02-14 15:24:48 +01:00
Logger :: info ( 'Invoked' , [ 'cmd' => $cmd , 'target' => $post_uriid , 'sender_uid' => $sender_uid , 'contact' => $contact_id ]);
2012-05-19 11:42:11 +02:00
$top_level = false ;
2015-12-14 00:39:20 +01:00
$followup = false ;
2018-04-26 07:45:05 +02:00
$public_message = false ;
2011-08-26 16:29:22 +02:00
2018-10-17 00:26:43 +02:00
$items = [];
2018-04-27 04:52:12 +02:00
if ( $cmd == self :: MAIL ) {
2021-02-19 07:30:38 +01:00
$target_item = DBA :: selectFirst ( 'mail' , [], [ 'id' => $post_uriid ]);
2018-07-21 14:46:04 +02:00
if ( ! DBA :: isResult ( $target_item )) {
2015-12-14 00:39:20 +01:00
return ;
}
2018-04-25 23:18:21 +02:00
$uid = $target_item [ 'uid' ];
2018-04-27 04:52:12 +02:00
} elseif ( $cmd == self :: SUGGESTION ) {
2021-02-19 07:30:38 +01:00
$target_item = DBA :: selectFirst ( 'fsuggest' , [], [ 'id' => $post_uriid ]);
2018-07-21 14:46:04 +02:00
if ( ! DBA :: isResult ( $target_item )) {
2015-12-14 00:39:20 +01:00
return ;
2017-01-10 17:11:08 +01:00
}
2018-04-25 23:18:21 +02:00
$uid = $target_item [ 'uid' ];
2018-04-27 04:52:12 +02:00
} elseif ( $cmd == self :: RELOCATION ) {
2021-02-19 07:30:38 +01:00
$uid = $post_uriid ;
2018-10-23 04:24:24 +02:00
$target_item = [];
2015-12-14 00:39:20 +01:00
} else {
2021-02-19 07:30:38 +01:00
$item = Model\Post :: selectFirst ([ 'id' , 'parent' ], [ 'uri-id' => $post_uriid , 'uid' => $sender_uid ]);
2018-07-21 14:46:04 +02:00
if ( ! DBA :: isResult ( $item ) || empty ( $item [ 'parent' ])) {
2021-02-19 07:30:38 +01:00
Logger :: warning ( 'Post not found' , [ 'uri-id' => $post_uriid , 'uid' => $sender_uid ]);
2017-11-19 19:59:55 +01:00
return ;
2012-05-19 11:42:11 +02:00
}
2021-02-19 07:30:38 +01:00
$target_id = intval ( $item [ 'id' ]);
2018-04-26 09:11:18 +02:00
$parent_id = intval ( $item [ 'parent' ]);
2011-08-29 04:22:27 +02:00
2021-02-13 20:56:03 +01:00
$condition = [ 'id' => [ $target_id , $parent_id ], 'visible' => true ];
2018-06-17 23:35:33 +02:00
$params = [ 'order' => [ 'id' ]];
2021-02-13 20:56:03 +01:00
$itemdata = Model\Post :: select ( Item :: DELIVER_FIELDLIST , $condition , $params );
2018-06-17 23:35:33 +02:00
2021-01-16 05:14:58 +01:00
while ( $item = Model\Post :: fetch ( $itemdata )) {
2020-08-31 04:46:24 +02:00
if ( $item [ 'verb' ] == Activity :: ANNOUNCE ) {
continue ;
}
2018-04-26 09:11:18 +02:00
if ( $item [ 'id' ] == $parent_id ) {
$parent = $item ;
2018-04-26 08:23:01 +02:00
}
2018-12-07 06:37:17 +01:00
if ( $item [ 'id' ] == $target_id ) {
2018-04-26 09:11:18 +02:00
$target_item = $item ;
}
$items [] = $item ;
2012-05-19 11:42:11 +02:00
}
2018-07-20 14:19:26 +02:00
DBA :: close ( $itemdata );
2018-04-26 09:11:18 +02:00
2018-07-31 07:54:25 +02:00
if ( empty ( $target_item )) {
2018-12-07 06:37:17 +01:00
Logger :: log ( 'Item ' . $target_id . " wasn't found. Quitting here. " );
2018-07-31 07:54:25 +02:00
return ;
}
if ( empty ( $parent )) {
2018-12-07 06:37:17 +01:00
Logger :: log ( 'Parent ' . $parent_id . ' for item ' . $target_id . " wasn't found. Quitting here. " );
2020-05-02 21:34:02 +02:00
self :: setFailedQueue ( $cmd , $target_item );
2018-07-31 07:54:25 +02:00
return ;
}
2019-01-18 00:06:27 +01:00
if ( ! empty ( $target_item [ 'contact-uid' ])) {
$uid = $target_item [ 'contact-uid' ];
} elseif ( ! empty ( $target_item [ 'uid' ])) {
$uid = $target_item [ 'uid' ];
} else {
2019-01-21 22:56:48 +01:00
Logger :: log ( 'Only public users for item ' . $target_id , Logger :: DEBUG );
2020-05-02 21:34:02 +02:00
self :: setFailedQueue ( $cmd , $target_item );
2019-01-18 00:06:27 +01:00
return ;
}
2011-08-26 16:29:22 +02:00
2019-10-07 06:19:12 +02:00
$condition = [ 'uri' => $target_item [ 'thr-parent' ], 'uid' => $target_item [ 'uid' ]];
2021-01-16 05:14:58 +01:00
$thr_parent = Model\Post :: selectFirst ([ 'network' , 'object' ], $condition );
2019-10-07 06:19:12 +02:00
if ( ! DBA :: isResult ( $thr_parent )) {
// Shouldn't happen. But when this does, we just take the parent as thread parent.
// That's totally okay for what we use this variable here.
$thr_parent = $parent ;
}
2019-08-27 21:01:11 +02:00
if ( ! empty ( $contact_id ) && Model\Contact :: isArchived ( $contact_id )) {
Logger :: info ( 'Contact is archived' , [ 'id' => $contact_id , 'cmd' => $cmd , 'item' => $target_item [ 'id' ]]);
2020-05-02 21:34:02 +02:00
self :: setFailedQueue ( $cmd , $target_item );
2019-08-27 21:01:11 +02:00
return ;
}
2012-05-19 11:42:11 +02:00
// avoid race condition with deleting entries
2016-03-13 19:47:02 +01:00
if ( $items [ 0 ][ 'deleted' ]) {
2017-01-10 17:11:08 +01:00
foreach ( $items as $item ) {
2012-05-19 11:42:11 +02:00
$item [ 'deleted' ] = 1 ;
2017-01-10 17:11:08 +01:00
}
2012-05-19 11:42:11 +02:00
}
2020-12-11 07:35:38 +01:00
$top_level = $target_item [ 'gravity' ] == GRAVITY_PARENT ;
2011-08-26 16:29:22 +02:00
2012-05-19 11:42:11 +02:00
// This is IMPORTANT!!!!
2011-08-26 16:29:22 +02:00
2012-05-19 11:42:11 +02:00
// We will only send a "notify owner to relay" or followup message if the referenced post
// originated on our system by virtue of having our hostname somewhere
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
2014-08-07 07:59:43 +02:00
2019-12-16 00:47:24 +01:00
$localhost = DI :: baseUrl () -> getHostname ();
2018-04-26 07:45:05 +02:00
if ( strpos ( $localhost , ':' )) {
$localhost = substr ( $localhost , 0 , strpos ( $localhost , ':' ));
2017-01-10 17:11:08 +01:00
}
2015-12-14 00:39:20 +01:00
/**
*
* Be VERY CAREFUL if you make any changes to the following line . Seemingly innocuous changes
* have been known to cause runaway conditions which affected several servers , along with
* permissions issues .
*
*/
2014-08-07 07:59:43 +02:00
2018-01-18 00:22:01 +01:00
if ( ! $top_level && ( $parent [ 'wall' ] == 0 ) && stristr ( $target_item [ 'uri' ], $localhost )) {
2018-10-30 14:58:45 +01:00
Logger :: log ( 'Followup ' . $target_item [ " guid " ], Logger :: DEBUG );
2015-12-14 00:39:20 +01:00
// local followup to remote post
$followup = true ;
}
2018-04-26 07:45:05 +02:00
if ( empty ( $parent [ 'allow_cid' ])
&& empty ( $parent [ 'allow_gid' ])
&& empty ( $parent [ 'deny_cid' ])
&& empty ( $parent [ 'deny_gid' ])
2020-03-02 08:57:23 +01:00
&& ( $parent [ " private " ] != Model\Item :: PRIVATE )) {
2018-04-26 07:45:05 +02:00
$public_message = true ;
2015-12-14 00:39:20 +01:00
}
2012-05-19 11:42:11 +02:00
}
2011-08-26 16:29:22 +02:00
2018-07-15 20:36:20 +02:00
if ( empty ( $items )) {
2021-02-25 06:13:49 +01:00
Logger :: notice ( 'No delivery data' , [ 'command' => $cmd , 'uri-id' => $post_uriid , 'cid' => $contact_id ]);
2018-07-15 20:36:20 +02:00
}
2019-03-07 05:17:58 +01:00
$owner = Model\User :: getOwnerDataById ( $uid );
2018-07-21 14:46:04 +02:00
if ( ! DBA :: isResult ( $owner )) {
2020-05-02 21:34:02 +02:00
self :: setFailedQueue ( $cmd , $target_item );
2018-04-26 07:45:05 +02:00
return ;
}
2020-11-23 20:25:22 +01:00
// We don't deliver our items to blocked, archived or pending contacts, and not to ourselves either
2018-07-20 14:19:26 +02:00
$contact = DBA :: selectFirst ( 'contact' , [],
2020-11-23 20:25:22 +01:00
[ 'id' => $contact_id , 'archive' => false , 'blocked' => false , 'pending' => false , 'self' => false ]
2012-05-19 11:42:11 +02:00
);
2018-07-21 14:46:04 +02:00
if ( ! DBA :: isResult ( $contact )) {
2020-05-02 21:34:02 +02:00
self :: setFailedQueue ( $cmd , $target_item );
2017-11-19 19:59:55 +01:00
return ;
2017-01-10 17:11:08 +01:00
}
2018-02-14 06:05:00 +01:00
2018-11-22 23:09:22 +01:00
if ( Network :: isUrlBlocked ( $contact [ 'url' ])) {
2020-05-02 21:34:02 +02:00
self :: setFailedQueue ( $cmd , $target_item );
2018-11-22 23:09:22 +01:00
return ;
}
2021-01-10 10:39:35 +01:00
$protocol = Model\GServer :: getProtocol ( $contact [ 'gsid' ] ? ? 0 );
2021-01-10 00:05:28 +01:00
2019-10-07 06:19:12 +02:00
// Transmit via Diaspora if the thread had started as Diaspora post.
// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
2018-04-26 07:45:05 +02:00
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
2020-12-11 07:35:38 +01:00
// Also transmit relayed posts from Diaspora contacts via Diaspora.
2021-09-04 06:51:20 +02:00
if (( $contact [ 'network' ] != Protocol :: DIASPORA ) && in_array ( Protocol :: DIASPORA , [ $parent [ 'network' ] ? ? '' , $thr_parent [ 'network' ] ? ? '' , $target_item [ 'network' ]])) {
Logger :: info ( 'Enforcing the Diaspora protocol' , [ 'id' => $contact [ 'id' ], 'network' => $contact [ 'network' ], 'parent' => $parent [ 'network' ], 'thread-parent' => $thr_parent [ 'network' ], 'post' => $target_item [ 'network' ]]);
2018-08-11 22:40:44 +02:00
$contact [ 'network' ] = Protocol :: DIASPORA ;
2018-04-26 07:45:05 +02:00
}
2011-08-26 16:29:22 +02:00
2021-02-25 06:13:49 +01:00
Logger :: notice ( 'Delivering' , [ 'cmd' => $cmd , 'uri-id' => $post_uriid , 'followup' => $followup , 'network' => $contact [ 'network' ]]);
2015-12-14 00:39:20 +01:00
2018-01-04 20:48:56 +01:00
switch ( $contact [ 'network' ]) {
2018-08-11 22:40:44 +02:00
case Protocol :: DFRN :
2021-01-10 00:05:28 +01:00
self :: deliverDFRN ( $cmd , $contact , $owner , $items , $target_item , $public_message , $top_level , $followup , $protocol );
2018-04-25 23:18:21 +02:00
break ;
2016-11-19 21:10:29 +01:00
2018-08-11 22:40:44 +02:00
case Protocol :: DIASPORA :
2018-04-26 07:45:05 +02:00
self :: deliverDiaspora ( $cmd , $contact , $owner , $items , $target_item , $public_message , $top_level , $followup );
2011-08-26 16:29:22 +02:00
break ;
2018-08-11 22:40:44 +02:00
case Protocol :: MAIL :
2019-11-22 23:15:04 +01:00
self :: deliverMail ( $cmd , $contact , $owner , $target_item , $thr_parent );
2018-04-25 23:18:21 +02:00
break ;
2011-08-26 16:29:22 +02:00
2018-04-25 23:18:21 +02:00
default :
break ;
}
2011-08-26 16:29:22 +02:00
2018-04-25 23:18:21 +02:00
return ;
}
2019-09-03 05:59:46 +02:00
/**
* Increased the " failed " counter in the item delivery data
*
2020-05-02 21:34:02 +02:00
* @ param string $cmd Command
* @ param array $item Item array
2019-09-03 05:59:46 +02:00
*/
2020-05-02 21:34:02 +02:00
private static function setFailedQueue ( string $cmd , array $item )
2019-09-02 05:25:05 +02:00
{
if ( ! in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
return ;
}
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueFailed ( $item [ 'uri-id' ] ? ? $item [ 'id' ]);
2019-09-02 05:25:05 +02:00
}
2018-04-27 05:08:13 +02:00
/**
2020-01-19 07:05:23 +01:00
* Deliver content via DFRN
2018-04-27 05:08:13 +02:00
*
2021-01-10 00:05:28 +01:00
* @ param string $cmd Command
* @ param array $contact Contact record of the receiver
* @ param array $owner Owner record of the sender
* @ param array $items Item record of the content and the parent
* @ param array $target_item Item record of the content
* @ param boolean $public_message Is the content public ?
* @ param boolean $top_level Is it a thread starter ?
* @ param boolean $followup Is it an answer to a remote post ?
* @ param int $server_protocol The protocol of the server
2019-01-06 22:06:53 +01:00
* @ throws \Friendica\Network\HTTPException\InternalServerErrorException
* @ throws \ImagickException
2018-04-27 05:08:13 +02:00
*/
2021-01-10 00:05:28 +01:00
private static function deliverDFRN ( $cmd , $contact , $owner , $items , $target_item , $public_message , $top_level , $followup , $server_protocol )
2018-04-25 23:18:21 +02:00
{
2019-12-08 09:59:21 +01:00
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
2020-08-06 12:31:05 +02:00
if ( Diaspora :: isReshare ( $target_item [ 'body' ]) && ! empty ( FContact :: getByURL ( $contact [ 'addr' ], false ))) {
2019-12-08 09:59:21 +01:00
Logger :: info ( 'Reshare will be transmitted via Diaspora' , [ 'url' => $contact [ 'url' ], 'guid' => ( $target_item [ 'guid' ] ? ? '' ) ? : $target_item [ 'id' ]]);
2019-12-06 07:39:50 +01:00
self :: deliverDiaspora ( $cmd , $contact , $owner , $items , $target_item , $public_message , $top_level , $followup );
return ;
}
2019-10-16 14:35:14 +02:00
Logger :: info ( 'Deliver ' . (( $target_item [ 'guid' ] ? ? '' ) ? : $target_item [ 'id' ]) . ' via DFRN to ' . (( $contact [ 'addr' ] ? ? '' ) ? : $contact [ 'url' ]));
2018-04-25 23:18:21 +02:00
2018-04-27 04:52:12 +02:00
if ( $cmd == self :: MAIL ) {
2018-04-25 23:18:21 +02:00
$item = $target_item ;
2019-03-07 05:17:58 +01:00
$item [ 'body' ] = Model\Item :: fixPrivatePhotos ( $item [ 'body' ], $owner [ 'uid' ], null , $item [ 'contact-id' ]);
2018-04-25 23:18:21 +02:00
$atom = DFRN :: mail ( $item , $owner );
2018-04-27 04:52:12 +02:00
} elseif ( $cmd == self :: SUGGESTION ) {
2018-04-25 23:18:21 +02:00
$item = $target_item ;
$atom = DFRN :: fsuggest ( $item , $owner );
2018-07-20 14:19:26 +02:00
DBA :: delete ( 'fsuggest' , [ 'id' => $item [ 'id' ]]);
2018-04-27 04:52:12 +02:00
} elseif ( $cmd == self :: RELOCATION ) {
2018-04-25 23:18:21 +02:00
$atom = DFRN :: relocate ( $owner , $owner [ 'uid' ]);
} elseif ( $followup ) {
2018-04-26 08:23:01 +02:00
$msgitems = [ $target_item ];
2018-04-25 23:18:21 +02:00
$atom = DFRN :: entries ( $msgitems , $owner );
} else {
2020-12-06 10:54:34 +01:00
if ( $target_item [ 'deleted' ]) {
$msgitems = [ $target_item ];
} else {
$msgitems = [];
foreach ( $items as $item ) {
// Only add the parent when we don't delete other items.
if (( $target_item [ 'id' ] == $item [ 'id' ]) || ( $cmd != self :: DELETION )) {
$item [ " entry:comment-allow " ] = true ;
$item [ " entry:cid " ] = ( $top_level ? $contact [ 'id' ] : 0 );
$msgitems [] = $item ;
}
2018-04-25 23:18:21 +02:00
}
}
2018-04-26 23:16:16 +02:00
$atom = DFRN :: entries ( $msgitems , $owner );
2018-04-25 23:18:21 +02:00
}
2012-02-01 05:03:46 +01:00
2019-10-17 04:39:31 +02:00
Logger :: debug ( 'Notifier entry: ' . $contact [ " url " ] . ' ' . (( $target_item [ 'guid' ] ? ? '' ) ? : $target_item [ 'id' ]) . ' entry: ' . $atom );
2012-02-01 05:03:46 +01:00
2020-05-02 21:34:02 +02:00
$protocol = Model\Post\DeliveryData :: DFRN ;
2019-06-28 11:03:58 +02:00
2018-04-26 23:16:16 +02:00
// We don't have a relationship with contacts on a public post.
// Se we transmit with the new method and via Diaspora as a fallback
2018-07-15 20:36:20 +02:00
if ( ! empty ( $items ) && (( $items [ 0 ][ 'uid' ] == 0 ) || ( $contact [ 'uid' ] == 0 ))) {
2018-04-27 07:11:52 +02:00
// Transmit in public if it's a relay post
2019-03-07 05:17:58 +01:00
$public_dfrn = ( $contact [ 'contact-type' ] == Model\Contact :: TYPE_RELAY );
2018-04-27 07:11:52 +02:00
$deliver_status = DFRN :: transmit ( $owner , $contact , $atom , $public_dfrn );
2018-04-30 07:56:40 +02:00
// We never spool failed relay deliveries
if ( $public_dfrn ) {
2019-10-17 04:39:31 +02:00
Logger :: info ( 'Relay delivery to ' . $contact [ " url " ] . ' with guid ' . $target_item [ " guid " ] . ' returns ' . $deliver_status );
2019-09-02 05:25:05 +02:00
if ( in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
2019-09-02 05:37:45 +02:00
if (( $deliver_status >= 200 ) && ( $deliver_status <= 299 )) {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueDone ( $target_item [ 'uri-id' ], $protocol );
2021-01-09 20:18:22 +01:00
2021-01-10 10:39:35 +01:00
Model\GServer :: setProtocol ( $contact [ 'gsid' ] ? ? 0 , $protocol );
2019-09-02 05:37:45 +02:00
} else {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueFailed ( $target_item [ 'uri-id' ]);
2019-09-02 05:37:45 +02:00
}
2019-09-02 05:25:05 +02:00
}
2018-04-30 07:56:40 +02:00
return ;
}
2021-01-10 00:05:28 +01:00
if ((( $deliver_status < 200 ) || ( $deliver_status > 299 )) && ( empty ( $server_protocol ) || ( $server_protocol == Model\Post\DeliveryData :: LEGACY_DFRN ))) {
2018-04-25 23:55:24 +02:00
// Transmit via Diaspora if not possible via Friendica
2018-04-26 07:45:05 +02:00
self :: deliverDiaspora ( $cmd , $contact , $owner , $items , $target_item , $public_message , $top_level , $followup );
2018-04-25 23:55:24 +02:00
return ;
}
2021-07-15 15:28:32 +02:00
} else {
2019-06-28 11:03:58 +02:00
// DFRN payload over Diaspora transport layer
$deliver_status = DFRN :: transmit ( $owner , $contact , $atom );
2018-04-25 23:18:21 +02:00
}
2011-08-26 16:29:22 +02:00
2019-10-16 14:35:14 +02:00
Logger :: info ( 'DFRN Delivery' , [ 'cmd' => $cmd , 'url' => $contact [ 'url' ], 'guid' => ( $target_item [ 'guid' ] ? ? '' ) ? : $target_item [ 'id' ], 'return' => $deliver_status ]);
2011-08-26 16:29:22 +02:00
2018-04-25 23:18:21 +02:00
if (( $deliver_status >= 200 ) && ( $deliver_status <= 299 )) {
// We successfully delivered a message, the contact is alive
2019-03-07 05:17:58 +01:00
Model\Contact :: unmarkForArchival ( $contact );
2019-06-01 08:54:47 +02:00
2021-01-10 10:39:35 +01:00
Model\GServer :: setProtocol ( $contact [ 'gsid' ] ? ? 0 , $protocol );
2021-01-09 20:18:22 +01:00
2019-06-10 16:19:24 +02:00
if ( in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueDone ( $target_item [ 'uri-id' ], $protocol );
2019-06-01 08:54:47 +02:00
}
2018-04-25 23:18:21 +02:00
} else {
// The message could not be delivered. We mark the contact as "dead"
2019-03-07 05:17:58 +01:00
Model\Contact :: markForArchival ( $contact );
2018-07-24 20:12:09 +02:00
2019-10-16 14:35:14 +02:00
Logger :: info ( 'Delivery failed: defer message' , [ 'id' => ( $target_item [ 'guid' ] ? ? '' ) ? : $target_item [ 'id' ]]);
2019-08-20 09:39:13 +02:00
if ( ! Worker :: defer () && in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueFailed ( $target_item [ 'uri-id' ]);
2019-08-20 09:39:13 +02:00
}
2012-05-19 11:42:11 +02:00
}
2018-04-25 23:18:21 +02:00
}
2011-08-26 16:29:22 +02:00
2018-04-27 05:08:13 +02:00
/**
2020-01-19 07:05:23 +01:00
* Deliver content via Diaspora
2018-04-27 05:08:13 +02:00
*
* @ param string $cmd Command
* @ param array $contact Contact record of the receiver
* @ param array $owner Owner record of the sender
* @ param array $items Item record of the content and the parent
* @ param array $target_item Item record of the content
* @ param boolean $public_message Is the content public ?
* @ param boolean $top_level Is it a thread starter ?
* @ param boolean $followup Is it an answer to a remote post ?
2019-01-06 22:06:53 +01:00
* @ throws \Friendica\Network\HTTPException\InternalServerErrorException
* @ throws \ImagickException
2018-04-27 05:08:13 +02:00
*/
2018-04-26 07:45:05 +02:00
private static function deliverDiaspora ( $cmd , $contact , $owner , $items , $target_item , $public_message , $top_level , $followup )
2018-04-25 23:18:21 +02:00
{
2018-04-26 07:45:05 +02:00
// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
2019-03-07 05:17:58 +01:00
$walltowall = $top_level && ( $owner [ 'id' ] != $items [ 0 ][ 'contact-id' ]) & ( $owner [ 'account-type' ] != Model\User :: ACCOUNT_TYPE_COMMUNITY );
2018-04-26 07:45:05 +02:00
2018-04-25 23:18:21 +02:00
if ( $public_message ) {
$loc = 'public batch ' . $contact [ 'batch' ];
} else {
2018-04-26 07:45:05 +02:00
$loc = $contact [ 'addr' ];
2018-04-25 23:18:21 +02:00
}
2019-10-06 23:59:23 +02:00
Logger :: notice ( 'Deliver via Diaspora' , [ 'target' => $target_item [ 'id' ], 'guid' => $target_item [ 'guid' ], 'to' => $loc ]);
2018-04-25 23:18:21 +02:00
2021-08-30 21:46:10 +02:00
if ( ! DI :: config () -> get ( 'system' , 'diaspora_enabled' )) {
2018-04-25 23:18:21 +02:00
return ;
}
2019-07-28 21:13:17 +02:00
2018-04-27 04:52:12 +02:00
if ( $cmd == self :: MAIL ) {
2018-04-25 23:18:21 +02:00
Diaspora :: sendMail ( $target_item , $owner , $contact );
return ;
}
2018-04-27 04:52:12 +02:00
if ( $cmd == self :: SUGGESTION ) {
2018-04-25 23:18:21 +02:00
return ;
}
2019-07-28 21:13:17 +02:00
2018-04-25 23:18:21 +02:00
if ( ! $contact [ 'pubkey' ] && ! $public_message ) {
return ;
}
2019-06-01 08:54:47 +02:00
2018-11-11 13:15:17 +01:00
if ( $cmd == self :: RELOCATION ) {
2019-06-01 08:54:47 +02:00
$deliver_status = Diaspora :: sendAccountMigration ( $owner , $contact , $owner [ 'uid' ]);
2018-11-11 13:15:17 +01:00
} elseif ( $target_item [ 'deleted' ] && (( $target_item [ 'uri' ] === $target_item [ 'parent-uri' ]) || $followup )) {
2018-04-25 23:18:21 +02:00
// top-level retraction
2018-10-29 22:20:46 +01:00
Logger :: log ( 'diaspora retract: ' . $loc );
2019-06-01 08:54:47 +02:00
$deliver_status = Diaspora :: sendRetraction ( $target_item , $owner , $contact , $public_message );
2018-04-25 23:18:21 +02:00
} elseif ( $followup ) {
// send comments and likes to owner to relay
2018-10-29 22:20:46 +01:00
Logger :: log ( 'diaspora followup: ' . $loc );
2019-06-01 08:54:47 +02:00
$deliver_status = Diaspora :: sendFollowup ( $target_item , $owner , $contact , $public_message );
2018-04-25 23:18:21 +02:00
} elseif ( $target_item [ 'uri' ] !== $target_item [ 'parent-uri' ]) {
// we are the relay - send comments, likes and relayable_retractions to our conversants
2018-10-29 22:20:46 +01:00
Logger :: log ( 'diaspora relay: ' . $loc );
2019-06-01 08:54:47 +02:00
$deliver_status = Diaspora :: sendRelay ( $target_item , $owner , $contact , $public_message );
2018-04-25 23:18:21 +02:00
} elseif ( $top_level && ! $walltowall ) {
// currently no workable solution for sending walltowall
2018-10-29 22:20:46 +01:00
Logger :: log ( 'diaspora status: ' . $loc );
2019-06-01 08:54:47 +02:00
$deliver_status = Diaspora :: sendStatus ( $target_item , $owner , $contact , $public_message );
} else {
Logger :: log ( 'Unknown mode ' . $cmd . ' for ' . $loc );
2018-04-25 23:18:21 +02:00
return ;
}
2019-06-01 08:54:47 +02:00
if (( $deliver_status >= 200 ) && ( $deliver_status <= 299 )) {
// We successfully delivered a message, the contact is alive
Model\Contact :: unmarkForArchival ( $contact );
2021-01-10 10:39:35 +01:00
Model\GServer :: setProtocol ( $contact [ 'gsid' ] ? ? 0 , Model\Post\DeliveryData :: DIASPORA );
2021-01-09 20:18:22 +01:00
2019-06-10 16:19:24 +02:00
if ( in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueDone ( $target_item [ 'uri-id' ], Model\Post\DeliveryData :: DIASPORA );
2019-06-01 08:54:47 +02:00
}
} else {
// The message could not be delivered. We mark the contact as "dead"
Model\Contact :: markForArchival ( $contact );
2019-09-02 05:25:05 +02:00
// When it is delivered to the public endpoint, we do mark the relay contact for archival as well
if ( $public_message ) {
2020-11-16 00:28:05 +01:00
Relay :: markForArchival ( $contact );
2019-09-02 05:25:05 +02:00
}
2019-06-01 13:28:37 +02:00
if ( empty ( $contact [ 'contact-type' ]) || ( $contact [ 'contact-type' ] != Model\Contact :: TYPE_RELAY )) {
2019-10-16 14:35:14 +02:00
Logger :: info ( 'Delivery failed: defer message' , [ 'id' => ( $target_item [ 'guid' ] ? ? '' ) ? : $target_item [ 'id' ]]);
2019-06-01 08:54:47 +02:00
// defer message for redelivery
2019-08-20 09:39:13 +02:00
if ( ! Worker :: defer () && in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueFailed ( $target_item [ 'uri-id' ]);
2019-08-20 09:39:13 +02:00
}
2019-06-10 16:19:24 +02:00
} elseif ( in_array ( $cmd , [ Delivery :: POST , Delivery :: POKE ])) {
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueFailed ( $target_item [ 'uri-id' ]);
2019-06-01 08:54:47 +02:00
}
}
2018-04-25 23:18:21 +02:00
}
2018-04-27 05:08:13 +02:00
/**
2020-01-19 07:05:23 +01:00
* Deliver content via mail
2018-04-27 05:08:13 +02:00
*
* @ param string $cmd Command
* @ param array $contact Contact record of the receiver
* @ param array $owner Owner record of the sender
* @ param array $target_item Item record of the content
2019-11-23 05:31:40 +01:00
* @ param array $thr_parent Item record of the direct parent in the thread
2019-01-06 22:06:53 +01:00
* @ throws \Friendica\Network\HTTPException\InternalServerErrorException
* @ throws \ImagickException
2018-04-27 05:08:13 +02:00
*/
2019-11-22 23:15:04 +01:00
private static function deliverMail ( $cmd , $contact , $owner , $target_item , $thr_parent )
2018-04-25 23:18:21 +02:00
{
2021-08-30 21:46:10 +02:00
if ( DI :: config () -> get ( 'system' , 'imap_disabled' )) {
2018-04-25 23:18:21 +02:00
return ;
}
$addr = $contact [ 'addr' ];
if ( ! strlen ( $addr )) {
return ;
}
2019-06-10 16:19:24 +02:00
if ( ! in_array ( $cmd , [ self :: POST , self :: POKE ])) {
2018-04-25 23:18:21 +02:00
return ;
}
2019-11-27 23:00:43 +01:00
2019-11-27 22:59:11 +01:00
if ( $target_item [ 'verb' ] != Activity :: POST ) {
return ;
}
2018-04-25 23:18:21 +02:00
2019-11-22 23:15:04 +01:00
if ( ! empty ( $thr_parent [ 'object' ])) {
$data = json_decode ( $thr_parent [ 'object' ], true );
if ( ! empty ( $data [ 'reply_to' ])) {
$addr = $data [ 'reply_to' ][ 0 ][ 'mailbox' ] . '@' . $data [ 'reply_to' ][ 0 ][ 'host' ];
Logger :: info ( 'Use "reply-to" address of the thread parent' , [ 'addr' => $addr ]);
} elseif ( ! empty ( $data [ 'from' ])) {
$addr = $data [ 'from' ][ 0 ][ 'mailbox' ] . '@' . $data [ 'from' ][ 0 ][ 'host' ];
Logger :: info ( 'Use "from" address of the thread parent' , [ 'addr' => $addr ]);
}
}
2018-07-20 14:19:26 +02:00
$local_user = DBA :: selectFirst ( 'user' , [], [ 'uid' => $owner [ 'uid' ]]);
2018-07-21 14:46:04 +02:00
if ( ! DBA :: isResult ( $local_user )) {
2018-04-25 23:18:21 +02:00
return ;
}
2019-11-22 23:15:04 +01:00
Logger :: info ( 'About to deliver via mail' , [ 'guid' => $target_item [ 'guid' ], 'to' => $addr ]);
2018-04-26 07:45:05 +02:00
2018-04-25 23:18:21 +02:00
$reply_to = '' ;
2018-07-20 14:19:26 +02:00
$mailacct = DBA :: selectFirst ( 'mailacct' , [ 'reply_to' ], [ 'uid' => $owner [ 'uid' ]]);
2018-07-21 14:46:04 +02:00
if ( DBA :: isResult ( $mailacct ) && ! empty ( $mailacct [ 'reply_to' ])) {
2018-04-25 23:18:21 +02:00
$reply_to = $mailacct [ 'reply_to' ];
}
2020-01-18 20:52:34 +01:00
$subject = ( $target_item [ 'title' ] ? Email :: encodeHeader ( $target_item [ 'title' ], 'UTF-8' ) : DI :: l10n () -> t ( " \x28 no subject \x29 " ));
2018-04-25 23:18:21 +02:00
// only expose our real email address to true friends
2019-03-07 05:17:58 +01:00
if (( $contact [ 'rel' ] == Model\Contact :: FRIEND ) && ! $contact [ 'blocked' ]) {
2018-04-25 23:18:21 +02:00
if ( $reply_to ) {
2019-11-22 23:15:04 +01:00
$headers = 'From: ' . Email :: encodeHeader ( $local_user [ 'username' ], 'UTF-8' ) . ' <' . $reply_to . '>' . " \n " ;
2018-04-25 23:18:21 +02:00
$headers .= 'Sender: ' . $local_user [ 'email' ] . " \n " ;
} else {
2019-11-22 23:15:04 +01:00
$headers = 'From: ' . Email :: encodeHeader ( $local_user [ 'username' ], 'UTF-8' ) . ' <' . $local_user [ 'email' ] . '>' . " \n " ;
2018-04-25 23:18:21 +02:00
}
} else {
2020-04-04 22:26:09 +02:00
$sender = DI :: config () -> get ( 'config' , 'sender_email' , 'noreply@' . DI :: baseUrl () -> getHostname ());
$headers = 'From: ' . Email :: encodeHeader ( $local_user [ 'username' ], 'UTF-8' ) . ' <' . $sender . '>' . " \n " ;
2018-04-25 23:18:21 +02:00
}
$headers .= 'Message-Id: <' . Email :: iri2msgid ( $target_item [ 'uri' ]) . '>' . " \n " ;
if ( $target_item [ 'uri' ] !== $target_item [ 'parent-uri' ]) {
2019-11-22 23:15:04 +01:00
$headers .= 'References: <' . Email :: iri2msgid ( $target_item [ 'parent-uri' ]) . '>' ;
2018-04-25 23:18:21 +02:00
2019-11-23 05:31:40 +01:00
// Export more references on deeper nested threads
2019-11-22 23:15:04 +01:00
if (( $target_item [ 'thr-parent' ] != '' ) && ( $target_item [ 'thr-parent' ] != $target_item [ 'parent-uri' ])) {
$headers .= ' <' . Email :: iri2msgid ( $target_item [ 'thr-parent' ]) . '>' ;
2018-04-25 23:18:21 +02:00
}
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 07:05:49 +02:00
2018-04-25 23:18:21 +02:00
$headers .= " \n " ;
if ( empty ( $target_item [ 'title' ])) {
$condition = [ 'uri' => $target_item [ 'parent-uri' ], 'uid' => $owner [ 'uid' ]];
2021-01-16 05:14:58 +01:00
$title = Model\Post :: selectFirst ([ 'title' ], $condition );
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 07:05:49 +02:00
2018-07-21 14:46:04 +02:00
if ( DBA :: isResult ( $title ) && ( $title [ 'title' ] != '' )) {
2018-04-25 23:18:21 +02:00
$subject = $title [ 'title' ];
} else {
$condition = [ 'parent-uri' => $target_item [ 'parent-uri' ], 'uid' => $owner [ 'uid' ]];
2021-01-16 05:14:58 +01:00
$title = Model\Post :: selectFirst ([ 'title' ], $condition );
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 07:05:49 +02:00
2018-07-21 14:46:04 +02:00
if ( DBA :: isResult ( $title ) && ( $title [ 'title' ] != '' )) {
2018-04-25 23:18:21 +02:00
$subject = $title [ 'title' ];
}
}
}
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 07:05:49 +02:00
2018-04-26 23:16:16 +02:00
if ( strncasecmp ( $subject , 'RE:' , 3 )) {
2018-04-25 23:18:21 +02:00
$subject = 'Re: ' . $subject ;
}
}
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 07:05:49 +02:00
2018-04-25 23:55:24 +02:00
Email :: send ( $addr , $subject , $headers , $target_item );
2019-11-22 23:15:04 +01:00
2020-05-02 21:34:02 +02:00
Model\Post\DeliveryData :: incrementQueueDone ( $target_item [ 'uri-id' ], Model\Post\DeliveryData :: MAIL );
2019-11-22 23:15:04 +01:00
Logger :: info ( 'Delivered via mail' , [ 'guid' => $target_item [ 'guid' ], 'to' => $addr , 'subject' => $subject ]);
2017-11-19 19:59:55 +01:00
}
2011-08-26 16:29:22 +02:00
}