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

Simple checkins

Browse source 
Squashed commit of the following:

commit 50f1993f45a9745ff77f2956a01543b747c85b41
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Dec 24 16:00:39 2017 +0000

    Add feature to changelog

commit 64deec40f7bc7941bd77f95c383f3b400952cec5
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Dec 24 14:19:06 2017 +0000

    Only show name of location in note metadata when not a simple checkin

commit 4c9fe397f76981f2eca5749a85ece136f78bb2af
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Dec 24 14:17:49 2017 +0000

    Add a simple checkin for testing purposes

commit 11564ead4aaf442113d380109d0b65972484dbcf
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Dec 24 14:17:05 2017 +0000

    Don’t set a default value for checkins during creation

commit 832c77c205626dd0119fc602727f6808c9d7758f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Dec 24 14:16:05 2017 +0000

    If note has no content, but an associated place, it is a simple checkin, set a note value appropriately

commit 8c11f9d4b058b3bd248ed02476904301def0e6fc
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Dec 24 14:13:31 2017 +0000

    Allow a note to not have content, in whihc case default the value to null
This commit is contained in:
Jonny Barnes 2017-12-24 16:00:58 +00:00
parent d3fc3aae20
commit 940d24c462
6 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/Note.php
View file

@ -143,12 +143,14 @@ class Note extends Model
*/
public function getNoteAttribute($value)
{
$emoji = new EmojiModifier();
if ($value === null && $this->place !== null) {
$value = '📍: <a href="' . $this->place->longurl . '">' . $this->place->name . '</a>';
}
$hcards = $this->makeHCards($value);
$hashtags = $this->autoLinkHashtag($hcards);
$html = $this->convertMarkdown($hashtags);
$modified = $emoji->makeEmojiAccessible($html);
$modified = resolve(EmojiModifier::class)->makeEmojiAccessible($html);
return $modified;
}

2
app/Observers/NoteObserver.php
View file

@ -14,7 +14,7 @@ class NoteObserver
*/
public function created(Note $note)
{
$tags = $this->getTagsFromNote($note->getAttributes()['note']);
$tags = $this->getTagsFromNote($note->getAttributes()['note'] ?? null);
if (count($tags) === 0) {
return;

3
app/Services/NoteService.php
View file

@ -35,9 +35,6 @@ class NoteService
if ($this->getCheckin($request)) {
$note->place()->associate($this->getCheckin($request));
$note->swarm_url = $this->getSwarmUrl($request);
if ($note->note === null || $note->note == '') {
$note->note = 'I’ve just checked in with Swarm';
}
}
$note->instagram_url = $this->getInstagramUrl($request);

3
changelog.md
View file

@ -1,5 +1,8 @@
# Changelog
## Version {next}
- Add simple checkins, i.e. checkins with no note content, for now add a default note for these
## Version 0.14 (2017-12-22)
- Tests
- Refactor

5
database/seeds/NotesTableSeeder.php
View file

@ -84,6 +84,11 @@ class NotesTableSeeder extends Seeder
'note' => 'I love https://duckduckgo.com 💕' // theres a two-heart emoji at the end of this
]);
sleep(1);
$noteJustCheckin = new Note();
$place = Place::find(1);
$noteJustCheckin->place()->associate($place);
$noteJustCheckin->save();
sleep(1);
$media = new Media();
$media->path = 'media/f1bc8faa-1a8f-45b8-a9b1-57282fa73f87.jpg';
$media->type = 'image';

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

@ -24,8 +24,8 @@
<div class="note-metadata">
<div>
<a class="u-url" href="/notes/{{ $note->nb60id }}"><time class="dt-published" datetime="{{ $note->iso8601 }}" title="{{ $note->iso8601 }}">{{ $note->humandiff }}</time></a>@if($note->client) via <a class="client" href="{{ $note->client->client_url }}">{{ $note->client->client_name }}</a>@endif
@if($note->place) in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->place->longurl }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->place->latitude }}"></data><data class="p-longitude" value="{{ $note->place->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
@if($note->place)@if($note->getOriginal('note')) in <span class="p-location h-card"><a class="p-name u-url" href="{{ $note->place->longurl }}">{{ $note->address }}</a><data class="p-latitude" value="{{ $note->place->latitude }}"></data><data class="p-longitude" value="{{ $note->place->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_count > 0) @include('templates.replies-icon'): {{ $note->replies_count }}@endif
</div>