vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tidy up is_banned || is_quieted cases

Browse source
This commit is contained in:
Ed Kellett 2020-10-11 20:24:55 +01:00
parent bad200457e
commit a28599d50f
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/channel.h
View file

@ -223,6 +223,8 @@ extern int is_banned(struct Channel *chptr, struct Client *who,
extern int is_quieted(struct Channel *chptr, struct Client *who, extern int is_quieted(struct Channel *chptr, struct Client *who,
struct membership *msptr, const struct matchset *ms, struct membership *msptr, const struct matchset *ms,
const struct matchset *mexcept); const struct matchset *mexcept);
extern int is_borq(struct Channel *chptr, struct Client *who,
struct membership *msptr);
extern int can_join(struct Client *source_p, struct Channel *chptr, extern int can_join(struct Client *source_p, struct Channel *chptr,
const char *key, const char **forward); const char *key, const char **forward);

39
ircd/channel.c
View file

@ -673,6 +673,24 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
#endif #endif
} }
int
is_borq(struct Channel *chptr, struct Client *who, struct membership *msptr)
{
struct matchset ms, mexcept;
int r;
if (!MyClient(who))
return 0;
matchset_for_client(who, &ms, CHFL_BAN);
matchset_for_client(who, &mexcept, CHFL_EXCEPTION);
if ((r = is_banned(chptr, who, msptr, &ms, &mexcept, NULL)))
return r;
return is_quieted(chptr, who, msptr, &ms, &mexcept);
}
/* can_join() /* can_join()
* *
* input - client to check, channel to check for, key * input - client to check, channel to check for, key
@ -686,7 +704,6 @@ can_join(struct Client *source_p, struct Channel *chptr, const char *key, const
rb_dlink_node *invite = NULL; rb_dlink_node *invite = NULL;
rb_dlink_node *ptr; rb_dlink_node *ptr;
struct Ban *invex = NULL; struct Ban *invex = NULL;
struct matchset ms, mexcept;
int i = 0; int i = 0;
hook_data_channel moduledata; hook_data_channel moduledata;
@ -696,10 +713,7 @@ can_join(struct Client *source_p, struct Channel *chptr, const char *key, const
moduledata.chptr = chptr; moduledata.chptr = chptr;
moduledata.approved = 0; moduledata.approved = 0;
matchset_for_client(source_p, &ms, CHFL_BAN); if((is_banned(chptr, source_p, NULL, NULL, NULL, forward)) == CHFL_BAN)
matchset_for_client(source_p, &mexcept, CHFL_EXCEPTION);
if((is_banned(chptr, source_p, NULL, &ms, &mexcept, forward)) == CHFL_BAN)
{ {
moduledata.approved = ERR_BANNEDFROMCHAN; moduledata.approved = ERR_BANNEDFROMCHAN;
goto finish_join_check; goto finish_join_check;
@ -717,6 +731,7 @@ can_join(struct Client *source_p, struct Channel *chptr, const char *key, const
if(chptr->mode.mode & MODE_INVITEONLY) if(chptr->mode.mode & MODE_INVITEONLY)
{ {
struct matchset ms;
matchset_for_client(source_p, &ms, CHFL_INVEX); matchset_for_client(source_p, &ms, CHFL_INVEX);
RB_DLINK_FOREACH(invite, source_p->user->invited.head) RB_DLINK_FOREACH(invite, source_p->user->invited.head)
@ -825,11 +840,7 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt
} }
else else
{ {
struct matchset ms, mexcept; if (is_borq(chptr, source_p, msptr) == CHFL_BAN)
matchset_for_client(source_p, &ms, CHFL_BAN);
matchset_for_client(source_p, &mexcept, CHFL_EXCEPTION);
if (is_banned(chptr, source_p, msptr, &ms, &mexcept, NULL) == CHFL_BAN
|| is_quieted(chptr, source_p, msptr, &ms, &mexcept) == CHFL_BAN)
moduledata.approved = CAN_SEND_NO; moduledata.approved = CAN_SEND_NO;
} }
} }
@ -914,15 +925,10 @@ find_bannickchange_channel(struct Client *client_p)
struct Channel *chptr; struct Channel *chptr;
struct membership *msptr; struct membership *msptr;
rb_dlink_node *ptr; rb_dlink_node *ptr;
struct matchset ms;
struct matchset mexcept;
if (!MyClient(client_p)) if (!MyClient(client_p))
return NULL; return NULL;
matchset_for_client(client_p, &ms, CHFL_BAN);
matchset_for_client(client_p, &ms, CHFL_EXCEPTION);
RB_DLINK_FOREACH(ptr, client_p->user->channel.head) RB_DLINK_FOREACH(ptr, client_p->user->channel.head)
{ {
msptr = ptr->data; msptr = ptr->data;
@ -935,8 +941,7 @@ find_bannickchange_channel(struct Client *client_p)
if (can_send_banned(msptr)) if (can_send_banned(msptr))
return chptr; return chptr;
} }
else if (is_banned(chptr, client_p, msptr, &ms, &mexcept, NULL) == CHFL_BAN else if (is_borq(chptr, client_p, msptr) == CHFL_BAN)
|| is_quieted(chptr, client_p, msptr, &ms, &mexcept) == CHFL_BAN)
return chptr; return chptr;
} }
return NULL; return NULL;

7
modules/m_knock.c
View file

@ -130,13 +130,8 @@ m_knock(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
if(MyClient(source_p)) if(MyClient(source_p))
{ {
struct matchset ms, mexcept;
matchset_for_client(source_p, &ms, CHFL_BAN);
matchset_for_client(source_p, &mexcept, CHFL_EXCEPTION);
/* don't allow a knock if the user is banned */ /* don't allow a knock if the user is banned */
if(is_banned(chptr, source_p, NULL, &ms, &mexcept, NULL) == CHFL_BAN || if(is_borq(chptr, source_p, NULL) == CHFL_BAN)
is_quieted(chptr, source_p, NULL, &ms, &mexcept) == CHFL_BAN)
{ {
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
form_str(ERR_CANNOTSENDTOCHAN), name); form_str(ERR_CANNOTSENDTOCHAN), name);