mirror of
https://github.com/matrix-construct/construct
synced 2024-09-11 19:19:11 +02:00
Branch merge
This commit is contained in:
commit
c71a6e3bed
2 changed files with 13 additions and 15 deletions
|
@ -239,8 +239,7 @@ extern void channel_member_names(struct Channel *chptr, struct Client *,
|
||||||
|
|
||||||
extern void del_invite(struct Channel *chptr, struct Client *who);
|
extern void del_invite(struct Channel *chptr, struct Client *who);
|
||||||
|
|
||||||
const char *channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *who);
|
const char *channel_modes(struct Channel *chptr, struct Client *who);
|
||||||
#define channel_modes(chptr, who) channel_modes_real(chptr, &(chptr)->mode, who)
|
|
||||||
|
|
||||||
extern struct Channel *find_bannickchange_channel(struct Client *client_p);
|
extern struct Channel *find_bannickchange_channel(struct Client *client_p);
|
||||||
|
|
||||||
|
|
|
@ -1074,10 +1074,9 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* channel_modes_real()
|
/* channel_modes()
|
||||||
*
|
*
|
||||||
* inputs - pointer to channel
|
* inputs - pointer to channel
|
||||||
* - pointer to channel Mode struct
|
|
||||||
* - pointer to client
|
* - pointer to client
|
||||||
* output - string with simple modes
|
* output - string with simple modes
|
||||||
* side effects - result from previous calls overwritten
|
* side effects - result from previous calls overwritten
|
||||||
|
@ -1085,7 +1084,7 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in
|
||||||
* Stolen from ShadowIRCd 4 --nenolod
|
* Stolen from ShadowIRCd 4 --nenolod
|
||||||
*/
|
*/
|
||||||
const char *
|
const char *
|
||||||
channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *client_p)
|
channel_modes(struct Channel *chptr, struct Client *client_p)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char buf1[BUFSIZE];
|
char buf1[BUFSIZE];
|
||||||
|
@ -1098,40 +1097,40 @@ channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *clie
|
||||||
*pbuf = '\0';
|
*pbuf = '\0';
|
||||||
|
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
if(mode->mode & chmode_flags[i])
|
if(chptr->mode.mode & chmode_flags[i])
|
||||||
*mbuf++ = i;
|
*mbuf++ = i;
|
||||||
|
|
||||||
if(mode->limit)
|
if(chptr->mode.limit)
|
||||||
{
|
{
|
||||||
*mbuf++ = 'l';
|
*mbuf++ = 'l';
|
||||||
|
|
||||||
if(!IsClient(client_p) || IsMember(client_p, chptr))
|
if(!IsClient(client_p) || IsMember(client_p, chptr))
|
||||||
pbuf += rb_sprintf(pbuf, " %d", mode->limit);
|
pbuf += rb_sprintf(pbuf, " %d", chptr->mode.limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(*mode->key)
|
if(*chptr->mode.key)
|
||||||
{
|
{
|
||||||
*mbuf++ = 'k';
|
*mbuf++ = 'k';
|
||||||
|
|
||||||
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
|
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
|
||||||
pbuf += rb_sprintf(pbuf, " %s", mode->key);
|
pbuf += rb_sprintf(pbuf, " %s", chptr->mode.key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mode->join_num)
|
if(chptr->mode.join_num)
|
||||||
{
|
{
|
||||||
*mbuf++ = 'j';
|
*mbuf++ = 'j';
|
||||||
|
|
||||||
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
|
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
|
||||||
pbuf += rb_sprintf(pbuf, " %d:%d", mode->join_num,
|
pbuf += rb_sprintf(pbuf, " %d:%d", chptr->mode.join_num,
|
||||||
mode->join_time);
|
chptr->mode.join_time);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(*mode->forward && (ConfigChannel.use_forward || !IsClient(client_p)))
|
if(*chptr->mode.forward && (ConfigChannel.use_forward || !IsClient(client_p)))
|
||||||
{
|
{
|
||||||
*mbuf++ = 'f';
|
*mbuf++ = 'f';
|
||||||
|
|
||||||
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
|
if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
|
||||||
pbuf += rb_sprintf(pbuf, " %s", mode->forward);
|
pbuf += rb_sprintf(pbuf, " %s", chptr->mode.forward);
|
||||||
}
|
}
|
||||||
|
|
||||||
*mbuf = '\0';
|
*mbuf = '\0';
|
||||||
|
|
Loading…
Reference in a new issue