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

fix regression when rendering event items

Browse Source
This commit is contained in:
Mario
2023-04-23 16:07:57 +00:00
parent 81f33da499
commit 3ad0179b62
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/Activity.php
View File

@@ -2215,7 +2215,7 @@ class Activity {
}
static function decode_note($act) {
//hz_syslog(print_r($act,true));
$response_activity = false;
$s = [];

4
Zotlabs/Lib/ThreadItem.php
View File

@@ -197,7 +197,7 @@ class ThreadItem {
$response_verbs = array('like');
if(feature_enabled($conv->get_profile_owner(),'dislike'))
$response_verbs[] = 'dislike';
if($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
if(in_array($item['obj_type'], ['Event', ACTIVITY_OBJ_EVENT])) {
$response_verbs[] = 'attendyes';
$response_verbs[] = 'attendno';
$response_verbs[] = 'attendmaybe';
@@ -299,7 +299,7 @@ class ThreadItem {
}
$has_event = false;
if(($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel())
if((in_array($item['obj_type'], ['Event', ACTIVITY_OBJ_EVENT])) && $conv->get_profile_owner() == local_channel())
$has_event = true;
$like = [];

2
Zotlabs/Module/Like.php
View File

@@ -451,7 +451,7 @@ class Like extends Controller {
}
else {
$post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
if ($item['obj_type'] === ACTIVITY_OBJ_EVENT)
if (in_array($item['obj_type'], ['Event', ACTIVITY_OBJ_EVENT]))
$post_type = t('event');
$obj_type = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE);

2
Zotlabs/Widget/Pinned.php
View File

@@ -67,7 +67,7 @@ class Pinned {
$conv_responses = [];
if($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
if(in_array($item['obj_type'], ['Event', ACTIVITY_OBJ_EVENT])) {
$conv_responses['attendyes'] = [ 'title' => t('Attending','title') ];
$conv_responses['attendno'] = [ 'title' => t('Not attending','title') ];
$conv_responses['attendmaybe'] = [ 'title' => t('Might attend','title') ];

2
include/event.php
View File

@@ -713,7 +713,7 @@ function event_addtocal($item_id, $uid) {
intval($channel['channel_id'])
);
if((! $r) || ($r[0]['obj_type'] !== ACTIVITY_OBJ_EVENT))
if(!$r || !in_array($r[0]['obj_type'], ['Event', ACTIVITY_OBJ_EVENT]))
return false;
$item = $r[0];

3
include/text.php
View File

@@ -1794,7 +1794,8 @@ function prepare_body(&$item,$attach = false,$opts = false) {
$s = $poll;
}
$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : []);
$event = (in_array($item['obj_type'], ['Event', ACTIVITY_OBJ_EVENT]) ? format_event_obj($item['obj']) : []);
$prep_arr = [
'item' => $item,
'html' => $event ? $event['content'] : $s,