Updated -user to account for discord id

[NDIRC.git] / Context.pm

diff --git a/Context.pm b/Context.pm
index 8a0a911a3b2abbaca49a0e8995dc853540c8b19d..39300254d1bf741e59122721a7bddc40e523a02a 100644 (file)
--- 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,69 +78,27 @@ 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 {
        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 {
@@ -166,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){
@@ -177,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;