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

Compare commits

base: bbs:d3a9e36bb7b2a0e3c3b9ffbf7b88a577eaf90688
Branches Tags
bbs:master
bbs:bbs
...
compare: bbs:b891abb611db1d613c33f979d45dba4cfd32a881
Branches Tags
bbs:master
bbs:bbs

4 Commits
d3a9e36bb7 ... b891abb611

Author SHA1 Message Date
Deon George
b891abb611 Netmail waiting query optimisation, increase logging on what we have for a node
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 43s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m53s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 8s
Details
2024-06-26 22:37:38 +10:00
Deon George
5f3db71451 Only show active AKAs for our systems 2024-06-26 22:29:05 +10:00
Deon George
9ed7171c9b Add FTN to mail:list for netmails 2024-06-26 22:21:52 +10:00
Deon George
298dfe6703 Fix message text. 2024-06-26 17:15:15 +10:00
5 changed files with 10 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
app/Classes/File/Send.php
View File

@ -201,7 +201,7 @@ class Send extends Base
// Files
if (($x=$ao->filesWaiting())->count()) {
Log::debug(sprintf('%s:- [%d] Files(s) added for sending to [%s]',self::LOGKEY,$x->count(),$ao->ftn));
Log::info(sprintf('%s:- [%d] Files(s) added for sending to [%s]',self::LOGKEY,$x->count(),$ao->ftn));
// Add Files
foreach ($x as $fo) {

4
app/Console/Commands/MailList.php
View File

@ -49,8 +49,8 @@ class MailList extends Command
return [
'id'=>$item->id,
'msgid'=>$item->msgid,
'from'=>$item->from,
'to'=>$item->to,
'from'=>sprintf('%s (%s)',$item->from,$item->fftn->ftn3d),
'to'=>sprintf('%s (%s)',$item->to,$item->tftn->ftn3d),
'subject'=>$item->subject,
];
}));

10
app/Models/Address.php
View File

@ -1135,8 +1135,8 @@ class Address extends Model
*/
public function getNetmail(): ?Packet
{
if (($num=$this->netmailAlertWaiting())->count()) {
Log::debug(sprintf('%s:= Packaging [%d] netmail alerts to [%s]',self::LOGKEY,$num->count(),$this->ftn));
if ($count=($num=$this->netmailAlertWaiting())->count()) {
Log::info(sprintf('%s:= Packaging [%d] netmail alerts to [%s]',self::LOGKEY,$count,$this->ftn));
$msgs = $num->get();
@ -1160,11 +1160,11 @@ class Address extends Model
);
}
if (($num=$this->netmailWaiting())->count()) {
Log::debug(sprintf('%s:= Got [%d] netmails for [%s] for sending',self::LOGKEY,$num->count(),$this->ftn));
if ($count=($num=$this->netmailWaiting())->count()) {
Log::info(sprintf('%s:= Got [%d] netmails for [%s] for sending',self::LOGKEY,$count,$this->ftn));
// Limit to max messages
if ($num->count() > $this->system->pkt_msgs)
if ($count > $this->system->pkt_msgs)
Log::alert(sprintf('%s:= Only sending [%d] netmails for [%s]',self::LOGKEY,$this->system->pkt_msgs,$this->ftn));
return $this->system->packet($this)->mail($num->take($this->system->pkt_msgs)->get());

2
app/Notifications/Netmails/NetmailHubNoUser.php
View File

@ -59,7 +59,7 @@ class NetmailHubNoUser extends Netmails
)
);
$msg->addText("This hub is not attended, so no user will be able to read your message (the hub is unattended). You may like to try and contact them another way.\r\r");
$msg->addText("This hub is not attended, so no user will be able to read your message. You may like to try and contact them another way.\r\r");
$msg->addText($this->message_path($this->mo));

2
resources/views/system/ours.blade.php
View File

@ -41,7 +41,7 @@
<td>{{ $oo->system->sysop }}</td>
<td>{{ $oo->system->location }}</td>
<td>{{ $oo->system->last_session ? $oo->system->last_session->format('Y-m-d H:i') : '-' }}</td>
<td>{{ $oo->system->addresses->where('zone_id',$oo->zone_id)->pluck('ftn4d')->join(', ') }}</td>
<td>{{ $oo->system->akas->where('zone_id',$oo->zone_id)->pluck('ftn4d')->join(', ') }}</td>
<td>{{ $oo->system->zt_id }}</td>
</tr>
@endforeach