bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Dont record us in seenby/path for local messages. Update echomail display to know if an exchomail seenby has collected the message
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 39s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m46s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George
2024-05-23 20:11:32 +10:00
parent 4f8448563d
commit f082bb0ebd
2 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
resources/views/widgets/message.blade.php
View File

@@ -63,7 +63,20 @@ use App\Models\{Echomail,Netmail};
@if ($msg instanceof Echomail)
<div class="row pb-2">
<div class="col-8">
SEENBY: <br><strong class="highlight">{!! $msg->seenby->pluck('ftn2d')->join('</strong>, <strong class="highlight">') !!}</strong>
SEENBY: <br><strong class="highlight">{!! $msg
->seenby
->map(function($item) {
if ($item->pivot->export_at) {
if ($item->pivot->sent_at)
return sprintf('<strong class="success" title="Sent: %s Packet: %s">%s</strong>',$item->pivot->sent_at,$item->pivot->sent_pkt,$item->ftn2d);
else
return sprintf('<strong class="danger">%s</strong>',$item->ftn2d);
} else {
return sprintf('<strong class="highlight">%s</strong>',$item->ftn2d);
}
})->join(', ') !!}
</strong>
</div>
@if($msg->rogue_seenby->count())
@@ -72,10 +85,14 @@ use App\Models\{Echomail,Netmail};
</div>
@endif
<!-- @todo for the nodes we export to, highlight those that we have actually sent it, vs those that havent received it yet -->
<div class="row pb-2">
<div class="col-8">
PATH: <br><strong class="highlight">{!! $msg->pathorder()->join('</strong> -> <strong class="highlight">') !!}</strong>
PATH:
@if($msg->path->count())
<br><strong class="highlight">{!! $msg->pathorder()->join('</strong> -> <strong class="highlight">') !!}</strong>
@else
<br><small>[<strong>No details</strong>]</small>
@endif
@if(($msg instanceof Echomail) && $msg->rogue_path->count())
<br><small>[<strong>NOTE</strong>: Some path values couldnt be identified - ({{ $msg->rogue_path->join(',') }})]</small>
@@ -83,19 +100,20 @@ use App\Models\{Echomail,Netmail};
</div>
</div>
<div class="row pb-2">
<div class="col-8">
@if($msg instanceof Netmail)
@if($msg->path->count())
<div class="row pb-2">
<div class="col-8">
RECEIVED:<br>
@foreach ($msg->path as $path)
<strong class="highlight">{{ $path->pivot->recv_pkt }}</strong> from <strong class="highlight">{{ $path->ftn }}</strong> {{ $msg->created_at }}
@endforeach
@elseif ($msg instanceof Echomail)
RECEIVED:<br>
<strong class="highlight">{{ ($x=$msg->path->sortBy('pivot.parent_id')->last())->pivot->recv_pkt }}</strong> from <strong class="highlight">{{ $x->ftn }}</strong> {{ $x->pivot->recv_at }}
@endif
@if($msg instanceof Netmail)
@foreach ($msg->path as $path)
<strong class="highlight">{{ $path->pivot->recv_pkt }}</strong> from <strong class="highlight">{{ $path->ftn }}</strong> {{ $msg->created_at }}<br>
@endforeach
@elseif ($msg instanceof Echomail)
<strong class="highlight">{{ ($x=$msg->path->sortBy('pivot.parent_id')->last())->pivot->recv_pkt }}</strong> from <strong class="highlight">{{ $x->ftn }}</strong> {{ $x->pivot->recv_at }}<br>
@endif
</div>
</div>
</div>
@endif
@if($msg instanceof Netmail)
<div class="col-8">