From ab59a5ff44c1a4f0128a2ecfe3a8a7dd187d7b07 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 26 Oct 2016 22:14:07 +0100 Subject: [PATCH 1/4] Add facebook to syndication targets --- app/Http/Controllers/MicropubController.php | 78 ++++++++++++++------- 1 file changed, 54 insertions(+), 24 deletions(-) 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', + ], ], - ]], + ], ]); } From 8bad2f159730e5ef30ef1219b4b048c008cb82a4 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 26 Oct 2016 22:21:26 +0100 Subject: [PATCH 2/4] Dispatch relavent syndication jobs during note creation --- app/Services/NoteService.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) 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; } From 740abab5ceb1cee6fcd2b4a33d54c02fe46bea62 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 26 Oct 2016 22:22:48 +0100 Subject: [PATCH 3/4] Update changelog --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index 5589bcb7..c8cb7bdb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## Version {next} + - Add facebook as a syndication target + ## Version 0.0.15 (2016-10-26) - Modify SyndicateToTwitter to use bridgy publish - Add a SyndicateToFacebook job which also uses bridgy publish (issue#24) From d2d1d38446798469ff35a4cf55eb6996d21d1000 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Wed, 26 Oct 2016 22:23:33 +0100 Subject: [PATCH 4/4] Bump version number --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index c8cb7bdb..0ba203d6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## Version {next} +## Version 0.0.15.1 (2016-10-26) - Add facebook as a syndication target ## Version 0.0.15 (2016-10-26)