Skip to content

Commit 7542055

Browse files
MeixDevMeixDev
committed
Lint fixes, converted to pure dart package
1 parent 018a246 commit 7542055

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+656
-333
lines changed

‎.github/workflows/dart.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This workflow uses actions that are not certified by GitHub.
2+
# They are provided by a third-party and are governed by
3+
# separate terms of service, privacy policy, and support
4+
# documentation.
5+
6+
name: Dart
7+
8+
on:
9+
push:
10+
branches: [ main, dev ]
11+
pull_request:
12+
branches: [ main, dev ]
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v2
19+
- uses: dart-lang/setup-dart@v1
20+
- name: Install dependencies
21+
run: dart pub get
22+
- name: Analyze project source
23+
run: dart analyze
24+
working-directory: ./lib
25+
- name: Run tests
26+
run: dart test --coverage="coverage"
27+
# - name: Generate Lcov
28+
# run: dart pub run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.packages --report-on=lib
29+
# - name: Collect and report coverage
30+
# uses: coverallsapp/[email protected]
31+
# with:
32+
# github-token: ${{ secrets.GITHUB_TOKEN }}

‎analysis_options.yaml‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,36 @@
1-
include: package:flutter_lints/flutter.yaml
1+
include: package:lint/analysis_options.yaml
22

3-
# Additional information about this file can be found at
4-
# https://dart.dev/guides/language/analysis-options
3+
analyzer:
4+
exclude:
5+
- lib/**.g.dart
6+
- test/**.mocks.dart
7+
- lib/generated_plugin_registrant.dart
8+
strong-mode:
9+
implicit-casts: false
10+
errors:
11+
missing_required_param: error
12+
unrelated_type_equality_checks: error
13+
missing_return: warning
14+
close_sinks: warning
15+
cancel_subscriptions: warning
16+
parameter_assignments: warning
17+
prefer_final_in_for_each: warning
18+
prefer_mixin: warning
19+
unawaited_futures: warning
20+
unnecessary_await_in_return: warning
21+
unnecessary_null_aware_assignments: warning
22+
use_string_buffers: warning
23+
24+
linter:
25+
rules:
26+
always_use_package_imports: false
27+
prefer_relative_imports: true
28+
use_string_buffers: true
29+
use_if_null_to_convert_nulls_to_bools: true
30+
parameter_assignments: true
31+
prefer_null_aware_method_calls: true
32+
use_is_even_rather_than_modulo: true
33+
prefer_final_in_for_each: true
34+
directives_ordering: true
35+
avoid_unused_constructor_parameters: true
36+
prefer_final_locals: true

‎example/pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ packages:
6363
path: ".."
6464
relative: true
6565
source: path
66-
version: "0.0.1"
66+
version: "0.1.0"
6767
fake_async:
6868
dependency: transitive
6969
description:

‎lib/discord_api.dart‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
library discord_api;
22

3-
export 'src/discord_client.dart';
43
export 'src/discord_cdn_helper.dart';
5-
6-
export 'src/providers/discord_http_client.dart';
7-
export 'src/providers/discord_dio_provider.dart'; //! TEMPORARY
8-
9-
export 'src/extensions/string_extensions.dart';
4+
export 'src/discord_client.dart';
105
export 'src/exceptions/discord_api_exceptions.dart';
11-
6+
export 'src/extensions/string_extensions.dart';
7+
export 'src/models/discord_activity.dart';
128
export 'src/models/discord_activity_assets.dart';
139
export 'src/models/discord_activity_button.dart';
1410
export 'src/models/discord_activity_flag.dart';
1511
export 'src/models/discord_activity_party.dart';
1612
export 'src/models/discord_activity_secrets.dart';
1713
export 'src/models/discord_activity_timestamps.dart';
1814
export 'src/models/discord_activity_type.dart';
19-
export 'src/models/discord_activity.dart';
2015
export 'src/models/discord_allowed_mentions.dart';
2116
export 'src/models/discord_api_scope.dart';
22-
export 'src/models/discord_application_flag.dart';
2317
export 'src/models/discord_application.dart';
18+
export 'src/models/discord_application_flag.dart';
2419
export 'src/models/discord_attachment.dart';
25-
export 'src/models/discord_audit_log_change_key.dart';
20+
export 'src/models/discord_audit_log.dart';
2621
export 'src/models/discord_audit_log_change.dart';
22+
export 'src/models/discord_audit_log_change_key.dart';
2723
export 'src/models/discord_audit_log_entry.dart';
28-
export 'src/models/discord_audit_log.dart';
2924
export 'src/models/discord_authorization_information.dart';
3025
export 'src/models/discord_ban.dart';
26+
export 'src/models/discord_channel.dart';
3127
export 'src/models/discord_channel_mention.dart';
3228
export 'src/models/discord_channel_type.dart';
33-
export 'src/models/discord_channel.dart';
3429
export 'src/models/discord_client_status.dart';
35-
export 'src/models/discord_connection_visibility_type.dart';
3630
export 'src/models/discord_connection.dart';
31+
export 'src/models/discord_connection_visibility_type.dart';
32+
export 'src/models/discord_embed.dart';
3733
export 'src/models/discord_embed_author.dart';
3834
export 'src/models/discord_embed_field.dart';
3935
export 'src/models/discord_embed_footer.dart';
@@ -42,79 +38,80 @@ export 'src/models/discord_embed_provider.dart';
4238
export 'src/models/discord_embed_thumbnail.dart';
4339
export 'src/models/discord_embed_type.dart';
4440
export 'src/models/discord_embed_video.dart';
45-
export 'src/models/discord_embed.dart';
4641
export 'src/models/discord_emoji.dart';
4742
export 'src/models/discord_errors.dart';
4843
export 'src/models/discord_explicit_content_filter_level.dart';
4944
export 'src/models/discord_followed_channel.dart';
45+
export 'src/models/discord_guild.dart';
5046
export 'src/models/discord_guild_feature.dart';
5147
export 'src/models/discord_guild_member.dart';
5248
export 'src/models/discord_guild_premium_tier.dart';
5349
export 'src/models/discord_guild_preview.dart';
50+
export 'src/models/discord_guild_scheduled_event.dart';
5451
export 'src/models/discord_guild_scheduled_event_entity_metadata.dart';
5552
export 'src/models/discord_guild_scheduled_event_entity_type.dart';
5653
export 'src/models/discord_guild_scheduled_event_privacy_level.dart';
5754
export 'src/models/discord_guild_scheduled_event_status.dart';
5855
export 'src/models/discord_guild_scheduled_event_user.dart';
59-
export 'src/models/discord_guild_scheduled_event.dart';
6056
export 'src/models/discord_guild_template.dart';
61-
export 'src/models/discord_guild_widget_settings.dart';
6257
export 'src/models/discord_guild_widget.dart';
63-
export 'src/models/discord_guild.dart';
58+
export 'src/models/discord_guild_widget_settings.dart';
6459
export 'src/models/discord_image_format.dart';
60+
export 'src/models/discord_integration.dart';
6561
export 'src/models/discord_integration_account.dart';
6662
export 'src/models/discord_integration_application.dart';
6763
export 'src/models/discord_integration_expiration_behavior.dart';
68-
export 'src/models/discord_integration.dart';
64+
export 'src/models/discord_invite.dart';
6965
export 'src/models/discord_invite_metadata.dart';
7066
export 'src/models/discord_invite_stage_instance.dart';
7167
export 'src/models/discord_invite_target_type.dart';
72-
export 'src/models/discord_invite.dart';
7368
export 'src/models/discord_membership_state.dart';
7469
export 'src/models/discord_mention_type.dart';
75-
export 'src/models/discord_message_activity_type.dart';
70+
export 'src/models/discord_message.dart';
7671
export 'src/models/discord_message_activity.dart';
77-
export 'src/models/discord_message_component_type.dart';
72+
export 'src/models/discord_message_activity_type.dart';
7873
export 'src/models/discord_message_component.dart';
74+
export 'src/models/discord_message_component_type.dart';
7975
export 'src/models/discord_message_flag.dart';
80-
export 'src/models/discord_message_interaction_type.dart';
8176
export 'src/models/discord_message_interaction.dart';
77+
export 'src/models/discord_message_interaction_type.dart';
8278
export 'src/models/discord_message_notifications_level.dart';
8379
export 'src/models/discord_message_reference.dart';
8480
export 'src/models/discord_message_type.dart';
85-
export 'src/models/discord_message.dart';
8681
export 'src/models/discord_mfa_level.dart';
8782
export 'src/models/discord_nsfw_level.dart';
8883
export 'src/models/discord_optional_audit_entry_info.dart';
89-
export 'src/models/discord_overwrite_type.dart';
9084
export 'src/models/discord_overwrite.dart';
85+
export 'src/models/discord_overwrite_type.dart';
9186
export 'src/models/discord_premium_type.dart';
9287
export 'src/models/discord_presence_update.dart';
9388
export 'src/models/discord_reaction.dart';
94-
export 'src/models/discord_role_tags.dart';
9589
export 'src/models/discord_role.dart';
90+
export 'src/models/discord_role_tags.dart';
9691
export 'src/models/discord_snowflake.dart';
9792
export 'src/models/discord_stage_instance.dart';
9893
export 'src/models/discord_stage_privacy_level.dart';
9994
export 'src/models/discord_status.dart';
95+
export 'src/models/discord_sticker.dart';
10096
export 'src/models/discord_sticker_format_type.dart';
10197
export 'src/models/discord_sticker_item.dart';
10298
export 'src/models/discord_sticker_pack.dart';
10399
export 'src/models/discord_sticker_type.dart';
104-
export 'src/models/discord_sticker.dart';
105100
export 'src/models/discord_system_channel_flag.dart';
106-
export 'src/models/discord_team_member.dart';
107101
export 'src/models/discord_team.dart';
102+
export 'src/models/discord_team_member.dart';
108103
export 'src/models/discord_thread_member.dart';
109104
export 'src/models/discord_thread_metadata.dart';
110-
export 'src/models/discord_token_webhook.dart';
111105
export 'src/models/discord_token.dart';
112-
export 'src/models/discord_user_flag.dart';
106+
export 'src/models/discord_token_webhook.dart';
113107
export 'src/models/discord_user.dart';
108+
export 'src/models/discord_user_flag.dart';
114109
export 'src/models/discord_verification_level.dart';
115110
export 'src/models/discord_video_quality_mode.dart';
116111
export 'src/models/discord_voice_region.dart';
117112
export 'src/models/discord_voice_state.dart';
118113
export 'src/models/discord_webhook.dart';
119-
export 'src/models/discord_welcome_screen_channel.dart';
120114
export 'src/models/discord_welcome_screen.dart';
115+
export 'src/models/discord_welcome_screen_channel.dart';
116+
export 'src/providers/discord_dio_provider.dart'; //! TEMPORARY
117+
export 'src/providers/discord_http_client.dart';

‎lib/src/discord_cdn_helper.dart‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:discord_api/src/models/discord_image_format.dart';
1+
import 'models/discord_image_format.dart';
22

33
class DiscordCdnHelper {
44
static final instance = DiscordCdnHelper._();
@@ -80,7 +80,8 @@ class DiscordCdnHelper {
8080
return null;
8181
}
8282
return getString(
83-
'/icons/$guildId/$guildIconHash.${format.fileExtension}?size=$size');
83+
'/icons/$guildId/$guildIconHash.${format.fileExtension}?size=$size',
84+
);
8485
}
8586

8687
/// Tries to create the right URL slug for a guild splash, given its guild_id and splash hash,
@@ -97,7 +98,8 @@ class DiscordCdnHelper {
9798
return null;
9899
}
99100
return getString(
100-
'/splashes/$guildId/$guildSplashHash.${format.fileExtension}?size=$size');
101+
'/splashes/$guildId/$guildSplashHash.${format.fileExtension}?size=$size',
102+
);
101103
}
102104

103105
/// Tries to create the right URL slug for a guild discovery splash, given its guild_id and discovery splash hash,
@@ -114,7 +116,8 @@ class DiscordCdnHelper {
114116
return null;
115117
}
116118
return getString(
117-
'/discovery-splashes/$guildId/$guildDiscoverySplashHash.${format.fileExtension}?size=$size');
119+
'/discovery-splashes/$guildId/$guildDiscoverySplashHash.${format.fileExtension}?size=$size',
120+
);
118121
}
119122

120123
/// Tries to create the right URL slug for a guild banner, given its guild_id and banner hash,
@@ -131,7 +134,8 @@ class DiscordCdnHelper {
131134
return null;
132135
}
133136
return getString(
134-
'/banners/$guildId/$guildBannerHash.${format.fileExtension}?size=$size');
137+
'/banners/$guildId/$guildBannerHash.${format.fileExtension}?size=$size',
138+
);
135139
}
136140

137141
/// Tries to create the right URL slug for a user banner, given its user_id and banner hash,
@@ -152,7 +156,8 @@ class DiscordCdnHelper {
152156
return null;
153157
}
154158
return getString(
155-
'/banners/$userId/$userBannerHash.${format.fileExtension}?size=$size');
159+
'/banners/$userId/$userBannerHash.${format.fileExtension}?size=$size',
160+
);
156161
}
157162

158163
/// Tries to create the right URL slug for the default user avatar of a user,
@@ -185,7 +190,8 @@ class DiscordCdnHelper {
185190
return null;
186191
}
187192
return getString(
188-
'/avatars/$userId/$userAvatarHash.${format.fileExtension}?size=$size');
193+
'/avatars/$userId/$userAvatarHash.${format.fileExtension}?size=$size',
194+
);
189195
}
190196

191197
/// Tries to create the right URL slug for a guild member avatar, given its guild_id, user_id
@@ -208,7 +214,8 @@ class DiscordCdnHelper {
208214
return null;
209215
}
210216
return getString(
211-
'/guilds/$guildId/users/$userId/avatars/$memberAvatarHash.${format.fileExtension}?size=$size');
217+
'/guilds/$guildId/users/$userId/avatars/$memberAvatarHash.${format.fileExtension}?size=$size',
218+
);
212219
}
213220

214221
/// Tries to create the right URL slug for an application icon, given its application_id and icon hash,
@@ -225,7 +232,8 @@ class DiscordCdnHelper {
225232
return null;
226233
}
227234
return getString(
228-
'/app-icons/$applicationId/$applicationIconHash.${format.fileExtension}?size=$size');
235+
'/app-icons/$applicationId/$applicationIconHash.${format.fileExtension}?size=$size',
236+
);
229237
}
230238

231239
/// Tries to create the right URL slug for an application cover, given its application_id and cover image hash,
@@ -242,7 +250,8 @@ class DiscordCdnHelper {
242250
return null;
243251
}
244252
return getString(
245-
'/app-icons/$applicationId/$applicationCoverHash.${format.fileExtension}?size=$size');
253+
'/app-icons/$applicationId/$applicationCoverHash.${format.fileExtension}?size=$size',
254+
);
246255
}
247256

248257
/// Tries to create the right URL slug for an application asset, given its application_id and asset hash,
@@ -259,7 +268,8 @@ class DiscordCdnHelper {
259268
return null;
260269
}
261270
return getString(
262-
'/app-assets/$applicationId/$applicationAssetHash.${format.fileExtension}?size=$size');
271+
'/app-assets/$applicationId/$applicationAssetHash.${format.fileExtension}?size=$size',
272+
);
263273
}
264274

265275
/// Tries to create the right URL slug for an application's achievement icon,
@@ -278,7 +288,8 @@ class DiscordCdnHelper {
278288
return null;
279289
}
280290
return getString(
281-
'/app-assets/$applicationId/achievements/$achievementId/icons/$achievementIconHash.${format.fileExtension}?size=$size');
291+
'/app-assets/$applicationId/achievements/$achievementId/icons/$achievementIconHash.${format.fileExtension}?size=$size',
292+
);
282293
}
283294

284295
/// Tries to create the right URL slug for a sticker pack banner, given its asset_id,
@@ -294,7 +305,8 @@ class DiscordCdnHelper {
294305
return null;
295306
}
296307
return getString(
297-
'/app-assets/710982414301790216/store/$stickerPackBannerId.${format.fileExtension}?size=$size');
308+
'/app-assets/710982414301790216/store/$stickerPackBannerId.${format.fileExtension}?size=$size',
309+
);
298310
}
299311

300312
/// Tries to create the right URL slug for a team icon, given its team_id and team icon hash,
@@ -311,7 +323,8 @@ class DiscordCdnHelper {
311323
return null;
312324
}
313325
return getString(
314-
'/team-icons/$teamId/$teamIconHash.${format.fileExtension}?size=$size');
326+
'/team-icons/$teamId/$teamIconHash.${format.fileExtension}?size=$size',
327+
);
315328
}
316329

317330
/// Tries to create the right URL slug for a sticker, given its sticker_id,
@@ -348,7 +361,8 @@ class DiscordCdnHelper {
348361
return null;
349362
}
350363
return getString(
351-
'/role-icons/$roleId/$roleIconHash.${format.fileExtension}?size=$size');
364+
'/role-icons/$roleId/$roleIconHash.${format.fileExtension}?size=$size',
365+
);
352366
}
353367

354368
/// Tries to create the right URL slug for a guild scheduled event cover,
@@ -366,6 +380,7 @@ class DiscordCdnHelper {
366380
return null;
367381
}
368382
return getString(
369-
'/guild-events/$scheduledEventId/$scheduledEventCoverHash.${format.fileExtension}?size=$size');
383+
'/guild-events/$scheduledEventId/$scheduledEventCoverHash.${format.fileExtension}?size=$size',
384+
);
370385
}
371386
}

0 commit comments

Comments
 (0)