aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2024-01-19 20:10:50 +0000
committerMario <mario@mariovavti.com>2024-01-19 20:10:50 +0000
commitfa4ab45692e5deaee3a51408a43c00a834f99903 (patch)
treec65ffa9cac472857eb8f45fa10c304fffc1389eb /Zotlabs
parent9cc85adf4734aec5bdaf7057b5885849a40c4340 (diff)
downloadvolse-hubzilla-fa4ab45692e5deaee3a51408a43c00a834f99903.tar.gz
volse-hubzilla-fa4ab45692e5deaee3a51408a43c00a834f99903.tar.bz2
volse-hubzilla-fa4ab45692e5deaee3a51408a43c00a834f99903.zip
native repeats continued
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php42
-rw-r--r--Zotlabs/Lib/ActivityStreams.php2
-rw-r--r--Zotlabs/Lib/Enotify.php28
-rw-r--r--Zotlabs/Lib/Libzot.php31
-rw-r--r--Zotlabs/Lib/ThreadItem.php39
-rw-r--r--Zotlabs/Module/Like.php4
-rw-r--r--Zotlabs/Module/Share.php2
7 files changed, 92 insertions, 56 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 61c36dc04..2bf8543b2 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -59,13 +59,16 @@ class Activity {
"select *, id as item_id from item where mid = '%s' and item_wall = 1 $item_normal $sql_extra",
dbesc($url)
);
+
if ($j) {
xchan_query($j, true);
$items = fetch_post_tags($j);
}
+
if ($items) {
return self::encode_item(array_shift($items), true);
}
+
return null;
}
@@ -537,7 +540,7 @@ class Activity {
}
}
- if (intval($i['item_wall']) && $i['mid'] === $i['parent_mid']) {
+ if (intval($i['item_wall'])) {
$ret['commentPolicy'] = map_scope(PermissionLimits::Get($i['uid'], 'post_comments'));
}
@@ -1586,8 +1589,7 @@ class Activity {
}
public static function drop($channel, $observer, $act) {
- $r = q(
- "select * from item where mid = '%s' and uid = %d limit 1",
+ $r = q("select * from item where mid = '%s' and uid = %d limit 1",
dbesc((is_array($act->obj)) ? $act->obj['id'] : $act->obj),
intval($channel['channel_id'])
);
@@ -1607,7 +1609,6 @@ class Activity {
if ($r[0]['item_wall']) {
Master::Summon(['Notifier', 'drop', $r[0]['id']]);
}
-
}
@@ -2431,6 +2432,10 @@ class Activity {
}
}
+ if ($act->type === 'Announce') {
+ $content['content'] = sprintf(t('&#x1f501; Repeated %1$s\'s %2$s'), $mention, $act->obj['type']);
+ }
+
if ($act->type === 'emojiReaction') {
$content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';');
}
@@ -3034,7 +3039,7 @@ class Activity {
// The $item['item_fetched'] flag is set in fetch_and_store_parents().
// In this case we should check against author permissions because sender is not owner.
- if (perm_is_allowed($channel['channel_id'], ((!empty($item['item_fetched'])) ? $item['author_xchan'] : $observer_hash), 'send_stream') || $is_sys_channel) {
+ if (perm_is_allowed($channel['channel_id'], ((empty($item['item_fetched'])) ? $observer_hash : $item['author_xchan']), 'send_stream') || $is_sys_channel) {
$allowed = true;
}
@@ -3162,6 +3167,10 @@ class Activity {
$fetch = false;
if (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') || $is_sys_channel) {
+ if ($item['verb'] === 'Announce') {
+ $force = true;
+ }
+
$fetch = (($fetch_parents) ? self::fetch_and_store_parents($channel, $observer_hash, $item, $force) : false);
}
@@ -3178,6 +3187,7 @@ class Activity {
return;
}
+ $item['owner_xchan'] = (($item['verb'] === 'Announce') ? $parent[0]['author_xchan'] : $parent[0]['owner_xchan']);
if ($parent[0]['parent_mid'] !== $item['parent_mid']) {
$item['thr_parent'] = $item['parent_mid'];
@@ -3236,12 +3246,6 @@ class Activity {
intval($item['uid'])
);
if ($r) {
-
- // If we already have the item, dismiss its announce
- if ($act->type === 'Announce') {
- return;
- }
-
if ($item['edited'] > $r[0]['edited']) {
$item['id'] = $r[0]['id'];
$x = item_store_update($item);
@@ -3307,6 +3311,8 @@ class Activity {
$p = [];
+ $announce_init = $item['verb'] === 'Announce';
+
$current_item = $item;
while ($current_item['parent_mid'] !== $current_item['mid']) {
@@ -3348,6 +3354,7 @@ class Activity {
$item = $hookinfo['item'];
if ($item) {
+
$item['item_fetched'] = true;
if (intval($channel['channel_system']) && intval($item['item_private'])) {
@@ -3360,9 +3367,19 @@ class Activity {
break;
}
+ if ($announce_init) {
+ // If the fetch was initiated by an announce activity
+ // do not set item fetched. This way the owner will be set to the
+ // observer -> the announce actor
+ unset($item['item_fetched']);
+ $item['verb'] = 'Announce';
+ $item['parent_mid'] = $item['mid'];
+ $item['item_thread_top'] = 1;
+ }
+
array_unshift($p, [$a, $item]);
- if ($item['parent_mid'] === $item['mid']) {
+ if ($announce_init || $item['parent_mid'] === $item['mid']) {
break;
}
}
@@ -3370,6 +3387,7 @@ class Activity {
$current_item = $item;
}
+
if ($p) {
foreach ($p as $pv) {
if ($pv[0]->is_valid()) {
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index f0fb7c9ae..0770f2040 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -345,7 +345,7 @@ class ActivityStreams {
if (!$s) {
return false;
}
- return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
+ return (in_array($s, ['Announce', 'Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact']));
}
/**
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index c3f96e103..d8e6f575a 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -149,7 +149,7 @@ class Enotify {
if(array_key_exists('item',$params)) {
- if(in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
+ if(in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_SHARE])) {
if(! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) {
logger('notification: not a visible activity. Ignoring.');
@@ -163,6 +163,9 @@ class Enotify {
if(activity_match($params['verb'], ACTIVITY_DISLIKE))
$action = (($moderated) ? t('requested to dislike') : t('disliked'));
+ if(activity_match($params['verb'], ACTIVITY_SHARE))
+ $action = t('repeated');
+
}
if($params['item']['obj_type'] === 'Answer')
@@ -835,18 +838,6 @@ class Enotify {
: (($item['obj_type'] === 'Answer') ? sprintf( t('voted on %s\'s poll'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]') : sprintf( t('commented on %s\'s post'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]'))
);
- if($item['verb'] === ACTIVITY_SHARE && empty($item['owner']['xchan_pubforum'])) {
- $itemem_text = sprintf( t('repeated %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
- }
-
- if($item['verb'] === ACTIVITY_LIKE) {
- $itemem_text = sprintf( t('liked %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
- }
-
- if($item['verb'] === ACTIVITY_DISLIKE) {
- $itemem_text = sprintf( t('disliked %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
- }
-
if(in_array($item['obj_type'], ['Document', 'Video', 'Audio', 'Image'])) {
$itemem_text = t('shared a file with you');
}
@@ -867,7 +858,6 @@ class Enotify {
// convert this logic into a json array just like the system notifications
- $who = (($item['verb'] === ACTIVITY_SHARE && empty($item['owner']['xchan_pubforum'])) ? 'owner' : 'author');
$body = html2plain(bbcode($item['body'], ['drop_media' => true, 'tryoembed' => false]), 75, true);
if ($body) {
$body = htmlentities($body, ENT_QUOTES, 'UTF-8', false);
@@ -875,10 +865,10 @@ class Enotify {
$x = array(
'notify_link' => $item['llink'],
- 'name' => $item[$who]['xchan_name'],
- 'addr' => $item[$who]['xchan_addr'] ? $item[$who]['xchan_addr'] : $item[$who]['xchan_url'],
- 'url' => $item[$who]['xchan_url'],
- 'photo' => $item[$who]['xchan_photo_s'],
+ 'name' => $item['author']['xchan_name'],
+ 'addr' => $item['author']['xchan_addr'] ? $item['author']['xchan_addr'] : $item['author']['xchan_url'],
+ 'url' => $item['author']['xchan_url'],
+ 'photo' => $item['author']['xchan_photo_s'],
'when' => (($edit) ? datetime_convert('UTC', date_default_timezone_get(), $item['edited']) : datetime_convert('UTC', date_default_timezone_get(), $item['created'])),
'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'),
'b64mid' => (($item['mid']) ? gen_link_id($item['mid']) : ''),
@@ -887,7 +877,7 @@ class Enotify {
'message' => bbcode(escape_tags($itemem_text)),
'body' => $body,
// these are for the superblock addon
- 'hash' => $item[$who]['xchan_hash'],
+ 'hash' => $item['author']['xchan_hash'],
'uid' => $item['uid'],
'display' => true
);
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 0d11704f1..be1ca15c0 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1204,7 +1204,6 @@ class Libzot {
// @fixme;
$deliveries = self::public_recips($env, $AS);
-
}
$deliveries = array_unique($deliveries);
@@ -1225,10 +1224,6 @@ class Libzot {
$author_url = $AS->actor['id'];
- if ($AS->type === 'Announce') {
- $author_url = Activity::get_attributed_to_actor_url($AS);
- }
-
$r = Activity::get_actor_hublocs($author_url);
if (!$r) {
@@ -1650,9 +1645,12 @@ class Libzot {
}
}
- } elseif ($permit_mentions) {
+ }
+ elseif ($permit_mentions) {
$allowed = true;
}
+
+
}
if ($request) {
@@ -1731,11 +1729,15 @@ class Libzot {
// the top level post is unlikely to be imported and
// this is just an exercise in futility.
- if (perm_is_allowed($channel['channel_id'], $sender, 'send_stream')) {
- Master::Summon(['Zotconvo', $channel['channel_id'], $arr['parent_mid']]);
+ if ($arr['verb'] === 'Announce') {
+ Activity::fetch_and_store_parents($channel, $sender, $arr, true);
+ }
+ else {
+ if (perm_is_allowed($channel['channel_id'], $sender, 'send_stream')) {
+ Master::Summon(['Zotconvo', $channel['channel_id'], $arr['parent_mid']]);
+ }
+ continue;
}
-
- continue;
}
if ($r[0]['obj_type'] === 'Question') {
@@ -1758,6 +1760,8 @@ class Libzot {
// so just set the owner and route accordingly.
$arr['route'] = $r[0]['route'];
$arr['owner_xchan'] = $r[0]['owner_xchan'];
+
+
}
else {
@@ -1841,13 +1845,6 @@ class Libzot {
);
if ($r) {
- // We already have this post.
- // Dismiss its announce
- if ($act->type === 'Announce') {
- $DR->update('update ignored');
- $result[] = $DR->get();
- continue;
- }
$item_id = $r[0]['id'];
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 3cdb59e5f..e7d6e33f8 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -196,9 +196,14 @@ class ThreadItem {
$attend = null;
// process action responses - e.g. like/dislike/attend/agree/whatever
- $response_verbs = array('like');
- if(feature_enabled($conv->get_profile_owner(),'dislike'))
+ $response_verbs[] = 'like';
+
+ if(feature_enabled($conv->get_profile_owner(),'dislike')) {
$response_verbs[] = 'dislike';
+ }
+
+ $response_verbs[] = 'announce';
+
if(in_array($item['obj_type'], ['Event', ACTIVITY_OBJ_EVENT])) {
$response_verbs[] = 'attendyes';
$response_verbs[] = 'attendno';
@@ -224,6 +229,8 @@ class ThreadItem {
$my_responses[$v] = ((isset($conv_responses[$v][$item['mid'] . '-m'])) ? 1 : 0);
}
+/*
+
$like_count = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid']] : '');
$like_list = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : '');
if (($like_list) && (count($like_list) > MAX_LIKERS)) {
@@ -234,6 +241,16 @@ class ThreadItem {
}
$like_button_label = tt('Like','Likes',$like_count,'noun');
+ $repeat_count = ((x($conv_responses['announce'],$item['mid'])) ? $conv_responses['announce'][$item['mid']] : '');
+ $repeat_list = ((x($conv_responses['announce'],$item['mid'])) ? $conv_responses['announce'][$item['mid'] . '-l'] : '');
+ if (($repeat_list) && (count($repeat_list) > MAX_LIKERS)) {
+ $repeat_list_part = array_slice($repeat_list, 0, MAX_LIKERS);
+ array_push($repeat_list_part, '<a class="dropdown-item" href="#" data-toggle="modal" data-target="#repeatModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
+ } else {
+ $repeat_list_part = '';
+ }
+ $repeat_button_label = tt('Repeat','Repeats',$repeat_count,'noun');
+
$showdislike = '';
if (feature_enabled($conv->get_profile_owner(),'dislike')) {
$dislike_count = ((x($conv_responses['dislike'],$item['mid'])) ? $conv_responses['dislike'][$item['mid']] : '');
@@ -250,6 +267,7 @@ class ThreadItem {
}
$showlike = ((x($conv_responses['like'],$item['mid'])) ? format_like($conv_responses['like'][$item['mid']],$conv_responses['like'][$item['mid'] . '-l'],'like',$item['mid']) : '');
+*/
/*
* We should avoid doing this all the time, but it depends on the conversation mode
@@ -483,19 +501,29 @@ class ThreadItem {
'markseen' => t('Mark all seen'),
'responses' => $responses,
'my_responses' => $my_responses,
+ /*
'like_count' => $like_count,
'like_list' => $like_list,
'like_list_part' => $like_list_part,
'like_button_label' => $like_button_label,
'like_modal_title' => t('Likes','noun'),
+
+ 'repeat_count' => $repeat_count,
+ 'repeat_list' => $repeat_list,
+ 'repeat_list_part' => $repeat_list_part,
+ 'repeat_button_label' => $repeat_button_label,
+ 'repeat_modal_title' => t('Repeats','noun'),
+
+
'dislike_modal_title' => t('Dislikes','noun'),
'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
'dislike_list_part' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''),
'dislike_button_label' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''),
+*/
'modal_dismiss' => t('Close'),
- 'showlike' => $showlike,
- 'showdislike' => $showdislike,
+ // 'showlike' => $showlike,
+ // 'showdislike' => $showdislike,
'comment' => ($item['item_delayed'] ? '' : $this->get_comment_box()),
'previewing' => ($conv->is_preview() ? true : false ),
'preview_lbl' => t('This is an unsaved preview'),
@@ -507,7 +535,8 @@ class ThreadItem {
'moderate' => ($item['item_blocked'] == ITEM_MODERATED),
'moderate_approve' => t('Approve'),
'moderate_delete' => t('Delete'),
- 'rtl' => in_array($item['lang'], rtl_languages())
+ 'rtl' => in_array($item['lang'], rtl_languages()),
+
);
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 54daf6471..4dd43b682 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -21,6 +21,7 @@ class Like extends Controller {
$acts = [
'like' => ACTIVITY_LIKE,
'dislike' => ACTIVITY_DISLIKE,
+ 'announce' => ACTIVITY_SHARE,
'agree' => ACTIVITY_AGREE,
'disagree' => ACTIVITY_DISAGREE,
'abstain' => ACTIVITY_ABSTAIN,
@@ -71,11 +72,12 @@ class Like extends Controller {
$activities = q("SELECT item.*, item.id AS item_id FROM item
WHERE uid = %d $item_normal
AND thr_parent = '%s'
- AND verb IN ('%s', '%s', '%s', '%s', '%s')",
+ AND verb IN ('%s', '%s', '%s', '%s', '%s', '%s')",
intval($arr['item']['uid']),
dbesc($arr['item']['mid']),
dbesc(ACTIVITY_LIKE),
dbesc(ACTIVITY_DISLIKE),
+ dbesc(ACTIVITY_SHARE),
dbesc(ACTIVITY_ATTEND),
dbesc(ACTIVITY_ATTENDNO),
dbesc(ACTIVITY_ATTENDMAYBE)
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index eb22b5802..248126f7f 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -123,7 +123,7 @@ class Share extends \Zotlabs\Web\Controller {
call_hooks('post_local_end', $arr);
- info( t('Post repeated') . EOL);
+ // info( t('Post repeated') . EOL);
$r = q("select * from item where id = %d",
intval($post_id)