aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-10-13 14:27:54 +0200
committerMario <mario@mariovavti.com>2019-10-13 14:27:54 +0200
commit5edeb0250b1fe1cb6b8e89282b661ab13025e7f0 (patch)
tree267890115e46cf3e9d5ab974a35f36dc7ae046b8 /Zotlabs/Module
parentbef5324feafc1f12d0804a769c4dca4f8295d274 (diff)
downloadvolse-hubzilla-5edeb0250b1fe1cb6b8e89282b661ab13025e7f0.tar.gz
volse-hubzilla-5edeb0250b1fe1cb6b8e89282b661ab13025e7f0.tar.bz2
volse-hubzilla-5edeb0250b1fe1cb6b8e89282b661ab13025e7f0.zip
Revert "Remove visible channels list from pubstream tags cloud creation procedure"
This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Articles.php12
-rw-r--r--Zotlabs/Module/Channel.php21
2 files changed, 15 insertions, 18 deletions
diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php
index ca132c01e..e3ad54be8 100644
--- a/Zotlabs/Module/Articles.php
+++ b/Zotlabs/Module/Articles.php
@@ -9,6 +9,7 @@ use Zotlabs\Lib\PermissionDescription;
require_once('include/channel.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
+require_once('include/opengraph.php');
class Articles extends Controller {
@@ -192,7 +193,7 @@ class Articles extends Controller {
$parents_str = ids_to_querystr($r,'id');
- $items = q("SELECT item.*, item.id AS item_id
+ $r = q("SELECT item.*, item.id AS item_id
FROM item
WHERE item.uid = %d $item_normal
AND item.parent IN ( %s )
@@ -200,15 +201,18 @@ class Articles extends Controller {
intval(App::$profile['profile_uid']),
dbesc($parents_str)
);
- if($items) {
- xchan_query($items);
- $items = fetch_post_tags($items, true);
+ if($r) {
+ xchan_query($r);
+ $items = fetch_post_tags($r, true);
$items = conv_sort($items,'updated');
}
else
$items = [];
}
+ // Add Opengraph markup
+ opengraph_add_meta(((! empty($items)) ? $r[0] : array()), App::$profile);
+
$mode = 'articles';
if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index b1639b213..3f617fd18 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -13,6 +13,7 @@ require_once('include/items.php');
require_once('include/security.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
+require_once('include/opengraph.php');
/**
@@ -111,17 +112,6 @@ class Channel extends Controller {
// we start loading content
profile_load($which,$profile);
-
- App::$page['htmlhead'] .= '<meta property="og:title" content="' . htmlspecialchars($channel['channel_name']) . '">' . "\r\n";
- App::$page['htmlhead'] .= '<meta property="og:image" content="' . $channel['xchan_photo_l'] . '">' . "\r\n";
-
- if(App::$profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) {
- App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(App::$profile['about']) . '">' . "\r\n";
- }
- else {
- App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(sprintf( t('This is the home page of %s.'), $channel['channel_name'])) . '">' . "\r\n";
- }
-
}
function get($update = 0, $load = false) {
@@ -362,7 +352,7 @@ class Channel extends Controller {
$parents_str = ids_to_querystr($r,'item_id');
- $items = q("SELECT item.*, item.id AS item_id
+ $r = q("SELECT item.*, item.id AS item_id
FROM item
WHERE item.uid = %d $item_normal
AND item.parent IN ( %s )
@@ -371,8 +361,8 @@ class Channel extends Controller {
dbesc($parents_str)
);
- xchan_query($items);
- $items = fetch_post_tags($items, true);
+ xchan_query($r);
+ $items = fetch_post_tags($r, true);
$items = conv_sort($items,$ordering);
if($load && $mid && (! count($items))) {
@@ -385,6 +375,9 @@ class Channel extends Controller {
$items = array();
}
+ // Add Opengraph markup
+ opengraph_add_meta((isset($decoded) && (! empty($items)) ? $r[0] : array()), App::$profile);
+
if((! $update) && (! $load)) {
if($decoded)