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

Merge branch 'release/0.0.15.1'

Browse source
This commit is contained in:
Jonny Barnes 2016-10-26 22:23:44 +01:00
commit ec5e54a52f
3 changed files with 75 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,20 +124,35 @@ class MicropubController extends Controller
//we have a valid token, is `syndicate-to` set? //we have a valid token, is `syndicate-to` set?
if ($request->input('q') === 'syndicate-to') { if ($request->input('q') === 'syndicate-to') {
return response()->json([ return response()->json([
'syndicate-to' => [[ 'syndicate-to' => [
'uid' => 'https://twitter.com/jonnybarnes', [
'name' => 'jonnybarnes on Twitter', 'uid' => 'https://twitter.com/jonnybarnes',
'service' => [ 'name' => 'jonnybarnes on Twitter',
'name' => 'Twitter', 'service' => [
'url' => 'https://twitter.com', 'name' => 'Twitter',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg', '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', 'uid' => 'https://facebook.com/jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes', 'name' => 'jonnybarnes on Facebook',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg', '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? //nope, how about a geo URL?
@ -161,20 +176,35 @@ class MicropubController extends Controller
//nope, ho about a config query? //nope, ho about a config query?
if ($request->input('q') == 'config') { if ($request->input('q') == 'config') {
return response()->json([ return response()->json([
'syndicate-to' => [[ 'syndicate-to' => [
'uid' => 'https://twitter.com/jonnybarnes', [
'name' => 'jonnybarnes on Twitter', 'uid' => 'https://twitter.com/jonnybarnes',
'service' => [ 'name' => 'jonnybarnes on Twitter',
'name' => 'Twitter', 'service' => [
'url' => 'https://twitter.com', 'name' => 'Twitter',
'photo' => 'https://upload.wikimedia.org/wikipedia/en/9/9f/Twitter_bird_logo_2012.svg', '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', 'uid' => 'https://facebook.com/jonnybarnes',
'url' => 'https://twitter.com/jonnybarnes', 'name' => 'jonnybarnes on Facebook',
'photo' => 'https://pbs.twimg.com/profile_images/1853565405/jmb-bw.jpg', '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',
],
], ],
]], ],
]); ]);
} }

23
app/Services/NoteService.php
View file

@ -70,17 +70,30 @@ class NoteService
dispatch(new SendWebMentions($note)); 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')) (is_array($request->input('syndicate-to'))
&& &&
(in_array('https://twitter.com/jonnybarnes', $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)); 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; return $note;
} }

3
changelog.md
View file

@ -1,5 +1,8 @@
# Changelog # Changelog
## Version 0.0.15.1 (2016-10-26)
- Add facebook as a syndication target
## Version 0.0.15 (2016-10-26) ## Version 0.0.15 (2016-10-26)
- Modify SyndicateToTwitter to use bridgy publish - Modify SyndicateToTwitter to use bridgy publish
- Add a SyndicateToFacebook job which also uses bridgy publish (issue#24) - Add a SyndicateToFacebook job which also uses bridgy publish (issue#24)