From 655151d88a6ab948949b73682c3a76a0274eb10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Sat, 26 Aug 2017 13:51:15 +0200
Subject: Cache the encoding_in database value, to avoid doing a query for each
 message

---
 src/bridge/bridge.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/bridge')

diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index e0cb36d..9fd0a5b 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -22,15 +22,12 @@ static std::string in_encoding_for(const Bridge& bridge, const Iid& iid)
 {
 #ifdef USE_DATABASE
   const auto jid = bridge.get_bare_jid();
-  auto options = Database::get_irc_channel_options_with_server_default(jid, iid.get_server(), iid.get_local());
-  auto result = options.col<Database::EncodingIn>();
-  if (!result.empty())
-    return result;
+  return Database::get_encoding_in(jid, iid.get_server(), iid.get_local());
 #else
   (void)bridge;
   (void)iid;
-#endif
   return {"ISO-8859-1"};
+#endif
 }
 
 Bridge::Bridge(std::string user_jid, BiboumiComponent& xmpp, std::shared_ptr<Poller>& poller):
-- 
cgit v1.2.3