use Friendica\Model\Conversation;
use Friendica\Model\GContact;
use Friendica\Model\Item;
+use Friendica\Model\ItemURI;
use Friendica\Model\ItemDeliveryData;
use Friendica\Model\Mail;
use Friendica\Model\Profile;
+use Friendica\Model\Tag;
+use Friendica\Model\Term;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
}
// All tags of the current post
- $condition = ['otype' => TERM_OBJ_POST, 'type' => TERM_HASHTAG, 'oid' => $parent['parent']];
+ $condition = ['otype' => Term::OBJECT_TYPE_POST, 'type' => Term::HASHTAG, 'oid' => $parent['parent']];
$tags = DBA::select('term', ['term'], $condition);
$taglist = [];
while ($tag = DBA::fetch($tags)) {
*/
public static function participantsForThread($thread, array $contacts)
{
- $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`url`, `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`
- WHERE `participation`.`iid` = ? AND NOT `contact`.`archive`", $thread);
-
- while ($contact = DBA::fetch($r)) {
- if (!empty($contact['fnetwork'])) {
- $contact['network'] = $contact['fnetwork'];
- }
- unset($contact['fnetwork']);
+ $participation = DBA::select('participation-view', [], ['iid' => $thread]);
+ while ($contact = DBA::fetch($participation)) {
if (empty($contact['protocol'])) {
$contact['protocol'] = $contact['network'];
}
- if (empty($contact['batch']) && !empty($contact['fbatch'])) {
- $contact['batch'] = $contact['fbatch'];
- }
- unset($contact['fbatch']);
-
$exists = false;
foreach ($contacts as $entry) {
if ($entry['batch'] == $contact['batch']) {
$contacts[] = $contact;
}
}
- DBA::close($r);
+
+ DBA::close($participation);
return $contacts;
}
*/
private static function verifyMagicEnvelope($envelope)
{
- $basedom = XML::parseString($envelope);
+ $basedom = XML::parseString($envelope, true);
if (!is_object($basedom)) {
Logger::log("Envelope is no XML file");
$xml = $raw;
}
- $basedom = XML::parseString($xml);
+ $basedom = XML::parseString($xml, true);
if (!is_object($basedom)) {
Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);
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;
}
}
return false;
}
+ /**
+ * Store the mentions in the tag table
+ *
+ * @param integer $uriid
+ * @param string $text
+ */
+ private static function storeMentions(int $uriid, string $text)
+ {
+ preg_match_all('/([@!]){(?:([^}]+?); ?)?([^} ]+)}/', $text, $matches, PREG_SET_ORDER);
+ if (empty($matches)) {
+ return;
+ }
+
+ /*
+ * Matching values for the preg match
+ * [1] = mention type (@ or !)
+ * [2] = name (optional)
+ * [3] = profile URL
+ */
+
+ foreach ($matches as $match) {
+ if (empty($match)) {
+ continue;
+ }
+
+ $person = self::personByHandle($match[3]);
+ if (empty($person)) {
+ continue;
+ }
+
+ Tag::storeByHash($uriid, $match[1], $person['name'] ?: $person['nick'], $person['url']);
+ }
+ }
+
/**
* Processes an incoming comment
*
$datarray["guid"] = $guid;
$datarray["uri"] = self::getUriFromGuid($author, $guid);
+ $datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
$datarray["verb"] = Activity::POST;
$datarray["gravity"] = GRAVITY_COMMENT;
$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"]);
+ self::storeMentions($datarray['uri-id'], $text);
+ Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
+
self::fetchGuid($datarray);
// If we are the origin of the parent we store the original data.
$datarray["guid"] = $guid;
$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
+ $datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
$datarray["verb"] = Activity::POST;
$datarray["gravity"] = GRAVITY_PARENT;
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
+ /// @todo Copy tag data from original post
+
$prefix = share_header(
$original_item["author-name"],
$original_item["author-link"],
$datarray["body"] = $prefix.$original_item["body"]."[/share]";
+ Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
+
$datarray["tag"] = $original_item["tag"];
$datarray["attach"] = $original_item["attach"];
$datarray["app"] = $original_item["app"];
$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["guid"] = $guid;
$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
+ $datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
$datarray["verb"] = Activity::POST;
$datarray["gravity"] = GRAVITY_PARENT;
$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
+ self::storeMentions($datarray['uri-id'], $text);
+ Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
+
if ($provider_display_name != "") {
$datarray["app"] = $provider_display_name;
}
Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG);
- // Old way - is used by the internal Friendica functions
- /// @todo Change all signatur storing functions to the new format
- if ($item['signed_text'] && $item['signature'] && $item['signer']) {
- $message = self::messageFromSignature($item);
- } else {// New way
- $msg = json_decode($item['signed_text'], true);
-
- $message = [];
- if (is_array($msg)) {
- foreach ($msg as $field => $data) {
- if (!$item["deleted"]) {
- if ($field == "diaspora_handle") {
- $field = "author";
- }
- if ($field == "target_type") {
- $field = "parent_type";
- }
- }
+ $msg = json_decode($item['signed_text'], true);
- $message[$field] = $data;
+ $message = [];
+ if (is_array($msg)) {
+ foreach ($msg as $field => $data) {
+ if (!$item["deleted"]) {
+ if ($field == "diaspora_handle") {
+ $field = "author";
+ }
+ if ($field == "target_type") {
+ $field = "parent_type";
+ }
}
- } else {
- Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
+
+ $message[$field] = $data;
}
+ } else {
+ Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
}
$message["parent_author_signature"] = self::signature($owner, $message);
*/
private static function createProfileData($uid)
{
- $r = q(
- "SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
- FROM `profile`
- INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
- INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid`
- WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
- intval($uid)
- );
-
- if (!$r) {
+ $profile = DBA::selectFirst('owner-view', ['uid', 'addr', 'name', 'location', 'net-publish', 'dob', 'about', 'pub_keywords'], ['uid' => $uid]);
+ if (!DBA::isResult($profile)) {
return [];
}
- $profile = $r[0];
$handle = $profile["addr"];
$split_name = self::splitName($profile['name']);
$about = BBCode::toMarkdown($profile['about']);
- $location = Profile::formatLocation($profile);
+ $location = $profile['location'];
$tags = '';
if ($profile['pub_keywords']) {
$kw = str_replace(',', ' ', $profile['pub_keywords']);
projects / friendica.git / blobdiff