diff --git a/src/database_core.cpp b/src/database_core.cpp index 3e8e89b..bc7e759 100644 --- a/src/database_core.cpp +++ b/src/database_core.cpp @@ -82,6 +82,7 @@ std::vector database::get_channels(dpp::snowflake guild_id) return {}; } +/* std::string database::get_channel_source(dpp::snowflake guild_id, dpp::snowflake channel_id) { #ifndef NDEBUG @@ -97,6 +98,7 @@ std::vector database::get_channel_targets(dpp::snowflake #endif return {}; } +*/ std::vector database::get_guilds() { diff --git a/src/database_core.h b/src/database_core.h index 41c1064..b922479 100644 --- a/src/database_core.h +++ b/src/database_core.h @@ -39,8 +39,10 @@ namespace bot { virtual std::variant find_channel_target(dpp::snowflake guild_id, dpp::snowflake channel_id, const std::string &target); virtual bot::settings::channel get_channel(dpp::snowflake guild_id, dpp::snowflake channel_id); virtual std::vector get_channels(dpp::snowflake guild_id); + /* unused atm. virtual std::string get_channel_source(dpp::snowflake guild_id, dpp::snowflake channel_id); virtual std::vector get_channel_targets(dpp::snowflake guild_id, dpp::snowflake channel_id); + */ virtual std::vector get_guilds(); virtual void set_channel_source(dpp::snowflake guild_id, dpp::snowflake channel_id, const std::string &source); virtual bool sync(); diff --git a/src/database_file.cpp b/src/database_file.cpp index c097cde..1f58955 100644 --- a/src/database_file.cpp +++ b/src/database_file.cpp @@ -286,6 +286,7 @@ std::vector file::get_channels(dpp::snowflake guild_id) return channels; } +/* std::string file::get_channel_source(dpp::snowflake guild_id, dpp::snowflake channel_id) { const std::lock_guard guard(m_mutex); @@ -324,6 +325,7 @@ std::vector file::get_channel_targets(dpp::snowflake guil cache_get_channel(channel_id, &channel); return channel.targets; } +*/ std::vector file::get_guilds() { diff --git a/src/database_file.h b/src/database_file.h index cc6f2a6..ad9f2b0 100644 --- a/src/database_file.h +++ b/src/database_file.h @@ -36,8 +36,10 @@ namespace bot { std::variant find_channel_target(dpp::snowflake guild_id, dpp::snowflake channel_id, const std::string &target) override; bot::settings::channel get_channel(dpp::snowflake guild_id, dpp::snowflake channel_id) override; std::vector get_channels(dpp::snowflake guild_id) override; + /* unused atm. std::string get_channel_source(dpp::snowflake guild_id, dpp::snowflake channel_id) override; std::vector get_channel_targets(dpp::snowflake guild_id, dpp::snowflake channel_id) override; + */ std::vector get_guilds() override; void set_channel_source(dpp::snowflake guild_id, dpp::snowflake channel_id, const std::string &source) override; bool sync() override; diff --git a/src/settings.cpp b/src/settings.cpp index ed9dc15..4979ee1 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -32,7 +32,8 @@ void process_database_channels(std::shared_ptr database for (auto channel = guild->channel.begin(); channel != guild->channel.end(); channel++) { if (channel->id == *db_channel_id) { const bot::settings::channel db_channel = database->get_channel(guild->id, channel->id); - channel->source = db_channel.source; + if (!db_channel.source.empty()) + channel->source = db_channel.source; for (auto db_target = db_channel.targets.begin(); db_target != db_channel.targets.end(); db_target++) { bool target_found = false; for (auto target = channel->targets.begin(); target != channel->targets.end(); target++) {