Use discord channel id

diff --git a/Bot.pm b/Bot.pm
index 1f5ff2102e50db0c18139449920b2bd969f884be..0a65f8fbafc11c7f84f7774579bb36e9818f1dd2 100644 (file)
--- a/Bot.pm
+++ b/Bot.pm
@@ -134,6 +134,7 @@ sub _start {
                                        'READY'          => sub { $self->discord_ready(@_) },
                                        'MESSAGE_CREATE' => sub { $self->discord_message_create(@_) },
                                        'GUILD_CREATE' => sub { $self->discord_guild_create(@_) },
+                                       'CHANNEL_CREATE' => sub { $self->discord_channel_create(@_) },
                                },
                                'reconnect' => 1,
                                'verbose'   => 1,
@@ -339,11 +340,21 @@ sub discord_guild_create {
        my $hash = shift;
 
        for my $chan (@{$hash->{channels}}) {
-               say localtime(time) . "$chan->{id} - $chan->{name}";
-               $self->discord_channels->{$chan->{id}} = $chan->{name};
+               say localtime(time) . " - $chan->{id} - $chan->{name}";
+               $self->discord_channels->{$chan->{id}} = $chan;
        }
 }
 
+sub discord_channel_create {
+       my $self = shift;
+       my $chan = shift;
+
+       for my $key (keys %{$chan}) {
+               say localtime(time) . " - $key - $chan->{$key}";
+       }
+       $self->discord_channels->{$chan->{id}} = $chan;
+}
+
 sub parseCommand {
        my ($self, $msg, $server, $nick, $address, $channel, $model) = @_;
 

diff --git a/Commands/Basic.pm b/Commands/Basic.pm
index 672c7a9958c7a84940ca6bb420fb957260372f02..d0570f6c432070d423735d4ac6608ae4319fd420 100644 (file)
--- a/Commands/Basic.pm
+++ b/Commands/Basic.pm
@@ -25,6 +25,7 @@ use NDIRC::Dispatcher;
 
 command commands => {
        help => q(commands <command> | Gives help about all available commands or lists all commands available in the current channel),
+       type => 'help',
 }, class extends NDIRC::Command {
        method execute ($c,$command) {
                unless($command){

diff --git a/Delling.pm b/Delling.pm
index 178e58b5f1459c1d912085b81659a7c93907ee12..1eb4824d98f1d263ff27f39b6c0ce46bd0239ee3 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -229,9 +229,9 @@ after discord_message_create => sub {
        my $author_id = $author->{id};
        return if $author->{'id'} eq $self->discord_id; # Ignore my own messages
 
-       my $channel = "pm";
+       my $channel = "D-".$channel_id;
        if (exists $self->discord_channels->{$channel_id}) {
-               $channel = "#".$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";