When limiting the number of messages in a packet, only retrieve that number from the DB
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
@@ -967,9 +968,9 @@ class Address extends Model
|
||||
* Echomail waiting to be sent to this system
|
||||
*
|
||||
* @param int|null $max
|
||||
* @return Collection
|
||||
* @return Builder
|
||||
*/
|
||||
public function echomailWaiting(int $max=NULL): Collection
|
||||
public function echomailWaiting(int $max=NULL): Builder
|
||||
{
|
||||
$echomails = $this
|
||||
->UncollectedEchomail()
|
||||
@@ -979,7 +980,7 @@ class Address extends Model
|
||||
->groupBy(['echomails.id'])
|
||||
->get();
|
||||
|
||||
return Echomail::whereIn('id',$echomails->pluck('id'))->get();
|
||||
return Echomail::whereIn('id',$echomails->pluck('id'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1161,10 +1162,10 @@ class Address extends Model
|
||||
/**
|
||||
* Netmail waiting to be sent to this system
|
||||
*
|
||||
* @return Collection
|
||||
* @return Builder
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function netmailWaiting(): Collection
|
||||
public function netmailWaiting(): Builder
|
||||
{
|
||||
$netmails = $this
|
||||
->UncollectedNetmail()
|
||||
@@ -1173,7 +1174,7 @@ class Address extends Model
|
||||
->groupBy(['netmails.id'])
|
||||
->get();
|
||||
|
||||
return Netmail::whereIn('id',$netmails->pluck('id'))->get();
|
||||
return Netmail::whereIn('id',$netmails->pluck('id'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user