~singpolyma/biboumi

d1626c929f1d313c2f0f85b7d8b756a8d488d1dc ā€” louizā€™ 6 years ago 593b326
When joining a channel, send the most recent history found in the database
M louloulibs/xmpp/xmpp_component.cpp => louloulibs/xmpp/xmpp_component.cpp +28 -0
@@ 16,6 16,9 @@

#include <uuid.h>

#include <cstdlib>
#include <iomanip>

#include <louloulibs.h>
#ifdef SYSTEMD_FOUND
# include <systemd/sd-daemon.h>


@@ 426,6 429,31 @@ void XmppComponent::send_muc_message(const std::string& muc_name, const std::str
  this->send_stanza(message);
}

void XmppComponent::send_history_message(const std::string& muc_name, const std::string& nick, const std::string& body_txt, const std::string& jid_to, std::time_t timestamp)
{
  Stanza message("message");
  message["to"] = jid_to;
  if (!nick.empty())
    message["from"] = muc_name + "@" + this->served_hostname + "/" + nick;
  else
    message["from"] = muc_name + "@" + this->served_hostname;
  message["type"] = "groupchat";

  XmlNode body("body");
  body.set_inner(body_txt);
  message.add_child(std::move(body));

  XmlNode delay("delay");
  delay["xmlns"] = "urn:xmpp:delay";
  delay["from"] = muc_name + "@" + this->served_hostname;
  std::stringstream date_ss;
  date_ss << std::put_time(std::gmtime(&timestamp), "%FT%Tz") << std::endl;
  delay["stamp"] = date_ss.str();

  message.add_child(std::move(delay));
  this->send_stanza(message);
}

void XmppComponent::send_muc_leave(const std::string& muc_name, std::string&& nick, Xmpp::body&& message, const std::string& jid_to, const bool self)
{
  Stanza presence("presence");

M louloulibs/xmpp/xmpp_component.hpp => louloulibs/xmpp/xmpp_component.hpp +5 -0
@@ 135,6 135,11 @@ public:
   */
  void send_muc_message(const std::string& muc_name, const std::string& nick, Xmpp::body&& body, const std::string& jid_to);
  /**
   * Send a message, with a <delay/> element, part of a MUC history
   */
  void send_history_message(const std::string& muc_name, const std::string& nick, const std::string& body,
                            const std::string& jid_to, const std::time_t timestamp);
  /**
   * Send an unavailable presence for this nick
   */
  void send_muc_leave(const std::string& muc_name, std::string&& nick, Xmpp::body&& message, const std::string& jid_to, const bool self);

M src/bridge/bridge.cpp => src/bridge/bridge.cpp +20 -0
@@ 744,6 744,26 @@ void Bridge::send_topic(const std::string& hostname, const std::string& chan_nam

}

void Bridge::send_room_history(const std::string& hostname, const std::string& chan_name)
{
  for (const auto& resource: this->resources_in_chan[ChannelKey{chan_name, hostname}])
    this->send_room_history(hostname, chan_name, resource);
}

void Bridge::send_room_history(const std::string& hostname, const std::string& chan_name, const std::string& resource)
{
#ifdef USE_DATABASE
  const auto coptions = Database::get_irc_channel_options_with_server_and_global_default(this->user_jid, hostname, chan_name);
  const auto lines = Database::get_muc_logs(this->user_jid, chan_name, hostname, coptions.maxHistoryLength.value());
  for (const auto& line: lines)
    {
      const auto seconds = line.date.value().timeStamp();
      this->xmpp.send_history_message(chan_name + "%" + hostname, line.nick.value(), line.body.value(),
                                      this->user_jid + "/" + resource, seconds);
    }
#endif
}

std::string Bridge::get_own_nick(const Iid& iid)
{
  IrcClient* irc = this->find_irc_client(iid.get_server());

M src/bridge/bridge.hpp => src/bridge/bridge.hpp +5 -0
@@ 138,6 138,11 @@ public:
  void send_topic(const std::string& hostname, const std::string& chan_name, const std::string& topic, const std::string& who);
  void send_topic(const std::string& hostname, const std::string& chan_name, const std::string& topic, const std::string& who, const std::string& resource);
  /**
   * Send the MUC history to the user
   */
  void send_room_history(const std::string& hostname, const std::string& chan_name);
  void send_room_history(const std::string& hostname, const std::string& chan_name, const std::string& resource);
  /**
   * Send a MUC message from some participant
   */
  void send_message(const Iid& iid, const std::string& nick, const std::string& body, const bool muc);

M src/database/database.cpp => src/database/database.cpp +9 -0
@@ 136,6 136,15 @@ void Database::store_muc_message(const std::string& owner, const Iid& iid,
  line.update();
}

std::vector<db::MucLogLine> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server, const int limit)
{
  auto res = litesql::select<db::MucLogLine>(*Database::db,
                                                   db::MucLogLine::Owner == owner &&
                                                   db::MucLogLine::IrcChanName == chan_name &&
                                                   db::MucLogLine::IrcServerName == server).orderBy(db::MucLogLine::Date, false).limit(limit).all();
  return {res.rbegin(), res.rend()};
}

void Database::close()
{
  Database::db.reset(nullptr);

M src/database/database.hpp => src/database/database.hpp +2 -0
@@ 48,6 48,8 @@ public:
  static db::IrcChannelOptions get_irc_channel_options_with_server_and_global_default(const std::string& owner,
                                                                                      const std::string& server,
                                                                                      const std::string& channel);
  static std::vector<db::MucLogLine> get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
                           const int limit);
  static void store_muc_message(const std::string& owner, const Iid& iid,
                                time_point date, const std::string& body, const std::string& nick);


M src/irc/irc_client.cpp => src/irc/irc_client.cpp +3 -1
@@ 755,7 755,9 @@ void IrcClient::on_channel_completely_joined(const IrcMessage& message)
  const std::string chan_name = utils::tolower(message.arguments[1]);
  IrcChannel* channel = this->get_channel(chan_name);
  channel->joined = true;
  this->bridge.send_user_join(this->hostname, chan_name, channel->get_self(), channel->get_self()->get_most_significant_mode(this->sorted_user_modes), true);
  this->bridge.send_user_join(this->hostname, chan_name, channel->get_self(),
                              channel->get_self()->get_most_significant_mode(this->sorted_user_modes), true);
  this->bridge.send_room_history(this->hostname, chan_name);
  this->bridge.send_topic(this->hostname, chan_name, channel->topic, channel->topic_author);
}