TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

make sure to store target information when decoding and indicate contained conversations with a colored border for now

Browse Source
This commit is contained in:
Mario Vavti
2024-11-09 10:55:10 +01:00
parent ebad9d56c9
commit a0c54c5f04
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Lib/Activity.php
View File

@@ -2399,6 +2399,16 @@ class Activity {
$s['obj']['actor'] = $s['obj']['actor']['id'];
}
if (is_array($act->tgt) && $act->tgt) {
if (array_key_exists('type', $act->tgt)) {
$s['tgt_type'] = self::activity_obj_mapper($act->tgt['type']);
}
// We shouldn't need to store collection contents which could be large. We will often only require the meta-data
if (isset($s['tgt_type']) && str_contains($s['tgt_type'], 'Collection')) {
$s['target'] = ['id' => $act->tgt['id'], 'type' => $s['tgt_type'], 'attributedTo' => $act->tgt['attributedTo'] ?? $act->tgt['actor']];
}
}
$generator = $act->get_property_obj('generator');
if ((!$generator) && (!$response_activity)) {
$generator = $act->get_property_obj('generator', $act->obj);

3
Zotlabs/Lib/ThreadItem.php
View File

@@ -544,7 +544,8 @@ class ThreadItem {
'moderate_delete' => t('Delete'),
'rtl' => in_array($item['lang'], rtl_languages()),
'reactions_allowed' => $reactions_allowed,
'reaction_str' => [t('Add yours'), t('Remove yours')]
'reaction_str' => [t('Add yours'), t('Remove yours')],
'is_contained' => $this->is_toplevel() && str_contains($item['tgt_type'], 'Collection')
);
$arr = array('item' => $item, 'output' => $tmp_item);

4
view/css/conversation.css
View File

@@ -96,10 +96,6 @@
/* conv_item */
.wall-item-head-new {
border-top: 0.2rem solid var(--bs-primary);
}
.wall-item-wrapper {
margin-left: .75rem;
}

8
view/theme/redbasic/css/style.css
View File

@@ -1150,6 +1150,14 @@ a .drop-icons:hover {
font-size: 1.1rem;
}
.generic-content-wrapper.is-contained {
border: 1px solid var(--bs-primary-border-subtle);
}
.generic-content-wrapper.is-new {
border-top: 2px solid var(--bs-primary);
}
.section-title-wrapper {
padding: 7px 10px;
background-color: var(--bs-tertiary-bg);

4
view/tpl/conv_item.tpl
View File

@@ -4,7 +4,7 @@
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}}
<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite{{/if}} clearfix" data-b64mids='{{$item.mids}}'>
<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite{{/if}} clearfix{{if $item.is_contained}} is-contained{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} is-new{{/if}}" data-b64mids='{{$item.mids}}'>
<a name="item_{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="rounded wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}">
@@ -26,7 +26,7 @@
<hr class="m-0">
{{/if}}
{{/if}}
<div class="p-2 wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}} clearfix">
<div class="p-2 wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}} clearfix">
<div class="lh-sm text-end float-end">
<div class="wall-item-ago opacity-75" id="wall-item-ago-{{$item.id}}">
{{if $item.location}}