X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/ac3bdc8db9c628263a86035ede92b7e905e4c8a6..1c5f669705f14465beb02aaea58a0bfc3221a35e:/src/chanserv.h

diff --git a/src/chanserv.h b/src/chanserv.h
index 89aea82..6d1ce8f 100644
--- 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
 };
 
@@ -105,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;
 };
@@ -136,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;
@@ -184,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];
@@ -192,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);