X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Context.pm;h=39300254d1bf741e59122721a7bddc40e523a02a;hp=5810ca4e97dc9cc369b2d6327e716d50ea67fd02;hb=bd6624a4e56ad6968b57b76786ebd8787433ead4;hpb=036bfadee395d5ec8bfa4e00b05077a90a8d232a

diff --git a/Context.pm b/Context.pm
index 5810ca4..3930025 100644
--- a/Context.pm
+++ b/Context.pm
@@ -23,21 +23,10 @@ use warnings;
 use feature ':5.10';
 
 use Moose;
+use namespace::autoclean;
 
 use Set::Object ();
 
-has host => (
-	is => 'ro',
-	isa => 'Str',
-	required => 1
-);
-
-has nick => (
-	is => 'ro',
-	isa => 'Str',
-	required => 1
-);
-
 has channel => (
 	is => 'ro',
 	isa => 'Str',
@@ -68,18 +57,6 @@ has model => (
 	required => 1
 );
 
-has server => (
-	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;
@@ -101,48 +78,9 @@ 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;
-
-	#Split the message, using the, slightly modified, algorithm from splitlong.pl in the irssi distribution.
-	if ($command eq 'privmsg'){
-		my $lend = ' ...';
-		my $lstart = '... ';
-		my $maxlength = $self->server->{msg_length} - bytes::length("privmsg $target :" . $self->server->nick_name());
-		my $maxlength2 = $maxlength - bytes::length($lend);
-
-		if (bytes::length($msg) > ($maxlength)) {
-			my @spltarr;
-
-			while (bytes::length($msg) > ($maxlength)) {
-				my $pos = rindex($msg, " ", $maxlength2);
-				push @spltarr, substr($msg, 0, ($pos < ($maxlength/10 + 4)) ? $maxlength2  : $pos)  . $lend;
-				$msg = $lstart . substr($msg, ($pos < ($maxlength/10 + 4)) ? $maxlength2 : $pos+1);
-			}
-
-			push @spltarr, $msg;
-			for (@spltarr) {
-				$self->command($command, $target, $_);
-			}
-			return;
-		}
-	}
-	$self->command($command, $target, $msg);
-}
-
-sub command {
-	my ($self,@command) = @_;
-
-	$self->server->yield(@command);
 }
 
 sub intel_log {
@@ -169,9 +107,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 = $1)
+	WHERE uid = $1)
 		});
-	$query->execute($self->host);
+	$query->execute($self->uid);
 
 	my @roles;
 	while (my $group = $query->fetchrow_hashref){
@@ -183,29 +121,14 @@ WHERE gid IN (SELECT gid FROM groupmembers JOIN users USING (uid)
 sub _build_uid {
 	my ($self) = @_;
 
-	my $query = $self->model->prepare(q{
-SELECT uid FROM users
-WHERE hostmask = $1
-		});
-	$query->execute($self->host);
-
-	if (my ($uid) = $query->fetchrow_array){
-		$query->finish;
-		return $uid;
-	}
 	return -4;
 }
 
 sub valuecolor {
 	shift @_;
 	my $s = $_;
-	$s = $_[1] if $#_ >= 1;
-	$s = "" unless defined $s;
-	return "<c05>$s</c>" if $s eq 'Hostile';
-	return "<c03>$s</c>" if $s eq 'Friendly';
-	return "<c12>$s</c>" if $s eq 'Nap' or $s eq 'NAP';
-	return "<b>$s</b>" if $_[0];
 	return $s;
 }
 
+__PACKAGE__->meta->make_immutable;
 1;