Skip to content

Commit 40b04b2

Browse files
committed
refactor: remove dead code and organize imports
1 parent 5dd3b14 commit 40b04b2

15 files changed

+18
-61
lines changed

lib/api/common/permission.dart

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ enum Permission implements EnhancedEnum<int> {
4545
startEmbeddedActivities(1 << 39),
4646
moderateMembers(1 << 40);
4747

48+
@override
4849
final int value;
4950

5051
const Permission(this.value);

lib/api/server/enums/forum_layout_types.dart

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ enum ForumLayoutType implements EnhancedEnum<int> {
55
listView(1),
66
galleryView(2);
77

8+
@override
89
final int value;
10+
911
const ForumLayoutType(this.value);
1012
}

lib/api/server/enums/sort_order_forum.dart

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ enum SortOrderType implements EnhancedEnum<int> {
44
lastedActivity(0),
55
creationDate(1);
66

7+
@override
78
final int value;
9+
810
const SortOrderType(this.value);
911
}

lib/api/server/managers/member_manager.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ final class MemberManager {
2020
});
2121
}
2222

23-
Member? get(String? id) => _members[id];
23+
Member? get(String? id) => _members[id != null ? Snowflake(id) : null];
2424

2525
Member getOrFail(String id, {String? error}) => _members.values
26-
.firstWhere((element) => element.id == id, orElse: () => throw error ?? 'Member not found');
26+
.firstWhere((element) => element.id.value == id, orElse: () => throw error ?? 'Member not found');
2727

2828

2929
late final int maxInGuild;

lib/domains/commands/contexts/global_command_context.dart

-5
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,4 @@ final class GlobalCommandContext implements CommandContext {
2424
required this.user,
2525
this.channel,
2626
});
27-
28-
@override
29-
Future<void> reply() {
30-
throw UnimplementedError();
31-
}
3227
}

lib/infrastructure/internals/environment/environment.dart

+4-16
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,11 @@ final class Environment implements EnvContract {
2121
@override
2222
Map<String, String> get list => _values;
2323

24-
T getRawOrFail<T>(String key) {
25-
final value = _values.entries
24+
T getRawOrFail<T extends dynamic>(String key) {
25+
return _values.entries
2626
.firstWhere((element) => element.key == key,
2727
orElse: () => throw Exception('Environment variable $key not found'))
28-
.value;
29-
30-
return switch (T) {
31-
int => int.parse(value),
32-
double => double.parse(value),
33-
bool => bool.parse(value),
34-
_ => value,
35-
} as T;
28+
.value as T;
3629
}
3730

3831
@override
@@ -43,12 +36,7 @@ final class Environment implements EnvContract {
4336
throw Exception('Environment variable ${variable.key} not found');
4437
}
4538

46-
return switch (T) {
47-
int => int.parse(result!.value),
48-
double => double.parse(result!.value),
49-
bool => bool.parse(result!.value),
50-
_ => result?.value,
51-
} as T;
39+
return result?.value as T;
5240
}
5341

5442
@override

lib/infrastructure/internals/marshaller/serializer_bucket.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ final class SerializerBucket {
7474
: channels = ChannelSerializer(marshaller),
7575
server = ServerSerializer(marshaller),
7676
member = MemberSerializer(marshaller),
77-
user = UserSerializer(marshaller),
77+
user = UserSerializer(),
7878
role = RoleSerializer(marshaller),
79-
serverSubscription = ServerSubscriptionSerializer(marshaller),
79+
serverSubscription = ServerSubscriptionSerializer(),
8080
serverSettings = ServerSettingsSerializer(marshaller),
8181
serversAsset = ServerAssetsSerializer(marshaller),
8282
emojis = EmojiSerializer(marshaller),
83-
sticker = StickerSerializer(marshaller),
83+
sticker = StickerSerializer(),
8484
channelPermissionOverwrite = ChannelPermissionOverwriteSerializer(marshaller),
8585
serverMessage = ServerMessageSerializer(marshaller),
8686
privateMessage = PrivateMessageSerializer(marshaller),
87-
embed = EmbedSerializer(marshaller),
87+
embed = EmbedSerializer(),
8888
globalCommandContext = GlobalCommandContextSerializer(marshaller),
8989
guildCommandContext = ServerCommandContextSerializer(marshaller),
90-
poll = PollSerializer(marshaller);
90+
poll = PollSerializer();
9191
}

lib/infrastructure/internals/marshaller/serializers/embed_serializer.dart

-5
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ import 'package:mineral/api/common/embed/message_embed_provider.dart';
88
import 'package:mineral/api/common/embed/message_embed_type.dart';
99
import 'package:mineral/infrastructure/commons/helper.dart';
1010
import 'package:mineral/infrastructure/commons/utils.dart';
11-
import 'package:mineral/infrastructure/internals/marshaller/marshaller.dart';
1211
import 'package:mineral/infrastructure/internals/marshaller/types/serializer.dart';
1312

1413
final class EmbedSerializer implements SerializerContract<MessageEmbed> {
15-
final MarshallerContract _marshaller;
16-
17-
EmbedSerializer(this._marshaller);
18-
1914
@override
2015
MessageEmbed serializeRemote(Map<String, dynamic> json) {
2116
return MessageEmbed(

lib/infrastructure/internals/marshaller/serializers/poll_serializer.dart

-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@ import 'package:mineral/api/common/polls/poll_layout.dart';
44
import 'package:mineral/api/common/polls/poll_question.dart';
55
import 'package:mineral/infrastructure/commons/helper.dart';
66
import 'package:mineral/infrastructure/commons/utils.dart';
7-
import 'package:mineral/infrastructure/internals/marshaller/marshaller.dart';
87
import 'package:mineral/infrastructure/internals/marshaller/types/serializer.dart';
98

109
final class PollSerializer implements SerializerContract<Poll> {
11-
final MarshallerContract _marshaller;
12-
13-
PollSerializer(this._marshaller);
14-
1510
@override
1611
Poll serializeRemote(Map<String, dynamic> json) {
1712
return Poll(

lib/infrastructure/internals/marshaller/serializers/server_subscription_serializer.dart

-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import 'package:mineral/api/common/premium_tier.dart';
22
import 'package:mineral/api/server/server_subscription.dart';
33
import 'package:mineral/infrastructure/commons/utils.dart';
4-
import 'package:mineral/infrastructure/internals/marshaller/marshaller.dart';
54
import 'package:mineral/infrastructure/internals/marshaller/types/serializer.dart';
65

76
final class ServerSubscriptionSerializer implements SerializerContract<ServerSubscription> {
8-
final MarshallerContract _marshaller;
9-
10-
ServerSubscriptionSerializer(this._marshaller);
11-
127
@override
138
ServerSubscription serializeRemote(Map<String, dynamic> json) => _serialize(json);
149

lib/infrastructure/internals/marshaller/serializers/sticker_serializer.dart

-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ import 'package:mineral/api/common/snowflake.dart';
22
import 'package:mineral/api/common/sticker.dart';
33
import 'package:mineral/api/common/types/format_type.dart';
44
import 'package:mineral/api/common/types/sticker_type.dart';
5-
import 'package:mineral/infrastructure/internals/marshaller/marshaller.dart';
65
import 'package:mineral/infrastructure/internals/marshaller/types/serializer.dart';
76

87
final class StickerSerializer implements SerializerContract<Sticker> {
9-
final MarshallerContract _marshaller;
10-
11-
StickerSerializer(this._marshaller);
12-
138
@override
149
Sticker serializeRemote(Map<String, dynamic> json) => _serialize(json);
1510

lib/infrastructure/internals/marshaller/serializers/user_serializer.dart

-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ import 'package:mineral/api/common/presence.dart';
22
import 'package:mineral/api/private/user.dart';
33
import 'package:mineral/api/private/user_assets.dart';
44
import 'package:mineral/infrastructure/commons/helper.dart';
5-
import 'package:mineral/infrastructure/internals/marshaller/marshaller.dart';
65
import 'package:mineral/infrastructure/internals/marshaller/types/serializer.dart';
76

87
final class UserSerializer implements SerializerContract<User> {
9-
final MarshallerContract _marshaller;
10-
11-
UserSerializer(this._marshaller);
12-
138
@override
149
User serializeRemote(Map<String, dynamic> json) => _serialize(json);
1510

lib/infrastructure/internals/packets/listeners/guild_audit_log_entry_create_packet.dart

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ final class GuildAuditLogEntryCreatePacket implements ListenablePacket {
1515

1616
@override
1717
Future<void> listen(ShardMessage message, DispatchEvent dispatch) async {
18-
final server = await marshaller.dataStore.server.getServer(message.payload['guild_id']);
19-
20-
21-
// dispatch(event: Event.serverPresenceUpdate, params: [member, server, presence]);
18+
// TODO: Implement this packet
2219
}
2320
}

lib/infrastructure/internals/wss/dispatchers/shard_authentication.dart

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ final class ShardAuthenticationImpl implements ShardAuthentication {
5252
});
5353
}
5454

55+
@override
5556
void heartbeat() {
5657
shard.client.send(jsonEncode({
5758
'op': 1,

lib/infrastructure/internals/wss/dispatchers/shard_network_error.dart

-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,5 @@ final class ShardNetworkErrorImpl implements ShardNetworkError {
3232
if (error case ShardDisconnectError(canBeReconnected: final canBeReconnected)) {
3333
return canBeReconnected ? shard.authentication.resume() : shard.authentication.reconnect();
3434
}
35-
36-
if (error case int when error == 1005) {
37-
return shard.client.disconnect();
38-
}
3935
}
4036
}

0 commit comments

Comments
 (0)