X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0b370fcc6368c254c592b1398f8285afcffe20e6..853058531aa2387ce1e8ab77ec9b416e70c6bffa:/src/channel.c?ds=sidebyside diff --git a/src/channel.c b/src/channel.c index e14d610..0191f1f 100644 --- a/src/channel.c +++ b/src/channel.c @@ -186,7 +186,7 @@ find_channel_status(struct membership *msptr, int combine) p = buffer; - if(is_owner(msptr)) + if(is_admin(msptr)) { if(!combine) return "!"; @@ -233,18 +233,18 @@ is_halfop(struct membership *msptr) return 0; } -/* is_owner() +/* is_admin() * - * input - membership to check for owner - * output - 1 if the user is an owner, 0 if the user is not or owner + * input - membership to check for admin + * output - 1 if the user is an admin, 0 if the user is not or admin * is disabled. * side effects - * */ int -is_owner(struct membership *msptr) +is_admin(struct membership *msptr) { - if(!ConfigChannel.use_owner) + if(!ConfigChannel.use_admin) return 0; if(is_chmode_a(msptr)) return 1; @@ -255,13 +255,13 @@ is_owner(struct membership *msptr) /* is_any_op() * * input - membership to check for ops - * output - 1 if the user is op, halfop, or owner, 0 elsewise + * output - 1 if the user is op, halfop, or admin, 0 elsewise * side effects - */ int is_any_op(struct membership *msptr) { - if(is_chanop(msptr) || is_halfop(msptr) || is_owner(msptr)) + if(is_chanop(msptr) || is_halfop(msptr) || is_admin(msptr)) return 1; else return 0; @@ -270,13 +270,13 @@ is_any_op(struct membership *msptr) /* is_chanop_voiced() * * input - memebership to check for status - * output - 1 if the user is op, halfop, owner, or voice, 0 elsewise + * output - 1 if the user is op, halfop, admin, or voice, 0 elsewise * side effects - */ int is_chanop_voiced(struct membership *msptr) { - if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_owner(msptr)) + if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_admin(msptr)) return 1; else return 0; @@ -291,11 +291,11 @@ is_chanop_voiced(struct membership *msptr) int can_kick_deop(struct membership *source, struct membership *target) { - if(is_chanop(source) && !is_owner(target)) + if(is_chanop(source) && !is_admin(target)) return 1; else if(is_halfop(source) && !is_any_op(target)) return 1; - else if(is_owner(source)) + else if(is_admin(source)) return 1; return 0; @@ -826,18 +826,15 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) char src_host[NICKLEN + USERLEN + HOSTLEN + 6]; char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6]; char src_althost[NICKLEN + USERLEN + HOSTLEN + 6]; + char *text = rb_strdup(""); int use_althost = 0; int i = 0; hook_data_channel moduledata; struct Metadata *md; struct DictionaryIter iter; - char *text = rb_strdup(""); s_assert(source_p->localClient != NULL); - if(IsOverride(source_p)) - return 0; - rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host); rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost); if(source_p->localClient->mangledhost != NULL) @@ -860,22 +857,15 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN) return (ERR_BANNEDFROMCHAN); - rb_sprintf(text, "K%s",source_p->name); + rb_sprintf(text, "K%s", source_p->id); - if(md = channel_metadata_find(chptr, text)) + DICTIONARY_FOREACH(md, &iter, chptr->metadata) { - if(md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()) - { + if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time())) return ERR_KICKNOREJOIN; - } - /* cleanup the channel's kicknorejoin metadata. */ - DICTIONARY_FOREACH(md, &iter, chptr->metadata) - { - text = rb_strdup(md->name); - if((text[0] == 'K') && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time())) - channel_metadata_delete(chptr, md->name, 1); - } - + /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */ + if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time())) + channel_metadata_delete(chptr, md->name, 0); } if(chptr->mode.mode & MODE_INVITEONLY) @@ -1821,7 +1811,16 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * /* can_join checks for +i key, bans etc */ if((i = can_join(source_p, chptr, key))) { - if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || + if(IsOverride(source_p)) + { + sendto_wallops_flags(UMODE_WALLOP, &me, + "%s is overriding JOIN to [%s]", + get_oper_name(source_p), chptr->chname); + sendto_server(NULL, chptr, NOCAPS, NOCAPS, + ":%s WALLOPS :%s is overriding JOIN to [%s]", + me.name, get_oper_name(source_p), chptr->chname); + } + else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) { /* might be wrong, but is there any other better location for such? @@ -1833,8 +1832,8 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * continue; } - - sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); + else + sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); } if(flags == 0 && @@ -1954,17 +1953,19 @@ channel_metadata_add(struct Channel *target, const char *name, const char *value * inputs - pointer to channel struct * - name of metadata item you wish to add * - time_t you wish to add + * - value you wish to add * output - none * side effects - metadata is added to the channel in question */ struct Metadata * -channel_metadata_time_add(struct Channel *target, const char *name, time_t value) +channel_metadata_time_add(struct Channel *target, const char *name, time_t timevalue, const char *value) { struct Metadata *md; md = rb_malloc(sizeof(struct Metadata)); md->name = rb_strdup(name); - md->timevalue = value; + md->value = rb_strdup(value); + md->timevalue = timevalue; irc_dictionary_add(target->metadata, md->name, md);