Command client!

Hackzzila · Sep 25, 2016 · 0696865 · 0696865
1 parent 5521571
commit 0696865
Show file tree

Hide file tree

Showing 46 changed files with 134 additions and 94 deletions.
diff --git a/example/command-client.dart b/example/command-client.dart
@@ -0,0 +1,16 @@
+import 'package:discord_dart/discord.dart' as discord;
+import 'package:discord_dart/command.dart' as command;
+
+main() {
+  var bot = new discord.Client("your token");
+  var commands = new command.Client(bot, "!");
+
+  bot.on('ready', (e) {
+    print("Ready!");
+  });
+
+  commands.on('ping', (e) {
+    var m = e.message;
+    m.channel.sendMessage("Pong!");
+  });
+}
diff --git a/lib/command.dart b/lib/command.dart
@@ -0,0 +1 @@
+export 'src/command.dart';
diff --git a/lib/discord.dart b/lib/discord.dart
@@ -1 +1,40 @@
 export 'src/client.dart';
+
+export 'src/events/ChannelCreateEvent.dart';
+export 'src/events/ChannelDeleteEvent.dart';
+export 'src/events/ChannelUpdateEvent.dart';
+export 'src/events/GuildBanAddEvent.dart';
+export 'src/events/GuildBanRemoveEvent.dart';
+export 'src/events/GuildCreateEvent.dart';
+export 'src/events/GuildDeleteEvent.dart';
+export 'src/events/GuildMemberAddEvent.dart';
+export 'src/events/GuildMemberRemoveEvent.dart';
+export 'src/events/GuildMemberUpdateEvent.dart';
+export 'src/events/GuildUpdateEvent.dart';
+export 'src/events/MessageDeleteEvent.dart';
+export 'src/events/MessageEvent.dart';
+export 'src/events/MessageUpdateEvent.dart';
+export 'src/events/ReadyEvent.dart';
+export 'src/events/TypingEvent.dart';
+export 'src/events/WebSocketErrorEvent.dart';
+
+export 'src/objects/Attachment.dart';
+export 'src/objects/ClientOAuth2Application.dart';
+export 'src/objects/ClientOptions.dart';
+export 'src/objects/ClientUser.dart';
+export 'src/objects/Embed.dart';
+export 'src/objects/EmbedProvider.dart';
+export 'src/objects/EmbedThumbnail.dart';
+export 'src/objects/Guild.dart';
+export 'src/objects/GuildChannel.dart';
+export 'src/objects/Invite.dart';
+export 'src/objects/InviteChannel.dart';
+export 'src/objects/InviteGuild.dart';
+export 'src/objects/Member.dart';
+export 'src/objects/MessageOptions.dart';
+export 'src/objects/Message.dart';
+export 'src/objects/OAuth2Application.dart';
+export 'src/objects/OAuth2Guild.dart';
+export 'src/objects/OAuth2Info.dart';
+export 'src/objects/PrivateChannel.dart';
+export 'src/objects/User.dart';
diff --git a/lib/events.dart b/lib/events.dart
diff --git a/lib/objects.dart b/lib/objects.dart
diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:async';
-import '../objects.dart';
 import 'http.dart';
 import 'ws.dart';
+import '../discord.dart';
 import 'package:events/events.dart' as events;
 import 'package:http/http.dart' as http;
 

diff --git a/lib/src/command.dart b/lib/src/command.dart
@@ -0,0 +1,37 @@
+import '../discord.dart' as discord;
+import 'package:events/events.dart' as events;
+
+/// Send when a new command is received.
+class CommandEvent {
+  /// A list of arguments provided.
+  List<String> args;
+
+  /// The message;
+  discord.Message message;
+
+  /// Constructs a `CommandEvent`.
+  CommandEvent(Client client, String command, this.args, this.message) {
+    client.emit(command, this);
+  }
+}
+
+/// The base class for the command client.
+class Client extends events.Events {
+  /// The main discord client.
+  discord.Client client;
+
+  /// The client's prefix.
+  String prefix;
+
+  /// Makes a new command client.
+  Client(this.client, this.prefix) {
+    this.client.on('message', (discord.MessageEvent e) {
+      if (e.message.content.startsWith(this.prefix)) {
+        final String command = e.message.content.split(" ")[0].replaceFirst(this.prefix, "");
+        final List<String> args = e.message.content.split(" ");
+        args.remove(this.prefix + command);
+        new CommandEvent(this, command, args, e.message);
+      }
+    });
+  }
+}
diff --git a/lib/src/events/ChannelCreateEvent.dart b/lib/src/events/ChannelCreateEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when a channel is created, can be a `PMChannel`.

diff --git a/lib/src/events/ChannelDeleteEvent.dart b/lib/src/events/ChannelDeleteEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when a channel is deleted, can be a `PMChannel`.

diff --git a/lib/src/events/ChannelUpdateEvent.dart b/lib/src/events/ChannelUpdateEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when a channel is updated.

diff --git a/lib/src/events/GuildBanAddEvent.dart b/lib/src/events/GuildBanAddEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when a member is banned.

diff --git a/lib/src/events/GuildBanRemoveEvent.dart b/lib/src/events/GuildBanRemoveEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when a user is unbanned from a guild.

diff --git a/lib/src/events/GuildCreateEvent.dart b/lib/src/events/GuildCreateEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../../events.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when the bot joins a guild.

diff --git a/lib/src/events/GuildDeleteEvent.dart b/lib/src/events/GuildDeleteEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when you leave a guild or it becomes unavailable.

diff --git a/lib/src/events/GuildMemberAddEvent.dart b/lib/src/events/GuildMemberAddEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a member joins a guild.
 class GuildMemberAddEvent {

diff --git a/lib/src/events/GuildMemberRemoveEvent.dart b/lib/src/events/GuildMemberRemoveEvent.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 import '../client.dart';
 
 /// Sent when a user leaves a guild, can be a leave, kick, or ban.

diff --git a/lib/src/events/GuildMemberUpdateEvent.dart b/lib/src/events/GuildMemberUpdateEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a member is updated.
 class GuildMemberUpdateEvent {

diff --git a/lib/src/events/GuildUpdateEvent.dart b/lib/src/events/GuildUpdateEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a guild is updated.
 class GuildUpdateEvent {

diff --git a/lib/src/events/MessageDeleteEvent.dart b/lib/src/events/MessageDeleteEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a message is deleted.
 class MessageDeleteEvent {

diff --git a/lib/src/events/MessageEvent.dart b/lib/src/events/MessageEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a new message is received.
 class MessageEvent {

diff --git a/lib/src/events/MessageUpdateEvent.dart b/lib/src/events/MessageUpdateEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a message is updated.
 class MessageUpdateEvent {

diff --git a/lib/src/events/ReadyEvent.dart b/lib/src/events/ReadyEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when the client is ready.
 class ReadyEvent {

diff --git a/lib/src/events/TypingEvent.dart b/lib/src/events/TypingEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when a user starts typing.
 class TypingEvent {

diff --git a/lib/src/events/WebSocketErrorEvent.dart b/lib/src/events/WebSocketErrorEvent.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// Sent when the websocket encounters an error (but certian errors will throw
 /// an exception).

diff --git a/lib/src/objects/Attachment.dart b/lib/src/objects/Attachment.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A message attachment.
 class Attachment {

diff --git a/lib/src/objects/ClientOAuth2Application.dart b/lib/src/objects/ClientOAuth2Application.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// The client's OAuth2 app, if the client is a bot.
 class ClientOAuth2Application {

diff --git a/lib/src/objects/ClientOptions.dart b/lib/src/objects/ClientOptions.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// The options for `Client`.
 class ClientOptions {

diff --git a/lib/src/objects/ClientUser.dart b/lib/src/objects/ClientUser.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// The client user.
 class ClientUser {

diff --git a/lib/src/objects/Embed.dart b/lib/src/objects/Embed.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A message embed.
 class Embed {

diff --git a/lib/src/objects/EmbedProvider.dart b/lib/src/objects/EmbedProvider.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A message embed provider.
 class EmbedProvider {

diff --git a/lib/src/objects/EmbedThumbnail.dart b/lib/src/objects/EmbedThumbnail.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A message embed thumbnail.
 class EmbedThumbnail {

diff --git a/lib/src/objects/Guild.dart b/lib/src/objects/Guild.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
-import '../client.dart';
-import '../../objects.dart';
+import '../../discord.dart';
 import 'package:http/http.dart' as http;
 
 /// A guild.

diff --git a/lib/src/objects/GuildChannel.dart b/lib/src/objects/GuildChannel.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
-import '../client.dart';
-import '../../objects.dart';
+import '../../discord.dart';
 import 'package:http/http.dart' as http;
 
 /// A guild channel.

diff --git a/lib/src/objects/Invite.dart b/lib/src/objects/Invite.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// An invite.
 class Invite {

diff --git a/lib/src/objects/InviteChannel.dart b/lib/src/objects/InviteChannel.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A mini channel object for invites.
 class InviteChannel {

diff --git a/lib/src/objects/InviteGuild.dart b/lib/src/objects/InviteGuild.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A mini guild object for invites.
 class InviteGuild {

diff --git a/lib/src/objects/Member.dart b/lib/src/objects/Member.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A guild member.
 class Member {

diff --git a/lib/src/objects/Message.dart b/lib/src/objects/Message.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
-import '../client.dart';
-import '../../objects.dart';
+import '../../discord.dart';
 import 'package:http/http.dart' as http;
 
 /// A message.

diff --git a/lib/src/objects/MessageOptions.dart b/lib/src/objects/MessageOptions.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// The options for message sending.
 class MessageOptions {

diff --git a/lib/src/objects/OAuth2Application.dart b/lib/src/objects/OAuth2Application.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// An OAuth2 application.
 class OAuth2Application {

diff --git a/lib/src/objects/OAuth2Guild.dart b/lib/src/objects/OAuth2Guild.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A mini guild object with permissions for [OAuth2Info].
 class OAuth2Guild {

diff --git a/lib/src/objects/OAuth2Info.dart b/lib/src/objects/OAuth2Info.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// Info about a OAuth2 app, bot, user, and possible guilds that that bot can
 /// be invited to.

diff --git a/lib/src/objects/PrivateChannel.dart b/lib/src/objects/PrivateChannel.dart
@@ -1,5 +1,4 @@
-import '../../objects.dart';
-import '../client.dart';
+import '../../discord.dart';
 
 /// A private channel.
 class PrivateChannel {

diff --git a/lib/src/objects/User.dart b/lib/src/objects/User.dart
@@ -1,4 +1,4 @@
-import '../../objects.dart';
+import '../../discord.dart';
 
 /// A user.
 class User {