<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
- $localhost = DI::baseUrl()->getHostname();
+ $localhost = DI::baseUrl()->getHost();
if (strpos($localhost, ':')) {
$localhost = substr($localhost, 0, strpos($localhost, ':'));
}
*/
private static function deliverDiaspora(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup): bool
{
- // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
+ // We don't treat group posts as "wall-to-wall" to be able to post them via Diaspora
$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY);
if ($public_message) {
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
}
} else {
- $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
+ $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHost());
$headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
}
}
return $success;
}
-
- /**
- * Add post for a server
- *
- * @param string $cmd
- * @param integer $uri_id
- * @param string $created
- * @param integer $cid
- * @param integer $gsid
- * @param integer $uid
- * @return bool
- */
- public static function addQueue(string $cmd, int $uri_id, string $created, int $cid, int $gsid, int $uid): bool
- {
- $fields = ['uri-id' => $uri_id, 'uid' => $uid, 'cid' => $cid, 'gsid' => $gsid, 'created' => $created, 'command' => $cmd];
-
- return DBA::insert('delivery-queue', $fields, Database::INSERT_IGNORE);
- }
-
- /**
- * Remove post by a server after delivery
- *
- * @param integer $uri_id
- * @param integer $gsid
- * @return bool
- */
- public static function removeQueue(int $uri_id, int $gsid): bool
- {
- return DBA::delete('delivery-queue', ['uri-id' => $uri_id, 'gsid' => $gsid]);
- }
-
- /**
- * Remove failed posts for the given server
- *
- * @param integer $gsid
- * @return bool
- */
- public static function removeFailedQueue(int $gsid): bool
- {
- return DBA::delete('delivery-queue', ["`gsid` = ? AND `failed` >= ?", $gsid, DI::config()->get('system', 'worker_defer_limit')]);
- }
-
- /**
- * Increment "failed" counter for the given server and post
- *
- * @param integer $uri_id
- * @param integer $gsid
- * @return bool
- */
- public static function incrementFailedQueue(int $uri_id, int $gsid): bool
- {
- return DBA::e('UPDATE `delivery-queue` SET `failed` = `failed` + 1 WHERE `uri-id` = ? AND `gsid` = ?', $uri_id, $gsid);
- }
-
- /**
- * Select queue entries for the given server
- *
- * @param integer $gsid
- * @return array
- */
- public static function selectQueueForServer(int $gsid): array
- {
- return DBA::selectToArray('delivery-queue', [], ["`gsid` = ? AND `failed` < ?", $gsid, DI::config()->get('system', 'worker_defer_limit')], ['order' => ['created']]);
- }
}