Skip to content

Commit cafc5e4

Browse files
committed
Remove sleepy part 2
1 parent 3aadcfb commit cafc5e4

File tree

4 files changed

+21
-60
lines changed

4 files changed

+21
-60
lines changed

SerialPrograms/Source/CommonFramework/Main.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ int main(int argc, char *argv[]){
111111
Integration::DiscordIntegrationSettingsOption& discord_settings = GlobalSettings::instance().DISCORD->integration;
112112
if (discord_settings.run_on_start){
113113
#ifdef PA_DPP
114-
if (discord_settings.library0 == Integration::DiscordIntegrationSettingsOption::Library::DPP){
115-
Integration::DppClient::Client::instance().connect();
116-
}
114+
Integration::DppClient::Client::instance().connect();
117115
#endif
118116
discord_settings.on_config_value_changed(nullptr);
119117
}

SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,10 @@ void send_raw_notification(
120120
);
121121

122122
#ifdef PA_DPP
123-
if (GlobalSettings::instance().DISCORD->integration.library0 == Integration::DiscordIntegrationSettingsOption::Library::DPP){
124-
Integration::DppClient::Client::instance().send_embed_dpp(
125-
should_ping, color, tags, std::move(embed),
126-
hasFile ? file : nullptr
127-
);
128-
}
123+
Integration::DppClient::Client::instance().send_embed_dpp(
124+
should_ping, color, tags, std::move(embed),
125+
hasFile ? file : nullptr
126+
);
129127
#endif
130128
}
131129
void send_raw_notification(
@@ -164,12 +162,10 @@ void send_raw_notification(
164162
);
165163

166164
#ifdef PA_DPP
167-
if (GlobalSettings::instance().DISCORD->integration.library0 == Integration::DiscordIntegrationSettingsOption::Library::DPP){
168-
Integration::DppClient::Client::instance().send_embed_dpp(
169-
should_ping, color, tags, std::move(embed),
170-
hasFile ? file : nullptr
171-
);
172-
}
165+
Integration::DppClient::Client::instance().send_embed_dpp(
166+
should_ping, color, tags, std::move(embed),
167+
hasFile ? file : nullptr
168+
);
173169
#endif
174170
}
175171

SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ namespace Integration{
2222

2323

2424
DiscordIntegrationSettingsOption::~DiscordIntegrationSettingsOption(){
25-
library0.remove_listener(*this);
2625
this->remove_listener(*this);
2726
}
2827
DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
@@ -37,14 +36,6 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
3736
LockMode::LOCK_WHILE_RUNNING,
3837
false
3938
)
40-
, library0(
41-
"<b>Discord Integration Library:</b><br>Restart the program for this to take effect.",
42-
{
43-
{Library::DPP, "dpp", "D++ (slash commands and normal commands)"},
44-
},
45-
LockMode::LOCK_WHILE_RUNNING,
46-
Library::DPP
47-
)
4839
, command_type(
4940
"<b>Discord Integration Command Type:</b><br>Restart the program for this to take effect.",
5041
{
@@ -85,7 +76,6 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
8576
)
8677
{
8778
PA_ADD_OPTION(run_on_start);
88-
PA_ADD_OPTION(library0);
8979
PA_ADD_OPTION(command_type);
9080
PA_ADD_OPTION(token);
9181
PA_ADD_OPTION(command_prefix);
@@ -100,29 +90,21 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
10090
DiscordIntegrationSettingsOption::on_config_value_changed(this);
10191

10292
this->add_listener(*this);
103-
library0.add_listener(*this);
10493
}
10594
void DiscordIntegrationSettingsOption::on_config_value_changed([[maybe_unused]] void* object){
10695
// cout << this->enabled() << endl;
10796
#ifdef PA_DPP
10897
bool options_enabled = this->enabled();
109-
switch (library0){
110-
case Library::DPP:{
111-
options_enabled &= !DppClient::Client::instance().is_initialized();
112-
ConfigOptionState state = options_enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED;
113-
114-
library0.set_visibility(state);
115-
command_type.set_visibility(state);
116-
token.set_visibility(state);
117-
game_status.set_visibility(state);
118-
hello_message.set_visibility(state);
119-
allow_buttons_from_users.set_visibility(state);
120-
121-
command_prefix.set_visibility(state);
122-
break;
123-
}
124-
default:;
125-
}
98+
options_enabled &= !DppClient::Client::instance().is_initialized();
99+
ConfigOptionState state = options_enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED;
100+
101+
command_type.set_visibility(state);
102+
token.set_visibility(state);
103+
game_status.set_visibility(state);
104+
hello_message.set_visibility(state);
105+
allow_buttons_from_users.set_visibility(state);
106+
107+
command_prefix.set_visibility(state);
126108
#endif
127109
}
128110

@@ -164,24 +146,14 @@ DiscordIntegrationSettingsWidget::DiscordIntegrationSettingsWidget(QWidget& pare
164146
connect(
165147
button_start, &QPushButton::clicked,
166148
this, [this, &value](bool){
167-
switch (value.library0){
168-
case DiscordIntegrationSettingsOption::Library::DPP:
169-
DppClient::Client::instance().connect();
170-
break;
171-
default:;
172-
}
149+
DppClient::Client::instance().connect();
173150
value.on_config_value_changed(this);
174151
}
175152
);
176153
connect(
177154
button_stop, &QPushButton::clicked,
178155
this, [this, &value](bool){
179-
switch (value.library0){
180-
case DiscordIntegrationSettingsOption::Library::DPP:
181-
DppClient::Client::instance().disconnect();
182-
break;
183-
default:;
184-
}
156+
DppClient::Client::instance().disconnect();
185157
value.on_config_value_changed(this);
186158
}
187159
);

SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ class DiscordIntegrationSettingsOption : public GroupOption, private ConfigOptio
2929

3030
BooleanCheckBoxOption run_on_start;
3131

32-
enum class Library{
33-
DPP,
34-
};
35-
EnumDropdownOption<Library> library0;
36-
3732
enum class CommandType{
3833
SlashCommands,
3934
MessageCommands,

0 commit comments

Comments
 (0)