Merge branch 'Ch2Usercard'

This commit is contained in:
fourtf
2020-09-26 14:54:44 +02:00
7 changed files with 334 additions and 81 deletions
+9
View File
@@ -11,6 +11,8 @@
#include "singletons/Toasts.hpp"
#include "widgets/Notebook.hpp"
using TimeoutButton = std::pair<QString, int>;
namespace chatterino {
class HighlightPhrase;
@@ -339,6 +341,13 @@ public:
IntSetting hideSimilarMaxMessagesToCheck = {
"/similarity/hideSimilarMaxMessagesToCheck", 3};
/// Timeout buttons
ChatterinoSetting<std::vector<TimeoutButton>> timeoutButtons = {
"/timeouts/timeoutButtons",
{ { "s", 1 }, { "s", 30 }, { "m", 1 }, { "m", 5 },
{ "m", 30 }, { "h", 1 }, { "d", 1 }, { "w", 1 } } };
private:
void updateModerationActions();
};