Merge branch 'main' of github.com:Taifin/ChitChat into main

Author: lilyreber

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Mikhail Rodionychev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

client/main_window.cpp

@@ -19,6 +19,9 @@ main_window::main_window(QWidget *parent)
     scene = new room();
     ui->setupUi(this);
     this->setWindowTitle("ChitChat");
+    btn = new QPushButton("Terminate\n server");
+    ui->verticalLayout_2->addWidget(btn);
+    connect(btn, SIGNAL(pressed()), this, SLOT(terminate()));
     ui->microphone_check->hide();
     ui->headphones_check->hide();
     move(QGuiApplication::screens().at(0)->geometry().center() -
@@ -68,9 +71,6 @@ void main_window::on_connect_button_clicked() {
     if (ui->connect_button->text() == "connect") {
         run_send_request(
             current_user.serialize(ChitChatMessage::Query_RequestType_CONNECT));
-        btn = new QPushButton("Terminate");
-        ui->verticalLayout_2->addWidget(btn);
-        connect(btn, SIGNAL(pressed()), this, SLOT(terminate()));
         ui->change_avatar_button->hide();
         ui->connect_button->setText("disconnect");
         ui->microphone_check->show();

client/main_window.h

@@ -54,8 +54,6 @@ public slots:
 
     void turn_head_off();
 
-    void stop_thread();
-
 private slots:
     void on_change_avatar_button_clicked();
 

client/voice_manager.cpp

@@ -20,7 +20,6 @@ client::processor::processor(network::queries_keeper *keeper1,
         format = info.nearestFormat(format);
     audioOutput = new QAudioOutput(format, this);
     outDevice = audioOutput->start();
-//    timer = new QTimer(this);
 }
 
 void client::processor::process() {
@@ -37,14 +36,10 @@ void client::processor::process() {
 void client::processor::input_audio_on() {
     inDevice = audioInput->start();
     connect(inDevice, SIGNAL(readyRead()), this, SLOT(send()));
-//    connect(timer, SIGNAL(timeout()), this, SLOT(send()));
-//    timer->start(50);
     qDebug() << "Microphone is on";
 }
 
 void client::processor::input_audio_off() {
-//    disconnect(timer, SIGNAL(timeout()), this, SLOT(send()));
-//    timer->stop();
     audioInput->stop();
     qDebug() << "Microphone is muted";
 }

client/voice_manager.h

@@ -26,7 +26,6 @@ class processor : public network::query_processor {
     QIODevice *outDevice;
     QIODevice *inDevice;
     QTcpSocket *audio_socket;
-    QTimer *timer;
     bool muted;
 
 public slots:

server/server.cpp

@@ -217,6 +217,7 @@ void server_processor::get_score() {
     auto score = model::database::get_user_score(user_in_process.get_name(), query.game_name() + "_score");
     auto q = user_in_process.serialize(Query_FeedbackType_SCORE);
     q.set_score(score);
+    q.set_game_name(query.game_name());
     prepare_query(q, to);
 }
 

shared/socket.cpp

@@ -13,7 +13,6 @@ void queries_keeper::push_parsed(const QByteArray &data, QTcpSocket *sender) {
 }
 
 void queries_keeper::push_prepared(const QByteArray &q, QTcpSocket *cli) {
-    //    std::unique_lock lock(queries_mutex);
     prepared_queries.push({q, cli});
 }
 
@@ -22,14 +21,12 @@ std::pair<QByteArray, QTcpSocket *> queries_keeper::front_parsed() {
 }
 
 std::pair<QByteArray, QTcpSocket *> queries_keeper::pop_parsed() {
-    //    std::unique_lock lock(queries_mutex);
     auto q = parsed_queries.front();
     parsed_queries.pop();
     return q;
 }
 
 std::pair<QByteArray, QTcpSocket *> queries_keeper::pop_prepared() {
-    std::unique_lock lock(queries_mutex);
     auto q = prepared_queries.front();
     prepared_queries.pop();
     return q;
@@ -78,7 +75,6 @@ void tcp_socket::send() {
     auto q = keeper->pop_prepared();
     qDebug() << "Sending msg of size:" << q.first.size();
     q.second->write(q.first);
-    q.second->waitForBytesWritten(100);
 }
 
 void tcp_socket::read() {

shared/socket.h

@@ -86,6 +86,7 @@ class query_processor : public QObject {
 public slots:
 
     void debug_terminate_me() {
+        qDebug() << "Aboba";
         debug_terminate = true;
     };