X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Context.pm;h=02aac95a7ba84819a49e6713acc7c241bec48d85;hp=124da62e5ca301a33da1a18534b24ac6737c51c6;hb=e8c94cdebefdc428ea92fde6db63f18d3e8399b2;hpb=9e077e0aeb51cfd1eeeb12f2362fc11ac6d6b38a

diff --git a/Context.pm b/Context.pm
index 124da62..02aac95 100644
--- a/Context.pm
+++ b/Context.pm
@@ -97,23 +97,30 @@ sub check_user_roles {
 sub reply {
 	my ($self,$msg) = @_;
 
-	$self->message($self->reply_string , $msg);
+	my @command = split / /, $self->reply_string;
+	$self->message(@command, $msg);
 }
 
 sub message {
-	my ($self,$command,$msg) = @_;
+	my ($self,$command, $target, $msg) = @_;
 
 	$msg =~ s`<b>(.*?)</b>`${\(chr(2))}$1${\(chr(15))}`gi;
 	$msg =~ s`<c(\d+)>(.*?)</c>`${\(chr(3))}$1$2${\(chr(15))}`gi;
 
-	$self->server->command("$command $msg");
+	$self->command($command, $target, $msg);
+}
+
+sub command {
+	my ($self,@command) = @_;
+
+	$self->server->yield(@command);
 }
 
 sub intel_log {
 	my ($c,$planet, $message) = @_;
 	my $log = $c->model->prepare_cached(q{
 INSERT INTO forum_posts (ftid,uid,message) VALUES(
-	(SELECT ftid FROM planets WHERE id = $3)
+	(SELECT ftid FROM planets WHERE pid = $3)
 	,(SELECT uid FROM users WHERE hostmask ILIKE $1)
 	,$2)
 		});
@@ -124,7 +131,7 @@ sub def_log {
 	my ($c,$call, $message) = @_;
 	my $log = $c->model->prepare(q{
 INSERT INTO forum_posts (ftid,uid,message) VALUES(
-	(SELECT ftid FROM calls WHERE id = $3)
+	(SELECT ftid FROM calls WHERE call = $3)
 	,(SELECT uid FROM users WHERE hostmask ILIKE $1),$2)
 		});
 	$log->execute($c->host,$message,$call);