admin/zemailnator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: code refactor via rector

Browse Source
This commit is contained in:
idevakk
2025-11-14 02:01:01 -08:00
parent 90ab79b3a2
commit ae795880ed
148 changed files with 1520 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
app/Models/Email.php
View File

@@ -2,13 +2,13 @@
namespace App\Models;
use DateTimeImmutable;
use Illuminate\Support\Facades\Date;
use App\ColorPicker;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
use DateTime;
use Ddeboer\Imap\ConnectionInterface;
use Ddeboer\Imap\Search\Date\Since;
use Ddeboer\Imap\Search\Email\To;
use Ddeboer\Imap\Server;
use Exception;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -55,20 +55,16 @@ class Email extends Model
public static function connectMailBox($imap = null): ConnectionInterface
{
if ($imap === null) {
$imap = json_decode(config('app.settings.imap_settings'), true);
$imap = json_decode((string) config('app.settings.imap_settings'), true);
}
$flags = $imap['protocol'].'/'.$imap['encryption'];
if ($imap['validate_cert']) {
$flags = $flags.'/validate-cert';
} else {
$flags = $flags.'/novalidate-cert';
}
$flags = $imap['validate_cert'] ? $flags.'/validate-cert' : $flags.'/novalidate-cert';
$server = new Server($imap['host'], $imap['port'], $flags);
return $server->authenticate($imap['username'], $imap['password']);
}
public static function fetchProcessStoreEmail()
public static function fetchProcessStoreEmail(): void
{
try {
@@ -82,7 +78,7 @@ class Email extends Model
$sender = $message->getFrom();
$date = $message->getDate();
if (! $date) {
if (!$date instanceof DateTimeImmutable) {
$date = new DateTime;
if ($message->getHeaders()->get('udate')) {
$date->setTimestamp($message->getHeaders()->get('udate'));
@@ -104,17 +100,11 @@ class Email extends Model
$obj = [];
$to = $message->getHeaders()->get('To') ? array_map(function ($entry) {
return $entry->mailbox.'@'.$entry->host;
}, $message->getHeaders()->get('To')) : [];
$to = $message->getHeaders()->get('To') ? array_map(fn($entry): string => $entry->mailbox.'@'.$entry->host, $message->getHeaders()->get('To')) : [];
$cc = $message->getHeaders()->get('Cc') ? array_map(function ($entry) {
return $entry->mailbox.'@'.$entry->host;
}, $message->getHeaders()->get('Cc')) : [];
$cc = $message->getHeaders()->get('Cc') ? array_map(fn($entry): string => $entry->mailbox.'@'.$entry->host, $message->getHeaders()->get('Cc')) : [];
$bcc = $message->getHeaders()->get('Bcc') ? array_map(function ($entry) {
return $entry->mailbox.'@'.$entry->host;
}, $message->getHeaders()->get('Bcc')) : [];
$bcc = $message->getHeaders()->get('Bcc') ? array_map(fn($entry): string => $entry->mailbox.'@'.$entry->host, $message->getHeaders()->get('Bcc')) : [];
$messageTime = $message->getDate();
$utcTime = CarbonImmutable::instance($messageTime)->setTimezone('UTC')->toDateTimeString();
@@ -139,9 +129,11 @@ class Email extends Model
$attachments = $message->getAttachments();
$directory = './tmp/attachments/'.$obj['id'].'/';
is_dir($directory) || mkdir($directory, 0777, true);
if (!is_dir($directory)) {
mkdir($directory, 0777, true);
}
foreach ($attachments as $attachment) {
$filenameArray = explode('.', $attachment->getFilename());
$filenameArray = explode('.', (string) $attachment->getFilename());
$extension = $filenameArray[count($filenameArray) - 1];
if (in_array($extension, $allowed)) {
if (! file_exists($directory.$attachment->getFilename())) {
@@ -177,7 +169,7 @@ class Email extends Model
if (! $message->isSeen()) {
$initialData = $obj;
$data = [
'message_id' => Carbon::parse($utcTime)->format('Ymd').$initialData['id'],
'message_id' => Date::parse($utcTime)->format('Ymd').$initialData['id'],
'subject' => $initialData['subject'],
'from_name' => $initialData['sender_name'],
'from_email' => $initialData['sender_email'],
@@ -197,7 +189,7 @@ class Email extends Model
];
try {
self::create($data);
self::query()->create($data);
$checkAction = config('app.move_or_delete');
if ($checkAction != null) {
if ($checkAction == 'delete') {
@@ -208,13 +200,13 @@ class Email extends Model
}
}
} catch (Exception $e) {
} catch (Exception) {
// \Log::error($e);
}
} else {
$initialData = $obj;
$data = [
'message_id' => Carbon::parse($utcTime)->format('Ymd').$initialData['id'],
'message_id' => Date::parse($utcTime)->format('Ymd').$initialData['id'],
'subject' => $initialData['subject'],
'from_name' => $initialData['sender_name'],
'from_email' => $initialData['sender_email'],
@@ -234,7 +226,7 @@ class Email extends Model
];
try {
self::create($data);
self::query()->create($data);
$checkAction = config('app.move_or_delete');
if ($checkAction != null) {
if ($checkAction == 'delete') {
@@ -245,7 +237,7 @@ class Email extends Model
}
}
} catch (Exception $e) {
} catch (Exception) {
// \Log::error($e);
}
}
@@ -263,24 +255,24 @@ class Email extends Model
{
$validator = Validator::make(['email' => $email], [
'email' => 'required|email',
'email' => ['required', 'email'],
]);
if ($validator->fails()) {
return [];
}
return self::whereJsonContains('to', $email)->orderBy('timestamp', 'desc')->get();
return self::query()->whereJsonContains('to', $email)->orderBy('timestamp', 'desc')->get();
}
public static function parseEmail($email, $deleted = []): array
public static function parseEmail(string $email, $deleted = []): array
{
if (config('app.fetch_from_remote_db')) {
$messages = RemoteEmail::fetchEmailFromDB($email);
} else {
$messages = self::fetchEmailFromDB($email);
}
$limit = json_decode(config('app.settings.configuration_settings'))->fetch_messages_limit ?? 15;
$limit = json_decode((string) config('app.settings.configuration_settings'))->fetch_messages_limit ?? 15;
$count = 1;
$response = [
'data' => [],
@@ -297,9 +289,9 @@ class Email extends Model
if (in_array($message['message_id'], $deleted)) {
// If it exists, delete the matching record from the 'emails' table
if (config('app.fetch_from_remote_db')) {
RemoteEmail::where('message_id', $message['message_id'])->delete();
RemoteEmail::query()->where('message_id', $message['message_id'])->delete();
} else {
Email::where('message_id', $message['message_id'])->delete();
Email::query()->where('message_id', $message['message_id'])->delete();
}
continue;
@@ -308,23 +300,23 @@ class Email extends Model
$blocked = false;
$timestamp = $message['timestamp'];
$carbonTimestamp = Carbon::parse($timestamp, 'UTC');
$carbonTimestamp = Date::parse($timestamp, 'UTC');
$obj = [];
$obj['subject'] = $message['subject'];
$obj['sender_name'] = $message['from_name'];
$obj['sender_email'] = $message['from_email'];
$obj['timestamp'] = $message['timestamp'];
$obj['date'] = $carbonTimestamp->format('d M Y h:i A');
$obj['datediff'] = $carbonTimestamp->diffForHumans(Carbon::now('UTC'));
$obj['datediff'] = $carbonTimestamp->diffForHumans(Date::now('UTC'));
$obj['id'] = $message['message_id'];
$obj['content'] = $message['body_html'];
$obj['contentText'] = $message['body_text'];
$obj['attachments'] = [];
$obj['is_seen'] = $message['is_seen'];
$obj['sender_photo'] = self::chooseColor(strtoupper(substr($message['from_name'] ?: $message['from_email'], 0, 1)));
$obj['sender_photo'] = self::chooseColor(strtoupper(substr((string) $message['from_name'] ?: (string) $message['from_email'], 0, 1)));
$domain = explode('@', $obj['sender_email'])[1];
$blocked = in_array($domain, json_decode(config('app.settings.configuration_settings'))->blocked_domains);
$domain = explode('@', (string) $obj['sender_email'])[1];
$blocked = in_array($domain, json_decode((string) config('app.settings.configuration_settings'))->blocked_domains);
if ($blocked) {
$obj['subject'] = __('Blocked');
$obj['content'] = __('Emails from').' '.$domain.' '.__('are blocked by Admin');
@@ -348,9 +340,9 @@ class Email extends Model
}
}
if (config('app.fetch_from_remote_db')) {
RemoteEmail::where('message_id', $message['message_id'])->update(['is_seen' => true]);
RemoteEmail::query()->where('message_id', $message['message_id'])->update(['is_seen' => true]);
} else {
Email::where('message_id', $message['message_id'])->update(['is_seen' => true]);
Email::query()->where('message_id', $message['message_id'])->update(['is_seen' => true]);
}
if (++$count > $limit) {
break;
@@ -360,7 +352,7 @@ class Email extends Model
return $response;
}
public static function deleteBulkAttachments()
public static function deleteBulkAttachments(): void
{
$dir = public_path('/tmp/attachments');
@@ -373,7 +365,7 @@ class Email extends Model
}
}
public static function deleteBulkMailboxes()
public static function deleteBulkMailboxes(): string
{
$foldersToClean = ['INBOX', 'ZDUMP', 'Trash'];
$cutoff = (new DateTime)->modify('-3 hours');
@@ -410,15 +402,15 @@ class Email extends Model
return "$totalDeleted message(s) deleted from Trash and ZDUMP.";
}
public static function deleteMessagesFromDB()
public static function deleteMessagesFromDB(): string
{
$cutoff = Carbon::now('UTC')->subHours(6)->toDateTimeString();
$count = count(self::where('timestamp', '<', $cutoff)
$cutoff = Date::now('UTC')->subHours(6)->toDateTimeString();
$count = count(self::query()->where('timestamp', '<', $cutoff)
->orderBy('timestamp', 'desc')
->get());
if ($count > 0) {
self::where('timestamp', '<', $cutoff)->delete();
self::query()->where('timestamp', '<', $cutoff)->delete();
return "$count old message(s) deleted from the database.";
}
@@ -429,22 +421,17 @@ class Email extends Model
public static function mailToDBStatus(): bool
{
if (config('app.fetch_from_remote_db')) {
$latestRecord = RemoteEmail::orderBy('timestamp', 'desc')->first();
$latestRecord = RemoteEmail::query()->orderBy('timestamp', 'desc')->first();
} else {
$latestRecord = self::orderBy('timestamp', 'desc')->first();
$latestRecord = self::query()->orderBy('timestamp', 'desc')->first();
}
if (! $latestRecord) {
return false;
}
$currentTime = Carbon::now('UTC');
$lastRecordTime = Carbon::parse($latestRecord->timestamp);
if ($lastRecordTime->diffInMinutes($currentTime) < 5) {
return true;
}
return false;
$currentTime = Date::now('UTC');
$lastRecordTime = Date::parse($latestRecord->timestamp);
return $lastRecordTime->diffInMinutes($currentTime) < 5;
}
public static function cleanMailbox(): string