Changed/improved 'silent' gline support

[irc/evilnet/x3.git] / src / chanserv.h

diff --git a/src/chanserv.h b/src/chanserv.h
index 657cf63d6eac5015fd317a3ab70abf8110fad454..6d1ce8f80b22b565729b26b185a85ec4f73fffbe 100644 (file)
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -3,7 +3,7 @@
  *
  * This file is part of x3.
  *
- * srvx is free software; you can redistribute it and/or modify
+ * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -35,17 +35,12 @@ enum UL_ALIASES {
 };
 
 enum levelOption {
-                    /* TODO: Does removing values here mess up reading the db files? */
-    lvlGiveVoice,   /* Depreciated */
-    lvlGiveHalfOps, /* Depreciated */
-    lvlGiveOps, /* Depreciated */
     lvlEnfOps,
     lvlEnfHalfOps,
     lvlEnfModes,
     lvlEnfTopic,
     lvlPubCmd,
     lvlSetters,
-    lvlCTCPUsers,
     lvlUserInfo,
     lvlInviteMe,
     lvlTopicSnarf,
@@ -53,11 +48,14 @@ enum levelOption {
 };
 
 enum charOption {
-    chVoice,
+    chAutomode,
     chProtect,
     chToys,
     chTopicRefresh,
     chCTCPReaction,
+    chBanTimeout,
+    chResync,
+    chBanType,
     NUM_CHAR_OPTIONS
 };
 
@@ -72,11 +70,15 @@ enum charOption {
 #define CHANNEL_PEON_INVITE     0x00000080 /* (1 << 7) - DEPRECATED */
 #define CHANNEL_OFFCHANNEL      0x00000100 /* (1 << 8) */
 #define CHANNEL_HOP_ALL         0x00000200 /* (1 << 9) */
-
 /* Flags with values over 0x20000000 or (1 << 29) will not work
  * because chanData.flags is a 30-bit field.
  */
 
+/* how many seconds a pending adduser will wait for a user
+ * to get auth or register 
+ */
+#define ADDUSER_PENDING_EXPIRE 7200  /* 2 hours */
+
 #define IsProtected(x)         ((x)->flags & CHANNEL_NODELETE)
 #define IsSuspended(x)         ((x)->flags & CHANNEL_SUSPENDED)
 #define IsOffChannel(x)         (((x)->flags & CHANNEL_OFFCHANNEL) && (off_channel > 1))
@@ -101,15 +103,17 @@ struct chanData
     unsigned int        may_opchan : 1;
     unsigned int        max;
     unsigned int        last_refresh;
-    unsigned short      banCount;
+    unsigned int        last_resync;
+    unsigned short      banCount; /* Lamers, really */
     unsigned short      userCount;
     unsigned short      lvlOpts[NUM_LEVEL_OPTIONS];
     unsigned char       chOpts[NUM_CHAR_OPTIONS];
 
     struct userData    *users;
-    struct banData     *bans;
+    struct banData     *bans; /* Lamers, really */
     struct dict         *notes;
     struct suspended   *suspended;
+    struct giveownership *giveownership;
     struct chanData    *prev;
     struct chanData    *next;
 };
@@ -132,6 +136,7 @@ struct userData
 
     char               *info;
     time_t             seen;
+    time_t              expires;
     unsigned short      access;
     unsigned int       present : 1;
     unsigned int        flags : USER_FLAGS_SIZE;
@@ -144,6 +149,17 @@ struct userData
     struct userData     *u_next;
 };
 
+struct adduserPending
+{
+    struct chanNode *channel;
+    struct userNode *user;
+    int level;
+    time_t created;
+
+    struct adduserPending *prev;
+    struct adduserPending *next;
+};
+
 struct banData
 {
     char               mask[NICKLEN + USERLEN + HOSTLEN + 3];
@@ -169,6 +185,17 @@ struct suspended
     struct suspended    *previous;
 };
 
+struct giveownership
+{
+    char                 *staff_issuer;
+    char                  *old_owner;
+    char                  *target;
+    unsigned short        target_access;
+    time_t                issued;
+    char                  *reason;
+    struct giveownership  *previous;
+};
+
 struct do_not_register
 {
     char   chan_name[CHANNELLEN+1];
@@ -177,6 +204,10 @@ struct do_not_register
     char   reason[1];
 };
 
+#define GetChannelUser(channel, handle) _GetChannelUser(channel, handle, 1, 0)
+struct userData *_GetChannelUser(struct chanData *channel, struct handle_info *handle, int override, int allow_suspended);
+struct banData *add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t set, time_t triggered, time_t expires, char *reason);
+
 void init_chanserv(const char *nick);
 void del_channel_user(struct userData *user, int do_gc);
 struct channelList *chanserv_support_channels(void);
@@ -187,5 +218,7 @@ int check_user_level(struct chanNode *channel, struct userNode *user, enum level
 void do_math(char *Buffer, char *Math);
 char* user_level_name_from_level(int level);
 
+void process_adduser_pending(struct userNode *user);
+void wipe_adduser_pending(struct chanNode *channel, struct userNode *user);
 
 #endif