use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\XML;
$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '"[/attach]';
}
- $tags = '';
$taglist = [];
$categories = $xpath->query("category", $entry);
foreach ($categories AS $category) {
- $hashtag = $category->nodeValue;
- if ($tags != '') {
- $tags .= ', ';
- }
-
- $taglink = "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
- $tags .= $taglink;
- $taglist[] = $hashtag;
+ $taglist[] = $category->nodeValue;
}
$body = trim(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
// We always strip the title since it will be added in the page information
$item["title"] = "";
- $item["body"] = $item["body"] . add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
- $item["tag"] = add_page_keywords($item["plink"], $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
- $taglist = add_page_keywords($item["plink"], $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"], true);
+ $item["body"] = $item["body"] . add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"]);
+ $taglist = get_page_keywords($item["plink"], $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"]);
$item["object-type"] = Activity\ObjectType::BOOKMARK;
unset($item["attach"]);
} else {
}
if (!empty($contact["fetch_further_information"]) && ($contact["fetch_further_information"] == 3)) {
- if (!empty($tags)) {
- $item["tag"] = $tags;
- } else {
- // @todo $preview is never set in this case, is it intended? - @MrPetovan 2018-02-13
- $item["tag"] = add_page_keywords($item["plink"], $preview, true, $contact["ffi_keyword_blacklist"]);
- $taglist = add_page_keywords($item["plink"], $preview, true, $contact["ffi_keyword_blacklist"], true);
+ if (empty($taglist)) {
+ $taglist = get_page_keywords($item["plink"], $preview, true, $contact["ffi_keyword_denylist"]);
}
- $item["body"] .= "\n" . $item['tag'];
+ $item["body"] .= "\n" . self::tagToString($taglist);
} else {
$taglist = [];
}
$notify = PRIORITY_MEDIUM;
}
- $id = Item::insert($item, false, $notify);
+ $id = Item::insert($item, $notify);
Logger::info("Feed for contact " . $contact["url"] . " stored under id " . $id);
if (!empty($id) && !empty($taglist)) {
$feeditem = Item::selectFirst(['uri-id'], ['id' => $id]);
foreach ($taglist as $tag) {
- $fields = ['uri-id' => $feeditem['uri-id'], 'name' => substr($tag, 0, 64), 'type' => Term::HASHTAG];
- DBA::insert('tag', $fields, true);
-
- Logger::info('Stored tag', ['uri-id' => $feeditem['uri-id'], 'tag' => $tag, 'fields' => $fields]);
+ Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag);
}
}
}
return ["header" => $author, "items" => $items];
}
+ /**
+ * Convert a tag array to a tag string
+ *
+ * @param array $tags
+ * @return string tag string
+ */
+ private static function tagToString(array $tags)
+ {
+ $tagstr = '';
+
+ foreach ($tags as $tag) {
+ if ($tagstr != "") {
+ $tagstr .= ", ";
+ }
+
+ $tagstr .= "#[url=" . DI::baseUrl() . "/search?tag=" . urlencode($tag) . "]" . $tag . "[/url]";
+ }
+
+ return $tagstr;
+ }
+
private static function titleIsBody($title, $body)
{
$title = strip_tags($title);