Changeset 2272cb3

Timestamp:

2010-04-20T23:11:32Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a4cdf43

Parents:

9d4352c

Message:

Restored block/allow commands. Only "chat" is left now, which will need some
more rethinking anyway (and groupchat support is not back yet anyway).

File:

• root_commands.c (modified) (10 diffs)

root_commands.c

@@ -717 +717 @@
         return strcmp( irc->channel, new_name ) == 0 ? new_name : SET_INVALID;
 }
+#endif
 
 static void cmd_block( irc_t *irc, char **cmd )
@@ -723 +724 @@
         account_t *a;
         
-        if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->ic )
+        if( !cmd[2] && ( a = account_get( irc->b, cmd[1] ) ) && a->ic )
         {
                 char *format;
@@ -736 +737 @@
                 for( l = a->ic->deny; l; l = l->next )
                 {
-                        user_t *u = user_findhandle( a->ic, l->data );
-                        irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
+                        bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
+                        irc_user_t *iu = bu ? bu->ui_data : NULL;
+                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
                 }
                 irc_usermsg( irc, "End of list." );
@@ -745 +747 @@
         else if( !cmd[2] )
         {
-                user_t *u = user_find( irc, cmd[1] );
-                if( !u || !u->ic )
+                irc_user_t *iu = irc_user_by_name( irc, cmd[1] );
+                if( !iu || !iu->bu )
                 {
                         irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
-                ic = u->ic;
-                cmd[2] = u->handle;
-        }
-        else if( !( a = account_get( irc, cmd[1] ) ) )
+                ic = iu->bu->ic;
+                cmd[2] = iu->bu->handle;
+        }
+        else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
                 irc_usermsg( irc, "Invalid account" );
@@ -782 +784 @@
         account_t *a;
         
-        if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->ic )
+        if( !cmd[2] && ( a = account_get( irc->b, cmd[1] ) ) && a->ic )
         {
                 char *format;
@@ -795 +797 @@
                 for( l = a->ic->permit; l; l = l->next )
                 {
-                        user_t *u = user_findhandle( a->ic, l->data );
-                        irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
+                        bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
+                        irc_user_t *iu = bu ? bu->ui_data : NULL;
+                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
                 }
                 irc_usermsg( irc, "End of list." );
@@ -804 +807 @@
         else if( !cmd[2] )
         {
-                user_t *u = user_find( irc, cmd[1] );
-                if( !u || !u->ic )
+                irc_user_t *iu = irc_user_by_name( irc, cmd[1] );
+                if( !iu || !iu->bu )
                 {
                         irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
-                ic = u->ic;
-                cmd[2] = u->handle;
-        }
-        else if( !( a = account_get( irc, cmd[1] ) ) )
+                ic = iu->bu->ic;
+                cmd[2] = iu->bu->handle;
+        }
+        else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
                 irc_usermsg( irc, "Invalid account" );
@@ -836 +839 @@
         }
 }
-#endif
 
 static void cmd_yesno( irc_t *irc, char **cmd )
@@ -1164 +1166 @@
         { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
+        { "allow",          1, cmd_allow,          0 },
         { "blist",          0, cmd_blist,          0 },
+        { "block",          1, cmd_block,          0 },
         { "drop",           1, cmd_drop,           0 },
         { "ft",             0, cmd_transfer,       0 },
@@ -1180 +1184 @@
         { "yes",            0, cmd_yesno,          0 },
 #if 0
-        { "allow",          1, cmd_allow,          0 },
-        { "block",          1, cmd_block,          0 },
         { "chat",           1, cmd_chat,           0 },
 #endif