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

photo object compatibility revamped

Browse Source
This commit is contained in:
Mario Vavti 2015-10-22 10:56:24 +02:00
parent 96f23758b4
commit 9cbca24f7a
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/ItemObject.php
View File

@ -264,18 +264,7 @@ class Item extends BaseObject {
localize_item($item); localize_item($item);
$is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false); $body = prepare_body($item,true);
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.
@ -335,8 +324,6 @@ 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,

9
include/text.php
View File

@ -1440,12 +1440,19 @@ function generate_named_map($location) {
function prepare_body(&$item,$attach = false) { function prepare_body(&$item,$attach = false) {
require_once('include/identity.php');
call_hooks('prepare_body_init', $item); call_hooks('prepare_body_init', $item);
unobscure($item); unobscure($item);
$s = prepare_text($item['body'],$item['mimetype']); $is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
if($is_photo) {
$object = json_decode($item['object'],true);
$s = '<a href="' . zid(rawurldecode(get_rel_link($object['link'],'alternate'))) . '"><img style="max-width:' . $object['width'] . 'px; width:100%; height:auto;" src="'. zid(rawurldecode($object['id'])) . '"></a>';
}
$s .= prepare_text($item['body'],$item['mimetype']);
$prep_arr = array('item' => $item, 'html' => $s); $prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body', $prep_arr); call_hooks('prepare_body', $prep_arr);

5
view/tpl/conv_item.tpl
View File

@ -33,11 +33,6 @@
<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">