Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SerialPrograms/Source/Integrations/DiscordWebhook.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void DiscordWebhookSender::send(
const QUrl& url, std::chrono::milliseconds delay,
const JsonObject& obj,
std::shared_ptr<PendingFileSend> file,
std::function<void()> finish_callback
MoveOnlyFunction<void()> finish_callback
){
cleanup_stuck_requests();
std::shared_ptr<JsonValue> json(new JsonValue(obj.clone()));
Expand All @@ -75,7 +75,7 @@ void DiscordWebhookSender::send(
json = std::move(json),
file = std::move(file),
finish_callback = std::move(finish_callback)
]{
]() mutable{
throttle();
std::vector<DiscordFileAttachment> attachments;
if (file){
Expand All @@ -95,7 +95,7 @@ void DiscordWebhookSender::send(
const QUrl& url, std::chrono::milliseconds delay,
const JsonObject& obj,
std::vector<std::shared_ptr<PendingFileSend>> files,
std::function<void()> finish_callback
MoveOnlyFunction<void()> finish_callback
){
cleanup_stuck_requests();
std::shared_ptr<JsonValue> json(new JsonValue(obj.clone()));
Expand All @@ -108,7 +108,7 @@ void DiscordWebhookSender::send(
json = std::move(json),
files = std::move(files),
finish_callback = std::move(finish_callback)
]{
]() mutable{
throttle();
std::vector<DiscordFileAttachment> attachments;
for (auto& file : files){
Expand Down
5 changes: 3 additions & 2 deletions SerialPrograms/Source/Integrations/DiscordWebhook.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <deque>
#include <QNetworkReply>
#include "Common/Cpp/MoveOnlyFunction.h"
#include "Common/Cpp/Time.h"
#include "Common/Cpp/Concurrency/Mutex.h"
#include "Common/Cpp/Concurrency/ConditionVariable.h"
Expand Down Expand Up @@ -52,14 +53,14 @@ class DiscordWebhookSender : public QObject{
const QUrl& url, std::chrono::milliseconds delay,
const JsonObject& obj,
std::shared_ptr<PendingFileSend> file,
std::function<void()> finish_callback = nullptr
MoveOnlyFunction<void()> finish_callback = nullptr
);
void send(
Logger& logger,
const QUrl& url, std::chrono::milliseconds delay,
const JsonObject& obj,
std::vector<std::shared_ptr<PendingFileSend>> files,
std::function<void()> finish_callback = nullptr
MoveOnlyFunction<void()> finish_callback = nullptr
);

static DiscordWebhookSender& instance();
Expand Down
Loading