Merge branch 'feature/webmentino-parser-fix' into develop

This commit is contained in:
Jonny Barnes 2016-10-20 18:20:12 +01:00
commit 2f24b988be
3 changed files with 10 additions and 11 deletions

View file

@ -38,8 +38,8 @@ class SaveProfileImage implements ShouldQueue
} catch (AuthorshipParserException $e) { } catch (AuthorshipParserException $e) {
return; return;
} }
$photo = $author['properties'][0]['photo'][0]; $photo = $author['properties']['photo'][0];
$home = $author['properties'][0]['url'][0]; $home = $author['properties']['url'][0];
//dont save pbs.twimg.com links //dont save pbs.twimg.com links
if (parse_url($photo, PHP_URL_HOST) != 'pbs.twimg.com' if (parse_url($photo, PHP_URL_HOST) != 'pbs.twimg.com'
&& parse_url($photo, PHP_URL_HOST) != 'twitter.com') { && parse_url($photo, PHP_URL_HOST) != 'twitter.com') {

View file

@ -9,7 +9,7 @@
"php": ">=7.0.0", "php": ">=7.0.0",
"laravel/framework": "5.3.*", "laravel/framework": "5.3.*",
"jonnybarnes/indieweb": "dev-master", "jonnybarnes/indieweb": "dev-master",
"jonnybarnes/webmentions-parser": "dev-master", "jonnybarnes/webmentions-parser": "0.4.*",
"guzzlehttp/guzzle": "~6.0", "guzzlehttp/guzzle": "~6.0",
"predis/predis": "~1.0", "predis/predis": "~1.0",
"thujohn/twitter": "~2.0", "thujohn/twitter": "~2.0",

15
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "52f9f6e1c88cb732b6b5c0c01646cdde", "content-hash": "6109ed77e9efda6af2d9607834c88beb",
"packages": [ "packages": [
{ {
"name": "anahkiasen/underscore-php", "name": "anahkiasen/underscore-php",
@ -1485,16 +1485,16 @@
}, },
{ {
"name": "jonnybarnes/webmentions-parser", "name": "jonnybarnes/webmentions-parser",
"version": "dev-master", "version": "v0.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/jonnybarnes/webmentions-parser.git", "url": "https://github.com/jonnybarnes/webmentions-parser.git",
"reference": "087be9b61d509f20ec5808fee32bb8d40bd553ad" "reference": "111aae8fdf9fd31417865d28fe2160ad3c2a10c5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/jonnybarnes/webmentions-parser/zipball/087be9b61d509f20ec5808fee32bb8d40bd553ad", "url": "https://api.github.com/repos/jonnybarnes/webmentions-parser/zipball/111aae8fdf9fd31417865d28fe2160ad3c2a10c5",
"reference": "087be9b61d509f20ec5808fee32bb8d40bd553ad", "reference": "111aae8fdf9fd31417865d28fe2160ad3c2a10c5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1528,7 +1528,7 @@
"microformats", "microformats",
"webmentions" "webmentions"
], ],
"time": "2016-07-13T07:54:27+00:00" "time": "2016-10-20T15:48:02+00:00"
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
@ -5716,8 +5716,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"jonnybarnes/indieweb": 20, "jonnybarnes/indieweb": 20
"jonnybarnes/webmentions-parser": 20
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,