X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Context.pm;h=7f1d2cc58e9654c71c3208c527486bd91615a737;hb=refs%2Fheads%2Fdiscord;hp=02aac95a7ba84819a49e6713acc7c241bec48d85;hpb=e8c94cdebefdc428ea92fde6db63f18d3e8399b2;p=NDIRC.git

diff --git a/Context.pm b/Context.pm
index 02aac95..7f1d2cc 100644
--- a/Context.pm
+++ b/Context.pm
@@ -23,30 +23,31 @@ use warnings;
 use feature ':5.10';
 
 use Moose;
+use namespace::autoclean;
 
 use Set::Object ();
 
-has host => (
+has channel => (
 	is => 'ro',
 	isa => 'Str',
 	required => 1
 );
 
-has nick => (
+has roles => (
 	is => 'ro',
-	isa => 'Str',
-	required => 1
+	isa => 'Object',
+	lazy_build => 1
 );
 
-has channel => (
+has uid => (
 	is => 'ro',
-	isa => 'Str',
-	required => 1
+	isa => 'Int',
+	lazy_build => 1
 );
 
-has roles => (
+has username => (
 	is => 'ro',
-	isa => 'Object',
+	isa => 'Str',
 	lazy_build => 1
 );
 
@@ -62,18 +63,12 @@ has model => (
 	required => 1
 );
 
-has server => (
+has bot => (
 	is => 'ro',
 	isa => 'Object',
 	required => 1
 );
 
-has reply_string => (
-	is => 'ro',
-	isa => 'Str',
-	required => 1,
-);
-
 sub assert_user_roles {
 	my ($self,@roles) = @_;
 	return 1 unless @roles;
@@ -95,46 +90,30 @@ sub check_user_roles {
 }
 
 sub reply {
-	my ($self,$msg) = @_;
-
-	my @command = split / /, $self->reply_string;
-	$self->message(@command, $msg);
 }
 
 sub message {
-	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->command($command, $target, $msg);
 }
 
-sub command {
-	my ($self,@command) = @_;
-
-	$self->server->yield(@command);
+sub replyId {
 }
 
 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 pid = $3)
-	,(SELECT uid FROM users WHERE hostmask ILIKE $1)
-	,$2)
+	(SELECT ftid FROM planets WHERE pid = $3),$1,$2)
 		});
-	$log->execute($c->host,$message,$planet);
+	$log->execute($c->uid,$message,$planet);
 }
 
 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 call = $3)
-	,(SELECT uid FROM users WHERE hostmask ILIKE $1),$2)
+	(SELECT ftid FROM calls WHERE call = $3),$1,$2)
 		});
-	$log->execute($c->host,$message,$call);
+	$log->execute($c->uid,$message,$call);
 }
 
 sub _build_roles {
@@ -143,9 +122,9 @@ sub _build_roles {
 	my $query = $self->model->prepare(q{
 SELECT role FROM group_roles
 WHERE gid IN (SELECT gid FROM groupmembers JOIN users USING (uid)
-	WHERE hostmask ILIKE $1)
+	WHERE uid = $1)
 		});
-	$query->execute($self->host);
+	$query->execute($self->uid);
 
 	my @roles;
 	while (my $group = $query->fetchrow_hashref){
@@ -154,5 +133,33 @@ WHERE gid IN (SELECT gid FROM groupmembers JOIN users USING (uid)
 	return Set::Object->new(@roles);
 }
 
+sub _build_uid {
+	my ($self) = @_;
+
+	return -4;
+}
+
+sub _build_username {
+	my ($self) = @_;
+
+	my $query = $self->model->prepare(q{
+SELECT username FROM users
+WHERE uid = $1
+		});
+	$query->execute($self->uid);
+
+	if (my ($username) = $query->fetchrow_array){
+		$query->finish;
+		return $username;
+	}
+	return "Anonymous";
+}
+
+sub valuecolor {
+	shift @_;
+	my $s = $_;
+	return $s;
+}
 
+__PACKAGE__->meta->make_immutable;
 1;