Code smell.
This commit is contained in:
+20
-19
@@ -18,21 +18,21 @@ class Chat
|
||||
|
||||
public function getMessages(): ?string
|
||||
{
|
||||
$query = 'select
|
||||
$query = 'select
|
||||
msg,
|
||||
msgdate,
|
||||
type,
|
||||
s.login as sender,
|
||||
r.login as receiver,
|
||||
s.id as sid,
|
||||
r.id as rid
|
||||
from chat
|
||||
left join users s on s.id = chat.user_id
|
||||
left join users r on r.id = chat.receiver_id
|
||||
where
|
||||
r.id = ?
|
||||
or r.id is null
|
||||
or s.id = ?
|
||||
s.login as sender,
|
||||
r.login as receiver,
|
||||
s.id as sid,
|
||||
r.id as rid
|
||||
from chat
|
||||
left join users s on s.id = chat.user_id
|
||||
left join users r on r.id = chat.receiver_id
|
||||
where
|
||||
r.id = ?
|
||||
or r.id is null
|
||||
or s.id = ?
|
||||
order by chat.id';
|
||||
$chatrows = $this->db->ofetchALL($query, [User::getInstance()->getId(), User::getInstance()->getId()]);
|
||||
$wrappedMessage = null;
|
||||
@@ -67,13 +67,14 @@ class Chat
|
||||
$this->db->execute('insert into chat (user_id, msg) values (?,?)', [User::getInstance()->getId(), $msg]);
|
||||
}
|
||||
|
||||
public static function sendSys(string $msg, ?int $receiver_id = null)
|
||||
public static function sendSys(string $msg, ?int $receiverId = null)
|
||||
{
|
||||
Db::getInstance()->execute('insert into chat (user_id, msg, receiver_id, type) values (-1,?,?,?)', [$msg, $receiver_id, 'sys']);
|
||||
}
|
||||
public static function sendTelegraf(string $msg, int $receiver_id)
|
||||
{
|
||||
Db::getInstance()->execute('insert into chat (user_id, msg, receiver_id, type) values (-1,?,?,?)', [$msg, $receiver_id, 'sms']);
|
||||
Db::getInstance()->execute('insert into chat (user_id, msg, receiver_id, type) values (-1,?,?,?)', [$msg, $receiverId, 'sys']);
|
||||
}
|
||||
|
||||
}
|
||||
public static function sendTelegraf(string $msg, int $receiverId)
|
||||
{
|
||||
Db::getInstance()->execute('insert into chat (user_id, msg, receiver_id, type) values (-1,?,?,?)', [$msg, $receiverId, 'sms']);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user