X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FUserExtra.pl;h=6d1223b82ed27d09f12caa1ba8b85f9ddec419bd;hb=2fe7b3f4c44843313576e45ac0ceee8d2fcdab3d;hp=cb0dc29ce0456785756e195a3e38fd99dcac0a00;hpb=9d62b4d8391174e9b89934d36af6cfb61f76cb8a;p=infobot.git

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index cb0dc29..6d1223b 100644
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -1,41 +1,15 @@
 #
 # UserExtra.pl: User Commands, Public.
 #       Author: dms
-#      Version: v0.2b (20000707)
-#      Created: 20000107
 #
 
 use strict;
 use vars qw($message $arg $qWord $verb $lobotomized $who $result $chan
 	$conn $msgType $query $talkchannel $ident $memusage);
 use vars qw(%channels %chanstats %cmdstats %count %ircstats %param
-	%cache %mask %userstats %hooks_main);
+	%cache %mask %userstats);
 
-###
-### Start of command hooks for UserExtra.
-###
-
-&addCmdHook("main", 'chan(stats|info)', ('CODEREF' => 'chaninfo', ) );
-&addCmdHook("main", 'cmd(stats|info)', ('CODEREF' => 'cmdstats', ) );
-&addCmdHook("main", 'sched(stats|info)', ('CODEREF' => 'scheduleList', ) );
-&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo',
-	'Cmdstats' => 'Factoid Info', Module => 'Factoids', ) );
-&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats',
-	'Cmdstats' => 'Factoid Stats', Help => "factstats",
-	Forker => 1, 'Identifier' => 'Factoids', ) );
-&addCmdHook("main", 'help', ('CODEREF' => 'help',
-	'Cmdstats' => 'Help', ) );
-&addCmdHook("main", 'karma', ('CODEREF' => 'karma', ) );
-&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell',
-	Help => 'tell', Identifier => 'allowTelling',
-	Cmdstats => 'Tell') );
-&addCmdHook("main", 'News', ('CODEREF' => 'News::Parse',
-	Module => 'News', 'Cmdstats' => 'News' ) );
-&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats',
-#	Forker => "NULL",
- ) );
-
-&status("CMD: loaded ".scalar(keys %hooks_main)." MAIN command hooks.");
+### hooks get added in CommandHooks.pl.
 
 ###
 ### Start of commands for hooks.
@@ -210,7 +184,7 @@ sub factinfo {
 sub factstats {
     my $type = shift(@_);
 
-    &Forker("factoids", sub {
+    &Forker("Factoids", sub {
 	&performStrictReply( &CmdFactStats($type) );
     } );
 }
@@ -218,7 +192,7 @@ sub factstats {
 sub karma {
     my $target	= lc( shift || $who );
     my $karma	= &sqlSelect("stats", "counter",
-	{ nick => $target, type => "karma" }) || 0;
+	{ nick => $target, type => "karma", channel => $chan }) || 0;
 
     if ($karma != 0) {
 	&performStrictReply("$target has karma of $karma");
@@ -302,8 +276,7 @@ sub tell {
 	# support command redirection.
 	# recursive cmdHooks aswell :)
 	my $done = 0;
-	$done++ if &parseCmdHook("main", $tell_obj);
-	$done++ if &parseCmdHook("extra", $tell_obj);
+	$done++ if &parseCmdHook($tell_obj);
 	$message	= $tell_obj;
 	$done++ unless (&Modules());
 
@@ -469,26 +442,13 @@ sub userCommands {
     }
 
     # crypt.
-    if ($message =~ /^crypt(\s+(.*))?$/i) {
-	my @args	= split /\s+/, $2;
-
-	if (!scalar @args or scalar @args > 2) {
-	    &help("crypt");
-	    return;
-	}
-
-	if (scalar @args == 2) {
-# disable cause $1$ will use md5
-#	    if (length $args[0] != 2) {
-#		&msg($who, "invalid format...");
-#		return;
-#	    }
-
-	    &performStrictReply( crypt($args[1], $args[0]) );
+    if ($message =~ /^crypt\s+(\S*)?\s*(.*)?$/i) {
+&status("crypt: $1:$2:$3");
+	if ("$2" ne '') {
+	    &performStrictReply(crypt($2, $1));
 	} else {
-	    &performStrictReply( &mkcrypt($args[0]) );
+	    &performStrictReply(&mkcrypt($1));
 	}
-
 	return;
     }
 
@@ -738,23 +698,6 @@ sub userCommands {
 	);
 
 	return;
-
-	my %hash = &sqlSelectColHash("stats", "nick,counter",
-		{ type => "cmdstats" }, 1);
-# ORDER won't be retained in a hash
-#			" ORDER BY counter DESC", 1);
-
-if (0) {
-	foreach (keys %hash) {
-	    my $i = $_;
-	    foreach (keys %{ $hash{$i} }) {
-		&DEBUG("cmdstats: $hash{$i}{$_} = $_");
-	    }
-	}
-	&DEBUG("end of cmdstats.");
-}
-
-	return;
     }
 
     # wantNick. xk++