From 8111946858563b3ca9f57a7bd8e0c3e1c49bb63a Mon Sep 17 00:00:00 2001 From: fourtf Date: Sun, 24 Jun 2018 13:06:11 +0200 Subject: [PATCH] renamed variables in twitchserver --- src/providers/twitch/twitchserver.cpp | 13 +++++++------ src/providers/twitch/twitchserver.hpp | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/providers/twitch/twitchserver.cpp b/src/providers/twitch/twitchserver.cpp index 58a969cff..cb2976de9 100644 --- a/src/providers/twitch/twitchserver.cpp +++ b/src/providers/twitch/twitchserver.cpp @@ -184,10 +184,11 @@ void TwitchServer::onMessageSendRequested(TwitchChannel *channel, const QString sent = false; { - std::lock_guard guard(this->lastMessageMutex); + std::lock_guard guard(this->lastMessageMutex_); // std::queue - auto &lastMessage = channel->hasModRights() ? this->lastMessageMod : this->lastMessagePleb; + auto &lastMessage = + channel->hasModRights() ? this->lastMessageMod_ : this->lastMessagePleb_; size_t maxMessageCount = channel->hasModRights() ? 99 : 19; auto minMessageOffset = (channel->hasModRights() ? 100ms : 1100ms); @@ -195,13 +196,13 @@ void TwitchServer::onMessageSendRequested(TwitchChannel *channel, const QString // check if you are sending messages too fast if (!lastMessage.empty() && lastMessage.back() + minMessageOffset > now) { - if (lastErrorTimeSpeed + 30s < now) { + if (lastErrorTimeSpeed_ + 30s < now) { auto errorMessage = messages::Message::createSystemMessage("sending messages too fast"); channel->addMessage(errorMessage); - lastErrorTimeSpeed = now; + lastErrorTimeSpeed_ = now; } return; } @@ -213,13 +214,13 @@ void TwitchServer::onMessageSendRequested(TwitchChannel *channel, const QString // check if you are sending too many messages if (lastMessage.size() >= maxMessageCount) { - if (lastErrorTimeAmount + 30s < now) { + if (lastErrorTimeAmount_ + 30s < now) { auto errorMessage = messages::Message::createSystemMessage("sending too many messages"); channel->addMessage(errorMessage); - lastErrorTimeAmount = now; + lastErrorTimeAmount_ = now; } return; } diff --git a/src/providers/twitch/twitchserver.hpp b/src/providers/twitch/twitchserver.hpp index 3d10c8527..2ac9773cc 100644 --- a/src/providers/twitch/twitchserver.hpp +++ b/src/providers/twitch/twitchserver.hpp @@ -45,11 +45,11 @@ protected: QString cleanChannelName(const QString &dirtyChannelName) override; private: - std::mutex lastMessageMutex; - std::queue lastMessagePleb; - std::queue lastMessageMod; - std::chrono::steady_clock::time_point lastErrorTimeSpeed; - std::chrono::steady_clock::time_point lastErrorTimeAmount; + std::mutex lastMessageMutex_; + std::queue lastMessagePleb_; + std::queue lastMessageMod_; + std::chrono::steady_clock::time_point lastErrorTimeSpeed_; + std::chrono::steady_clock::time_point lastErrorTimeAmount_; void onMessageSendRequested(TwitchChannel *channel, const QString &message, bool &sent); };