use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
+use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/items.php';
*/
public static function relay_list() {
- $serverdata = get_config("system", "relay_server");
+ $serverdata = Config::get("system", "relay_server");
if ($serverdata == "")
return array();
*/
public static function dispatch_public($msg) {
- $enabled = intval(get_config("system", "diaspora_enabled"));
+ $enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
logger("diaspora is disabled");
return false;
if (!$person || $update) {
logger("create or refresh", LOGGER_DEBUG);
- $r = probe_url($handle, PROBE_DIASPORA);
+ $r = Probe::uri($handle, NETWORK_DIASPORA);
// Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server
return false;
// This will work for new Diaspora servers and Friendica servers from 3.5
- $source_url = $server."/fetch/post/".$guid;
+ $source_url = $server."/fetch/post/".urlencode($guid);
+
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
$envelope = fetch_url($source_url);
// This will work for older Diaspora and Friendica servers
if (!$x) {
- $source_url = $server."/p/".$guid.".xml";
+ $source_url = $server."/p/".urlencode($guid).".xml";
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
$x = fetch_url($source_url);
* @brief Receives account migration
*
* @param array $importer Array of the importer user
- * @param string $sender The sender of the message
* @param object $data The message object
*
* @return bool Success
*/
- private static function receiveAccountMigration($importer, $sender, $data) {
+ private static function receiveAccountMigration($importer, $data) {
$old_handle = notags(unxmlify($data->author));
$new_handle = notags(unxmlify($data->profile->author));
$signature = notags(unxmlify($data->signature));
$n, dbesc($f[0]),
intval($importer["uid"]));
- if ($x === false) {
- return false;
- }
+ if ($x === false) {
+ return false;
+ }
}
}
dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
// notify others
- proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
+ Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
}
return true;
dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
// notify others
- proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
+ Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
}
return true;
intval($importer["uid"])
);
- if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
+ if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) {
$self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
$i = item_store($arr);
if ($i)
- proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+ Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
}
}
}
// Now check if the retraction needs to be relayed by us
if ($parent["origin"]) {
// notify others
- proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $item["id"]);
+ Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
}
}
$a = get_app();
- $enabled = intval(get_config("system", "diaspora_enabled"));
+ $enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled)
return 200;
if (!$queue_run && was_recently_delayed($contact["id"])) {
$return_code = 0;
} else {
- if (!intval(get_config("system", "diaspora_test"))) {
+ if (!intval(Config::get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type));
logger("Send account migration ".print_r($message, true), LOGGER_DEBUG);
- return self::build_and_transmit($owner, $contact, "account_migration", $message, true);
+ return self::build_and_transmit($owner, $contact, "account_migration", $message);
}
/**
// Split the signed text
$signed_parts = explode(";", $signature['signed_text']);
- if ($item["deleted"])
+ if ($item["deleted"]) {
$message = array("author" => $signature['signer'],
"target_guid" => $signed_parts[0],
"target_type" => $signed_parts[1]);
- elseif ($item['verb'] === ACTIVITY_LIKE)
+ } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
$message = array("author" => $signed_parts[4],
"guid" => $signed_parts[1],
"parent_guid" => $signed_parts[3],
"positive" => $signed_parts[0],
"author_signature" => $signature['signature'],
"parent_author_signature" => "");
- else {
+ } else {
// Remove the comment guid
$guid = array_shift($signed_parts);
*/
public static function send_relay($item, $owner, $contact, $public_batch = false) {
- if ($item["deleted"])
+ if ($item["deleted"]) {
return self::send_retraction($item, $owner, $contact, $public_batch, true);
- elseif ($item['verb'] === ACTIVITY_LIKE)
+ } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
$type = "like";
- else
+ } else {
$type = "comment";
+ }
logger("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
if ($item['id'] == $item['parent']) {
$target_type = "Post";
- } elseif ($item["verb"] == ACTIVITY_LIKE) {
+ } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
$target_type = "Like";
} else {
$target_type = "Comment";