summaryrefslogtreecommitdiff
path: root/src/database
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-08-21 01:04:32 +0200
committerlouiz’ <louiz@louiz.org>2016-08-21 01:51:52 +0200
commit992fa938951558f4515145c9b82af0123c979a29 (patch)
tree421be454fb10e8af6ba1aa92f2ad23c8e6cbde3f /src/database
parentc97e3498216e24ceb4633a5fdce0847ea0609103 (diff)
downloadbiboumi-992fa938951558f4515145c9b82af0123c979a29.tar.gz
biboumi-992fa938951558f4515145c9b82af0123c979a29.tar.bz2
biboumi-992fa938951558f4515145c9b82af0123c979a29.tar.xz
biboumi-992fa938951558f4515145c9b82af0123c979a29.zip
Add get_first_non_empty and use it into Database to simplify a little bit
Diffstat (limited to 'src/database')
-rw-r--r--src/database/database.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 5513946..3891f41 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -4,8 +4,8 @@
#include <database/database.hpp>
#include <logger/logger.hpp>
#include <irc/iid.hpp>
-#include <string>
#include <uuid.h>
+#include <utils/get_first_non_empty.hpp>
using namespace std::string_literals;
@@ -73,10 +73,11 @@ db::IrcChannelOptions Database::get_irc_channel_options_with_server_default(cons
{
auto coptions = Database::get_irc_channel_options(owner, server, channel);
auto soptions = Database::get_irc_server_options(owner, server);
- if (coptions.encodingIn.value().empty())
- coptions.encodingIn = soptions.encodingIn;
- if (coptions.encodingOut.value().empty())
- coptions.encodingOut = soptions.encodingOut;
+
+ coptions.encodingIn = get_first_non_empty(coptions.encodingIn.value(),
+ soptions.encodingIn.value());
+ coptions.encodingOut = get_first_non_empty(coptions.encodingOut.value(),
+ soptions.encodingOut.value());
return coptions;
}