X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8bced6dc398efeff57b077a44d9a90b6acf9a407..d0cf872a952a8212ea7a7b44ddbb1b4a590f0524:/include/channel.h

diff --git a/include/channel.h b/include/channel.h
index 2573e19..6a0a56a 100644
--- a/include/channel.h
+++ b/include/channel.h
@@ -72,7 +72,7 @@ struct Channel
 	unsigned int join_count;  /* joins within delta */
 	unsigned int join_delta;  /* last ts of join */
 
-	struct Dictionary *c_metadata;
+	struct Dictionary *metadata;
 
 	unsigned long bants;
 	time_t channelts;
@@ -92,13 +92,6 @@ struct membership
 	unsigned long bants;
 };
 
-struct c_Metadata
-{
-	const char *name;
-	const char *value;
-	time_t timevalue;
-};
-
 #define BANLEN 195
 struct Ban
 {
@@ -158,14 +151,14 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define CHFL_QUIETED		0x0010  /* cached as being +q victim */
 #define ONLY_SERVERS		0x0020
 #define CHFL_HALFOP		0x0040
-#define CHFL_OWNER		0x0080
+#define CHFL_ADMIN		0x0080
 #define	ONLY_OPERS		0x0100
 #define ALL_MEMBERS		CHFL_PEON
 #define ONLY_CHANOPS		CHFL_CHANOP
 #define ONLY_CHANOPSVOICED	(CHFL_CHANOP|CHFL_VOICE)
 
 #define is_chmode_h(x)	((x) && (x)->flags & CHFL_HALFOP) /* does not check if halfop is enabled, should typically not be used */
-#define is_chmode_a(x)	((x) && (x)->flags & CHFL_OWNER) /* does not check if owner is enabled, should typically not be used */
+#define is_chmode_a(x)	((x) && (x)->flags & CHFL_ADMIN) /* does not check if admin is enabled, should typically not be used */
 #define is_chanop(x)	((x) && (x)->flags & CHFL_CHANOP)
 #define is_voiced(x)	((x) && (x)->flags & CHFL_VOICE)
 #define can_send_banned(x) ((x) && (x)->flags & (CHFL_BANNED|CHFL_QUIETED))
@@ -245,7 +238,7 @@ extern int can_join(struct Client *source_p, struct Channel *chptr, char *key);
 extern struct membership *find_channel_membership(struct Channel *, struct Client *);
 extern const char *find_channel_status(struct membership *msptr, int combine);
 extern int is_halfop(struct membership *msptr);
-extern int is_owner(struct membership *msptr);
+extern int is_admin(struct membership *msptr);
 extern int is_any_op(struct membership *msptr);
 extern int is_chanop_voiced(struct membership *msptr);
 extern int can_kick_deop(struct membership *source, struct membership *target);
@@ -306,11 +299,7 @@ extern void do_join_0(struct Client *client_p, struct Client *source_p);
 extern int check_channel_name_loc(struct Client *source_p, const char *name);
 
 extern struct Metadata *channel_metadata_add(struct Channel *target, const char *name, const char *value, int propegate);
-extern void channel_metadata_delete(struct Channel *target, const char *name, int propegate);
-extern struct Metadata *channel_metadata_find(struct Channel *target, const char *name);
-
-extern struct Metadata *channel_metadata_add(struct Channel *target, const char *name, const char *value, int propegate);
-extern struct Metadata *channel_metadata_time_add(struct Channel *target, const char *name, time_t value);
+extern struct Metadata *channel_metadata_time_add(struct Channel *target, const char *name, time_t timevalue, const char *value);
 extern void channel_metadata_delete(struct Channel *target, const char *name, int propegate);
 extern struct Metadata *channel_metadata_find(struct Channel *target, const char *name);
 extern void channel_metadata_clear(struct Channel *target);