From 0c9d5f86b9a518e83cc57ba4c5aa741aa0a5eef0 Mon Sep 17 00:00:00 2001 From: theusermc <62674887+theusermc@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:23:03 -0700 Subject: [PATCH] removed src/ --- src/Discord_WebHook.cpp | 139 ---------------------------------------- src/Discord_WebHook.h | 74 --------------------- 2 files changed, 213 deletions(-) delete mode 100644 src/Discord_WebHook.cpp delete mode 100644 src/Discord_WebHook.h diff --git a/src/Discord_WebHook.cpp b/src/Discord_WebHook.cpp deleted file mode 100644 index cf859ef..0000000 --- a/src/Discord_WebHook.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/* - Discord_WebHook.cpp - Library for sending messages to Discord via WebHook - - Copyright (c) 2022 µsini - Author : Rémi Sarrailh - Version : 1.0.0 - - The MIT License (MIT) - 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. -*/ - -#include "Discord_WebHook.h" - -// Get webhook url into webhook_url -void Discord_Webhook::begin(String webhook_url) { - Discord_Webhook::webhook_url = webhook_url; -} - -// Add WiFi credentials using WiFiMulti -void Discord_Webhook::addWiFi(const char *ssid, const char *password) { - if (Discord_Webhook::debug) { - Serial.print("[WIFI] Added ssid:"); - Serial.println(ssid); - } - Discord_Webhook::wifi.addAP(ssid, password); -} - -// Wait for WiFi connection to established -void Discord_Webhook::connectWiFi() { - WiFi.mode(WIFI_STA); - if (Discord_Webhook::debug) { - Serial.println("[WiFi] Connecting WiFi"); - } - // wait for WiFi connection - while ((Discord_Webhook::wifi.run() != WL_CONNECTED)) { - if (Discord_Webhook::debug) { - Serial.print("."); - } - delay(100); - } - if (Discord_Webhook::debug) { - Serial.println("[WiFi] Connected"); - } -} - -// Set TTS variable -void Discord_Webhook::setTTS() { Discord_Webhook::tts = true; } - -// Set debug variable to false -void Discord_Webhook::disableDebug() { Discord_Webhook::debug = false; } - -// Send message to Discord, we disable SSL certificate verification for ease of -// use (Warning: this is insecure) -bool Discord_Webhook::send(String content) { - String discord_tts = "false"; - if (Discord_Webhook::tts) { - discord_tts = "true"; - } - - WiFiClientSecure *client = new WiFiClientSecure; // Create a WiFiClientSecure - bool ok = false; - if (client) { - client->setInsecure(); // Disable SSL certificate verification - - HTTPClient https; // Create HTTPClient - if (Discord_Webhook::debug) { - Serial.println("[HTTP] Connecting to Discord..."); - Serial.println("[HTTP] Message: " + content); - Serial.println("[HTTP] TTS: " + discord_tts); - } - - // Begin HTTPS requests - if (https.begin(*client, Discord_Webhook::webhook_url)) { - https.addHeader("Content-Type", "application/json"); // Set request as JSON - - // Send POST request - int httpCode = https.POST("{\"content\":\"" + content + - "\",\"tts\":" + discord_tts + "}"); - if (httpCode > 0) { // if HTTP code is return - if (httpCode == HTTP_CODE_OK || - httpCode == HTTP_CODE_MOVED_PERMANENTLY || - httpCode == HTTP_CODE_NO_CONTENT) { - // Discord webhook has changed and our request is not correct, so it - // will not send response, so we end without getting a response - // https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks - if (Discord_Webhook::debug) { - Serial.println("[HTTP] OK"); - } - ok = true; - } else { - if (Discord_Webhook::debug) { - // This should mainly return an error if token or id is invalid - String payload = https.getString(); - Serial.print("[HTTP] ERROR: "); - Serial.println(payload); - ok = false; - } - } - https.end(); - } else { - if (Discord_Webhook::debug) { - // This will return an error if the server is unreachable - Serial.printf("[HTTP] ERROR: %s\n", - https.errorToString(httpCode).c_str()); - ok = false; - } - } - } else { - if (Discord_Webhook::debug) { - // This will return an error if request failed - Serial.printf("[HTTP] Unable to connect\n"); - ok = false; - } - } - } else { - if (Discord_Webhook::debug) { - // This shouldn't happen but anyway it's better to check - Serial.println("[HTTP] Unable to create client"); - ok = false; - } - } - delete client; - return ok; -} diff --git a/src/Discord_WebHook.h b/src/Discord_WebHook.h deleted file mode 100644 index 5a2fbd6..0000000 --- a/src/Discord_WebHook.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - Discord_WebHook.h - Library for sending messages to Discord via WebHook - - Copyright (c) 2022 µsini - Author : Rémi Sarrailh - Version : 1.0.0 - - The MIT License (MIT) - 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. -*/ - -#ifndef Discord_WebHook_h -#define Discord_WebHook_h - -#include - -// Define if it is an ESP32 (code should works on new board ESP32-S2/ESP32-C3) -#if defined(ESP32) -#include -#include -#include - -#elif defined(ESP8266) -#include -#include -#include -#include -//#include "WiFiClientSecureAxTLS.h" -#include -#else -// We still open it as ESP32 for compatibility with later version (not tested) -#warning "Library worked on ESP8266/ESP32 only" -#include -#include -#include -#endif - -class Discord_Webhook { -public: - void begin(String webhook_url); - void addWiFi(const char* ssid, const char* password); - void connectWiFi(); - void disableDebug(); - void setTTS(); - bool send(String content); - -private: - #ifdef ESP32 - WiFiMulti wifi; - #endif - #ifdef ESP8266 - ESP8266WiFiMulti wifi; - #endif - String webhook_url; - bool tts = false; - bool debug = true; -}; - -#endif \ No newline at end of file