X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Delling.pm;h=1eb4824d98f1d263ff27f39b6c0ce46bd0239ee3;hb=14fe324122bee271d8153f3db81491240a87895c;hp=e6ce4e5e328b8a2042ae72c6b66b61e64246f7e5;hpb=194c1b6e27f8febba17d591ec1e44e7072b3d3f4;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index e6ce4e5..1eb4824 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -28,6 +28,8 @@ extends 'NDIRC::Bot';
 use POE::Session;
 use ND::DB;
 
+use NDIRC::DiscordContext;
+
 my ($tick,$stattick) = (0,0);
 my $last_announcement = 0;
 
@@ -45,7 +47,7 @@ after irc_public => sub {
 
 	my $nickname = $irc->nick_name;
 	if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
-		my $_ = $1;
+		local $_ = $1;
 		my $text = $2;
 		unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
 			$msg = ".anon $_ $text";
@@ -112,7 +114,7 @@ SELECT uid,pid,hostmask,password
 FROM users u WHERE hostmask = ?
 		}, undef, $address);
 		if ($user){
-			if ($user->{password} eq ''){
+			unless ($user->{password}) {
 				$irc->yield(privmsg => $disp->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
 			}
 			if ($tick > 12 && not defined $user->{pid}){
@@ -216,4 +218,42 @@ after _start => sub {
  ($tick,$stattick) = DB()->selectrow_array(q{SELECT tick(),max(tick) FROM planet_stats});
 };
 
+after discord_message_create => sub {
+	my $self = shift;
+	my $hash = shift;
+
+	my $author = $hash->{author};
+	my $msg = $hash->{content};
+	my $channel_id = $hash->{channel_id};
+	my $author_name = $author->{username}.'#'.$author->{discriminator};
+	my $author_id = $author->{id};
+	return if $author->{'id'} eq $self->discord_id; # Ignore my own messages
+
+	my $channel = "D-".$channel_id;
+	if (exists $self->discord_channels->{$channel_id}) {
+		$channel = 'dm' if ($self->discord_channels->{$channel_id}->{type} == 1);
+	}
+
+	say localtime(time) . " - $channel_id $channel $author_name $author_id";
+
+	my ($p,$command,$args) = ($msg =~ /^([.!~])(\S+)(?: (.+))?/);
+
+
+	return 0 unless $self->disp->has_command($command,$channel);
+
+	say localtime(time) . " - $msg";
+
+	my $c = NDIRC::DiscordContext->new({
+			discord_id => $author_name,
+			channel_id => $channel_id,
+			channel => $channel,
+			disp => $self->disp,
+			model => DB(),
+			discord => $self->discord,
+		});
+
+	return $self->disp->run_command($c,$command,$args);
+
+};
+
 1;