jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge branch 'hotfix/0.0.11.9' into develop

Browse source
This commit is contained in:
Jonny Barnes 2016-09-21 19:57:00 +01:00
commit 856d98391a
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/NotesController.php
View file

@ -77,6 +77,7 @@ class NotesController extends Controller
$replies = [];
$reposts = [];
$likes = [];
$carbon = new Carbon\Carbon();
foreach ($note->webmentions as $webmention) {
/*
reply->url |
@ -96,7 +97,7 @@ class NotesController extends Controller
like->photo | Author
like->name |
*/
$microformats = json_decode($webmention->mf2);
$microformats = json_decode($webmention->mf2, true);
$authorHCard = $authorship->findAuthor($microformats);
$content['url'] = $authorHCard['properties']['url'][0];
$content['photo'] = $this->createPhotoLink($authorHCard['properties']['photo'][0]);
@ -104,13 +105,13 @@ class NotesController extends Controller
switch ($webmention->type) {
case 'in-reply-to':
$content['source'] = $webmention->source;
$content['date'] = $carbon->parse($content['date'])->toDayDateTimeString();
$content['date'] = $carbon->parse($microformats['items'][0]['properties']['published'][0])->toDayDateTimeString();
$content['reply'] = $this->filterHTML($microformats['items'][0]['properties']['content'][0]['html']);
$replies[] = $content;
break;
case 'repost-of':
$content['date'] = $carbon->parse($content['date'])->toDayDateTimeString();
$content['date'] = $carbon->parse($microformats['items'][0]['properties']['published'][0])->toDayDateTimeString();
$content['source'] = $webmention->source;
$reposts[] = $content;
break;

3
changelog.md
View file

@ -1,5 +1,8 @@
# Changelog
## Version 0.0.11.9 (2016-09-21)
- Fix: Correctly parse microformats data for single note view
## Version 0.0.11.8 (2016-09-21)
- Fix: remove index.html from generated url