Store datetime in UTC format now, and fix presentation of TZUTC. Also standardise message summaries on Notifications
This commit is contained in:
@@ -228,16 +228,18 @@ class MessageProcess implements ShouldQueue
|
||||
if ($this->mo->msgid) {
|
||||
$o = Echomail::where('msgid',$this->mo->msgid)
|
||||
->where('fftn_id',$this->mo->fftn->id)
|
||||
->where('datetime','>=',$this->mo->date->subYears(3))
|
||||
->where('datetime','>=',$this->mo->date->clone()->subYears(3))
|
||||
->where('datetime','<=',$this->mo->date)
|
||||
->dontCache()
|
||||
->single();
|
||||
|
||||
Log::debug(sprintf('%s:- Checking for duplicate from host id [%d].',self::LOGKEY,$this->mo->fftn->id));
|
||||
|
||||
if ($o) {
|
||||
// @todo Actually update seenby
|
||||
Log::alert(sprintf('%s:! Duplicate echomail [%s] in [%s] from (%s) [%s] to (%s) - updating seenby.',
|
||||
Log::alert(sprintf('%s:! Duplicate echomail [%d] (%s) in [%s] from (%s) [%s] to (%s) - updating seenby.',
|
||||
self::LOGKEY,
|
||||
$o->id,
|
||||
$this->mo->msgid,
|
||||
$this->mo->echoarea->name,
|
||||
$this->mo->from,$this->mo->fftn->ftn,
|
||||
@@ -284,6 +286,7 @@ class MessageProcess implements ShouldQueue
|
||||
$o = Echomail::where('msg_crc',$xx=md5($this->mo->msg_crc))
|
||||
->where('fftn_id',$this->mo->fftn->id)
|
||||
->where('datetime','>',Carbon::now()->subWeek())
|
||||
->dontCache()
|
||||
->get();
|
||||
|
||||
if ($o->count())
|
||||
|
Reference in New Issue
Block a user