Disallow sending empty message

2 files changed, 25 insertions, 10 deletions

diff --git a/pica-client/chatwindow.cpp b/pica-client/chatwindow.cpp
index 9cb1c8c..c00d0fc 100644
--- a/pica-client/chatwindow.cpp
+++ b/pica-client/chatwindow.cpp
@@ -264,21 +264,35 @@ void ChatWindow::msg_informational(QString text)
   chatw->moveCursor(QTextCursor::End, QTextCursor::KeepAnchor);
 }
 
+bool ChatWindow::isEmptyMessage(const QString &msg) const
+{
+    int size = msg.size();
+    for (int i = 0; i < size; ++i) {
+        if (!msg.at(i).isSpace()) {
+            return false;
+        }
+    }
+    return true;
+}
+
 void ChatWindow::send_message()
 {
-    put_message(sendtextw->toPlainText(), Accounts::GetCurrentAccount().id, true);
-    hist.Add(peer_id_, sendtextw->toPlainText(), true);
+    QString message = sendtextw->toPlainText();
+    if (!isEmptyMessage(message)) {
+        put_message(message, Accounts::GetCurrentAccount().id, true);
+        hist.Add(peer_id_, message, true);
 
-    if (!hist.isOK())
-    {
-        QMessageBox mbx;
-        mbx.setText(hist.GetLastError());
-        mbx.exec();
-    }
+        if (!hist.isOK())
+        {
+            QMessageBox mbx;
+            mbx.setText(hist.GetLastError());
+            mbx.exec();
+        }
 
-    emit msg_input(sendtextw->toPlainText(), this);
+        emit msg_input(message, this);
 
-    sendtextw->clear();
+        sendtextw->clear();
+    }
 }
 
 void ChatWindow::closeEvent(QCloseEvent *e)
diff --git a/pica-client/chatwindow.h b/pica-client/chatwindow.h
index 73a053e..a099130 100644
--- a/pica-client/chatwindow.h
+++ b/pica-client/chatwindow.h
@@ -60,6 +60,7 @@ private:
     QPushButton *btAddCtBlacklist;
     QLabel *lbAddCtQuestion;
 
+    bool isEmptyMessage(const QString &msg) const;
     void put_message(QString msg, QByteArray id, bool is_me);
     int draw_message(QString msg, QString nickname, QString datetime, QString color, bool is_delivered);
     void print_history(QList<History::HistoryRecord> H);