Skip to content

Commit 6b70fc6

Browse files
LeadcodeDevLeadcodeDev
committed
refactor: dart analyze code
1 parent c41d5c9 commit 6b70fc6

File tree

21 files changed

+137
-122
lines changed

21 files changed

+137
-122
lines changed

‎lib/src/api/server/audit_log/actions/auto_moderation.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,13 @@ final class AutoModerationFlagToChannelAuditLog extends AuditLog {
5858
}
5959

6060
final class AutoModerationUserCommunicationDisabledAuditLog extends AuditLog {
61-
@override
62-
final Snowflake userId;
6361
final int duration;
6462

6563
AutoModerationUserCommunicationDisabledAuditLog({
6664
required Snowflake serverId,
6765
required Snowflake moderatorId,
68-
required this.userId,
6966
required this.duration,
67+
required Snowflake userId,
7068
}) : super(AuditLogType.autoModerationUserCommunicationDisabled, serverId,
7169
moderatorId);
7270
}

‎lib/src/api/server/audit_log/actions/member.dart‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ final class MemberKickAuditLog extends AuditLog {
1717
}) : super(AuditLogType.memberKick, serverId, userId);
1818

1919
Future<Member?> resolveMember({bool force = false}) async {
20-
if (memberId == null) return null;
20+
if (memberId == null) {
21+
return null;
22+
}
23+
2124
final member =
2225
await _datastore.member.get(serverId.value, memberId!.value, force);
2326
return member;
@@ -71,7 +74,10 @@ final class MemberBanRemoveAuditLog extends AuditLog {
7174
}) : super(AuditLogType.memberBanRemove, serverId, userId);
7275

7376
Future<Member?> resolveMember({bool force = false}) async {
74-
if (memberId == null) return null;
77+
if (memberId == null) {
78+
return null;
79+
}
80+
7581
final member =
7682
await _datastore.member.get(serverId.value, memberId!.value, force);
7783
return member;
@@ -92,7 +98,10 @@ final class MemberUpdateAuditLog extends AuditLog {
9298
}) : super(AuditLogType.memberUpdate, serverId, userId);
9399

94100
Future<Member?> resolveMember({bool force = false}) async {
95-
if (memberId == null) return null;
101+
if (memberId == null) {
102+
return null;
103+
}
104+
96105
final member =
97106
await _datastore.member.get(serverId.value, memberId!.value, force);
98107
return member;
@@ -113,7 +122,10 @@ final class MemberRoleUpdateAuditLog extends AuditLog {
113122
}) : super(AuditLogType.memberRoleUpdate, serverId, userId);
114123

115124
Future<Member?> resolveMember({bool force = false}) async {
116-
if (memberId == null) return null;
125+
if (memberId == null) {
126+
return null;
127+
}
128+
117129
final member =
118130
await _datastore.member.get(serverId.value, memberId!.value, force);
119131
return member;
@@ -134,7 +146,10 @@ final class MemberMoveAuditLog extends AuditLog {
134146
}) : super(AuditLogType.memberMove, serverId, userId);
135147

136148
Future<Member?> resolveMember({bool force = false}) async {
137-
if (memberId == null) return null;
149+
if (memberId == null) {
150+
return null;
151+
}
152+
138153
final member =
139154
await _datastore.member.get(serverId.value, memberId!.value, force);
140155
return member;
@@ -162,7 +177,10 @@ final class MemberDisconnectAuditLog extends AuditLog {
162177
}) : super(AuditLogType.memberDisconnect, serverId, userId);
163178

164179
Future<Member?> resolveMember({bool force = false}) async {
165-
if (memberId == null) return null;
180+
if (memberId == null) {
181+
return null;
182+
}
183+
166184
final member =
167185
await _datastore.member.get(serverId.value, memberId!.value, force);
168186
return member;
@@ -181,7 +199,10 @@ final class BotAddAuditLog extends AuditLog {
181199
}) : super(AuditLogType.botAdd, serverId, userId);
182200

183201
Future<Member?> resolveBot({bool force = false}) async {
184-
if (botId == null) return null;
202+
if (botId == null) {
203+
return null;
204+
}
205+
185206
final member =
186207
await _datastore.member.get(serverId.value, botId!.value, force);
187208
return member;

‎lib/src/api/server/managers/member_voice_manager.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:mineral/api.dart';
22
import 'package:mineral/container.dart';
33
import 'package:mineral/contracts.dart';
4-
import 'package:mineral/src/api/server/voice_state.dart';
54

65
final class MemberVoiceManager {
76
DataStoreContract get _datastore => ioc.resolve<DataStoreContract>();

‎lib/src/api/server/managers/rules_manager.dart‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'package:mineral/api.dart';
22
import 'package:mineral/container.dart';
33
import 'package:mineral/contracts.dart';
4-
import 'package:mineral/src/api/server/moderation/action.dart';
5-
import 'package:mineral/src/api/server/moderation/auto_moderation_rule.dart';
64
import 'package:mineral/src/api/server/moderation/enums/auto_moderation_event_type.dart';
75
import 'package:mineral/src/api/server/moderation/enums/trigger_type.dart';
86
import 'package:mineral/src/api/server/moderation/trigger_metadata.dart';
@@ -32,18 +30,19 @@ final class RulesManager {
3230
/// ```dart
3331
/// final emoji = await server.emojis.create(name: 'New Emoji', );
3432
/// ```
35-
Future<AutoModerationRule> create(
36-
{required Object serverId,
37-
required String name,
38-
required AutoModerationEventType eventType,
39-
required TriggerType triggerType,
40-
required List<Action> actions,
41-
TriggerMetadata? triggerMetadata,
42-
List<Snowflake> exemptRoles = const [],
43-
List<Snowflake> exemptChannels = const [],
44-
bool enabled = true,
45-
String? reason,
46-
}) => _datastore.rules.create(
33+
Future<AutoModerationRule> create({
34+
required Object serverId,
35+
required String name,
36+
required AutoModerationEventType eventType,
37+
required TriggerType triggerType,
38+
required List<Action> actions,
39+
TriggerMetadata? triggerMetadata,
40+
List<Snowflake> exemptRoles = const [],
41+
List<Snowflake> exemptChannels = const [],
42+
bool enabled = true,
43+
String? reason,
44+
}) =>
45+
_datastore.rules.create(
4746
serverId: serverId,
4847
name: name,
4948
eventType: eventType,

‎lib/src/api/server/moderation/auto_moderation_rule.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:mineral/api.dart';
2-
import 'package:mineral/src/api/server/moderation/action.dart';
32
import 'package:mineral/src/api/server/moderation/enums/auto_moderation_event_type.dart';
43
import 'package:mineral/src/api/server/moderation/enums/trigger_type.dart';
54
import 'package:mineral/src/api/server/moderation/trigger_metadata.dart';
@@ -30,4 +29,4 @@ final class AutoModerationRule {
3029
required this.exemptRoles,
3130
required this.exemptChannels,
3231
});
33-
}
32+
}

‎lib/src/api/server/moderation/trigger_metadata.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class TriggerMetadata {
1818
this.mentionRaidProtectionEnabled,
1919
});
2020

21-
static fromJson(Map<String, dynamic> json) {
21+
factory TriggerMetadata.fromJson(Map<String, dynamic> json) {
2222
return TriggerMetadata(
2323
keywordFilter: List<String>.from(json['keyword_filter'] ?? []),
2424
regexPatterns: List<String>.from(json['regex_patterns'] ?? []),
@@ -32,4 +32,4 @@ final class TriggerMetadata {
3232
mentionRaidProtectionEnabled: json['mention_raid_protection_enabled'],
3333
);
3434
}
35-
}
35+
}

‎lib/src/domains/events/buckets/private_bucket.dart‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import 'package:mineral/src/domains/events/contracts/private/private_button_click_event.dart';
22
import 'package:mineral/src/domains/events/contracts/private/private_channel_create_event.dart';
33
import 'package:mineral/src/domains/events/contracts/private/private_channel_pins_update_event.dart';
4-
import 'package:mineral/src/domains/events/contracts/private/private_modal_submit_event.dart';
54
import 'package:mineral/src/domains/events/contracts/private/private_message_create_event.dart';
5+
import 'package:mineral/src/domains/events/contracts/private/private_message_reaction_add_event.dart';
66
import 'package:mineral/src/domains/events/contracts/private/private_message_reaction_remove_all_event.dart';
7+
import 'package:mineral/src/domains/events/contracts/private/private_message_reaction_remove_event.dart';
8+
import 'package:mineral/src/domains/events/contracts/private/private_modal_submit_event.dart';
79
import 'package:mineral/src/domains/events/contracts/private/private_poll_vote_add_event.dart';
810
import 'package:mineral/src/domains/events/contracts/private/private_poll_vote_remove_event.dart';
911
import 'package:mineral/src/domains/events/contracts/private/private_text_select_event.dart';
1012
import 'package:mineral/src/domains/events/contracts/private/private_user_select_event.dart';
11-
import 'package:mineral/src/domains/events/contracts/private/private_message_reaction_add_event.dart';
12-
import 'package:mineral/src/domains/events/contracts/private/private_message_reaction_remove_event.dart';
1313
import 'package:mineral/src/domains/events/event.dart';
1414
import 'package:mineral/src/domains/events/event_bucket.dart';
1515

@@ -42,10 +42,12 @@ final class PrivateBucket {
4242
void privateMessageReactionAdd(PrivateMessageReactionAddHandler handle) =>
4343
_events.make(Event.privateMessageReactionAdd, handle);
4444

45-
void privateMessageReactionRemove(PrivateMessageReactionRemoveHandler handle) =>
45+
void privateMessageReactionRemove(
46+
PrivateMessageReactionRemoveHandler handle) =>
4647
_events.make(Event.privateMessageReactionRemove, handle);
4748

48-
void messageReactionRemoveAll(PrivateMessageReactionRemoveAllHandler handle) =>
49+
void messageReactionRemoveAll(
50+
PrivateMessageReactionRemoveAllHandler handle) =>
4951
_events.make(Event.privateMessageReactionRemoveAll, handle);
5052

5153
void pollVoteAdd(PrivatePollVoteAddEventHandler handle) =>

‎lib/src/domains/events/buckets/server_bucket.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:mineral/src/domains/events/contracts/server/server_channel_selec
99
import 'package:mineral/src/domains/events/contracts/server/server_channel_update_event.dart';
1010
import 'package:mineral/src/domains/events/contracts/server/server_create_event.dart';
1111
import 'package:mineral/src/domains/events/contracts/server/server_delete_event.dart';
12-
import 'package:mineral/src/domains/events/contracts/server/server_modal_submit_event.dart';
1312
import 'package:mineral/src/domains/events/contracts/server/server_emojis_update_event.dart';
1413
import 'package:mineral/src/domains/events/contracts/server/server_member_add_event.dart';
1514
import 'package:mineral/src/domains/events/contracts/server/server_member_chunk_event.dart';
@@ -20,6 +19,7 @@ import 'package:mineral/src/domains/events/contracts/server/server_message_creat
2019
import 'package:mineral/src/domains/events/contracts/server/server_message_reaction_add_event.dart';
2120
import 'package:mineral/src/domains/events/contracts/server/server_message_reaction_remove_all_event.dart';
2221
import 'package:mineral/src/domains/events/contracts/server/server_message_reaction_remove_event.dart';
22+
import 'package:mineral/src/domains/events/contracts/server/server_modal_submit_event.dart';
2323
import 'package:mineral/src/domains/events/contracts/server/server_poll_vote_add_event.dart';
2424
import 'package:mineral/src/domains/events/contracts/server/server_poll_vote_remove_event.dart';
2525
import 'package:mineral/src/domains/events/contracts/server/server_presence_update_event.dart';

‎lib/src/domains/events/event_bucket.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:mineral/src/domains/events/buckets/private_bucket.dart';
44
import 'package:mineral/src/domains/events/buckets/server_bucket.dart';
55
import 'package:mineral/src/domains/events/contracts/common/invite_create_event.dart';
66
import 'package:mineral/src/domains/events/contracts/common/invite_delete_event.dart';
7-
import 'package:mineral/src/domains/events/contracts/common/voice_move_event.dart';
87

98
final class EventBucket {
109
final Kernel _kernel;

‎lib/src/domains/services/datastore/parts.dart‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ import 'package:mineral/api.dart';
22
import 'package:mineral/src/api/common/polls/poll_answer_vote.dart';
33
import 'package:mineral/src/api/server/channels/private_thread_channel.dart';
44
import 'package:mineral/src/api/server/channels/public_thread_channel.dart';
5-
import 'package:mineral/src/api/server/moderation/action.dart';
6-
import 'package:mineral/src/api/server/moderation/auto_moderation_rule.dart';
75
import 'package:mineral/src/api/server/moderation/enums/auto_moderation_event_type.dart';
86
import 'package:mineral/src/api/server/moderation/enums/trigger_type.dart';
97
import 'package:mineral/src/api/server/moderation/trigger_metadata.dart';
10-
import 'package:mineral/src/api/server/voice_state.dart';
118

129
abstract interface class DataStorePart {}
1310

@@ -49,18 +46,18 @@ abstract interface class ThreadPartContract implements DataStorePart {
4946
}
5047

5148
abstract interface class InteractionPartContract implements DataStorePart {
52-
Future<void> replyInteraction(Snowflake id, String token,
53-
MessageBuilder builder, bool ephemeral);
49+
Future<void> replyInteraction(
50+
Snowflake id, String token, MessageBuilder builder, bool ephemeral);
5451

55-
Future<void> editInteraction(Snowflake botId, String token,
56-
MessageBuilder builder, bool ephemeral);
52+
Future<void> editInteraction(
53+
Snowflake botId, String token, MessageBuilder builder, bool ephemeral);
5754

5855
Future<void> deleteInteraction(Snowflake botId, String token);
5956

6057
Future<void> noReplyInteraction(Snowflake id, String token, bool ephemeral);
6158

62-
Future<void> createFollowup(Snowflake botId, String token,
63-
MessageBuilder builder, bool ephemeral);
59+
Future<void> createFollowup(
60+
Snowflake botId, String token, MessageBuilder builder, bool ephemeral);
6461

6562
Future<void> editFollowup(Snowflake botId, String token, Snowflake messageId,
6663
MessageBuilder builder, bool ephemeral);

0 commit comments

Comments
 (0)