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

Use location instead of place, given we support co-ordinates as well

Browse source
This commit is contained in:
Jonny Barnes 2016-10-07 15:27:48 +01:00
parent 00ec89595b
commit 6cd5672dab
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Services/NoteService.php
View file

@ -22,14 +22,14 @@ class NoteService
if ($request->header('Content-Type') == 'application/json') {
$content = $request->input('properties.content')[0];
$inReplyTo = $request->input('properties.in-reply-to')[0];
$place = $request->input('properties.location');
if (is_array($place)) {
$place = $place[0];
$location = $request->input('properties.location');
if (is_array($location)) {
$location = $location[0];
}
} else {
$content = $request->input('content');
$inReplyTo = $request->input('in-reply-to');
$place = $request->input('location');
$location = $request->input('location');
}
$note = Note::create(
@ -40,19 +40,19 @@ class NoteService
]
);
if ($place !== null && $place !== 'no-location') {
if (substr($place, 0, strlen(config('app.url'))) == config('app.url')) {
if ($location !== null && $location !== 'no-location') {
if (substr($location, 0, strlen(config('app.url'))) == config('app.url')) {
//uri of form http://host/places/slug, we want slug so chop off start
//that’s the app’s url plus `/places/`
$slug = mb_substr($place, mb_strlen(config('app.url')) + 8);
$placeModel = Place::where('slug', '=', $slug)->first();
$note->place()->associate($placeModel);
$slug = mb_substr($location, mb_strlen(config('app.url')) + 8);
$place = Place::where('slug', '=', $slug)->first();
$note->place()->associate($place);
$note->save();
}
if (substr($place, 0, 4) == 'geo:') {
if (substr($location, 0, 4) == 'geo:') {
preg_match_all(
'/([0-9\.\-]+)/',
$place,
$location,
$matches
);
$note->location = $matches[0][0] . ', ' . $matches[0][1];