X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=Context.pm;h=39300254d1bf741e59122721a7bddc40e523a02a;hb=14fe324122bee271d8153f3db81491240a87895c;hp=abe59b24cf538b477f794153241a11649a1865b7;hpb=ae37bc6b64270f8c65298a36fce1f4bad761231f;p=NDIRC.git
diff --git a/Context.pm b/Context.pm
index abe59b2..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',
@@ -50,30 +39,24 @@ has roles => (
lazy_build => 1
);
-has disp => (
+has uid => (
is => 'ro',
- isa => 'Object',
- required => 1
+ isa => 'Int',
+ lazy_build => 1
);
-has model => (
+has disp => (
is => 'ro',
isa => 'Object',
required => 1
);
-has server => (
+has model => (
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,39 +78,27 @@ sub check_user_roles {
}
sub reply {
- my ($self,$msg) = @_;
-
- $self->message($self->reply_string , $msg);
}
sub message {
- my ($self,$command,$msg) = @_;
-
- $msg =~ s`(.*?)`${\(chr(2))}$1${\(chr(15))}`gi;
- $msg =~ s`(.*?)`${\(chr(3))}$1$2${\(chr(15))}`gi;
-
- $self->server->command("$command $msg");
}
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,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 ILIKE $1)
+ WHERE uid = $1)
});
- $query->execute($self->host);
+ $query->execute($self->uid);
my @roles;
while (my $group = $query->fetchrow_hashref){
@@ -147,5 +118,17 @@ WHERE gid IN (SELECT gid FROM groupmembers JOIN users USING (uid)
return Set::Object->new(@roles);
}
+sub _build_uid {
+ my ($self) = @_;
+
+ return -4;
+}
+
+sub valuecolor {
+ shift @_;
+ my $s = $_;
+ return $s;
+}
+__PACKAGE__->meta->make_immutable;
1;