Browse Source

Organise imports

Oliver Youle 2 years ago
parent
commit
b9ba1e100c
71 changed files with 124 additions and 135 deletions
  1. 1 1
      bin/mumble-bot
  2. 2 3
      lib/MumbleBot.pm
  3. 2 3
      lib/MumbleBot/Audio/Manager.pm
  4. 2 3
      lib/MumbleBot/Client.pm
  5. 1 1
      lib/MumbleBot/Client/Packet.pm
  6. 1 1
      lib/MumbleBot/Client/Packet/Handler.pm
  7. 3 3
      lib/MumbleBot/Client/Packet/Handler/ChannelState.pm
  8. 3 3
      lib/MumbleBot/Client/Packet/Handler/CryptSetup.pm
  9. 3 3
      lib/MumbleBot/Client/Packet/Handler/Ping.pm
  10. 3 3
      lib/MumbleBot/Client/Packet/Handler/ServerSync.pm
  11. 3 3
      lib/MumbleBot/Client/Packet/Handler/TextMessage.pm
  12. 3 3
      lib/MumbleBot/Client/Packet/Handler/UserRemove.pm
  13. 3 3
      lib/MumbleBot/Client/Packet/Handler/UserState.pm
  14. 3 3
      lib/MumbleBot/Client/Packet/Handler/Version.pm
  15. 2 2
      lib/MumbleBot/Client/Packet/Type.pm
  16. 1 1
      lib/MumbleBot/Client/Protocol/ACL.pm
  17. 1 1
      lib/MumbleBot/Client/Protocol/Authenticate.pm
  18. 1 1
      lib/MumbleBot/Client/Protocol/BanList.pm
  19. 1 1
      lib/MumbleBot/Client/Protocol/ChannelRemove.pm
  20. 1 1
      lib/MumbleBot/Client/Protocol/ChannelState.pm
  21. 1 1
      lib/MumbleBot/Client/Protocol/CodecVersion.pm
  22. 1 1
      lib/MumbleBot/Client/Protocol/ContextAction.pm
  23. 1 2
      lib/MumbleBot/Client/Protocol/ContextActionModify.pm
  24. 1 1
      lib/MumbleBot/Client/Protocol/CryptSetup.pm
  25. 1 1
      lib/MumbleBot/Client/Protocol/PermissionDenied.pm
  26. 1 1
      lib/MumbleBot/Client/Protocol/PermissionQuery.pm
  27. 1 1
      lib/MumbleBot/Client/Protocol/Ping.pm
  28. 1 1
      lib/MumbleBot/Client/Protocol/QueryUsers.pm
  29. 1 1
      lib/MumbleBot/Client/Protocol/Reject.pm
  30. 1 1
      lib/MumbleBot/Client/Protocol/RequestBlob.pm
  31. 1 1
      lib/MumbleBot/Client/Protocol/ServerConfig.pm
  32. 1 1
      lib/MumbleBot/Client/Protocol/ServerSync.pm
  33. 1 1
      lib/MumbleBot/Client/Protocol/SuggestConfig.pm
  34. 1 1
      lib/MumbleBot/Client/Protocol/TextMessage.pm
  35. 1 1
      lib/MumbleBot/Client/Protocol/UDPTunnel.pm
  36. 1 1
      lib/MumbleBot/Client/Protocol/UserList.pm
  37. 1 1
      lib/MumbleBot/Client/Protocol/UserRemove.pm
  38. 1 1
      lib/MumbleBot/Client/Protocol/UserState.pm
  39. 1 1
      lib/MumbleBot/Client/Protocol/UserStats.pm
  40. 1 1
      lib/MumbleBot/Client/Protocol/Version.pm
  41. 1 1
      lib/MumbleBot/Client/Protocol/VoiceTarget.pm
  42. 2 0
      lib/MumbleBot/Command.pm
  43. 1 1
      lib/MumbleBot/Command/Clear.pm
  44. 1 1
      lib/MumbleBot/Command/Flip.pm
  45. 1 1
      lib/MumbleBot/Command/Roll.pm
  46. 2 3
      lib/MumbleBot/Command/Talk.pm
  47. 2 3
      lib/MumbleBot/Config.pm
  48. 3 4
      lib/MumbleBot/Database.pm
  49. 1 1
      lib/MumbleBot/Event.pm
  50. 1 1
      lib/MumbleBot/Event/ChannelMessageEvent.pm
  51. 1 1
      lib/MumbleBot/Event/ConnectEvent.pm
  52. 1 1
      lib/MumbleBot/Event/Handler.pm
  53. 4 5
      lib/MumbleBot/Event/Handler/Command.pm
  54. 4 5
      lib/MumbleBot/Event/Handler/Connect.pm
  55. 4 3
      lib/MumbleBot/Event/Handler/ImageLink.pm
  56. 5 6
      lib/MumbleBot/Event/Handler/LoginAlert.pm
  57. 4 5
      lib/MumbleBot/Event/Handler/UpdateLastLogin.pm
  58. 3 3
      lib/MumbleBot/Event/Handler/WelcomeUser.pm
  59. 4 3
      lib/MumbleBot/Event/Handler/YouTubeLink.pm
  60. 2 2
      lib/MumbleBot/Event/Manager.pm
  61. 1 1
      lib/MumbleBot/Event/Priority.pm
  62. 1 1
      lib/MumbleBot/Event/ServerSyncEvent.pm
  63. 1 1
      lib/MumbleBot/Event/UserJoinEvent.pm
  64. 1 1
      lib/MumbleBot/Event/UserMessageEvent.pm
  65. 2 3
      lib/MumbleBot/State.pm
  66. 2 3
      lib/MumbleBot/State/Channel.pm
  67. 1 1
      lib/MumbleBot/State/Crypt.pm
  68. 2 3
      lib/MumbleBot/State/PacketStats.pm
  69. 4 5
      lib/MumbleBot/State/RegisteredUser.pm
  70. 1 1
      lib/MumbleBot/State/User.pm
  71. 1 1
      lib/MumbleBot/State/Version.pm

+ 1 - 1
bin/mumble-bot

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-use strictures 2;
+use Modern::Perl;
 
 use MumbleBot;
 

+ 2 - 3
lib/MumbleBot.pm

@@ -1,10 +1,9 @@
 package MumbleBot;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
+use Moo;
 use POSIX qw(uname);
 
 use MumbleBot::Audio::Manager;

+ 2 - 3
lib/MumbleBot/Audio/Manager.pm

@@ -1,11 +1,10 @@
 package MumbleBot::Audio::Manager;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
 use List::Util qw(min);
+use Moo;
 use Opus::Encoder;
 use Try::Tiny;
 use Time::HiRes qw(usleep time);

+ 2 - 3
lib/MumbleBot/Client.pm

@@ -1,13 +1,12 @@
 package MumbleBot::Client;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
 use Module::Find;
 use Mojo::IOLoop::Client;
 use Mojo::IOLoop::Stream;
+use Moo;
 
 use MumbleBot::Event::ConnectEvent;
 use MumbleBot::Client::Packet;

+ 1 - 1
lib/MumbleBot/Client/Packet.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Packet;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Client/Packet/Handler.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Packet::Handler;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo::Role;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/ChannelState.pm

@@ -1,14 +1,14 @@
 package MumbleBot::Client::Packet::Handler::ChannelState;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 use MumbleBot::State::Channel;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/CryptSetup.pm

@@ -1,14 +1,14 @@
 package MumbleBot::Client::Packet::Handler::CryptSetup;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 use MumbleBot::State::Crypt;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/Ping.pm

@@ -1,13 +1,13 @@
 package MumbleBot::Client::Packet::Handler::Ping;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/ServerSync.pm

@@ -1,14 +1,14 @@
 package MumbleBot::Client::Packet::Handler::ServerSync;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 use MumbleBot::Event::ServerSyncEvent;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/TextMessage.pm

@@ -1,15 +1,15 @@
 package MumbleBot::Client::Packet::Handler::TextMessage;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 use MumbleBot::Event::ChannelMessageEvent;
 use MumbleBot::Event::UserMessageEvent;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/UserRemove.pm

@@ -1,13 +1,13 @@
 package MumbleBot::Client::Packet::Handler::UserRemove;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/UserState.pm

@@ -1,16 +1,16 @@
 package MumbleBot::Client::Packet::Handler::UserState;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 use MumbleBot::Event::UserJoinEvent;
 use MumbleBot::State::RegisteredUser;
 use MumbleBot::State::User;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Client/Packet/Handler/Version.pm

@@ -1,14 +1,14 @@
 package MumbleBot::Client::Packet::Handler::Version;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Client::Packet::Handler';
-
 use MumbleBot::Client::Packet::Type;
 use MumbleBot::State::Version;
 
+with 'MumbleBot::Client::Packet::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 2 - 2
lib/MumbleBot/Client/Packet/Type.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Packet::Type;
 
-use strictures 2;
+use Modern::Perl;
 
 use Scalar::Util qw(dualvar);
 
@@ -35,7 +35,7 @@ sub BEGIN {
         SERVER_CONFIG         => dualvar(24, 'ServerConfig'),
         SUGGEST_CONFIG        => dualvar(25, 'SuggestConfig'),
     );
-    
+
     foreach my $type (keys %TYPES) {
         constant->import($type, $TYPES{$type});
         require "MumbleBot/Client/Protocol/$TYPES{$type}.pm";

+ 1 - 1
lib/MumbleBot/Client/Protocol/ACL.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::ACL;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/Authenticate.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::Authenticate;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/BanList.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::BanList;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/ChannelRemove.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::ChannelRemove;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/ChannelState.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::ChannelState;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/CodecVersion.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::CodecVersion;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/ContextAction.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::ContextAction;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 2
lib/MumbleBot/Client/Protocol/ContextActionModify.pm

@@ -1,7 +1,6 @@
 package MumbleBot::Client::Protocol::ContextActionModify;
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/CryptSetup.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::CryptSetup;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/PermissionDenied.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::PermissionDenied;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/PermissionQuery.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::PermissionQuery;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/Ping.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::Ping;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/QueryUsers.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::QueryUsers;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/Reject.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::Reject;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/RequestBlob.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::RequestBlob;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/ServerConfig.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::ServerConfig;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/ServerSync.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::ServerSync;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/SuggestConfig.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::SuggestConfig;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/TextMessage.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::TextMessage;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/UDPTunnel.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::UDPTunnel;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/UserList.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::UserList;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/UserRemove.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::UserRemove;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/UserState.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::UserState;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/UserStats.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::UserStats;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/Version.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::Version;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 1 - 1
lib/MumbleBot/Client/Protocol/VoiceTarget.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Client::Protocol::VoiceTarget;
 
-use strictures 2;
+use Modern::Perl;
 
 use Google::ProtocolBuffers;
 

+ 2 - 0
lib/MumbleBot/Command.pm

@@ -1,5 +1,7 @@
 package MumbleBot::Command;
 
+use Modern::Perl;
+
 use Moo::Role;
 
 has 'name' => (

+ 1 - 1
lib/MumbleBot/Command/Clear.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Command::Clear;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Command/Flip.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Command::Flip;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Command/Roll.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Command::Roll;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 2 - 3
lib/MumbleBot/Command/Talk.pm

@@ -1,13 +1,12 @@
 package MumbleBot::Command::Talk;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
+use Try::Tiny;
 
 with 'MumbleBot::Command';
 
-use Try::Tiny;
-
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 2 - 3
lib/MumbleBot/Config.pm

@@ -1,10 +1,9 @@
 package MumbleBot::Config;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
+use Moo;
 use Try::Tiny;
 use YAML::XS qw(LoadFile);
 

+ 3 - 4
lib/MumbleBot/Database.pm

@@ -1,16 +1,15 @@
 package MumbleBot::Database;
 
-use strictures 2;
+use Modern::Perl;
 
+use Carp;
+use DBI;
 use Moo;
 
 extends 'Exporter';
 
 our @EXPORT_OK = qw(dbi);
 
-use Carp;
-use DBI;
-
 sub dbi {
     my $handle = shift;
 

+ 1 - 1
lib/MumbleBot/Event.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo::Role;
 

+ 1 - 1
lib/MumbleBot/Event/ChannelMessageEvent.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::ChannelMessageEvent;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Event/ConnectEvent.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::ConnectEvent;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Event/Handler.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::Handler;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo::Role;
 

+ 4 - 5
lib/MumbleBot/Event/Handler/Command.pm

@@ -1,15 +1,14 @@
 package MumbleBot::Event::Handler::Command;
 
-use strictures 2;
-
-use Moo;
-
-with 'MumbleBot::Event::Handler';
+use Modern::Perl;
 
 use Module::Find;
+use Moo;
 
 use MumbleBot::Event::Priority;
 
+with 'MumbleBot::Event::Handler';
+
 has '_commands' => (
     is => 'ro',
     default => sub { [] },

+ 4 - 5
lib/MumbleBot/Event/Handler/Connect.pm

@@ -1,17 +1,16 @@
 package MumbleBot::Event::Handler::Connect;
 
-use strictures 2;
+use Modern::Perl;
 
+use List::Util qw(sum);
 use Moo;
-
-with 'MumbleBot::Event::Handler';
-
 use Time::HiRes qw(gettimeofday);
-use List::Util qw(sum);
 
 use MumbleBot::Client::Packet;
 use MumbleBot::Event::Priority;
 
+with 'MumbleBot::Event::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 4 - 3
lib/MumbleBot/Event/Handler/ImageLink.pm

@@ -1,16 +1,17 @@
 package MumbleBot::Event::Handler::ImageLink;
 
-use Moo;
-
-with 'MumbleBot::Event::Handler';
+use Modern::Perl;
 
 use Carp;
 use Image::Magick;
 use MIME::Base64;
+use Moo;
 use Try::Tiny;
 
 use MumbleBot::Event::Priority;
 
+with 'MumbleBot::Event::Handler';
+
 has 'ua' => (
     is => 'ro',
     default => sub {

+ 5 - 6
lib/MumbleBot/Event/Handler/LoginAlert.pm

@@ -1,17 +1,16 @@
 package MumbleBot::Event::Handler::LoginAlert;
 
-use strictures 2;
+use Modern::Perl;
 
-use Moo;
-
-with 'MumbleBot::Event::Handler';
-
-use LWP::UserAgent;
 use JSON::XS;
+use LWP::UserAgent;
+use Moo;
 
 use MumbleBot::Database qw(dbi);
 use MumbleBot::Event::Priority;
 
+with 'MumbleBot::Event::Handler';
+
 has 'ua' => (
     is => 'ro',
     default => sub {

+ 4 - 5
lib/MumbleBot/Event/Handler/UpdateLastLogin.pm

@@ -1,15 +1,14 @@
 package MumbleBot::Event::Handler::UpdateLastLogin;
 
-use strictures 2;
-
-use Moo;
-
-with 'MumbleBot::Event::Handler';
+use Modern::Perl;
 
 use DateTime;
+use Moo;
 
 use MumbleBot::Event::Priority;
 
+with 'MumbleBot::Event::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 3 - 3
lib/MumbleBot/Event/Handler/WelcomeUser.pm

@@ -1,13 +1,13 @@
 package MumbleBot::Event::Handler::WelcomeUser;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 
-with 'MumbleBot::Event::Handler';
-
 use MumbleBot::Event::Priority;
 
+with 'MumbleBot::Event::Handler';
+
 around BUILDARGS => sub {
     my ($orig, $class, %args) = @_;
 

+ 4 - 3
lib/MumbleBot/Event/Handler/YouTubeLink.pm

@@ -1,16 +1,17 @@
 package MumbleBot::Event::Handler::YouTubeLink;
 
-use Moo;
-
-with 'MumbleBot::Event::Handler';
+use Modern::Perl;
 
 use Carp;
 use HTML::TreeBuilder;
 use Image::Magick;
 use LWP::UserAgent;
 use MIME::Base64;
+use Moo;
 use Try::Tiny;
 
+with 'MumbleBot::Event::Handler';
+
 has 'ua' => (
     is => 'ro',
     default => sub {

+ 2 - 2
lib/MumbleBot/Event/Manager.pm

@@ -1,10 +1,10 @@
 package MumbleBot::Event::Manager;
 
-use strictures 2;
+use Modern::Perl;
 
 use Carp;
-use Moo;
 use Module::Find;
+use Moo;
 
 extends 'Mojo::EventEmitter';
 

+ 1 - 1
lib/MumbleBot/Event/Priority.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::Priority;
 
-use strictures 2;
+use Modern::Perl;
 
 use constant {
     LOW     => 2,

+ 1 - 1
lib/MumbleBot/Event/ServerSyncEvent.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::ServerSyncEvent;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Event/UserJoinEvent.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::UserJoinEvent;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/Event/UserMessageEvent.pm

@@ -1,6 +1,6 @@
 package MumbleBot::Event::UserMessageEvent;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 2 - 3
lib/MumbleBot/State.pm

@@ -1,10 +1,9 @@
 package MumbleBot::State;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
+use Moo;
 
 use MumbleBot::State::PacketStats;
 

+ 2 - 3
lib/MumbleBot/State/Channel.pm

@@ -1,10 +1,9 @@
 package MumbleBot::State::Channel;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
+use Moo;
 
 has 'id' => (
     is => 'ro',

+ 1 - 1
lib/MumbleBot/State/Crypt.pm

@@ -1,6 +1,6 @@
 package MumbleBot::State::Crypt;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 2 - 3
lib/MumbleBot/State/PacketStats.pm

@@ -1,11 +1,10 @@
 package MumbleBot::State::PacketStats;
 
-use strictures 2;
-
-use Moo;
+use Modern::Perl;
 
 use Carp;
 use List::Util qw(sum);
+use Moo;
 use Time::HiRes qw(tv_interval);
 
 has 'counts' => (

+ 4 - 5
lib/MumbleBot/State/RegisteredUser.pm

@@ -1,15 +1,14 @@
 package MumbleBot::State::RegisteredUser;
 
-use strictures 2;
-
-use Moo;
-
-extends 'MumbleBot::State::User';
+use Modern::Perl;
 
 use DateTime::Format::Strptime;
+use Moo;
 
 use MumbleBot::Database qw(dbi);
 
+extends 'MumbleBot::State::User';
+
 has '_id' => (
     is => 'ro',
     required => 1,

+ 1 - 1
lib/MumbleBot/State/User.pm

@@ -1,6 +1,6 @@
 package MumbleBot::State::User;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;
 

+ 1 - 1
lib/MumbleBot/State/Version.pm

@@ -1,6 +1,6 @@
 package MumbleBot::State::Version;
 
-use strictures 2;
+use Modern::Perl;
 
 use Moo;