diff options
author | Max Kusatz <max@trialserver.de> | 2020-08-22 14:08:46 +0200 |
---|---|---|
committer | Max Kusatz <max@trialserver.de> | 2020-08-22 14:08:46 +0200 |
commit | 598218e9e1d6e97b7793b0cff2c0d50cab879fa4 (patch) | |
tree | b0c80ca9c038195f4f473a34cb99d0c01479676a /src/N-Commands | |
parent | 537a243882f49cd95b304ecf283de950440fd66a (diff) | |
download | n_core-598218e9e1d6e97b7793b0cff2c0d50cab879fa4.tar.gz n_core-598218e9e1d6e97b7793b0cff2c0d50cab879fa4.zip |
Mensa working sort of with JSON
Diffstat (limited to 'src/N-Commands')
-rw-r--r-- | src/N-Commands/KlingerHandler.cpp | 7 | ||||
-rw-r--r-- | src/N-Commands/KlingerHandler.hpp (renamed from src/N-Commands/KlingerHandler.h) | 3 | ||||
-rw-r--r-- | src/N-Commands/RelationshipHandler.cpp | 10 | ||||
-rw-r--r-- | src/N-Commands/RelationshipHandler.h | 10 | ||||
-rw-r--r-- | src/N-Commands/RelationshipHandler.hpp | 10 |
5 files changed, 22 insertions, 18 deletions
diff --git a/src/N-Commands/KlingerHandler.cpp b/src/N-Commands/KlingerHandler.cpp index 448532c..c596952 100644 --- a/src/N-Commands/KlingerHandler.cpp +++ b/src/N-Commands/KlingerHandler.cpp @@ -2,9 +2,10 @@ // Created by max on 11.08.20. // -#include "KlingerHandler.h" +#include "KlingerHandler.hpp" + +void KlingerHandler::onCall(const Mongoose::Request& request, Mongoose::JsonResponse& response) { -void KlingerHandler::onCall(const Mongoose::Request& request, Mongoose::StreamResponse& response) { std::cout << "Klinger was called\n"; - response << "Bonjour!"; + response["text"] = "Bonjour!"; } diff --git a/src/N-Commands/KlingerHandler.h b/src/N-Commands/KlingerHandler.hpp index 2fc5267..c078303 100644 --- a/src/N-Commands/KlingerHandler.h +++ b/src/N-Commands/KlingerHandler.hpp @@ -2,6 +2,7 @@ // Created by max on 11.08.20. // #include <mongoose/Server.h> +#include <mongoose/JsonResponse.h> #include <string> #ifndef DORGODBOTBACKEND_KLINGERHANDLER_H #define DORGODBOTBACKEND_KLINGERHANDLER_H @@ -9,7 +10,7 @@ class KlingerHandler { public: - void onCall(const Mongoose::Request& request, Mongoose::StreamResponse& response) ; + void onCall(const Mongoose::Request& request, Mongoose::JsonResponse& response) ; }; diff --git a/src/N-Commands/RelationshipHandler.cpp b/src/N-Commands/RelationshipHandler.cpp index 808e17c..46991a3 100644 --- a/src/N-Commands/RelationshipHandler.cpp +++ b/src/N-Commands/RelationshipHandler.cpp @@ -1,4 +1,4 @@ -#include "RelationshipHandler.h" +#include "RelationshipHandler.hpp" #include<string> #include<vector> #include <algorithm> @@ -111,12 +111,14 @@ string rsStart(vector<string> names) { return (names.at(0) + " und " + names.at(1) + " passen nach Angaben von N zu " + to_string(result) + "% zusammen. Gratuliere!\n"); } -void RelationshipHandler::onCall(Mongoose::Request& request, Mongoose::StreamResponse& response) { +void RelationshipHandler::onCall(Mongoose::Request& request, Mongoose::JsonResponse& response) { - // only react when command was issued after this boot std::cout << "/relation was called\n"; - response << rsStart(vector<string>{request.get("name1", "Lukas"), request.get("name2", "cpp")}); + response["text"] = rsStart(vector<string>{request.get("name1", "Lukas"), request.get("name2", "cpp")}); + + response["success"] = "1"; + response["session"] = "NULL"; /*if (messagePtr->date > telegram->getBootDate()) { log(messagePtr->from->username + ": "+messagePtr->text); diff --git a/src/N-Commands/RelationshipHandler.h b/src/N-Commands/RelationshipHandler.h deleted file mode 100644 index 251cabf..0000000 --- a/src/N-Commands/RelationshipHandler.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once -#include <mongoose.h> -#include <mongoose/Request.h> -#include <mongoose/StreamResponse.h> - -class RelationshipHandler { -public: - void onCall(Mongoose::Request& request, Mongoose::StreamResponse& response); - -}; diff --git a/src/N-Commands/RelationshipHandler.hpp b/src/N-Commands/RelationshipHandler.hpp new file mode 100644 index 0000000..fe9c0ea --- /dev/null +++ b/src/N-Commands/RelationshipHandler.hpp @@ -0,0 +1,10 @@ +#pragma once +#include <mongoose.h> +#include <mongoose/Request.h> +#include <mongoose/JsonResponse.h> + +class RelationshipHandler { +public: + void onCall(Mongoose::Request& request, Mongoose::JsonResponse& response); + +}; |