X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=blobdiff_plain;f=Context.pm;h=39300254d1bf741e59122721a7bddc40e523a02a;hb=bd6624a4e56ad6968b57b76786ebd8787433ead4;hp=8c16a95a65cdacc507cb06299e434f0727cb417d;hpb=a7e034b3599d41cdf5a158b14bd1715451f89a0c;p=NDIRC.git
diff --git a/Context.pm b/Context.pm
index 8c16a95..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`(.*?)`${\(chr(2))}$1${\(chr(15))}`gi;
- $msg =~ s`(.*?)`${\(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,17 +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 = $_;
+ return $s;
+}
+
+__PACKAGE__->meta->make_immutable;
1;