harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hubzilla photo object compatibility

Browse Source
This commit is contained in:
Mario Vavti 2015-10-20 09:40:32 +02:00
parent f00887ea42
commit 96f23758b4
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/ItemObject.php
View File

@ -263,7 +263,19 @@ class Item extends BaseObject {
localize_item($item); localize_item($item);
$body = prepare_body($item,true);
$is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false);
if($is_photo) {
$object = json_decode($item['object'],true);
$photo = array(
'url' => rawurldecode($object['id']) . '?zid=' . $observer['xchan_addr'],
'link' => rawurldecode(get_rel_link($object['link'],'alternate')) . '?zid=' . $observer['xchan_addr'],
'width' => $object['width'],
'height' => $object['height']
);
}
$body .= prepare_body($item,true);
// $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
// since we can't depend on llink or plink pointing to the right local location. // since we can't depend on llink or plink pointing to the right local location.
@ -323,6 +335,8 @@ class Item extends BaseObject {
'owner_url' => $this->get_owner_url(), 'owner_url' => $this->get_owner_url(),
'owner_photo' => $this->get_owner_photo(), 'owner_photo' => $this->get_owner_photo(),
'owner_name' => $this->get_owner_name(), 'owner_name' => $this->get_owner_name(),
'is_photo' => $is_photo,
'photo' => (($is_photo) ? $photo : ''),
// Item toolbar buttons // Item toolbar buttons
'like' => $like, 'like' => $like,

5
view/tpl/conv_item.tpl
View File

@ -33,6 +33,11 @@
<div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-content" id="wall-item-content-{{$item.id}}">
<div class="wall-item-title-end"></div> <div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-{{$item.id}}" > <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
{{if $item.is_photo}}
<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
<a href="{{$item.photo.link}}"><img style="max-width:{{$item.photo.width}}px; width:100%; height:auto;" src={{$item.photo.url}}></a>
</div>
{{/if}}
{{$item.body}} {{$item.body}}
{{if $item.tags}} {{if $item.tags}}
<div class="body-tag"> <div class="body-tag">