aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Lib/ThreadStream.php4
-rw-r--r--Zotlabs/Module/Hq.php19
-rw-r--r--Zotlabs/Module/Ping.php2
-rw-r--r--include/conversation.php6
-rw-r--r--view/js/main.js1
-rw-r--r--view/js/mod_hq.js12
-rw-r--r--view/pdl/mod_hq.pdl3
7 files changed, 37 insertions, 10 deletions
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 9eebb929c..bdd2e9657 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -54,6 +54,10 @@ class ThreadStream {
$this->profile_owner = local_channel();
$this->writable = true;
break;
+ case 'hq':
+ $this->profile_owner = local_channel();
+ $this->writable = true;
+ break;
case 'channel':
$this->profile_owner = \App::$profile['profile_uid'];
$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index 78087c0f9..2795b9086 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -61,6 +61,7 @@ class Hq extends \Zotlabs\Web\Controller {
$item_hash = 'b64.' . base64url_encode($r[0]['mid']);
}
+
if(strpos($item_hash,'b64.') === 0)
$decoded = @base64url_decode(substr($item_hash,4));
if($decoded)
@@ -91,7 +92,7 @@ class Hq extends \Zotlabs\Web\Controller {
'bang' => '',
'visitor' => true,
'profile_uid' => local_channel(),
- 'return_path' => 'channel/' . $channel['channel_address'],
+ 'return_path' => 'hq',
'expanded' => true,
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
@@ -133,6 +134,8 @@ class Hq extends \Zotlabs\Web\Controller {
if(! $update && ! $load) {
+ nav_set_selected('HQ');
+
$static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1);
// if the target item is not a post (eg a like) we want to address its thread parent
@@ -143,14 +146,14 @@ class Hq extends \Zotlabs\Web\Controller {
if($decoded)
$mid = 'b64.' . base64url_encode($mid);
- $o .= '<div id="live-display"></div>' . "\r\n";
+ $o .= '<div id="live-hq"></div>' . "\r\n";
$o .= "<script> var profile_uid = " . local_channel()
. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . "; </script>\r\n";
\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[
'$baseurl' => z_root(),
- '$pgtype' => 'display',
- '$uid' => '0',
+ '$pgtype' => 'hq',
+ '$uid' => local_channel(),
'$gid' => '0',
'$cid' => '0',
'$cmin' => '0',
@@ -181,6 +184,7 @@ class Hq extends \Zotlabs\Web\Controller {
}
if($load) {
+
$r = null;
$r = q("SELECT item.id as item_id from item
@@ -198,6 +202,7 @@ class Hq extends \Zotlabs\Web\Controller {
}
elseif($update) {
+
$r = null;
$r = q("SELECT item.parent AS item_id from item
@@ -238,7 +243,7 @@ class Hq extends \Zotlabs\Web\Controller {
$items = [];
}
- $o .= conversation($items, 'display', $update, 'client');
+ $o .= conversation($items, 'hq', $update, 'client');
if($updateable) {
$x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
@@ -249,10 +254,6 @@ class Hq extends \Zotlabs\Web\Controller {
$o .= '<div id="content-complete"></div>';
- if(($update && $load) && (! $items)) {
- notice( t('Something went wrong.') . EOL );
- }
-
return $o;
}
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 406e554d1..84f9d2a21 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -496,7 +496,7 @@ class Ping extends \Zotlabs\Web\Controller {
$r = q("SELECT id, item_wall FROM item
WHERE item_unseen = 1 and uid = %d
$item_normal
- AND author_xchan != '%s' $sql_extra ",
+ AND author_xchan != '%s'",
intval(local_channel()),
dbesc($ob_hash)
);
diff --git a/include/conversation.php b/include/conversation.php
index 63d503177..70a38ee8e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -513,6 +513,12 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
}
}
+ elseif ($mode === 'hq') {
+ $profile_owner = local_channel();
+ $page_writeable = true;
+ $live_update_div = '<div id="live-hq"></div>' . "\r\n";
+ }
+
elseif ($mode === 'channel') {
$profile_owner = App::$profile['profile_uid'];
$page_writeable = ($profile_owner == local_channel());
diff --git a/view/js/main.js b/view/js/main.js
index c39d6c84c..1738ca7e9 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -437,6 +437,7 @@ function NavUpdate() {
if($('#live-channel').length) { src = 'channel'; liveUpdate(); }
if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); }
if($('#live-display').length) { src = 'display'; liveUpdate(); }
+ if($('#live-hq').length) { src = 'hq'; liveUpdate(); }
if($('#live-search').length) { src = 'search'; liveUpdate(); }
// if($('#live-cards').length) { src = 'cards'; liveUpdate(); }
// if($('#live-articles').length) { src = 'articles'; liveUpdate(); }
diff --git a/view/js/mod_hq.js b/view/js/mod_hq.js
index 8bbd5e3ad..3ce5f1ca6 100644
--- a/view/js/mod_hq.js
+++ b/view/js/mod_hq.js
@@ -1,3 +1,15 @@
+$(document).on('click', '#jot-toggle', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ $(this).toggleClass('active');
+ $(window).scrollTop(0);
+ $('#jot-popup').toggle();
+ $('#profile-jot-text').focus();
+
+});
+
+
function hqLiveUpdate(notify_id) {
if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */
diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl
index e657fa88b..450fcb9a7 100644
--- a/view/pdl/mod_hq.pdl
+++ b/view/pdl/mod_hq.pdl
@@ -1,3 +1,6 @@
+[region=aside]
+[widget=hq_controls][/widget]
+[/region]
[region=right_aside]
[widget=notifications][/widget]
[/region]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:40:30 +0000