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

refactor location code to support h-cards from instagram

Browse source
This commit is contained in:
Jonny Barnes 2017-06-13 18:10:51 +01:00
parent 87ccb1c93e
commit dece5c8d0a
2 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,10 +78,20 @@ class MicropubController extends Controller
$data['content'] = $request->input('properties.content')[0]['html']; $data['content'] = $request->input('properties.content')[0]['html'];
} }
$data['in-reply-to'] = $request->input('properties.in-reply-to')[0]; $data['in-reply-to'] = $request->input('properties.in-reply-to')[0];
$data['location'] = $request->input('properties.location'); // check location is geo: string
//flatten location if array if (is_string($request->input('properties.location.0'))) {
if (is_array($data['location'])) { $data['location'] = $request->input('properties.location.0');
$data['location'] = $data['location'][0]; }
// check location is h-card
if (is_array($request->input('properties.location.0'))) {
if ($request->input('properties.location.0.type' === 'h-card')) {
try {
$place = $this->placeService->createPlaceFromCheckin($request->input('properties.location.0'));
$data['checkin'] = $place->longurl;
} catch (\Exception $e) {
//
}
}
} }
$data['published'] = $request->input('properties.published')[0]; $data['published'] = $request->input('properties.published')[0];
//create checkin place //create checkin place
@ -89,7 +99,8 @@ class MicropubController extends Controller
$data['checkin'] = $request->input('properties.checkin.0.properties.url.0'); $data['checkin'] = $request->input('properties.checkin.0.properties.url.0');
$data['swarm-url'] = $request->input('properties.syndication.0'); $data['swarm-url'] = $request->input('properties.syndication.0');
try { try {
$this->placeService->createPlaceFromCheckin($request->input('properties.checkin.0')); $place = $this->placeService->createPlaceFromCheckin($request->input('properties.checkin.0'));
$data['checkin'] = $place->longurl;
} catch (\Exception $e) { } catch (\Exception $e) {
$data['checkin'] = null; $data['checkin'] = null;
} }

16
app/Services/PlaceService.php
View file

@ -41,15 +41,15 @@ class PlaceService
* Create a place from a h-card checkin, for exameple from OwnYourSwarm. * Create a place from a h-card checkin, for exameple from OwnYourSwarm.
* *
* @param array * @param array
* @return bool * @return Place
*/ */
public function createPlaceFromCheckin(array $checkin): bool public function createPlaceFromCheckin(array $checkin): Place
{ {
//check if the place exists if from swarm //check if the place exists if from swarm
if (array_key_exists('url', $checkin['properties'])) { if (array_key_exists('url', $checkin['properties']) && ends_with(parse_url($checkin['properties']['url'][0], PHP_URL_HOST), 'foursquare.com')) {
$search = Place::where('foursquare', $checkin['properties']['url'][0])->count(); $place = Place::where('foursquare', $checkin['properties']['url'][0])->get();
if ($search === 1) { if (count($place) === 1) {
return true; return $place;
} }
} }
if (array_key_exists('name', $checkin['properties']) === false) { if (array_key_exists('name', $checkin['properties']) === false) {
@ -60,7 +60,7 @@ class PlaceService
} }
$place = new Place(); $place = new Place();
$place->name = $checkin['properties']['name'][0]; $place->name = $checkin['properties']['name'][0];
if (starts_with($checkin['properties']['url'][0], 'https://foursquare.com')) { if (ends_with(parse_url($checkin['properties']['url'][0], PHP_URL_HOST), 'foursquare.com')) {
$place->foursquare = $checkin['properties']['url'][0]; $place->foursquare = $checkin['properties']['url'][0];
} }
$place->location = new Point( $place->location = new Point(
@ -69,6 +69,6 @@ class PlaceService
); );
$place->save(); $place->save();
return true; return $place;
} }
} }