Make User::WriteRemoteNumeric() virtual, implement it in SpanningTree::RemoteUser

diff --git a/include/users.h b/include/users.h
index c2ad6b9ee21f8b2aa79a507ab7fcc3da532f12c2..8cbf8a8daf8543a7ffc4b9366fc1d2c249a99e9d 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -524,7 +524,7 @@ class CoreExport User : public Extensible
         */
        virtual void WriteRemoteNotice(const std::string& text);
 
-       void WriteRemoteNumeric(const Numeric::Numeric& numeric);
+       virtual void WriteRemoteNumeric(const Numeric::Numeric& numeric);
 
        template <typename T1>
        void WriteRemoteNumeric(unsigned int numeric, T1 p1)

diff --git a/src/modules/m_spanningtree/remoteuser.cpp b/src/modules/m_spanningtree/remoteuser.cpp
index cbd1b801e2cc5267c8d51619e3d59c3f811c020e..717a6fd9f5132a6d92f35aab3c2732e3939ba0bb 100644 (file)
--- a/src/modules/m_spanningtree/remoteuser.cpp
+++ b/src/modules/m_spanningtree/remoteuser.cpp
@@ -26,3 +26,8 @@ SpanningTree::RemoteUser::RemoteUser(const std::string& uid, Server* srv)
        : ::RemoteUser(uid, srv)
 {
 }
+
+void SpanningTree::RemoteUser::WriteRemoteNumeric(const Numeric::Numeric& numeric)
+{
+       CommandNum::Builder(this, numeric).Unicast(this);
+}

diff --git a/src/modules/m_spanningtree/remoteuser.h b/src/modules/m_spanningtree/remoteuser.h
index 235cbfd78624debd63f8cefd9a644cb0ed81aa8e..416f2f760f42256ace211c2c583413ade9f29309 100644 (file)
--- a/src/modules/m_spanningtree/remoteuser.h
+++ b/src/modules/m_spanningtree/remoteuser.h
@@ -28,4 +28,5 @@ class SpanningTree::RemoteUser : public ::RemoteUser
 {
  public:
        RemoteUser(const std::string& uid, Server* srv);
+       void WriteRemoteNumeric(const Numeric::Numeric& numeric) CXX11_OVERRIDE;
 };

diff --git a/src/users.cpp b/src/users.cpp
index e1bda1ad3ff39efe39850e92e63130f28051e30f..7437e8a209f83baea1e3345608785616883e1732 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -950,8 +950,7 @@ void User::SendText(const char *text, ...)
 
 void User::WriteRemoteNumeric(const Numeric::Numeric& numeric)
 {
-       const std::string& servername = (numeric.GetServer() ? numeric.GetServer()->GetName() : ServerInstance->Config->ServerName);
-       SendText(BuildNumeric(servername, this, numeric.GetNumeric(), numeric.GetParams()));
+       WriteNumeric(numeric);
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels