diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php index 8714ea28..7f5cf83c 100644 --- a/app/Http/Controllers/MicropubController.php +++ b/app/Http/Controllers/MicropubController.php @@ -124,20 +124,35 @@ class MicropubController extends Controller //we have a valid token, is `syndicate-to` set? if ($request->input('q') === 'syndicate-to') { 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', + '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', + ], ], - 'user' => [ - 'name' => 'jonnybarnes', - 'url' => 'https://twitter.com/jonnybarnes', - 'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg', + [ + 'uid' => 'https://facebook.com/jonnybarnes', + 'name' => 'jonnybarnes on Facebook', + 'service' => [ + 'name' => 'Facebook', + 'url' => 'https://facebook.com', + 'photo' => 'https://en.facebookbrand.com/wp-content/uploads/2016/05/FB-fLogo-Blue-broadcast-2.png', + ], + 'user' => [ + 'name' => 'jonnybarnes', + 'url' => 'https://facebook.com/jonnybarnes', + ], ], - ]], + ], ]); } //nope, how about a geo URL? @@ -161,20 +176,35 @@ class MicropubController extends Controller //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', + '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', + ], ], - 'user' => [ - 'name' => 'jonnybarnes', - 'url' => 'https://twitter.com/jonnybarnes', - 'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg', + [ + 'uid' => 'https://facebook.com/jonnybarnes', + 'name' => 'jonnybarnes on Facebook', + 'service' => [ + 'name' => 'Facebook', + 'url' => 'https://facebook.com', + 'photo' => 'https://en.facebookbrand.com/wp-content/uploads/2016/05/FB-fLogo-Blue-broadcast-2.png', + ], + 'user' => [ + 'name' => 'jonnybarnes', + 'url' => 'https://facebook.com/jonnybarnes', + ], ], - ]], + ], ]); } diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php index b2258dbf..18ec3907 100644 --- a/app/Services/NoteService.php +++ b/app/Services/NoteService.php @@ -70,17 +70,30 @@ class NoteService dispatch(new SendWebMentions($note)); - if (//micropub request, syndication sent as array + //syndication targets + //string sent from either local admin CP or micropub + if ($request->input('twitter') == true || $request->input('syndicate-to') == 'https://twitter.com/jonnybarnes') { + dispatch(new SyndicateToTwitter($note)); + } + if ($request->input('facebook') == true || $request->input('syndicate-to') == 'https://facebook.com/jonnybarnes') { + dispatch(new SyndicateToFacebook($note)); + } + + //micropub request, syndication sent as array + if ( (is_array($request->input('syndicate-to')) && (in_array('https://twitter.com/jonnybarnes', $request->input('syndicate-to'))) - || //micropub request, syndication sent as string - ($request->input('syndicate-to') == 'https://twitter.com/jonnybarnes') - || //local admin cp request - ($request->input('twitter') == true)) ) { dispatch(new SyndicateToTwitter($note)); } + if ( + (is_array($request->input('syndicate-to')) + && + (in_array('https://facebook.com/jonnybarnes', $request->input('syndicate-to'))) + ) { + dispatch(new SyndicateToFacebook($note)); + } return $note; }