* to clearly show that it is fake. SCENE is a special case and not underlined.
* these commands only work on channels set +N
*
- * also adds oper commands FSAY and FACTION, which are like NPC and NPCA
+ * also adds oper commands FSAY and FACTION, which are like NPC and NPCA
* except without the underline.
- *
+ *
* all of these messages have the hostmask npc.fakeuser.invalid, and their ident
* is the nickname of the user running the commands.
*/
#include "tgchange.h"
#include "channel.h"
#include "packet.h"
-
-static int m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_faction(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_npc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_npca(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_displaymsg(struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text);
-static int me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+#include "messages.h"
+
+static int m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_npc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_npca(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_displaymsg(struct MsgBuf *msgbuf_p, struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text);
+static int me_roleplay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static unsigned int mymode;
static int
struct Message scene_msgtab = {
- "SCENE", 0, 0, 0, MFLG_SLOW,
+ "SCENE", 0, 0, 0, 0,
{mg_unreg, {m_scene, 3}, mg_ignore, mg_ignore, mg_ignore, {m_scene, 3}}
};
/* this serves as an alias for people who are used to inspircd/unreal m_roleplay */
struct Message ambiance_msgtab = {
- "AMBIANCE", 0, 0, 0, MFLG_SLOW,
+ "AMBIANCE", 0, 0, 0, 0,
{mg_unreg, {m_scene, 3}, mg_ignore, mg_ignore, mg_ignore, {m_scene, 3}}
-};
+};
struct Message fsay_msgtab = {
- "FSAY", 0, 0, 0, MFLG_SLOW,
+ "FSAY", 0, 0, 0, 0,
{mg_unreg, {m_npc, 4}, mg_ignore, mg_ignore, mg_ignore, {m_fsay, 4}}
-};
+};
struct Message faction_msgtab = {
- "FACTION", 0, 0, 0, MFLG_SLOW,
+ "FACTION", 0, 0, 0, 0,
{mg_unreg, {m_npca, 4}, mg_ignore, mg_ignore, mg_ignore, {m_faction, 4}}
-};
+};
struct Message npc_msgtab = {
- "NPC", 0, 0, 0, MFLG_SLOW,
+ "NPC", 0, 0, 0, 0,
{mg_unreg, {m_npc, 4}, mg_ignore, mg_ignore, mg_ignore, {m_npc, 4}}
-};
+};
struct Message npca_msgtab = {
- "NPCA", 0, 0, 0, MFLG_SLOW,
+ "NPCA", 0, 0, 0, 0,
{mg_unreg, {m_npca, 4}, mg_ignore, mg_ignore, mg_ignore, {m_npca, 4}}
-};
+};
struct Message roleplay_msgtab = {
- "ROLEPLAY", 0, 0, 0, MFLG_SLOW,
+ "ROLEPLAY", 0, 0, 0, 0,
{mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_roleplay, 4}, mg_ignore}
-};
+};
mapi_clist_av1 roleplay_clist[] = { &scene_msgtab, &ambiance_msgtab, &fsay_msgtab, &faction_msgtab, &npc_msgtab, &npca_msgtab, &roleplay_msgtab, NULL };
DECLARE_MODULE_AV1(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, "$m_roleplay$");
static int
-m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- m_displaymsg(source_p, parv[1], 0, 0, "=Scene=", parv[2]);
+ m_displaymsg(msgbuf_p, source_p, parv[1], 0, 0, "=Scene=", parv[2]);
return 0;
}
static int
-m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- m_displaymsg(source_p, parv[1], 0, 0, parv[2], parv[3]);
+ m_displaymsg(msgbuf_p, source_p, parv[1], 0, 0, parv[2], parv[3]);
return 0;
}
static int
-m_faction(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- m_displaymsg(source_p, parv[1], 0, 1, parv[2], parv[3]);
+ m_displaymsg(msgbuf_p, source_p, parv[1], 0, 1, parv[2], parv[3]);
return 0;
}
static int
-m_npc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_npc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- m_displaymsg(source_p, parv[1], 1, 0, parv[2], parv[3]);
+ m_displaymsg(msgbuf_p, source_p, parv[1], 1, 0, parv[2], parv[3]);
return 0;
}
static int
-m_npca(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_npca(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
- m_displaymsg(source_p, parv[1], 1, 1, parv[2], parv[3]);
+ m_displaymsg(msgbuf_p, source_p, parv[1], 1, 1, parv[2], parv[3]);
return 0;
}
static int
-m_displaymsg(struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text)
+m_displaymsg(struct MsgBuf *msgbuf_p, struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text)
{
struct Channel *chptr;
struct membership *msptr;
char nick2[NICKLEN+1];
- char *nick3 = rb_strdup(nick);
+ char nick3[NICKLEN+1];
+ char text3[BUFSIZE];
char text2[BUFSIZE];
+ rb_strlcpy(nick3, nick, sizeof nick3);
+
if(!IsFloodDone(source_p))
flood_endgrace(source_p);
}
if(underline)
- rb_snprintf(nick2, sizeof(nick2), "\x1F%s\x1F", strip_unprintable(nick3));
+ snprintf(nick2, sizeof(nick2), "\x1F%s\x1F", strip_unprintable(nick3));
else
- rb_snprintf(nick2, sizeof(nick2), "%s", strip_unprintable(nick3));
+ snprintf(nick2, sizeof(nick2), "%s", strip_unprintable(nick3));
/* don't allow nicks to be empty after stripping
* this prevents nastiness like fake factions, etc. */
return 0;
}
+ snprintf(text3, sizeof(text3), "%s (%s)", text, source_p->name);
+
if(action)
- rb_snprintf(text2, sizeof(text2), "\1ACTION %s\1", text);
+ snprintf(text2, sizeof(text2), "\1ACTION %s\1", text3);
else
- rb_snprintf(text2, sizeof(text2), "%s", text);
+ snprintf(text2, sizeof(text2), "%s", text3);
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s (%s)", nick2, source_p->name, channel, text2, source_p->name);
+ sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", nick2, source_p->name, channel, text2);
sendto_match_servs(source_p, "*", CAP_ENCAP, NOCAPS, "ENCAP * ROLEPLAY %s %s :%s",
channel, nick2, text2);
return 0;
}
static int
-me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_roleplay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Channel *chptr;
if((chptr = find_channel(parv[1])) == NULL)
return 0;
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", parv[2], source_p->name, parv[1], parv[3]);
+ sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", parv[2], source_p->name, parv[1], parv[3]);
return 0;
}