Clean up files

nyxx-discord · Sep 1, 2023 · 93d2c54 · 93d2c54
1 parent 95a55e4
commit 93d2c54
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 90 deletions.
diff --git a/.pubignore b/.pubignore
diff --git a/lib/attachment_extension.dart b/lib/attachment_extension.dart
diff --git a/lib/embed_builder_extension.dart b/lib/embed_builder_extension.dart
diff --git a/lib/emoji.dart b/lib/emoji.dart
diff --git a/lib/guild_extension.dart b/lib/guild_extension.dart
diff --git a/lib/member_extension.dart b/lib/member_extension.dart
diff --git a/lib/message_resolver.dart b/lib/message_resolver.dart
diff --git a/lib/nyxx_extensions.dart b/lib/nyxx_extensions.dart
@@ -1,9 +1,10 @@
 library nyxx_extensions;
 
-export 'attachment_extension.dart';
-export 'embed_builder_extension.dart';
-export 'emoji.dart';
-export 'member_extension.dart';
-export 'message_resolver.dart';
-export 'utils.dart';
-export 'guild_extension.dart';
+export 'src/attachment_extension.dart';
+export 'src/embed_builder_extension.dart';
+export 'src/emoji/emoji_definition.dart';
+export 'src/emoji/emoji_utils.dart';
+export 'src/member_extension.dart';
+export 'src/message_resolver/message_resolver.dart';
+export 'src/utils.dart';
+export 'src/guild_extension.dart';
diff --git a/lib/src/emoji/emoji_definition.dart b/lib/src/emoji/emoji_definition.dart
@@ -1,4 +1,4 @@
-part of emoji;
+import 'package:nyxx/nyxx.dart';
 
 /// Wrapper class around discords emojis data
 class EmojiDefinition {
@@ -20,7 +20,7 @@ class EmojiDefinition {
   /// Url of emoji picture
   late final String assetUrl;
 
-  EmojiDefinition._new(RawApiMap raw) {
+  EmojiDefinition(RawApiMap raw) {
     primaryName = raw["primaryName"] as String;
     names = (raw["names"] as Iterable<dynamic>).cast();
     rawEmoji = raw["surrogates"] as String;

diff --git a/lib/src/emoji/emoji_utils.dart b/lib/src/emoji/emoji_utils.dart
@@ -1,4 +1,9 @@
-part of emoji;
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+
+import 'package:nyxx/nyxx.dart';
+import 'package:nyxx_extensions/nyxx_extensions.dart';
 
 List<EmojiDefinition> _emojisCache = [];
 
@@ -26,7 +31,7 @@ Stream<EmojiDefinition> getAllEmojiDefinitions({bool cache = false}) async* {
   final rawData = await _downloadEmojiData();
 
   for (final emojiDefinition in rawData["emojiDefinitions"]) {
-    final definition = EmojiDefinition._new(emojiDefinition as RawApiMap);
+    final definition = EmojiDefinition(emojiDefinition as RawApiMap);
 
     if (cache) {
       _emojisCache.add(definition);

diff --git a/lib/utils.dart b/lib/utils.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,17 +1,16 @@
 name: nyxx_extensions
-version: 3.2.0
-description: Nyxx Extensions Module. Discord library for Dart. Simple, robust framework for creating discord bots for Dart language.
-homepage: https://github.com/nyxx-discord/nyxx
-repository: https://github.com/nyxx-discord/nyxx
+version: 4.0.0
+description: Extensions to the Discord API provided in nyxx, including pagination support and message sanitization.
+repository: https://github.com/nyxx-discord/nyxx_extensions
 documentation: https://nyxx.l7ssha.xyz
-issue_tracker: https://github.com/nyxx-discord/nyxx/issues
+issue_tracker: https://github.com/nyxx-discord/nyxx_extensions/issues
 
 environment:
   sdk: '>=2.13.0 <3.0.0'
 
 dependencies:
-  http: ^0.13.3
-  nyxx: ^5.0.0
+  http: ^1.1.0
+  nyxx: ^6.0.0-dev.2
 
 dev_dependencies:
   coverage: ^1.0.3

diff --git a/test/interaction/.gitkeep b/test/interaction/.gitkeep
diff --git a/test/unit/unit.dart b/test/unit/unit.dart
@@ -1,9 +1,7 @@
 import "dart:async";
 
 import "package:nyxx/nyxx.dart";
-import "package:nyxx_extensions/embed_builder_extension.dart";
-import "package:nyxx_extensions/emoji.dart";
-import "package:nyxx_extensions/src/utils.dart";
+import "package:nyxx_extensions/nyxx_extensions.dart";
 import "package:test/expect.dart";
 import "package:test/scaffolding.dart";