X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Context.pm;h=8c16a95a65cdacc507cb06299e434f0727cb417d;hp=abe59b24cf538b477f794153241a11649a1865b7;hb=06eb99af20cebc85b1f609becb125b4dc32bf8ff;hpb=ae37bc6b64270f8c65298a36fce1f4bad761231f

diff --git a/Context.pm b/Context.pm
index abe59b2..8c16a95 100644
--- a/Context.pm
+++ b/Context.pm
@@ -50,6 +50,12 @@ has roles => (
 	lazy_build => 1
 );
 
+has uid => (
+	is => 'ro',
+	isa => 'Int',
+	lazy_build => 1
+);
+
 has disp => (
 	is => 'ro',
 	isa => 'Object',
@@ -97,37 +103,64 @@ 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");
+	#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 {
 	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 {
@@ -136,7 +169,7 @@ 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 hostmask = $1)
 		});
 	$query->execute($self->host);
 
@@ -147,5 +180,20 @@ WHERE gid IN (SELECT gid FROM groupmembers JOIN users USING (uid)
 	return Set::Object->new(@roles);
 }
 
+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;
+}
 
 1;