use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Item;
+use Friendica\Model\Mail;
use Friendica\Model\Profile;
-use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
*/
public static function participantsForThread($thread, array $contacts)
{
- $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
+ $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`, `contact`.`protocol`,
`fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`
}
unset($contact['fnetwork']);
+ if (empty($contact['protocol'])) {
+ $contact['protocol'] = $contact['network'];
+ }
+
if (empty($contact['batch']) && !empty($contact['fbatch'])) {
$contact['batch'] = $contact['fbatch'];
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if (!$base) {
Logger::log('unable to locate salmon data in xml');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
if (!$author_link) {
Logger::log('Could not retrieve author URI.');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
// Once we have the author URI, go to the web and try to find their public key
// (first this will look it up locally if it is in the fcontact cache)
if (!$key) {
Logger::log('Could not retrieve author key.');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
Logger::log('Message did not verify. Discarding.');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
Logger::log('Message verified.');
$person = self::personByHandle($msg_author);
- DBA::lock('mail');
-
- if (DBA::exists('mail', ['guid' => $msg_guid, 'uid' => $importer["uid"]])) {
- Logger::log("duplicate message already delivered.", Logger::DEBUG);
- return false;
- }
-
- DBA::insert('mail', [
+ return Mail::insert([
'uid' => $importer['uid'],
'guid' => $msg_guid,
'convid' => $conversation['id'],
'contact-id' => $contact['id'],
'title' => $subject,
'body' => $body,
- 'seen' => 0,
- 'reply' => 0,
'uri' => $message_uri,
'parent-uri' => $author . ':' . $guid,
'created' => $msg_created_at
]);
-
- $message_id = DBA::lastInsertId();
-
- DBA::unlock();
-
- DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
-
- notification([
- "type" => NOTIFY_MAIL,
- "notify_flags" => $importer["notify-flags"],
- "language" => $importer["language"],
- "to_name" => $importer["username"],
- "to_email" => $importer["email"],
- "uid" => $importer["uid"],
- "item" => ["id" => $message_id, "title" => $subject, "subject" => $subject, "body" => $body],
- "parent" => $conversation["id"],
- "source_name" => $person["name"],
- "source_link" => $person["url"],
- "source_photo" => $person["photo"],
- "verb" => ACTIVITY_POST,
- "otype" => "mail"
- ]);
-
- return true;
}
/**
$body = self::replacePeopleGuid($body, $person["url"]);
- DBA::lock('mail');
-
- if (DBA::exists('mail', ['guid' => $guid, 'uid' => $importer["uid"]])) {
- Logger::log("duplicate message already delivered.", Logger::DEBUG);
- return false;
- }
-
- DBA::insert('mail', [
+ return Mail::insert([
'uid' => $importer['uid'],
'guid' => $guid,
'convid' => $conversation['id'],
'contact-id' => $contact['id'],
'title' => $conversation['subject'],
'body' => $body,
- 'seen' => 0,
'reply' => 1,
'uri' => $message_uri,
'parent-uri' => $author.":".$conversation['guid'],
'created' => $created_at
]);
-
- $message_id = DBA::lastInsertId();
-
- DBA::unlock();
-
- DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
-
- notification([
- "type" => NOTIFY_MAIL,
- "notify_flags" => $importer["notify-flags"],
- "language" => $importer["language"],
- "to_name" => $importer["username"],
- "to_email" => $importer["email"],
- "uid" => $importer["uid"],
- "item" => ["id" => $message_id, "title" => $conversation["subject"], "subject" => $conversation["subject"], "body" => $body],
- "parent" => $conversation["id"],
- "source_name" => $person["name"],
- "source_link" => $person["url"],
- "source_photo" => $person["photo"],
- "verb" => ACTIVITY_POST,
- "otype" => "mail"
- ]);
-
- return true;
}
/**
* @param array $contact Target of the communication
* @param string $envelope The message that is to be transmitted
* @param bool $public_batch Is it a public post?
- * @param bool $queue_run Is the transmission called from the queue?
* @param string $guid message guid
+ * @param bool $no_defer Don't defer a failing delivery
*
- * @param bool $no_queue
* @return int Result of the transmission
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
+ public static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "", $no_defer = false)
{
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
Logger::log("transmit: ".$logid."-".$guid." ".$dest_url);
- if (!$queue_run && Queue::wasDelayed($contact["id"])) {
- $return_code = 0;
- } else {
- if (!intval(Config::get("system", "diaspora_test"))) {
- $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
+ if (!intval(Config::get("system", "diaspora_test"))) {
+ $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
- $return_code = $postResult->getReturnCode();
- } else {
- Logger::log("test_mode");
- return 200;
- }
+ $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
+ $return_code = $postResult->getReturnCode();
+ } else {
+ Logger::log("test_mode");
+ return 200;
}
Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeader(), "retry-after")))) {
- if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::TYPE_RELAY)) {
+ if (!$no_defer && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::TYPE_RELAY)) {
Logger::info('defer message', ['log' => $logid, 'guid' => $guid, 'destination' => $dest_url]);
// defer message for redelivery
Worker::defer();
* @param array $message The message data
* @param bool $public_batch Is it a public post?
* @param string $guid message guid
+ * @param bool $no_defer Don't defer a failing delivery
*
* @return int Result of the transmission
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "")
+ private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $no_defer = false)
{
$msg = self::buildPostXml($type, $message);
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
- $return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
+ $return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid, $no_defer);
Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
foreach ($recips as $recip) {
Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
- self::buildAndTransmit($owner, $recip, "profile", $message, false);
+ self::buildAndTransmit($owner, $recip, "profile", $message, false, '', true);
}
}
projects / friendica.git / blobdiff