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

Squashed commit of the following:

Browse source 
commit e7723f4290dd79eddc2a8dd1d4c2725914a90b55
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 3 19:44:33 2016 +0000

    Add latest change to the changelog

commit e2104997ab796eeba320931beaec3bc99fd2d296
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 3 19:43:27 2016 +0000

    Pass correct info to updated social links template

commit 586ca9b5446e272ef3b89a615ba0666e6f7d8d82
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 3 19:42:08 2016 +0000

    Remove reply/like/repost links, add facebook link

commit 00483089380d2e00d24d86a4b1a03363161c7a97
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 3 19:22:46 2016 +0000

    Add dummy Facebook URLs for syndication

commit 2e001b04e36a7fd1198fe5ee70db65cd2523e123
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 3 19:22:11 2016 +0000

    Clarify that syndication isn’t being tested during micropub client integration test
This commit is contained in:
Jonny Barnes 2016-11-03 19:45:56 +00:00
parent e272c22d5b
commit 4833540642
5 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog.md
View file

@ -1,5 +1,9 @@
# Changelog # Changelog
## Version {next}
- Remove reply/like/repost links, not needed without indie-action
- Add facebook syndication link (issue#29)
## Version 0.0.15.5 (2016-10-31) ## Version 0.0.15.5 (2016-10-31)
- Fix: update note view to use longitude in h-card for a place - Fix: update note view to use longitude in h-card for a place

1
database/factories/ModelFactory.php
View file

@ -25,5 +25,6 @@ $factory->define(App\Note::class, function (Faker\Generator $faker) {
return [ return [
'note' => $faker->paragraph, 'note' => $faker->paragraph,
'tweet_id' => $faker->randomNumber(9), 'tweet_id' => $faker->randomNumber(9),
'facebook_url' => 'https://facebook.com/' . $faker->randomNumber(9),
]; ];
}); });

2
resources/views/templates/note.blade.php
View file

@ -19,7 +19,7 @@
@if($note->placeLink)in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->placeLink }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->latitude }}"></data><data class="p-longitude" value="{{ $note->longitude }}"></data></span> @if($note->placeLink)in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->placeLink }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->latitude }}"></data><data class="p-longitude" value="{{ $note->longitude }}"></data></span>
@elseif($note->address)in <span class="p-location h-adr">{!! $note->address !!}<data class="p-latitude" value="{{ $note->latitude }}"></data><data class="p-longitude" value="{{ $note->longitude }}"></data></span>@endif @elseif($note->address)in <span class="p-location h-adr">{!! $note->address !!}<data class="p-latitude" value="{{ $note->latitude }}"></data><data class="p-longitude" value="{{ $note->longitude }}"></data></span>@endif
@if($note->replies > 0)Replies: {{ $note->replies }}@endif @if($note->replies > 0)Replies: {{ $note->replies }}@endif
@if($note->tweet_id)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'nb60id' => $note->nb60id])@endif @if($note->tweet_id || $note->facebook_url)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'facebook_url' => $note->facebook_url])@endif
@if ($note->placeLink) @if ($note->placeLink)
<div class="map" data-latitude="{{ $note->latitude }}" data-longitude="{{ $note->longitude }}"></div> <div class="map" data-latitude="{{ $note->latitude }}" data-longitude="{{ $note->longitude }}"></div>
@endif @endif

32
resources/views/templates/social-links.blade.php
View file

@ -1,25 +1,21 @@
<span class="social-links"> <span class="social-links">
<a class="u-syndication" href="https://twitter.com/i/web/status/{{ $tweet_id }}"> @if($tweet_id !== null)<a class="u-syndication" href="https://twitter.com/i/web/status/{{ $tweet_id }}" title="View note on Twitter">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 171.5054 139.37839" class="icon"> <svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 171.5054 139.37839" class="icon">
<g transform="translate(-282.32053,-396.30734)"> <g transform="translate(-282.32053,-396.30734)">
<path d="m 453.82593,412.80619 c -6.3097,2.79897 -13.09189,4.68982 -20.20852,5.54049 7.26413,-4.35454 12.84406,-11.24992 15.47067,-19.46675 -6.79934,4.03295 -14.3293,6.96055 -22.34461,8.53841 -6.41775,-6.83879 -15.56243,-11.111 -25.68298,-11.111 -19.43159,0 -35.18696,15.75365 -35.18696,35.18525 0,2.75781 0.31128,5.44359 0.91155,8.01875 -29.24344,-1.46723 -55.16995,-15.47582 -72.52461,-36.76396 -3.02879,5.19662 -4.76443,11.24048 -4.76443,17.6891 0,12.20777 6.21194,22.97747 15.65332,29.28716 -5.76773,-0.18265 -11.19331,-1.76565 -15.93716,-4.40083 -0.004,0.14663 -0.004,0.29412 -0.004,0.44248 0,17.04767 12.12889,31.26806 28.22555,34.50266 -2.95247,0.80436 -6.06101,1.23398 -9.26989,1.23398 -2.2673,0 -4.47114,-0.22124 -6.62011,-0.63114 4.47801,13.97857 17.47214,24.15143 32.86992,24.43441 -12.04227,9.43796 -27.21366,15.06335 -43.69965,15.06335 -2.84014,0 -5.64082,-0.16722 -8.39349,-0.49223 15.57186,9.98421 34.06703,15.8094 53.93768,15.8094 64.72024,0 100.11301,-53.61524 100.11301,-100.11387 0,-1.52554 -0.0343,-3.04251 -0.10204,-4.55261 6.87394,-4.95995 12.83891,-11.15646 17.55618,-18.21305 z" /> <path fill="#4099FF" d="m 453.82593,412.80619 c -6.3097,2.79897 -13.09189,4.68982 -20.20852,5.54049 7.26413,-4.35454 12.84406,-11.24992 15.47067,-19.46675 -6.79934,4.03295 -14.3293,6.96055 -22.34461,8.53841 -6.41775,-6.83879 -15.56243,-11.111 -25.68298,-11.111 -19.43159,0 -35.18696,15.75365 -35.18696,35.18525 0,2.75781 0.31128,5.44359 0.91155,8.01875 -29.24344,-1.46723 -55.16995,-15.47582 -72.52461,-36.76396 -3.02879,5.19662 -4.76443,11.24048 -4.76443,17.6891 0,12.20777 6.21194,22.97747 15.65332,29.28716 -5.76773,-0.18265 -11.19331,-1.76565 -15.93716,-4.40083 -0.004,0.14663 -0.004,0.29412 -0.004,0.44248 0,17.04767 12.12889,31.26806 28.22555,34.50266 -2.95247,0.80436 -6.06101,1.23398 -9.26989,1.23398 -2.2673,0 -4.47114,-0.22124 -6.62011,-0.63114 4.47801,13.97857 17.47214,24.15143 32.86992,24.43441 -12.04227,9.43796 -27.21366,15.06335 -43.69965,15.06335 -2.84014,0 -5.64082,-0.16722 -8.39349,-0.49223 15.57186,9.98421 34.06703,15.8094 53.93768,15.8094 64.72024,0 100.11301,-53.61524 100.11301,-100.11387 0,-1.52554 -0.0343,-3.04251 -0.10204,-4.55261 6.87394,-4.95995 12.83891,-11.15646 17.55618,-18.21305 z" />
</g> </g>
</svg> </svg>
</a> - </a>@endif
<a href="https://twitter.com/intent/tweet?in_reply_to={{ $tweet_id }}"> @if($facebook_url !== null)<a class="u-syndication" href="{{ $facebook_url }}" title="View note on Facebook">
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 920.898 1000" class="icon"> <svg xmlns="http://www.w3.org/2000/svg" version="1.1" preservedAspectRatio="xMinYMin meet" viewBox="0 0 266.893 266.895" class="icon">
<path d="M0 470.52q0 -6.832 3.416 -13.664t6.344 -9.76l3.416 -3.416 376.736 -273.768q20.496 -15.616 35.38 -5.368t14.884 40.016v111.264l26.84 1.952q96.136 8.296 181.292 54.168t145.424 117.12 94.428 165.432 32.696 196.176q-60.512 -106.872 -161.284 -174.704t-222.284 -78.08q-49.288 -4.392 -97.112 1.464v137.128q0 29.768 -14.884 40.016t-35.38 -5.368l-376.736 -274.256q-13.176 -11.224 -13.176 -26.352z"/> <path id="Blue_1_" fill="#3C5A99" d="M248.082,262.307c7.854,0,14.223-6.369,14.223-14.225V18.812
c0-7.857-6.368-14.224-14.223-14.224H18.812c-7.857,0-14.224,6.367-14.224,14.224v229.27c0,7.855,6.366,14.225,14.224,14.225
H248.082z"
/>
<path id="f" fill="#FFFFFF" d="M182.409,262.307v-99.803h33.499l5.016-38.895h-38.515V98.777c0-11.261,3.127-18.935,19.275-18.935
l20.596-0.009V45.045c-3.562-0.474-15.788-1.533-30.012-1.533c-29.695,0-50.025,18.126-50.025,51.413v28.684h-33.585v38.895h33.585
v99.803H182.409z"
/>
</svg> </svg>
</a> </a>@endif
<a href="https://twitter.com/intent/retweet?tweet_id={{ $tweet_id }}">
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1071.429 1000" class="icon">
<path d="M714.24 839.296q0 7.254 -5.301 12.555t-12.555 5.301h-535.68q-4.464 0 -7.533 -1.116t-5.022 -3.906 -3.069 -4.464 -1.674 -6.417 -.558 -6.417v-334.79999999999995h-107.136q-14.508 0 -25.11 -10.602t-10.602 -25.11q0 -13.392 8.37 -22.878l178.56 -214.272q10.602 -12.276 27.342 -12.276t27.342 12.276l178.56 214.272q8.37 9.486 8.37 22.878 0 14.508 -10.602 25.11t-25.11 10.602h-107.136v214.272h321.408q8.928 0 13.95 6.138l89.28 107.136q3.906 6.138 3.906 11.718zm357.12 -232.128q0 13.392 -8.37 22.878l-178.56 214.272q-11.16 12.834 -27.342 12.834t-27.342 -12.834l-178.56 -214.272q-8.37 -9.486 -8.37 -22.878 0 -14.508 10.602 -25.11t25.11 -10.602h107.136v-214.272h-321.408q-8.928 0 -13.95 -6.696l-89.28 -107.136q-3.906 -5.022 -3.906 -11.16 0 -7.254 5.301 -12.555t12.555 -5.301h535.68q4.464 0 7.533 1.116t5.022 3.906 3.069 4.464 1.674 6.417 .558 6.417v334.79999999999995h107.136q14.508 0 25.11 10.602t10.602 25.11z"/>
</svg>
</a>
<a href="https://twitter.com/intent/favorite?tweet_id={{ $tweet_id }}">
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 645 585" class="icon">
<path d="M 297.29747,550.86823 C 283.52243,535.43191 249.1268,505.33855 220.86277,483.99412 C 137.11867,420.75228 125.72108,411.5999 91.719238,380.29088 C 29.03471,322.57071 2.413622,264.58086 2.5048478,185.95124 C 2.5493594,147.56739 5.1656152,132.77929 15.914734,110.15398 C 34.151433,71.768267 61.014996,43.244667 95.360052,25.799457 C 119.68545,13.443675 131.6827,7.9542046 172.30448,7.7296236 C 214.79777,7.4947896 223.74311,12.449347 248.73919,26.181459 C 279.1637,42.895777 310.47909,78.617167 316.95242,103.99205 L 320.95052,119.66445 L 330.81015,98.079942 C 386.52632,-23.892986 564.40851,-22.06811 626.31244,101.11153 C 645.95011,140.18758 648.10608,223.6247 630.69256,270.6244 C 607.97729,331.93377 565.31255,378.67493 466.68622,450.30098 C 402.0054,497.27462 328.80148,568.34684 323.70555,578.32901 C 317.79007,589.91654 323.42339,580.14491 297.29747,550.86823 z"/>
<g transform="translate(129.28571,-64.285714)"/>
</svg>
</a>
</span> </span>

1
tests/MicropubClientTest.php
View file

@ -48,6 +48,7 @@ class MicropubClientTest extends TestCase
public function testClientCreatesNewNoteWithTag() public function testClientCreatesNewNoteWithTag()
{ {
//in this test, the syndication targets are blank
$faker = \Faker\Factory::create(); $faker = \Faker\Factory::create();
$note = 'Fake note from #PHPUnit: ' . $faker->text; $note = 'Fake note from #PHPUnit: ' . $faker->text;
$this->withSession([ $this->withSession([