<?php
/**
- * @file src/Protocol/diaspora.php
- * The implementation of the diaspora protocol
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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/>.
*
- * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html
- * This implementation here interprets the old and the new protocol and sends the new one.
- * In the future we will remove most stuff from "validPosting" and interpret only the new protocol.
*/
namespace Friendica\Protocol;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
/**
* This class contain functions to create and send Diaspora XML files
- *
*/
class Diaspora
{
$serverlist = [];
// Fetching relay servers
- $serverdata = Config::get("system", "relay_server");
+ $serverdata = DI::config()->get("system", "relay_server");
if (!empty($serverdata)) {
$servers = explode(",", $serverdata);
}
}
- if (Config::get("system", "relay_directly", false)) {
+ if (DI::config()->get("system", "relay_directly", false)) {
// We distribute our stuff based on the parent to ensure that the thread will be complete
$parent = Item::selectFirst(['parent'], ['id' => $item_id]);
if (!DBA::isResult($parent)) {
}
/**
- * @brief: Decodes incoming Diaspora message in the new format
+ * Decodes incoming Diaspora message in the new format
*
* @param string $raw raw post message
* @param string $privKey The private key of the importer
}
/**
- * @brief: Decodes incoming Diaspora message in the deprecated format
+ * Decodes incoming Diaspora message in the deprecated format
*
* @param string $xml urldecoded Diaspora salmon
* @param string $privKey The private key of the importer
*/
public static function dispatchPublic($msg)
{
- $enabled = intval(Config::get("system", "diaspora_enabled"));
+ $enabled = intval(DI::config()->get("system", "diaspora_enabled"));
if (!$enabled) {
Logger::log("diaspora is disabled");
return false;
public static function fetchByURL($url, $uid = 0)
{
// Check for Diaspora (and Friendica) typical paths
- if (!preg_match("=(https?://.+)/(?:posts|display)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) {
+ if (!preg_match("=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) {
+ Logger::info('Invalid url', ['url' => $url]);
return false;
}
$item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
if (DBA::isResult($item)) {
+ Logger::info('Found', ['id' => $item['id']]);
return $item['id'];
}
- self::storeByGuid($guid, $matches[1], $uid);
+ Logger::info('Fetch GUID from origin', ['guid' => $guid, 'server' => $matches[1]]);
+ $ret = self::storeByGuid($guid, $matches[1], $uid);
+ Logger::info('Result', ['ret' => $ret]);
$item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
if (DBA::isResult($item)) {
+ Logger::info('Found', ['id' => $item['id']]);
return $item['id'];
} else {
+ Logger::info('Not found', ['guid' => $guid, 'uid' => $uid]);
return false;
}
}
*
* @return bool is it a hubzilla server?
*/
- public static function isRedmatrix($url)
+ private static function isHubzilla($url)
{
- return(strstr($url, "/channel/"));
+ return(strstr($url, '/channel/'));
}
/**
private static function plink($addr, $guid, $parent_guid = '')
{
$contact = Contact::getDetailsByAddr($addr);
+ if (empty($contact)) {
+ Logger::info('No contact data for address', ['addr' => $addr]);
+ return '';
+ }
- // Fallback
- if (!$contact) {
- if ($parent_guid != '') {
- return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
- } else {
- return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
+ if (empty($contact['baseurl'])) {
+ $contact['baseurl'] = 'https://' . substr($addr, strpos($addr, '@') + 1);
+ Logger::info('Create baseurl from address', ['baseurl' => $contact['baseurl'], 'url' => $contact['url']]);
+ }
+
+ $platform = '';
+ $gserver = DBA::selectFirst('gserver', ['platform'], ['nurl' => Strings::normaliseLink($contact['baseurl'])]);
+ if (!empty($gserver['platform'])) {
+ $platform = strtolower($gserver['platform']);
+ Logger::info('Detected platform', ['platform' => $platform, 'url' => $contact['url']]);
+ }
+
+ if (!in_array($platform, ['diaspora', 'friendica', 'hubzilla', 'socialhome'])) {
+ if (self::isHubzilla($contact['url'])) {
+ Logger::info('Detected unknown platform as Hubzilla', ['platform' => $platform, 'url' => $contact['url']]);
+ $platform = 'hubzilla';
+ } elseif ($contact['network'] == Protocol::DFRN) {
+ Logger::info('Detected unknown platform as Friendica', ['platform' => $platform, 'url' => $contact['url']]);
+ $platform = 'friendica';
}
}
- if ($contact["network"] == Protocol::DFRN) {
- return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/");
+ if ($platform == 'friendica') {
+ return str_replace('/profile/' . $contact['nick'] . '/', '/display/' . $guid, $contact['url'] . '/');
+ }
+
+ if ($platform == 'hubzilla') {
+ return $contact['baseurl'] . '/item/' . $guid;
+ }
+
+ if ($platform == 'socialhome') {
+ return $contact['baseurl'] . '/content/' . $guid;
}
- if (self::isRedmatrix($contact["url"])) {
- return $contact["url"] . "/?mid=" . $guid;
+ if ($platform != 'diaspora') {
+ Logger::info('Unknown platform', ['platform' => $platform, 'url' => $contact['url']]);
+ return '';
}
if ($parent_guid != '') {
- return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
+ return $contact['baseurl'] . '/posts/' . $parent_guid . '#' . $guid;
} else {
- return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
+ return $contact['baseurl'] . '/posts/' . $guid;
}
}
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
$datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
-
$body = Markdown::toBBCode($text);
$datarray["body"] = self::replacePeopleGuid($body, $person["url"]);
return false;
}
- $item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
+ $item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
if (!DBA::isResult($item)) {
Logger::log('Item not found, no origin or private: '.$parent_guid);
return false;
$name = XML::unescape($data->first_name).((strlen($data->last_name)) ? " ".XML::unescape($data->last_name) : "");
$image_url = XML::unescape($data->image_url);
$birthday = XML::unescape($data->birthday);
- $gender = XML::unescape($data->gender);
$about = Markdown::toBBCode(XML::unescape($data->bio));
$location = Markdown::toBBCode(XML::unescape($data->location));
$searchable = (XML::unescape($data->searchable) == "true");
}
$fields = ['name' => $name, 'location' => $location,
- 'name-date' => DateTimeFormat::utcNow(),
- 'about' => $about, 'gender' => $gender,
+ 'name-date' => DateTimeFormat::utcNow(), 'about' => $about,
'addr' => $author, 'nick' => $nick, 'keywords' => $keywords,
'unsearchable' => !$searchable, 'sensitive' => $nsfw];
$gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2,
"photo" => $image_url, "name" => $name, "location" => $location,
- "about" => $about, "birthday" => $birthday, "gender" => $gender,
+ "about" => $about, "birthday" => $birthday,
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
"hide" => !$searchable, "nsfw" => $nsfw];
// Do we already have this item?
$fields = ['body', 'title', 'attach', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
'author-name', 'author-link', 'author-avatar'];
- $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
+ $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
$item = Item::selectFirst($fields, $condition);
if (DBA::isResult($item)) {
if ($stored) {
$fields = ['body', 'title', 'attach', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
'author-name', 'author-link', 'author-avatar'];
- $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
+ $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
$item = Item::selectFirst($fields, $condition);
if (DBA::isResult($item)) {
$datarray["app"] = $original_item["app"];
$datarray["plink"] = self::plink($author, $guid);
- $datarray["private"] = (($public == "false") ? 1 : 0);
+ $datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC);
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
$datarray["object-type"] = $original_item["object-type"];
continue;
}
- Item::delete(['id' => $item['id']]);
+ Item::markForDeletion(['id' => $item['id']]);
Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], Logger::DEBUG);
}
$datarray["object-type"] = Activity\ObjectType::NOTE;
// Add OEmbed and other information to the body
- if (!self::isRedmatrix($contact["url"])) {
+ if (!self::isHubzilla($contact["url"])) {
$body = add_page_info_to_body($body, false, true);
}
}
}
$datarray["plink"] = self::plink($author, $guid);
- $datarray["private"] = (($public == "false") ? 1 : 0);
+ $datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC);
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
if (isset($address["address"])) {
*/
private static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "")
{
- $enabled = intval(Config::get("system", "diaspora_enabled"));
+ $enabled = intval(DI::config()->get("system", "diaspora_enabled"));
if (!$enabled) {
return 200;
}
Logger::log("transmit: ".$logid."-".$guid." ".$dest_url);
- if (!intval(Config::get("system", "diaspora_test"))) {
+ if (!intval(DI::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]);
private static function sendParticipation(array $contact, array $item)
{
// Don't send notifications for private postings
- if ($item['private']) {
+ if ($item['private'] == Item::PRIVATE) {
return;
}
$myaddr = self::myHandle($owner);
- $public = ($item["private"] ? "false" : "true");
+ $public = ($item["private"] == Item::PRIVATE ? "false" : "true");
$created = DateTimeFormat::utc($item['received'], DateTimeFormat::ATOM);
$edited = DateTimeFormat::utc($item["edited"] ?? $item["created"], DateTimeFormat::ATOM);
// Detect a share element and do a reshare
- if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
+ if (($item['private'] != Item::PRIVATE) && ($ret = self::isReshare($item["body"]))) {
$message = ["author" => $myaddr,
"guid" => $item["guid"],
"created_at" => $created,
if (
$item['author-id'] != $thread_parent_item['author-id']
&& (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
- && !Config::get('system', 'disable_implicit_mentions')
+ && !DI::config()->get('system', 'disable_implicit_mentions')
) {
$body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']);
}
FROM `profile`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid`
- WHERE `user`.`uid` = %d AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
+ WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
intval($uid)
);
$large = DI::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
$medium = DI::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
$small = DI::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg';
- $searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false');
+ $searchable = ($profile['net-publish'] ? 'true' : 'false');
$dob = null;
$about = null;
$dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
}
- $about = $profile['about'];
- $about = strip_tags(BBCode::convert($about));
+ $about = BBCode::toMarkdown($profile['about']);
$location = Profile::formatLocation($profile);
$tags = '';
"image_url_medium" => $medium,
"image_url_small" => $small,
"birthday" => $dob,
- "gender" => $profile['gender'],
"bio" => $about,
"location" => $location,
"searchable" => $searchable,
projects / friendica.git / blobdiff