philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WANT_CHAN_NICK_SERV define and include services commands by default.

Browse Source 
They're pretty widely used these days, and the cost is trivial.  And quite frankly,
the less #ifdefs I have to see, the better.

This covers /NICKSERV, /CHANSERV, /OPERSERV and /MEMOSERV.  It also brings 
in the bahamut / unreal /SILENCE server-side-ignore command, and unreal's /HELPOP.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@524 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2014-11-04 10:27:19 +00:00
parent 78aeaeb1cb
commit 0b6725dbe2
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2c01] [Changes 1.2c01]
* Remove WANT_CHAN_NICK_SERV define and include network services commands
by default. (caf)
* Pass through externally-provided CPPFLAGS (reported by cpet). (caf) * Pass through externally-provided CPPFLAGS (reported by cpet). (caf)
* Don't set the mode on new channels until synched - this speeds up joining * Don't set the mode on new channels until synched - this speeds up joining

1
include/config.h
View File

@@ -654,7 +654,6 @@
#endif #endif
#undef PARANOID /* #define this if your paranoid about dcc hijacking */ #undef PARANOID /* #define this if your paranoid about dcc hijacking */
#undef WANT_CHAN_NICK_SERV /* do we want to include some chan/nick/oper server commands */
/* new epic stuff */ /* new epic stuff */
#define OLD_STATUS_S_EXPANDO_BEHAVIOR #define OLD_STATUS_S_EXPANDO_BEHAVIOR

25
source/commands.c
View File

@@ -272,9 +272,7 @@ IrcCommand irc_command[] =
{ "CDVOL", NULL, cd_volume, 0, NULL }, { "CDVOL", NULL, cd_volume, 0, NULL },
#endif #endif
{ "CHANNEL", "JOIN", e_channel, SERVERREQ, "- Shows information on the channels, modes and server you are on" }, { "CHANNEL", "JOIN", e_channel, SERVERREQ, "- Shows information on the channels, modes and server you are on" },
#ifdef WANT_CHAN_NICK_SERV { "CHANSERV", "CHANSERV", send_comm, SERVERREQ, "- Network services command" },
{ "CHANSERV", "CHANSERV", send_comm, SERVERREQ, NULL },
#endif
{ "CHANST", NULL, channel_stats, SERVERREQ, "%Y<%n-ALL%Y> %R[%Bchannel%R]%n\n- Shows statistics on current channel or %R[%Bchannel%R]%n" }, { "CHANST", NULL, channel_stats, SERVERREQ, "%Y<%n-ALL%Y> %R[%Bchannel%R]%n\n- Shows statistics on current channel or %R[%Bchannel%R]%n" },
{ "CHAT", "Chat", chat, SERVERREQ, "%Y<%nNick%Y>%n\n- Attempts to dcc chat nick" }, { "CHAT", "Chat", chat, SERVERREQ, "%Y<%nNick%Y>%n\n- Attempts to dcc chat nick" },
{ "CHATOPS", "CHATOPS", e_wall, SERVERREQ, NULL }, { "CHATOPS", "CHATOPS", e_wall, SERVERREQ, NULL },
@@ -389,10 +387,8 @@ IrcCommand irc_command[] =
{ "GONE", "Gone", away, SERVERREQ, "%R[%nreason%R]%n\n- Sets you away on server if %R[%nreason%R]%n else sets you back. Does not announce to your channels." }, { "GONE", "Gone", away, SERVERREQ, "%R[%nreason%R]%n\n- Sets you away on server if %R[%nreason%R]%n else sets you back. Does not announce to your channels." },
{ "HASH", "HASH", send_comm, SERVERREQ, "Server command"}, { "HASH", "HASH", send_comm, SERVERREQ, "Server command"},
{ "HELP", NULL, help, 0, NULL }, { "HELP", NULL, help, 0, NULL },
#ifdef WANT_CHAN_NICK_SERV
{ "HELPOP", "HELPOP", send_comm, SERVERREQ, NULL }, { "HELPOP", "HELPOP", send_comm, SERVERREQ, NULL },
{ "HELPSERV", "HELPSERV", send_comm, SERVERREQ, NULL }, { "HELPSERV", "HELPSERV", send_comm, SERVERREQ, "- Network services command" },
#endif
{ "HISTORY", NULL, history, 0, "- Shows recently typed commands" }, { "HISTORY", NULL, history, 0, "- Shows recently typed commands" },
{ "HOOK", NULL, hookcmd, 0, scripting_command }, { "HOOK", NULL, hookcmd, 0, scripting_command },
{ "HOP", "h", doop, SERVERREQ, "%Y<%Cnick%Y>%n\n- Gives %Y<%Cnick%Y>%n +h" }, { "HOP", "h", doop, SERVERREQ, "%Y<%Cnick%Y>%n\n- Gives %Y<%Cnick%Y>%n +h" },
@@ -457,9 +453,7 @@ IrcCommand irc_command[] =
{ "MDOP", NULL, massdeop, SERVERREQ, "- Mass deops current channel" }, { "MDOP", NULL, massdeop, SERVERREQ, "- Mass deops current channel" },
{ "MDVOICE", "MDVoice", massdeop, SERVERREQ, "- Mass de-voices current channel" }, { "MDVOICE", "MDVoice", massdeop, SERVERREQ, "- Mass de-voices current channel" },
{ "ME", NULL, me, SERVERREQ, "<action>\n- Sends an action to current channel" }, { "ME", NULL, me, SERVERREQ, "<action>\n- Sends an action to current channel" },
#ifdef WANT_CHAN_NICK_SERV { "MEMOSERV", "MEMOSERV", send_comm, SERVERREQ, "- Network services command" },
{ "MEMOSERV", "MEMOSERV", send_comm, SERVERREQ, NULL },
#endif
#ifdef GUI #ifdef GUI
{ "MENU", NULL, os2menu, 0, "GUI - Creates or removes a menu" }, { "MENU", NULL, os2menu, 0, "GUI - Creates or removes a menu" },
{ "MENUITEM", NULL, os2menuitem, 0, "GUI - Adds a menuitem to a menu" }, { "MENUITEM", NULL, os2menuitem, 0, "GUI - Adds a menuitem to a menu" },
@@ -484,9 +478,7 @@ IrcCommand irc_command[] =
{ "NEWNICK", NULL, newnick, 0, NULL }, { "NEWNICK", NULL, newnick, 0, NULL },
{ "NEWUSER", NULL, newuser, 0, NULL }, { "NEWUSER", NULL, newuser, 0, NULL },
{ "NICK", "NICK", e_nick, 0, "-Changes nick to specified nickname" }, { "NICK", "NICK", e_nick, 0, "-Changes nick to specified nickname" },
#ifdef WANT_CHAN_NICK_SERV { "NICKSERV", "NICKSERV", send_comm, SERVERREQ, "- Network services command" },
{ "NICKSERV", "NICKSERV", send_comm, SERVERREQ, NULL },
#endif
{ "NOCHAT", "NoChat", chat, 0, "%Y<%nnick%Y>%n\n- Kills chat reqest from %Y<%nnick%Y>" }, { "NOCHAT", "NoChat", chat, 0, "%Y<%nnick%Y>%n\n- Kills chat reqest from %Y<%nnick%Y>" },
{ "NOPS", "Nops", users, 0, "%R[%Bchannel%R]%n\n- Shows, in a full format, all the nicks without ops in %R[%Bchannel%R]%n or channel" }, { "NOPS", "Nops", users, 0, "%R[%Bchannel%R]%n\n- Shows, in a full format, all the nicks without ops in %R[%Bchannel%R]%n or channel" },
{ "NOTE", "NOTE", send_comm, SERVERREQ, NULL }, { "NOTE", "NOTE", send_comm, SERVERREQ, NULL },
@@ -501,9 +493,7 @@ IrcCommand irc_command[] =
{ "OOPS", NULL, do_oops, SERVERREQ, "%Y<%Cnick%Y>%n\n- Sends a oops message to last recipient of a message and sends the correct message to %Y<%Cnick%Y>%n" }, { "OOPS", NULL, do_oops, SERVERREQ, "%Y<%Cnick%Y>%n\n- Sends a oops message to last recipient of a message and sends the correct message to %Y<%Cnick%Y>%n" },
{ "OP", "o", doop, SERVERREQ, "%Y<%Cnick%Y>%n\n- Gives %Y<%Cnick%Y>%n +o" }, { "OP", "o", doop, SERVERREQ, "%Y<%Cnick%Y>%n\n- Gives %Y<%Cnick%Y>%n +o" },
{ "OPER", "OPER", oper, SERVERREQ, "%Y*%n Requires irc operator status\n%Y<%Cnick%Y>%n %R[%npassword%R]%n" }, { "OPER", "OPER", oper, SERVERREQ, "%Y*%n Requires irc operator status\n%Y<%Cnick%Y>%n %R[%npassword%R]%n" },
#ifdef WANT_CHAN_NICK_SERV { "OPERSERV", "OPERSERV", send_comm, SERVERREQ, "- Network services command" },
{ "OPERSERV", "OPERSERV", send_comm, SERVERREQ, NULL },
#endif
{ "OPERWALL", "OPERWALL", e_wall, 0, NULL }, { "OPERWALL", "OPERWALL", e_wall, 0, NULL },
{ "ORIGNICK", "OrigNick", orig_nick, 0, "%Y<%Cnick%Y>%n\n- Attempts to regain a nick that someone else has taken from you." }, { "ORIGNICK", "OrigNick", orig_nick, 0, "%Y<%Cnick%Y>%n\n- Attempts to regain a nick that someone else has taken from you." },
{ "OSTAT", NULL, serv_stat, 0, "-Displays some internal statistics gathered about the server" }, { "OSTAT", NULL, serv_stat, 0, "-Displays some internal statistics gathered about the server" },
@@ -623,10 +613,7 @@ IrcCommand irc_command[] =
{ "SHOWLOCK", "ShowLock", mode_lock, 0, "- Show the mode lock on the channel" }, { "SHOWLOCK", "ShowLock", mode_lock, 0, "- Show the mode lock on the channel" },
{ "SHOWSPLIT", NULL, linklook, 0, "- Shows split servers" }, { "SHOWSPLIT", NULL, linklook, 0, "- Shows split servers" },
{ "SHOWWORDKICK",NULL, show_word_kick, 0, "- Shows the internal banned word list" }, { "SHOWWORDKICK",NULL, show_word_kick, 0, "- Shows the internal banned word list" },
{ "SILENCE", "SILENCE", send_comm, 0, "%R[%n+nick|-nick%R]%n\n- Server-side ignore" },
#ifdef WANT_CHAN_NICK_SERV
{ "SILENCE", "SILENCE", send_comm, 0, NULL },
#endif
{ "SLEEP", NULL, sleepcmd, 0, scripting_command }, { "SLEEP", NULL, sleepcmd, 0, scripting_command },
{ "SPAM", NULL, spam, 0, NULL }, { "SPAM", NULL, spam, 0, NULL },
{ "SPING", "Sping", sping, 0, "%Y<%nserver|.|-clear%Y>%n\n- Checks how lagged you are to %Y<%nserver%Y>%n" }, { "SPING", "Sping", sping, 0, "%Y<%nserver|.|-clear%Y>%n\n- Checks how lagged you are to %Y<%nserver%Y>%n" },