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

Improve tests feature

Browse source 
Squashed commit of the following:

commit 13ac266b79b496d62291a07f4f5f81940d217ccb
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 20 17:17:25 2019 +0000

    test on 7.2 and 7.3, download phpcs directly from github

commit 692cc7dfe165a7ecaf9dba9498c868193b749aee
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 20 17:10:16 2019 +0000

    Drop code-coverage for now, PHP7.3 and Xdebug aren’t playing ball at the moment

commit 03d262c47af79cfa0ce4937cc8e196e3b6f5877a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 20 17:09:48 2019 +0000

    Use an excewption when generating twitter content of a note

commit e2df1e5cebebd30473787c924f495a5687145fb8
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 20 17:08:48 2019 +0000

    Updating dependencies

commit 8008eb53854eddefaa4e302f95353c626b3062ef
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Nov 25 16:09:32 2018 +0000

    Fix S3 URLs to use config settings

commit 941864b9d6c6cb9d87b4b95385ada67f55de837c
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Nov 24 21:28:19 2018 +0000

    Increase code-coverage in the notes unit tests

commit 4a253d3c5c1854dd8ea01d975bb8e709ae697393
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Tue Nov 20 18:26:59 2018 +0000

    Don’t create new notes in null note test

commit 9616cd2b66bc6f26b2d3266f95cf1be894aaed99
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Tue Nov 20 18:23:05 2018 +0000

    Use Laravel’s FileSystem class to better deal with files/folders in the tearDown methods

commit 294f7961ec03d26cc45845632a97b2521a58f403
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Tue Nov 20 18:22:28 2018 +0000

    Add more unit tests for the geocoding method

commit 43328e3ce249fe8df95770f1275cab97f4ca88bc
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Tue Nov 20 18:18:36 2018 +0000

    Improve the revereseGeoCode method

commit 84424e1d8274bfe62bc5f0a7556e5732bf094178
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Tue Nov 20 15:03:14 2018 +0000

    Test that empty notes are saved to the DB as null

commit 77fd87b81323457ce6f578ed7f359ceb6b3ce6b6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Oct 13 20:20:03 2018 +0100

    Increase test coverage to 100% for the WebMention model

commit 4b6da595dc1efc025470279e9012c2a2a90ec3ef
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Oct 13 18:49:33 2018 +0100

    Improving test coverage

commit 895061b8dd0ddf4fbc321e4f371ea148d9b3007f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Oct 13 17:19:35 2018 +0100

    Improvements in Like tests and code, and WebMentions processing tests and code

commit f9a8b96f2c8b1ef22e97d3dc634ee76d97c25cb5
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Oct 12 22:43:49 2018 +0100

    Don’t track the coverage files in git
This commit is contained in:
Jonny Barnes 2019-01-20 17:35:58 +00:00
parent d43386b3b9
commit ffa9756cb7
17 changed files with 1322 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/Models/Note.php
View file

@ -17,6 +17,7 @@ use League\CommonMark\HtmlRenderer;
use Illuminate\Database\Eloquent\Model;
use Jonnybarnes\EmojiA11y\EmojiModifier;
use Illuminate\Database\Eloquent\Builder;
use App\Exceptions\TwitterContentException;
use Illuminate\Database\Eloquent\SoftDeletes;
use Jonnybarnes\CommonmarkLinkify\LinkifyExtension;
@ -362,21 +363,20 @@ class Note extends Model
*
* That is we swap the contacts names for their known Twitter handles.
*
* @return string|null
* @return string
*/
public function getTwitterContentAttribute(): ?string
public function getTwitterContentAttribute(): string
{
if ($this->contacts === null) {
return null;
}
if (count($this->contacts) === 0) {
return null;
// check for contacts
if ($this->contacts === null || count($this->contacts) === 0) {
throw new TwitterContentException('There are no contacts for this note');
}
// here we check the matched contact from the note corresponds to a contact
// in the database
if (count(array_unique(array_values($this->contacts))) === 1
&& array_unique(array_values($this->contacts))[0] === null) {
return null;
throw new TwitterContentException('The matched contact is not in the database');
}
// swap in twitter usernames
@ -530,7 +530,7 @@ class Note extends Model
$latlng = $latitude . ',' . $longitude;
return Cache::get($latlng, function () use ($latlng, $latitude, $longitude) {
$guzzle = new Client();
$guzzle = resolve(Client::class);
$response = $guzzle->request('GET', 'https://nominatim.openstreetmap.org/reverse', [
'query' => [
'format' => 'json',
@ -542,9 +542,13 @@ class Note extends Model
'headers' => ['User-Agent' => 'jonnybarnes.uk via Guzzle, email jonny@jonnybarnes.uk'],
]);
$json = json_decode((string) $response->getBody());
if (isset($json->address->town)) {
if (isset($json->address->suburb)) {
$locality = $json->address->suburb;
if (isset($json->address->city)) {
$locality .= ', ' . $json->address->city;
}
$address = '<span class="p-locality">'
. $json->address->town
. $locality
. '</span>, <span class="p-country-name">'
. $json->address->country
. '</span>';
@ -553,7 +557,11 @@ class Note extends Model
return $address;
}
if (isset($json->address->city)) {
$address = $json->address->city . ', ' . $json->address->country;
$address = '<span class="p-locality">'
. $json->address->city
. '</span>, <span class="p-country-name">'
. $json->address->country
. '</span>';
Cache::forever($latlng, $address);
return $address;