Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/api/common/activity.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ final class Activity {
fn: () => ActivityEmoji(
name: json['name'],
id: json['id'],
animated: json['animated'] ?? false)));
isAnimated: json['animated'] ?? false)));
}
}
4 changes: 2 additions & 2 deletions lib/src/api/common/activity_emoji.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
final class ActivityEmoji {
final String name;
final String? id;
final bool animated;
final bool isAnimated;

ActivityEmoji({
required this.name,
required this.id,
required this.animated,
required this.isAnimated,
});
}
6 changes: 3 additions & 3 deletions lib/src/api/common/channel_properties.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class ChannelProperties {
final Snowflake? serverId;
final Snowflake? categoryId;
final int? position;
final bool nsfw;
final bool isNsfw;
final Snowflake? lastMessageId;
final int? bitrate;
final int? userLimit;
Expand Down Expand Up @@ -51,7 +51,7 @@ final class ChannelProperties {
required this.serverId,
required this.categoryId,
required this.position,
required this.nsfw,
required this.isNsfw,
required this.lastMessageId,
required this.bitrate,
required this.userLimit,
Expand Down Expand Up @@ -105,7 +105,7 @@ final class ChannelProperties {
serverId: Snowflake.nullable(element['server_id']),
categoryId: Snowflake.nullable(element['parent_id']),
position: element['position'],
nsfw: element['nsfw'] ?? false,
isNsfw: element['nsfw'] ?? false,
lastMessageId: Snowflake.nullable(element['last_message_id']),
bitrate: element['bitrate'],
userLimit: element['user_limit'],
Expand Down
24 changes: 12 additions & 12 deletions lib/src/api/common/commands/builder/command_definition_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -79,29 +79,29 @@ final class CommandDefinitionBuilder implements CommandBuilder {
final String name = _extractDefaultValue('option', 'name', element);
final String description =
_extractDefaultValue('option', 'description', element);
final bool required = element['required'] ?? false;
final bool isRequired = element['required'] ?? false;

final option = switch (element['type']) {
final String value when value == 'string' => Option.string(
name: name, description: description, required: required),
name: name, description: description, isRequired: isRequired),
final String value when value == 'integer' => Option.integer(
name: name, description: description, required: required),
name: name, description: description, isRequired: isRequired),
final String value when value == 'double' => Option.double(
name: name, description: description, required: required),
name: name, description: description, isRequired: isRequired),
final String value when value == 'string' => Option.boolean(
name: name, description: description, required: required),
name: name, description: description, isRequired: isRequired),
final String value when value == 'user' =>
Option.user(name: name, description: description, required: required),
Option.user(name: name, description: description, isRequired: isRequired),
final String value when value == 'channel' => Option.channel(
name: name, description: description, required: required),
name: name, description: description, isRequired: isRequired),
final String value when value == 'role' =>
Option.role(name: name, description: description, required: required),
Option.role(name: name, description: description, isRequired: isRequired),
final String value when value == 'mention' => Option.mentionable(
name: name, description: description, required: required),
name: name, description: description, isRequired: isRequired),
final String value when value == 'choice.string' => ChoiceOption.string(
name: name,
description: description,
required: required,
isRequired: isRequired,
choices: List.from(element['choices'] ?? [])
.map((element) =>
Choice<String>(element['name'], element['value']))
Expand All @@ -110,15 +110,15 @@ final class CommandDefinitionBuilder implements CommandBuilder {
ChoiceOption.integer(
name: name,
description: description,
required: required,
isRequired: isRequired,
choices: List.from(element['choices'] ?? [])
.map((element) =>
Choice(element['name'], int.parse(element['value'])))
.toList()),
final String value when value == 'choice.double' => ChoiceOption.double(
name: name,
description: description,
required: required,
isRequired: isRequired,
choices: List.from(element['choices'] ?? [])
.map((element) =>
Choice(element['name'], double.parse(element['value'])))
Expand Down
12 changes: 6 additions & 6 deletions lib/src/api/common/commands/command_choice_option.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,25 @@ final class ChoiceOption implements CommandOption {
{required String name,
required String description,
required List<Choice<String>> choices,
bool required = false}) =>
bool isRequired = false}) =>
ChoiceOption._(
name, description, CommandOptionType.string, required, null, choices);
name, description, CommandOptionType.string, isRequired, null, choices);

factory ChoiceOption.integer(
{required String name,
required String description,
required List<Choice<int>> choices,
bool required = false}) =>
ChoiceOption._(name, description, CommandOptionType.integer, required,
bool isRequired = false}) =>
ChoiceOption._(name, description, CommandOptionType.integer, isRequired,
null, choices);

factory ChoiceOption.double(
{required String name,
required String description,
required List<Choice<double>> choices,
bool required = false}) =>
bool isRequired = false}) =>
ChoiceOption._(
name, description, CommandOptionType.double, required, null, choices);
name, description, CommandOptionType.double, isRequired, null, choices);
}

final class Choice<T> {
Expand Down
36 changes: 18 additions & 18 deletions lib/src/api/common/commands/command_option.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,57 +48,57 @@ final class Option<T> implements CommandOption {
factory Option.string(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.string, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.string, null, isRequired);

factory Option.integer(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.integer, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.integer, null, isRequired);

factory Option.double(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.double, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.double, null, isRequired);

factory Option.boolean(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.boolean, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.boolean, null, isRequired);

factory Option.user(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.user, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.user, null, isRequired);

factory Option.channel(
{required String name,
required String description,
List<ChannelType> channels = const [],
bool required = false}) =>
bool isRequired = false}) =>
Option._(
name, description, CommandOptionType.channel, channels, required);
name, description, CommandOptionType.channel, channels, isRequired);

factory Option.role(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.role, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.role, null, isRequired);

factory Option.mentionable(
{required String name,
required String description,
bool required = false}) =>
bool isRequired = false}) =>
Option._(
name, description, CommandOptionType.mentionable, null, required);
name, description, CommandOptionType.mentionable, null, isRequired);

factory Option.attachment(
{required String name,
required String description,
bool required = false}) =>
Option._(name, description, CommandOptionType.attachment, null, required);
bool isRequired = false}) =>
Option._(name, description, CommandOptionType.attachment, null, isRequired);
}
6 changes: 3 additions & 3 deletions lib/src/api/common/components/builder/message_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,13 @@ final class MessageBuilder {
/// ```
///
/// Parameters:
/// - [show]: Whether to display the separator line (default: true)
/// - [isDividerVisible]: Whether to display the separator line (default: true)
/// - [spacing]: The amount of vertical space (default: [SeparatorSize.small])
void addSeparator({
bool show = true,
bool isDividerVisible = true,
SeparatorSize spacing = SeparatorSize.small,
}) {
_components.add(Separator(show, spacing));
_components.add(Separator(isDividerVisible, spacing));
}

/// Adds text content to the message.
Expand Down
8 changes: 4 additions & 4 deletions lib/src/api/common/components/button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class Button implements MessageComponent {
final String? _label;
final String? _url;
final PartialEmoji? _emoji;
final bool _disabled;
final bool _isDisabled;

Button(
{required ButtonType type,
Expand All @@ -34,7 +34,7 @@ final class Button implements MessageComponent {
_label = label,
_url = url,
_emoji = emoji,
_disabled = disabled ?? false;
_isDisabled = disabled ?? false;

factory Button.primary(String customId,
{String? label, PartialEmoji? emoji, bool? disabled}) =>
Expand Down Expand Up @@ -98,12 +98,12 @@ final class Button implements MessageComponent {
'style': _type.value,
if (_url != null) 'url': _url,
if (_label != null) 'label': _label,
if (_disabled) 'disabled': _disabled,
if (_isDisabled) 'disabled': _isDisabled,
if (_emoji != null)
'emoji': {
'name': _emoji.name,
'id': _emoji.id,
'animated': _emoji.animated,
'animated': _emoji.isAnimated,
},
};
}
Expand Down
8 changes: 4 additions & 4 deletions lib/src/api/common/components/select_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ final class SelectMenu<T> implements MessageComponent, ModalComponent {
int? _maxLength;
int? _minValues;
int? _maxValues;
bool? _disabled;
bool? _isDisabled;

final List<SelectMenuOption<T>> _options;
final List<Snowflake> _defaultValues;
Expand All @@ -30,7 +30,7 @@ final class SelectMenu<T> implements MessageComponent, ModalComponent {
_maxLength = maxLength,
_minValues = minValues,
_maxValues = maxValues,
_disabled = disabled,
_isDisabled = disabled,
_options = options ?? [],
_defaultValues = defaultValues ?? [],
_channelTypes = channelTypes ?? [];
Expand Down Expand Up @@ -118,7 +118,7 @@ final class SelectMenu<T> implements MessageComponent, ModalComponent {
'type': _type.value,
'custom_id': _customId,
'placeholder': _placeholder,
'disabled': _disabled,
'disabled': _isDisabled,
if (_minValues != null) 'min_values': _minValues,
if (_maxValues != null) 'max_values': _maxValues,
if (_minLength != null) 'min_length': _minLength,
Expand Down Expand Up @@ -166,7 +166,7 @@ final class SelectMenuOption<T> {
'emoji': {
'name': emoji?.name,
'id': emoji?.id,
'animated': emoji?.animated,
'animated': emoji?.isAnimated,
},
'default': isDefault,
};
Expand Down
6 changes: 3 additions & 3 deletions lib/src/api/common/components/separator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ enum SeparatorSize {
final class Separator implements MessageComponent {
ComponentType get type => ComponentType.separator;

final bool _show;
final bool _isDividerVisible;
final SeparatorSize _spacing;

Separator(this._show, this._spacing);
Separator(this._isDividerVisible, this._spacing);

@override
Map<String, dynamic> toJson() {
return {
'type': type.value,
'divider': _show,
'divider': _isDividerVisible,
'spacing': _spacing.value,
};
}
Expand Down
4 changes: 2 additions & 2 deletions lib/src/api/common/embed/message_embed_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ final class MessageEmbedBuilder {
}

MessageEmbedBuilder addField(
{required String name, required String value, bool inline = false}) {
fields.add(MessageEmbedField(name: name, value: value, inline: inline));
{required String name, required String value, bool isInline = false}) {
fields.add(MessageEmbedField(name: name, value: value, isInline: isInline));
return this;
}

Expand Down
8 changes: 4 additions & 4 deletions lib/src/api/common/embed/message_embed_field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import 'package:mineral/src/domains/common/utils/utils.dart';
final class MessageEmbedField {
final String name;
final String value;
final bool inline;
final bool isInline;

MessageEmbedField(
{required this.name, required this.value, this.inline = false}) {
{required this.name, required this.value, this.isInline = false}) {
expectOrThrow(name.length <= 256,
message: 'Name must be 256 or fewer in length');
expectOrThrow(value.length <= 1024,
Expand All @@ -17,15 +17,15 @@ final class MessageEmbedField {
return {
'name': name,
'value': value,
'inline': inline,
'inline': isInline,
};
}

factory MessageEmbedField.fromJson(Map<String, dynamic> json) {
return MessageEmbedField(
name: json['name'],
value: json['value'],
inline: json['inline'],
isInline: json['inline'],
);
}
}
12 changes: 6 additions & 6 deletions lib/src/api/common/emoji.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ final class Emoji extends PartialEmoji {

final Snowflake serverId;
final Map<Snowflake, Role> roles;
final bool managed;
final bool available;
final bool isManaged;
final bool isAvailable;

Emoji(
this.serverId, {
required Snowflake id,
required String name,
required this.roles,
required this.managed,
required this.available,
required bool animated,
}) : super(id, name, animated);
required this.isManaged,
required this.isAvailable,
required bool isAnimated,
}) : super(id, name, isAnimated);

/// Update image
/// ```dart
Expand Down
Loading