Merge pull request #70 from Shawn-Smith/insp20+chancreatefix

[user/henk/code/inspircd.git] / include / protocol.h

diff --git a/include/protocol.h b/include/protocol.h
index 4d6f8f27d006a0121cc42c6fbb56f4adf1f01bb3..89a9135631ea4bfe3f1843045c885151c392309a 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,15 +11,14 @@
  * ---------------------------------------------------
  */
 
-#ifndef __PROTOCOL_H__
-#define __PROTOCOL_H__
+#ifndef PROTOCOL_H
+#define PROTOCOL_H
 
 #include "hashcomp.h"
 
-class InspIRCd;
 class User;
 
-typedef std::deque<std::string> parameterlist;
+typedef std::vector<std::string> parameterlist;
 
 class ProtoServer
 {
@@ -34,12 +33,10 @@ class ProtoServer
 
 typedef std::list<ProtoServer> ProtoServerList;
 
-class ProtocolInterface : public Extensible
+class ProtocolInterface
 {
- protected:
-       InspIRCd* ServerInstance;
  public:
-       ProtocolInterface(InspIRCd* Instance) : ServerInstance(Instance) { }
+       ProtocolInterface() { }
        virtual ~ProtocolInterface() { }
 
        /** Send an ENCAP message to one or more linked servers.
@@ -47,16 +44,16 @@ class ProtocolInterface : public Extensible
         * @param encap This is a list of string parameters, the first of which must be a server ID or glob matching servernames.
         * The second must be a subcommand. All subsequent parameters are dependant on the subcommand.
         * ENCAP (should) be used instead of creating new protocol messages for easier third party application support.
+        * @return True if the message was sent out (target exists)
         */
-       virtual void SendEncapsulatedData(parameterlist &encap) { }
+       virtual bool SendEncapsulatedData(const parameterlist &encap) { return false; }
 
        /** Send metadata for an object to other linked servers.
         * @param target The object to send metadata for.
-        * @param type The type of metadata to send (TYPE_USER, TYPE_CHANNEL, etc)
         * @param key The 'key' of the data, e.g. "swhois" for swhois desc on a user
         * @param data The string representation of the data
         */
-       virtual void SendMetaData(void* target, TargetTypeFlags type, const std::string &key, const std::string &data) { }
+       virtual void SendMetaData(Extensible* target, const std::string &key, const std::string &data) { }
 
        /** Send a topic change for a channel
         * @param channel The channel to change the topic for.
@@ -68,7 +65,7 @@ class ProtocolInterface : public Extensible
         * @param target The channel name or user to send mode changes for.
         * @param The mode changes to send.
         */
-       virtual void SendMode(const std::string &target, parameterlist &modedata) { }
+       virtual void SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &translate) { }
 
        /** Convenience function, string wrapper around the above.
          */
@@ -76,18 +73,16 @@ class ProtocolInterface : public Extensible
        {
                irc::spacesepstream x(modeline);
                parameterlist n;
+               std::vector<TranslateType> types;
                std::string v;
                while (x.GetToken(v))
+               {
                        n.push_back(v);
-               SendMode(target, n);
+                       types.push_back(TR_TEXT);
+               }
+               SendMode(target, n, types);
        }
 
-       /** Send a notice to users with a given mode(s).
-        * @param modes The modes required for the message to be sent.
-        * @param text The message to send.
-        */
-       virtual void SendModeNotice(const std::string &modes, const std::string &text) { }
-
        /** Send a notice to users with a given snomask.
         * @param snomask The snomask required for the message to be sent.
         * @param text The message to send.
@@ -131,11 +126,6 @@ class ProtocolInterface : public Extensible
         * XXX: document me properly, this is shit.
         */
        virtual void GetServerList(ProtoServerList &sl) { }
-
-       /** Send information about a user connection to linked servers.
-        * @param u The user to send information about.
-        */
-       virtual void Introduce(User* u) { }
 };
 
 #endif