Changeset d7d677d

Timestamp:

2010-04-14T12:34:39Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

003a12b

Parents:

d33679e

Message:

Restored a few more trivial commands including all the oper stuff.

File:

• irc_commands.c (modified) (7 diffs)

irc_commands.c

@@ -351 +351 @@
 
 
-#if 0
 static void irc_cmd_oper( irc_t *irc, char **cmd )
 {
@@ -368 +367 @@
 }
 
+#if 0
 static void irc_cmd_invite( irc_t *irc, char **cmd )
 {
@@ -553 +553 @@
 }
 
-#if 0
 static void irc_cmd_version( irc_t *irc, char **cmd )
 {
-        irc_send_num( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU );
+        irc_send_num( irc, 351, "bitlbee-%s. %s :%s/%s ",
+                      BITLBEE_VERSION, irc->root->host, ARCH, CPU );
 }
 
 static void irc_cmd_completions( irc_t *irc, char **cmd )
 {
-        user_t *u = user_find( irc, irc->mynick );
         help_t *h;
         set_t *s;
         int i;
         
-        irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "OK" );
+        irc_send_msg_raw( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS OK" );
         
         for( i = 0; commands[i].command; i ++ )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", commands[i].command );
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS %s", commands[i].command );
         
         for( h = global.help; h; h = h->next )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS help ", h->title );
-        
-        for( s = irc->set; s; s = s->next )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS set ", s->key );
-        
-        irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "END" );
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS help %s", h->title );
+        
+        for( s = irc->b->set; s; s = s->next )
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS set %s", s->key );
+        
+        irc_send_msg_raw( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS END" );
 }
 
@@ -589 +588 @@
         irc_send_num( irc, 382, "%s :Rehashing", global.conf_file );
 }
-#endif
 
 static const command_t irc_commands[] = {
@@ -610 +608 @@
         { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
         { "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
+        { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
+        { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
+        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
 #if 0
-        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
         { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
         { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
@@ -618 +618 @@
         { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
-        { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
-        { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
+#endif
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
@@ -627 +626 @@
         { "restart",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "kill",        2, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-#endif
         { NULL }
 };