diff --git a/app/controller/chat.php b/app/controller/chat.php index 6fbe8ea..303402d 100644 --- a/app/controller/chat.php +++ b/app/controller/chat.php @@ -90,7 +90,7 @@ class ChatController extends BaseController { 'userId' => $message->get('userId'), 'userName' => UserModel::getNameById($message->get('userId')), 'message' => $message->get('message'), - 'system' => $message->get('system'), + 'system' => $message->get('sysmsg'), 'chatcolor' => UserModel::getChatColorForUser($message->get('userId')), 'created_at' => date('Y-m-h H:i', strtotime($message->get('created_at'))), 'diffForHumans' => (new Carbon($message->get('created_at')))->diffForHumans(), diff --git a/app/migrations/ChatMsgModel.php b/app/migrations/ChatMsgModel.php index ff0a64b..b9cd25c 100644 --- a/app/migrations/ChatMsgModel.php +++ b/app/migrations/ChatMsgModel.php @@ -30,7 +30,7 @@ class ChatMsgModel_Migration { $this->database->add('id INT NOT NULL AUTO_INCREMENT PRIMARY KEY'); $this->database->add('userId INT NOT NULL'); $this->database->add('message TEXT NOT NULL'); - $this->database->add('system BOOLEAN NOT NULL DEFAULT 0'); + $this->database->add('sysmsg BOOLEAN NOT NULL DEFAULT 0'); $this->database->add('created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP'); $this->database->create(); } diff --git a/app/models/ChatMsgModel.php b/app/models/ChatMsgModel.php index 0411a91..88c497e 100644 --- a/app/models/ChatMsgModel.php +++ b/app/models/ChatMsgModel.php @@ -42,7 +42,7 @@ class ChatMsgModel extends \Asatru\Database\Model { if (count($result) > 0) { UserModel::updateLastSeenMsg($result->get(0)->get('id')); - $lastsysmsg = static::raw('SELECT * FROM `' . self::tableName() . '` WHERE system = 1 ORDER BY created_at DESC')->first(); + $lastsysmsg = static::raw('SELECT * FROM `' . self::tableName() . '` WHERE sysmsg = 1 ORDER BY created_at DESC')->first(); if ($lastsysmsg) { UserModel::updateLastSeenSysMsg($lastsysmsg->get('id')); } @@ -96,7 +96,7 @@ class ChatMsgModel extends \Asatru\Database\Model { $limit_token = 'LIMIT ' . strval($limit); } - $result = static::raw('SELECT * FROM `' . self::tableName() . '` WHERE system = 1 AND id > ? ORDER BY created_at DESC ' . $limit_token, [($user->get('last_seen_sysmsg')) ? $user->get('last_seen_sysmsg') : 0]); + $result = static::raw('SELECT * FROM `' . self::tableName() . '` WHERE sysmsg = 1 AND id > ? ORDER BY created_at DESC ' . $limit_token, [($user->get('last_seen_sysmsg')) ? $user->get('last_seen_sysmsg') : 0]); if (($result) && (count($result) > 0)) { $msg = $result->get(count($result) - 1); diff --git a/app/modules/TextBlockModule.php b/app/modules/TextBlockModule.php index 72c5d77..c399d34 100644 --- a/app/modules/TextBlockModule.php +++ b/app/modules/TextBlockModule.php @@ -211,7 +211,7 @@ class TextBlockModule { $icon = html_entity_decode('&#' . $icon, ENT_COMPAT | ENT_QUOTES); - ChatMsgModel::raw('INSERT INTO `' . ChatMsgModel::tableName() . '` (userId, message, system, created_at) VALUES(?, ?, 1, CURRENT_TIMESTAMP)', [ + ChatMsgModel::raw('INSERT INTO `' . ChatMsgModel::tableName() . '` (userId, message, sysmsg, created_at) VALUES(?, ?, 1, CURRENT_TIMESTAMP)', [ $user->get('id'), $icon . ' ' . $message ]); diff --git a/app/views/chat.php b/app/views/chat.php index 5aecc14..072a65a 100644 --- a/app/views/chat.php +++ b/app/views/chat.php @@ -38,7 +38,7 @@ @if (isset($messages)) @foreach ($messages as $message) - @if (!$message->get('system')) + @if (!$message->get('sysmsg'))
{{ UserModel::getNameById($message->get('userId')) }}