use Friendica\Model\Mail;
use Friendica\Model\Notify\Type;
use Friendica\Model\PermissionSet;
+use Friendica\Model\Post\Category;
use Friendica\Model\Profile;
use Friendica\Model\Tag;
-use Friendica\Model\Term;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
$sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE);
- $r = q(
- "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
- FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
- DBA::escape($owner_nick)
- );
-
- if (! DBA::isResult($r)) {
+ $owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]);
+ if (!DBA::isResult($owner)) {
Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
exit();
}
- $owner = $r[0];
$owner_id = $owner['uid'];
$sql_post_table = "";
}
if (isset($category)) {
- $sql_post_table = sprintf(
- "INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
- DBA::escape(Strings::protectSprintf($category)),
- intval(Term::OBJECT_TYPE_POST),
- intval(Term::CATEGORY),
- intval($owner_id)
- );
+ $sql_post_table = sprintf("INNER JOIN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d ORDER BY `uri-id` DESC) AS `category` ON `item`.`uri-id` = `category`.`uri-id` ",
+ DBA::escape(Strings::protectSprintf($category)), intval(Category::CATEGORY), intval($owner_id));
}
if ($public_feed && ! $converse) {
}
// Only show contact details when we are allowed to
- $r = q(
- "SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
- `user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
- `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
- FROM `profile`
- INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
- WHERE NOT `user`.`hidewall` AND `user`.`uid` = %d",
- intval($owner['uid'])
- );
- if (DBA::isResult($r)) {
- $profile = $r[0];
-
+ $profile = DBA::selectFirst('owner-view',
+ ['about', 'name', 'homepage', 'nickname', 'timezone', 'locality', 'region', 'country-name', 'pub_keywords', 'xmpp', 'dob'],
+ ['uid' => $owner['uid'], 'hidewall' => false]);
+ if (DBA::isResult($profile)) {
XML::addElement($doc, $author, "poco:displayName", $profile["name"]);
XML::addElement($doc, $author, "poco:updated", $namdate);
if ($activity) {
$entry = $doc->createElement($element);
- $r = XML::parseString($activity, false);
+ $r = XML::parseString($activity);
if (!$r) {
return false;
}
$r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
// XML does need a single element as root element so we add a dummy element here
- $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
+ $data = XML::parseString("<dummy>" . $r->link . "</dummy>");
if (is_object($data)) {
foreach ($data->link as $link) {
$attributes = [];
$htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
}
- $htmlbody = BBCode::convert($htmlbody, false, 7);
+ $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS);
}
$author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
$entry->appendChild($actarg);
}
- $tags = Item::getFeedTags($item);
+ $tags = Tag::getByURIId($item['uri-id']);
- /// @TODO Combine this with similar below if() block?
if (count($tags)) {
- foreach ($tags as $t) {
- if (($type != 'html') || ($t[0] != "@")) {
- XML::addElement($doc, $entry, "category", "", ["scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]]);
+ foreach ($tags as $tag) {
+ if (($type != 'html') || ($tag['type'] == Tag::HASHTAG)) {
+ XML::addElement($doc, $entry, "category", "", ["scheme" => "X-DFRN:" . Tag::TAG_CHARACTER[$tag['type']] . ":" . $tag['url'], "term" => $tag['name']]);
}
- }
- }
-
- if (count($tags)) {
- foreach ($tags as $t) {
- if ($t[0] == "@") {
- $mentioned[$t[1]] = $t[1];
+ if ($tag['type'] != Tag::HASHTAG) {
+ $mentioned[$tag['url']] = $tag['url'];
}
}
}
}
$fields = ['title' => $item['title'] ?? '', 'body' => $item['body'] ?? '',
- 'tag' => $item['tag'] ?? '', 'changed' => DateTimeFormat::utcNow(),
+ 'changed' => DateTimeFormat::utcNow(),
'edited' => DateTimeFormat::utc($item["edited"])];
$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
if (!$verb) {
return;
}
- $xo = XML::parseString($item["object"], false);
+ $xo = XML::parseString($item["object"]);
if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
}
if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) {
- $xo = XML::parseString($item["object"], false);
- $xt = XML::parseString($item["target"], false);
+ $xo = XML::parseString($item["object"]);
+ $xt = XML::parseString($item["target"]);
if ($xt->type == Activity\ObjectType::NOTE) {
- $item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
+ $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
if (!DBA::isResult($item_tag)) {
Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
// extract tag, if not duplicate, add to parent item
if ($xo->content) {
- if (!stristr($item_tag["tag"], trim($xo->content))) {
- $tag = $item_tag["tag"] . (strlen($item_tag["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
- Item::update(['tag' => $tag], ['id' => $item_tag["id"]]);
- }
+ Tag::store($item_tag['uri-id'], Tag::HASHTAG, $xo->content);
}
}
}
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
$dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
if ($dsprsig != "") {
- $item["dsprsig"] = $dsprsig;
+ $signature = json_decode(base64_decode($dsprsig));
+ // We don't store the old style signatures anymore that also contained the "signature" and "signer"
+ if (!empty($signature->signed_text) && empty($signature->signature) && empty($signature->signer)) {
+ $item["diaspora_signed_text"] = $signature->signed_text;
+ }
}
$item["verb"] = XML::getFirstNodeValue($xpath, "activity:verb/text()", $entry);
$item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") {
- $r = XML::parseString($item["object"], false);
+ $r = XML::parseString($item["object"]);
if (isset($r->type)) {
$item["object-type"] = $r->type;
}
if (($term != "") && ($scheme != "")) {
$parts = explode(":", $scheme);
if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
- $termhash = array_shift($parts);
- $termurl = implode(":", $parts);
-
- if (!empty($item["tag"])) {
- $item["tag"] .= ",";
- } else {
- $item["tag"] = "";
- }
-
- $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
-
- Tag::storeByHash($item['uri-id'], $termhash, $term, $termurl);
+ $termurl = array_pop($parts);
+ $termurl = array_pop($parts) . $termurl;
+ Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl);
}
}
}
// Turn this into a wall post.
$notify = Item::isRemoteSelf($importer, $item);
- $posted_id = Item::insert($item, false, $notify);
+ $posted_id = Item::insert($item, $notify);
if ($notify) {
$posted_id = $notify;