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

Merge branch 'release/0.0.7'

Browse source
This commit is contained in:
Jonny Barnes 2016-07-04 16:02:19 +01:00
commit 1283afe0a5
49 changed files with 167 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -13,12 +13,10 @@ env:
- setup=basic
php:
- 7.0.6
- 7.0.7
- 7.0
- nightly
matrix:
allow_failures:
- php: 7.0.7 # A known bug in PHP 7.0.7 stops phpdbg producing code coverage reports
- php: nightly
before_install:

13
app/Http/Controllers/MicropubClientController.php
View file

@ -37,9 +37,7 @@ class MicropubClientController extends Controller
public function newNotePage(Request $request)
{
$url = $request->session()->get('me');
$syndication = $this->parseSyndicationTargets(
$request->session()->get('syndication')
);
$syndication = $request->session()->get('syndication');
return view('micropubnewnotepage', [
'url' => $url,
@ -113,7 +111,7 @@ class MicropubClientController extends Controller
return redirect('notes/new')->withErrors('Bad response when refreshing syndication targets', 'endpoint');
}
$body = (string) $response->getBody();
$syndication = str_replace(['&', '[]'], [';', ''], $body);
$syndication = $this->parseSyndicationTargets($body);
$request->session()->put('syndication', $syndication);
@ -321,10 +319,9 @@ class MicropubClientController extends Controller
return;
}
$syndicateTo = [];
$parts = explode(';', $syndicationTargets);
foreach ($parts as $part) {
$target = explode('=', $part);
$syndicateTo[] = urldecode($target[1]);
$data = json_decode($syndicationTargets, true);
foreach ($syndicateTo['syndicate-to'] as $syn) {
$syndicateTo[] = $syn['uid'];
}
if (count($syndicateTo) > 0) {
return $syndicateTo;

120
app/Http/Controllers/MicropubController.php
View file

@ -27,7 +27,7 @@ class MicropubController extends Controller
protected $placeService;
/**
* Injest the dependency.
* Inject the dependencies.
*/
public function __construct(
TokenService $tokenService = null,
@ -59,31 +59,53 @@ class MicropubController extends Controller
$type = $request->input('h');
if ($type == 'entry') {
$note = $this->noteService->createNote($request, $clientId);
$content = 'Note created at ' . $note->longurl;
$content = <<<EOD
{
"response": "created",
"location": "$note->longurl"
}
EOD;
return (new Response($content, 201))
->header('Location', $note->longurl);
->header('Location', $note->longurl)
->header('Content-Type', 'application/json');
}
if ($type == 'card') {
$place = $this->placeService->createPlace($request);
$content = 'Place created at ' . $place->longurl;
$content = <<<EOD
{
"response": "created",
"location": "$place->longurl"
}
EOD;
return (new Response($content, 201))
->header('Location', $place->longurl);
->header('Location', $place->longurl)
->header('Content-Type', 'application/json');
}
}
}
$content = http_build_query([
'error' => 'invalid_token',
'error_description' => 'The token provided is not valid or does not have the necessary scope',
]);
$content = <<<EOD
{
"response": "error",
"error": "invalid_token",
"error_description": "The token provided is not valid or does not have the necessary scope",
}
EOD;
return (new Response($content, 400))
->header('Content-Type', 'application/x-www-form-urlencoded');
->header('Content-Type', 'application/json');
}
$content = 'No OAuth token sent with request.';
$content = <<<EOD
{
"response": "error",
"error": "no_token",
"error_description": "No OAuth token sent with request"
}
EOD;
return new Response($content, 400);
return (new Response($content, 400))
->header('Content-Type', 'application/json');
}
/**
@ -104,16 +126,34 @@ class MicropubController extends Controller
$valid = $this->tokenService->validateToken($token);
if ($valid === null) {
return new Response('Invalid token', 400);
$content = <<<EOD
{
"respose": "error",
"error": "invalid_token",
"error_description": "The provided token did not pass validation"
}
EOD;
return (new Response($content, 400))
->header('Content-Type', 'application/json');
}
//we have a valid token, is `syndicate-to` set?
if ($request->input('q') === 'syndicate-to') {
$content = http_build_query([
'syndicate-to' => 'twitter.com/jonnybarnes',
return response()->json([
'syndicate-to' => [[
'uid' => 'https://twitter.com/jonnybarnes',
'name' => 'jonnybarnes on Twitter',
'service' => [
'name' => 'Twitter',
'url' => 'https://twitter.com',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg',
],
]],
]);
return (new Response($content, 200))
->header('Content-Type', 'application/x-www-form-urlencoded');
}
//nope, how about a geo URL?
if (substr($request->input('q'), 0, 4) === 'geo:') {
@ -123,21 +163,51 @@ class MicropubController extends Controller
$longitude = $latlng[1];
$places = Place::near($latitude, $longitude, 1000);
return (new Response(json_encode($places), 200))
->header('Content-Type', 'application/json');
return response()->json([
'response' => 'places',
'places' => $places
]);
}
//nope, ho about a config query?
if ($request->input('q') == 'config') {
return response()->json([
'syndicate-to' => [[
'uid' => 'https://twitter.com/jonnybarnes',
'name' => 'jonnybarnes on Twitter',
'service' => [
'name' => 'Twitter',
'url' => 'https://twitter.com',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg',
],
'user' => [
'name' => 'jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg',
],
]],
]);
}
//nope, just return the token
$content = http_build_query([
return response()->json([
'response' => 'token',
'token' => [
'me' => $valid->getClaim('me'),
'scope' => $valid->getClaim('scope'),
'client_id' => $valid->getClaim('client_id'),
],
]);
return (new Response($content, 200))
->header('Content-Type', 'application/x-www-form-urlencoded');
}
$content = 'No OAuth token sent with request.';
$content = <<<EOD
{
"response": "error",
"error": "no_token",
"error_description": "No token provided with request"
}
EOD;
return new Response($content, 400);
return (new Response($content, 400))
->header('Content-Type', 'application/json');
}
}

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

@ -41,8 +41,7 @@ class NotesController extends Controller
}
}
if ($note->place !== null) {
preg_match('/\((.*)\)/', $note->place->location, $matches);
$lnglat = explode(' ', $matches[1]);
$lnglat = explode(' ', $note->place->location);
$note->latitude = $lnglat[1];
$note->longitude = $lnglat[0];
$note->address = $note->place->name;
@ -110,8 +109,7 @@ class NotesController extends Controller
}
}
if ($note->place !== null) {
preg_match('/\((.*)\)/', $note->place->location, $matches);
$lnglat = explode(' ', $matches[1]);
$lnglat = explode(' ', $note->place->location);
$note->latitude = $lnglat[1];
$note->longitude = $lnglat[0];
$note->address = $note->place->name;

3
app/Jobs/SendWebMentions.php
View file

@ -63,6 +63,9 @@ class SendWebMentions extends Job implements ShouldQueue
if (parse_url($url, PHP_URL_HOST) == env('LONG_URL', 'localhost')) {
return false;
}
if (starts_with($url, '/notes/tagged/')) {
return false;
}
$endpoint = null;

19
app/Place.php
View file

@ -32,7 +32,10 @@ class Place extends Model
*
* @var array
*/
protected $postgisFields = [Point::class, Polygon::class];
protected $postgisFields = [
'location' => Point::class,
'polygon' => Polygon::class,
];
/**
* Define the relationship with Notes.
@ -74,18 +77,18 @@ class Place extends Model
return $places;
}
/**
/*
* Convert location to text.
*
* @param text $value
* @return text
*/
*
public function getLocationAttribute($value)
{
$result = DB::select(DB::raw("SELECT ST_AsText('$value')"));
return $result[0]->st_astext;
}
}*/
/**
* Get the latitude from the `location` property.
@ -94,9 +97,7 @@ class Place extends Model
*/
public function getLatitudeAttribute()
{
preg_match('/\((.*)\)/', $this->location, $latlng);
return explode(' ', $latlng[1])[1];
return explode(' ', $this->location)[1];
}
/**
@ -106,9 +107,7 @@ class Place extends Model
*/
public function getLongitudeAttribute()
{
preg_match('/\((.*)\)/', $this->location, $latlng);
return explode(' ', $latlng[1])[0];
return explode(' ', $this->location)[0];
}
/**

6
app/Services/NoteService.php
View file

@ -48,11 +48,11 @@ class NoteService
$this->dispatch(new SendWebMentions($note));
if (//micropub request, syndication sent as array
(is_array($request->input('mp-syndicate-to'))
(is_array($request->input('syndicate-to'))
&&
(in_array('twitter.com/jonnybarnes', $request->input('mp-syndicate-to')))
(in_array('https://twitter.com/jonnybarnes', $request->input('syndicate-to')))
|| //micropub request, syndication sent as string
($request->input('mp-syndicate-to') == 'twitter.com/jonnybarnes')
($request->input('syndicate-to') == 'https://twitter.com/jonnybarnes')
|| //local admin cp request
($request->input('twitter') == true))
) {

15
changelog.md
View file

@ -1,5 +1,20 @@
# Changelog
## Version 0.0.7 (2016-07-04)
- Use JSON for syndication endpoint query response
- Use JSON for all micropub requests
- Add support for `q=config` query of the micropub endpoint
## Version 0.0.6.3 (2016-06-29)
- Fix an issue with dispatching the syndication job
## Version 0.0.6.2 (2016-06-28)
- Fix an issue with sending webmentions
## Version 0.0.6 (2016-06-28)
- Better use of `laravel-postgis`
- Change style for inline mini-profile images
## Version 0.0.5 (2016-06-23)
- Automatically send webmentions
- Change `mp-syndicate-to` to `syndicate-to`

22
composer.lock generated
View file

@ -59,16 +59,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.18.19",
"version": "3.18.21",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "2ffb032afe91b143293f75b48ec7593659c66ddb"
"reference": "db88adc1569789e7d680809f51a62d2bd3410216"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2ffb032afe91b143293f75b48ec7593659c66ddb",
"reference": "2ffb032afe91b143293f75b48ec7593659c66ddb",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/db88adc1569789e7d680809f51a62d2bd3410216",
"reference": "db88adc1569789e7d680809f51a62d2bd3410216",
"shasum": ""
},
"require": {
@ -135,7 +135,7 @@
"s3",
"sdk"
],
"time": "2016-06-21 21:41:45"
"time": "2016-06-27 22:52:29"
},
{
"name": "barnabywalters/mf-cleaner",
@ -640,16 +640,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "31382fef2889136415751badebbd1cb022a4ed72"
"reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
"reference": "31382fef2889136415751badebbd1cb022a4ed72",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
"reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
"shasum": ""
},
"require": {
@ -665,7 +665,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.4-dev"
}
},
"autoload": {
@ -694,7 +694,7 @@
"stream",
"uri"
],
"time": "2016-04-13 19:56:01"
"time": "2016-06-24 23:00:38"
},
{
"name": "indieauth/client",

2
public/assets/css/global.css vendored
View file

@ -82,7 +82,7 @@ nav {
white-space: nowrap; }
.mini-h-card img {
display: inline;
height: 1em;
border-radius: 2px;
vertical-align: text-bottom; }

2
public/assets/css/global.css.map
View file

File diff suppressed because one or more lines are too long

BIN
public/build/assets/bower/Autolinker-2cb3468034.min.js.br
View file

Binary file not shown.

BIN
public/build/assets/bower/Autolinker-2cb3468034.min.js.gz
View file

Binary file not shown.

BIN
public/build/assets/bower/alertify-1b3c6aa174.css.br
View file

Binary file not shown.

BIN
public/build/assets/bower/alertify-1b3c6aa174.css.gz
View file

Binary file not shown.

BIN
public/build/assets/bower/alertify-84061c87f5.js.br
View file

Binary file not shown.

BIN
public/build/assets/bower/alertify-84061c87f5.js.gz
View file

Binary file not shown.

BIN
public/build/assets/bower/fetch-d8a2646ccc.js.br
View file

Binary file not shown.

BIN
public/build/assets/bower/fetch-d8a2646ccc.js.gz
View file

Binary file not shown.

BIN
public/build/assets/bower/marked-c2a88705e2.min.js.br
View file

Binary file not shown.

BIN
public/build/assets/bower/marked-c2a88705e2.min.js.gz
View file

Binary file not shown.

BIN
public/build/assets/bower/sanitize-85919f917a.css.br
View file

Binary file not shown.

BIN
public/build/assets/bower/store2-c4daa8f871.min.js.br
View file

Binary file not shown.

BIN
public/build/assets/bower/store2-c4daa8f871.min.js.gz
View file

Binary file not shown.

2
public/build/assets/css/global-c8783949cd.css → public/build/assets/css/global-5eaecdf53d.css vendored
View file

@ -82,7 +82,7 @@ nav {
white-space: nowrap; }
.mini-h-card img {
display: inline;
height: 1em;
border-radius: 2px;
vertical-align: text-bottom; }

BIN
public/build/assets/css/global-5eaecdf53d.css.br Normal file
View file

Binary file not shown.

BIN
public/build/assets/css/global-5eaecdf53d.css.gz Normal file
View file

Binary file not shown.

BIN
public/build/assets/css/global-c8783949cd.css.br
View file

Binary file not shown.

BIN
public/build/assets/css/global-c8783949cd.css.gz
View file

Binary file not shown.

2
public/build/assets/css/global.css.map
View file

File diff suppressed because one or more lines are too long

BIN
public/build/assets/css/projects-d945298e4f.css.br
View file

Binary file not shown.

BIN
public/build/assets/css/projects-d945298e4f.css.gz
View file

Binary file not shown.

BIN
public/build/assets/js/form-save-4d4f6e1cb8.js.br
View file

Binary file not shown.

BIN
public/build/assets/js/form-save-4d4f6e1cb8.js.gz
View file

Binary file not shown.

BIN
public/build/assets/js/links-c394f9c920.js.br
View file

Binary file not shown.

BIN
public/build/assets/js/links-c394f9c920.js.gz
View file

Binary file not shown.

BIN
public/build/assets/js/maps-a6a01a253b.js.gz
View file

Binary file not shown.

BIN
public/build/assets/js/newnote-36ff29cdef.js.br
View file

Binary file not shown.

BIN
public/build/assets/js/newnote-36ff29cdef.js.gz
View file

Binary file not shown.

BIN
public/build/assets/js/newplace-89a1be080e.js.br
View file

Binary file not shown.

BIN
public/build/assets/js/newplace-89a1be080e.js.gz
View file

Binary file not shown.

BIN
public/build/assets/prism/prism-5c98941a94.css.br
View file

Binary file not shown.

BIN
public/build/assets/prism/prism-5c98941a94.css.gz
View file

Binary file not shown.

BIN
public/build/assets/prism/prism-f6e997bc6d.js.br
View file

Binary file not shown.

BIN
public/build/assets/prism/prism-f6e997bc6d.js.gz
View file

Binary file not shown.

2
public/build/rev-manifest.json
View file

@ -6,7 +6,7 @@
"assets/bower/marked.min.js": "assets/bower/marked-c2a88705e2.min.js",
"assets/bower/sanitize.css": "assets/bower/sanitize-85919f917a.css",
"assets/bower/store2.min.js": "assets/bower/store2-c4daa8f871.min.js",
"assets/css/global.css": "assets/css/global-c8783949cd.css",
"assets/css/global.css": "assets/css/global-5eaecdf53d.css",
"assets/css/projects.css": "assets/css/projects-d945298e4f.css",
"assets/js/form-save.js": "assets/js/form-save-4d4f6e1cb8.js",
"assets/js/links.js": "assets/js/links-c394f9c920.js",

2
resources/assets/sass/layout.scss vendored
View file

@ -96,7 +96,7 @@ nav {
}
.mini-h-card img {
display: inline;
height: 1em;
border-radius: 2px;
vertical-align: text-bottom;
}

5
tests/MicropubClientTest.php
View file

@ -32,12 +32,13 @@ class MicropubClientTest extends TestCase
public function testClientPageRecentAuth()
{
$syndication = ['https://twitter.com/jonnybarnes'];
$this->withSession([
'me' => $this->appurl,
'syndication' => 'mp-syndicate-to=twitter.com%2Fjbl5',
'syndication' => $syndication,
])->visit($this->appurl . '/notes/new')
->see($this->appurl)
->see('twitter.com/jbl5');
->see('https://twitter.com/jonnybarnes');
}
/**

14
tests/MicropubTest.php
View file

@ -25,26 +25,26 @@ class MicropubTest extends TestCase
{
$this->call('GET', $this->appurl . '/api/post');
$this->assertResponseStatus(400);
$this->see('No OAuth token sent with request.');
$this->seeJson(['error_description' => 'No token provided with request']);
}
public function testMicropubRequestWithoutValidToken()
{
$this->call('GET', $this->appurl . '/api/post', [], [], [], ['HTTP_Authorization' => 'Bearer abc123']);
$this->assertResponseStatus(400);
$this->see('Invalid token');
$this->seeJson(['error_description' => 'The provided token did not pass validation']);
}
public function testMicropubRequestWithValidToken()
{
$this->call('GET', $this->appurl . '/api/post', [], [], [], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
$this->see('me=https%3A%2F%2Fjonnybarnes.localhost');
$this->seeJson(['response' => 'token']);
}
public function testMicropubRequestForSyndication()
{
$this->call('GET', $this->appurl . '/api/post', ['q' => 'syndicate-to'], [], [], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
$this->see('twitter.com%2Fjonnybarnes');
$this->seeJson(['uid' => 'https://twitter.com/jonnybarnes']);
}
public function testMicropubRequestForNearbyPlacesThatExist()
@ -59,6 +59,12 @@ class MicropubTest extends TestCase
$this->see('[]');
}
public function testMicropubRequestForConfig()
{
$this->call('GET', $this->appurl . '/api/post', ['q' => 'config'], [], [], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
$this->seeJson(['uid' => 'https://twitter.com/jonnybarnes']);
}
public function testMicropubRequestCreateNewNote()
{
$faker = \Faker\Factory::create();