X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/63c95a478af1b51ad021abef19f630de189f0229..4b8ccfeb5cff79382167d1d7d6c765870ed1a5cd:/src/chanserv.h?ds=sidebyside

diff --git a/src/chanserv.h b/src/chanserv.h
index 6d1ce8f..79f992a 100644
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -24,11 +24,11 @@
 #include "nickserv.h"
 
 enum UL_ALIASES {
-    UL_PEON = 100,
+    UL_PEON = 1,
     UL_HALFOP = 150,
     UL_OP = 200,
     UL_MANAGER = 300,
-    UL_PRESENT = UL_MANAGER,
+    UL_PRESENT = UL_MANAGER, /* Level needed to keep the channel active */
     UL_COOWNER = 400,
     UL_OWNER = 500,
     UL_HELPER = 600,
@@ -55,7 +55,6 @@ enum charOption {
     chCTCPReaction,
     chBanTimeout,
     chResync,
-    chBanType,
     NUM_CHAR_OPTIONS
 };
 
@@ -122,12 +121,14 @@ struct chanData
 #define USER_SUSPENDED          0x00000002
 #define USER_AUTO_INVITE        0x00000004
 #define USER_AUTO_OP            0x00000008
-#define USER_FLAGS_SIZE         15
+#define USER_AUTO_JOIN          0x00000010
+#define USER_FLAGS_SIZE         25
 #define USER_FLAGS_DEFAULT      USER_AUTO_OP
 
 #define IsUserAutoOp(USER)      ((USER)->flags & USER_AUTO_OP)
 #define IsUserSuspended(USER)   ((USER)->flags & USER_SUSPENDED)
 #define IsUserAutoInvite(USER)  ((USER)->flags & USER_AUTO_INVITE)
+#define IsUserAutoJoin(USER)    ((USER)->flags & USER_AUTO_JOIN)
 
 struct userData
 {
@@ -137,6 +138,9 @@ struct userData
     char		*info;
     time_t 		seen;
     time_t              expires;
+    time_t              accessexpiry;
+    time_t              clvlexpiry;
+    unsigned short      lastaccess;
     unsigned short      access;
     unsigned int	present : 1;
     unsigned int        flags : USER_FLAGS_SIZE;
@@ -221,4 +225,7 @@ 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);
 
+int check_bans(struct userNode *user, const char *channel);
+int trace_check_bans(struct userNode *user, struct chanNode *chan);
+
 #endif