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

Compare commits

base: bbs:22ba6fe35c46d25eea8d363868fe55ed83e93bd3
Branches Tags
bbs:master
bbs:bbs
..
compare: bbs:e2cd09ac9899ee5c99899b629b8f3420cc645bae
Branches Tags
bbs:master
bbs:bbs

No commits in common. "22ba6fe35c46d25eea8d363868fe55ed83e93bd3" and "e2cd09ac9899ee5c99899b629b8f3420cc645bae" have entirely different histories.
22ba6fe35c ... e2cd09ac98

20 changed files with 727 additions and 954 deletions
Show Stats Expand all files Collapse all files

3
app/Models/Address.php
View File

@ -9,9 +9,10 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use App\Classes\FTN\Packet;
use App\Classes\FTN\{Message,Packet};
use App\Exceptions\InvalidFTNException;
use App\Traits\{QueryCacheableConfig,ScopeActive};

9
app/Models/AddressEchoarea.php
View File

@ -6,10 +6,7 @@ use Illuminate\Database\Eloquent\Relations\Pivot;
class AddressEchoarea extends Pivot
{
protected function casts(): array
{
return [
'subscribed' => 'datetime:Y-m-d H:i',
];
}
protected $casts = [
'subscribed' => 'datetime:Y-m-d H:i',
];
}

9
app/Models/Domain.php
View File

@ -28,12 +28,9 @@ class Domain extends Model
private const CACHE_TIME = 3600;
private const STATS_MONTHS = 6;
protected function casts(): array
{
return [
'homepage' => CompressedStringOrNull::class,
];
}
protected $casts = [
'homepage' => CompressedStringOrNull::class,
];
/* SCOPES */

15
app/Models/Dynamic.php
View File

@ -11,15 +11,12 @@ class Dynamic extends Model
{
use SoftDeletes;
protected function casts(): array
{
return [
'arguments' => CollectionOrNull::class,
'next_at' => 'datetime:Y-m-d H:i:s',
'start_date' => 'datetime:Y-m-d',
'start_time' => 'datetime:H:i:s',
];
}
protected $casts = [
'arguments' => CollectionOrNull::class,
'next_at' => 'datetime:Y-m-d H:i:s',
'start_date' => 'datetime:Y-m-d',
'start_time' => 'datetime:H:i:s',
];
/* RELATIONS */

11
app/Models/Echoarea.php
View File

@ -45,13 +45,10 @@ class Echoarea extends Model
private const CACHE_TIME = 3600;
protected function casts(): array
{
return [
'first_message' => 'datetime:Y-m-d H:i:s',
'last_message' => 'datetime:Y-m-d H:i:s',
];
}
protected $casts = [
'first_message' => 'datetime:Y-m-d H:i:s',
'last_message' => 'datetime:Y-m-d H:i:s',
];
/* RELATIONS */

27
app/Models/Echomail.php
View File

@ -34,20 +34,17 @@ final class Echomail extends Model implements Packet
// When generating a packet for this echomail, the packet recipient is our tftn
public Address $tftn;
protected function casts(): array
{
return [
'to' => UTF8StringOrNull::class,
'from' => UTF8StringOrNull::class,
'subject' => UTF8StringOrNull::class,
'datetime' => 'datetime:Y-m-d H:i:s',
'kludges' => CollectionOrNull::class,
'msg' => CompressedStringOrNull::class,
'msg_src' => CompressedStringOrNull::class,
'rogue_seenby' => CollectionOrNull::class,
'rogue_path' => CollectionOrNull::class, // @deprecated?
];
}
protected $casts = [
'to' => UTF8StringOrNull::class,
'from' => UTF8StringOrNull::class,
'subject' => UTF8StringOrNull::class,
'datetime' => 'datetime:Y-m-d H:i:s',
'kludges' => CollectionOrNull::class,
'msg' => CompressedStringOrNull::class,
'msg_src' => CompressedStringOrNull::class,
'rogue_seenby' => CollectionOrNull::class,
'rogue_path' => CollectionOrNull::class, // @deprecated?
];
public function __get($key)
{
@ -261,7 +258,7 @@ final class Echomail extends Model implements Packet
$exportto = $model
->echoarea
->addresses
->filter(fn($item)=>$model->echoarea->can_read($item->security))
->filter(function($item) use ($model) { return $model->echoarea->can_read($item->security); })
->pluck('id')
->diff(our_address($model->fftn->zone->domain,FALSE)->pluck('id'))
->diff($seenby);

30
app/Models/File.php
View File

@ -25,18 +25,15 @@ class File extends Model
public Collection $set_seenby;
public string $src_file = '';
protected function casts(): array
{
return [
'kludges' => CollectionOrNull::class,
'datetime' => 'datetime:Y-m-d H:i:s',
'desc' => CompressedStringOrNull::class,
'ldesc' => CompressedStringOrNull::class,
'rogue_seenby' => CollectionOrNull::class,
'rogue_path' => CollectionOrNull::class,
'size' => 'int',
];
}
protected $casts = [
'kludges' => CollectionOrNull::class,
'datetime' => 'datetime:Y-m-d H:i:s',
'desc' => CompressedStringOrNull::class,
'ldesc' => CompressedStringOrNull::class,
'rogue_seenby' => CollectionOrNull::class,
'rogue_path' => CollectionOrNull::class,
'size' => 'int',
];
public static function boot()
{
@ -149,21 +146,18 @@ class File extends Model
$rogue->push($sb);
}
if (count($rogue)) {
$model->rogue_seenby = $rogue;
$model->save();
}
$model->rogue_seenby = $rogue;
$model->seenby()->sync($seenby);
$model->save();
// See if we need to export this file.
if ($model->filearea->sec_read) {
$exportto = $model
->filearea
->addresses
->filter(fn($item)=>$model->filearea->can_read($item->security))
->filter(function($item) use ($model) { return $model->filearea->can_read($item->security); })
->pluck('id')
->diff(our_address($model->fftn->zone->domain,FALSE)->pluck('id'))
->diff($seenby);
if ($exportto->count()) {

11
app/Models/Filearea.php
View File

@ -11,13 +11,10 @@ class Filearea extends Model
{
use SoftDeletes,ScopeActive,AreaSecurity;
protected function casts(): array
{
return [
'first_file' => 'datetime:Y-m-d H:i:s',
'last_file' => 'datetime:Y-m-d H:i:s',
];
}
protected $casts = [
'first_file' => 'datetime:Y-m-d H:i:s',
'last_file' => 'datetime:Y-m-d H:i:s',
];
protected $fillable = [
'name',

29
app/Models/Job.php
View File

@ -7,23 +7,20 @@ use Illuminate\Support\Facades\Config;
class Job extends Model
{
public $timestamps = false;
public $timestamps = false;
protected function casts(): array
{
return [
'payload' => 'array',
'reserved_at' => 'datetime',
'available_at' => 'datetime',
'created_at' => 'datetime',
];
}
protected $casts = [
'payload' => 'array',
'reserved_at' => 'datetime',
'available_at' => 'datetime',
'created_at' => 'datetime',
];
public function __construct(array $attributes=[])
{
parent::__construct($attributes);
$this->table = Config::get('queue.connections.' . (Config::get('queue.default', 'database')) . '.table', 'jobs');
}
public function __construct(array $attributes = [])
{
parent::__construct($attributes);
$this->table = Config::get('queue.connections.' . (Config::get('queue.default', 'database')) . '.table', 'jobs');
}
public function getDisplayNameAttribute()
{
@ -69,4 +66,4 @@ class Job extends Model
{
return unserialize($this->payload['data']['command']);
}
}
}

23
app/Models/Netmail.php
View File

@ -34,19 +34,16 @@ final class Netmail extends Model implements Packet
'Via' => 'set_path',
];
protected function casts(): array
{
return [
'to' => UTF8StringOrNull::class,
'from' => UTF8StringOrNull::class,
'subject' => UTF8StringOrNull::class,
'datetime' => 'datetime:Y-m-d H:i:s',
'kludges' => CollectionOrNull::class,
'msg' => CompressedStringOrNull::class,
'msg_src' => CompressedStringOrNull::class,
'sent_at' => 'datetime:Y-m-d H:i:s',
];
}
protected $casts = [
'to' => UTF8StringOrNull::class,
'from' => UTF8StringOrNull::class,
'subject' => UTF8StringOrNull::class,
'datetime' => 'datetime:Y-m-d H:i:s',
'kludges' => CollectionOrNull::class,
'msg' => CompressedStringOrNull::class,
'msg_src' => CompressedStringOrNull::class,
'sent_at' => 'datetime:Y-m-d H:i:s',
];
public function __get($key)
{

9
app/Models/Nodelist.php
View File

@ -9,12 +9,9 @@ class Nodelist extends Model
{
use SoftDeletes;
protected function casts(): array
{
return [
'date' => 'datetime:Y-m-d H:i:s'
];
}
protected $casts = [
'date' => 'datetime:Y-m-d H:i:s'
];
protected $fillable = ['date','domain_id'];

9
app/Models/Origin.php
View File

@ -12,12 +12,9 @@ class Origin extends Model
public const UPDATED_AT = NULL;
protected function casts(): array
{
return [
'value' => UTF8StringOrNull::class,
];
}
protected $casts = [
'value' => UTF8StringOrNull::class,
];
public function complete(Address $o): string
{

11
app/Models/Pivots/ViaPivot.php
View File

@ -6,10 +6,7 @@ use Illuminate\Database\Eloquent\Relations\Pivot;
class ViaPivot extends Pivot
{
protected function casts(): array
{
return [
'datetime' => 'datetime',
];
}
}
protected $casts = [
'datetime' => 'datetime',
];
}

11
app/Models/Setup.php
View File

@ -35,13 +35,10 @@ class Setup extends Model
public const MAX_BATCH_FILES = 5;
public const MAX_MSGS_PKT = 50;
protected function casts(): array
{
return [
'options' => 'array',
'servers' => 'array',
];
}
protected $casts = [
'options' => 'array',
'servers' => 'array',
];
/**
* @throws \Exception

9
app/Models/System.php
View File

@ -17,12 +17,9 @@ class System extends Model
public const default = 'Discovered System';
protected function casts(): array
{
return [
'last_session' => 'datetime:Y-m-d H:i:s'
];
}
protected $casts = [
'last_session' => 'datetime:Y-m-d H:i:s'
];
/* STATIC */

9
app/Models/Tagline.php
View File

@ -12,12 +12,9 @@ class Tagline extends Model
public const UPDATED_AT = NULL;
protected function casts(): array
{
return [
'value' => UTF8StringOrNull::class,
];
}
protected $casts = [
'value' => UTF8StringOrNull::class,
];
public function complete(): string
{

9
app/Models/Tearline.php
View File

@ -12,12 +12,9 @@ class Tearline extends Model
public const UPDATED_AT = NULL;
protected function casts(): array
{
return [
'value' => UTF8StringOrNull::class,
];
}
protected $casts = [
'value' => UTF8StringOrNull::class,
];
public function complete(): string
{

15
app/Models/User.php
View File

@ -53,16 +53,13 @@ class User extends Authenticatable implements MustVerifyEmail
/**
* The attributes that should be cast to native types.
*
* @return array
* @var array
*/
protected function casts(): array
{
return [
'email_verified_at' => 'datetime',
'last_on' => 'datetime:Y-m-d H:i:s',
'passkey' => 'json',
];
}
protected $casts = [
'email_verified_at' => 'datetime',
'last_on' => 'datetime:Y-m-d H:i:s',
'passkey' => 'json',
];
/* RELATIONS */

1430
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
resources/views/layouts/auth.blade.php
View File

@ -16,6 +16,8 @@
{{-- Scripts --}}
@section('scripts')
@include('layouts.partials.scripts')
@yield('page-scripts')
@show
</body>
</html>