Skip to content

Change chanmode +P to +u to align with precedence #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
empus wants to merge 1 commit into
base: u2_10_12_branch
Choose a base branch
from
Open

Change chanmode +P to +u to align with precedence #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/channel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ struct Client;
#define MODE_APASS 0x200000
#define MODE_WASDELJOINS 0x400000 /**< Not DELJOINS, but some joins
* pending */
#define MODE_NOPARTMSGS 0x800000 /**< +P No part messages */
#define MODE_NOPARTMSGS 0x800000 /**< +u No part messages */
#define MODE_MODERATENOREG 0x1000000 /**< +M Moderate unauthed users */

/** mode flags which take another parameter (With PARAmeterS)
*/
#define MODE_WPARAS (MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT|MODE_APASS|MODE_UPASS)

/** Available Channel modes */
#define infochanmodes feature_bool(FEAT_OPLEVELS) ? "AbiklmnopstUvrDdRcCPM" : "biklmnopstvrDdRcCPM"
#define infochanmodes feature_bool(FEAT_OPLEVELS) ? "AbiklmnopstUvrDdRcCuM" : "biklmnopstvrDdRcCuM"
/** Available Channel modes that take parameters */
#define infochanmodeswithparams feature_bool(FEAT_OPLEVELS) ? "AbkloUv" : "bklov"

Expand Down
4 changes: 2 additions & 2 deletions include/supported.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
feature_int(FEAT_CHANNELLEN), CHANNELLEN, \
(feature_bool(FEAT_LOCAL_CHANNELS) ? "#&" : "#"), "(ov)@+", "@+", \
(feature_bool(FEAT_OPLEVELS) \
? "b,AkU,l,imnpstrDdRcCPM" \
: "b,k,l,imnpstrDdRcCPM"), \
? "b,AkU,l,imnpstrDdRcCuM" \
: "b,k,l,imnpstrDdRcCuM"), \
"rfc1459", feature_str(FEAT_NETWORK)

#endif /* INCLUDED_supported_h */
Expand Down
8 changes: 4 additions & 4 deletions ircd/channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ void channel_modes(struct Client *cptr, char *mbuf, char *pbuf, int buflen,
if (chptr->mode.mode & MODE_NOCTCP)
*mbuf++ = 'C';
if (chptr->mode.mode & MODE_NOPARTMSGS)
*mbuf++ = 'P';
*mbuf++ = 'u';
if (chptr->mode.mode & MODE_MODERATENOREG)
*mbuf++ = 'M';
if (chptr->mode.limit) {
Expand Down Expand Up @@ -1540,7 +1540,7 @@ modebuf_flush_int(struct ModeBuf *mbuf, int all)
MODE_REGISTERED, 'R',
MODE_NOCOLOR, 'c',
MODE_NOCTCP, 'C',
MODE_NOPARTMSGS, 'P',
MODE_NOPARTMSGS, 'u',
MODE_MODERATENOREG, 'M',
/* MODE_KEY, 'k', */
/* MODE_BAN, 'b', */
Expand Down Expand Up @@ -2109,7 +2109,7 @@ modebuf_extract(struct ModeBuf *mbuf, char *buf)
MODE_DELJOINS, 'D',
MODE_NOCOLOR, 'c',
MODE_NOCTCP, 'C',
MODE_NOPARTMSGS, 'P',
MODE_NOPARTMSGS, 'u',
MODE_MODERATENOREG, 'M',
0x0, 0x0
};
Expand Down Expand Up @@ -3254,7 +3254,7 @@ mode_parse(struct ModeBuf *mbuf, struct Client *cptr, struct Client *sptr,
MODE_DELJOINS, 'D',
MODE_NOCOLOR, 'c',
MODE_NOCTCP, 'C',
MODE_NOPARTMSGS, 'P',
MODE_NOPARTMSGS, 'u',
MODE_MODERATENOREG, 'M',
MODE_ADD, '+',
MODE_DEL, '-',
Expand Down
2 changes: 1 addition & 1 deletion ircd/m_clearmode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
MODE_DELJOINS, 'D',
MODE_NOCOLOR, 'c',
MODE_NOCTCP, 'C',
MODE_NOPARTMSGS, 'P',
MODE_NOPARTMSGS, 'u',
MODE_MODERATENOREG, 'M',
0x0, 0x0
};
Expand Down