Skip to content

Commit 56ba54f

Browse files
CenngoCenngo
committed
simplify naming of the component classes and normalize namespaces
1 parent a5acfb3 commit 56ba54f

File tree

45 files changed

+227
-233
lines changed

Some content is hidden

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

45 files changed

+227
-233
lines changed

src/Discord.Net.Interactions/Attributes/Modals/ModalChannelSelectInputAttribute.cs renamed to src/Discord.Net.Interactions/Attributes/Modals/ModalChannelSelectAttribute.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
namespace Discord.Interactions.Attributes.Modals;
1+
namespace Discord.Interactions;
22

33
/// <summary>
44
/// Marks a <see cref="IModal"/> property as a channel select.
55
/// </summary>
6-
public class ModalChannelSelectInputAttribute : ModalSelectInputAttribute
6+
public class ModalChannelSelectAttribute : ModalSelectComponentAttribute
77
{
88
/// <inheritdoc/>
99
public override ComponentType ComponentType => ComponentType.ChannelSelect;
1010

1111
/// <summary>
12-
/// Create a new <see cref="ModalChannelSelectInputAttribute"/>.
12+
/// Create a new <see cref="ModalChannelSelectAttribute"/>.
1313
/// </summary>
1414
/// <param name="customId">Custom ID of the channel select component.</param>
15-
public ModalChannelSelectInputAttribute(string customId) : base(customId)
16-
{
17-
}
15+
public ModalChannelSelectAttribute(string customId) : base(customId) { }
1816
}

‎src/Discord.Net.Interactions/Attributes/Modals/ModalComponentAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace Discord.Interactions.Attributes.Modals;
3+
namespace Discord.Interactions;
44

55
/// <summary>
66
/// Mark an <see cref="IModal"/> property as a modal component field.

src/Discord.Net.Interactions/Attributes/Modals/ModalFileUploadInputAttribute.cs renamed to src/Discord.Net.Interactions/Attributes/Modals/ModalFileUploadAttribute.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace Discord.Interactions;
33
/// <summary>
44
/// Marks a <see cref="IModal"/> property as a file upload input.
55
/// </summary>
6-
public class ModalFileUploadInputAttribute : ModalInputAttribute
6+
public class ModalFileUploadAttribute : ModalInputAttribute
77
{
88
/// <inheritdoc/>
99
public override ComponentType ComponentType => ComponentType.FileUpload;
@@ -19,12 +19,12 @@ public class ModalFileUploadInputAttribute : ModalInputAttribute
1919
public int MaxValues { get; set; } = 1;
2020

2121
/// <summary>
22-
/// Create a new <see cref="ModalFileUploadInputAttribute"/>.
22+
/// Create a new <see cref="ModalFileUploadAttribute"/>.
2323
/// </summary>
2424
/// <param name="customId">Custom ID of the file upload component.</param>
2525
/// <param name="minValues">Minimum number of files that can be uploaded.</param>
2626
/// <param name="maxValues">Maximum number of files that can be uploaded.</param>
27-
public ModalFileUploadInputAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId)
27+
public ModalFileUploadAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId)
2828
{
2929
MinValues = minValues;
3030
MaxValues = maxValues;

‎src/Discord.Net.Interactions/Attributes/Modals/ModalInputAttribute.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Discord.Interactions.Attributes.Modals;
21
using System;
32

43
namespace Discord.Interactions

src/Discord.Net.Interactions/Attributes/Modals/ModalMentionableSelectInputAttribute.cs renamed to src/Discord.Net.Interactions/Attributes/Modals/ModalMentionableSelectAttribute.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@ namespace Discord.Interactions;
33
/// <summary>
44
/// Marks a <see cref="IModal"/> property as a mentionable select input.
55
/// </summary>
6-
public class ModalMentionableSelectInputAttribute : ModalSelectInputAttribute
6+
public class ModalMentionableSelectAttribute : ModalSelectComponentAttribute
77
{
88
/// <inheritdoc />
99
public override ComponentType ComponentType => ComponentType.MentionableSelect;
1010

1111
/// <summary>
12-
/// Create a new <see cref="ModalMentionableSelectInputAttribute"/>.
12+
/// Create a new <see cref="ModalMentionableSelectAttribute"/>.
1313
/// </summary>
1414
/// <param name="customId">Custom ID of the mentionable select component.</param>
1515
/// <param name="minValues">Minimum number of values that can be selected.</param>
1616
/// <param name="maxValues">Maximum number of values that can be selected</param>
17-
public ModalMentionableSelectInputAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues)
18-
{
19-
}
17+
public ModalMentionableSelectAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
2018
}

src/Discord.Net.Interactions/Attributes/Modals/ModalRoleSelectInputAttribute.cs renamed to src/Discord.Net.Interactions/Attributes/Modals/ModalRoleSelectAttribute.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
namespace Discord.Interactions.Attributes.Modals;
1+
namespace Discord.Interactions;
22

33
/// <summary>
44
/// Marks a <see cref="IModal"/> property as a role select input.
55
/// </summary>
6-
public class ModalRoleSelectInputAttribute : ModalSelectInputAttribute
6+
public class ModalRoleSelectAttribute : ModalSelectComponentAttribute
77
{
88
/// <inheritdoc/>
99
public override ComponentType ComponentType => ComponentType.RoleSelect;
1010

1111
/// <summary>
12-
/// Create a new <see cref="ModalRoleSelectInputAttribute"/>.
12+
/// Create a new <see cref="ModalRoleSelectAttribute"/>.
1313
/// </summary>
1414
/// <param name="customId">Custom ID of the role select component.</param>
1515
/// <param name="minValues">Minimum number of values that can be selected.</param>
1616
/// <param name="maxValues">Maximum number of values that can be selected.</param>
17-
public ModalRoleSelectInputAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues)
18-
{
19-
}
17+
public ModalRoleSelectAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
2018
}

src/Discord.Net.Interactions/Attributes/Modals/ModalSelectInputAttribute.cs renamed to src/Discord.Net.Interactions/Attributes/Modals/ModalSelectComponentAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace Discord.Interactions;
33
/// <summary>
44
/// Base attribute for select-menu, user, channel, role, and mentionable select inputs in modals.
55
/// </summary>
6-
public abstract class ModalSelectInputAttribute : ModalInputAttribute
6+
public abstract class ModalSelectComponentAttribute : ModalInputAttribute
77
{
88
/// <summary>
99
/// Gets or sets the minimum number of values that can be selected.
@@ -20,7 +20,7 @@ public abstract class ModalSelectInputAttribute : ModalInputAttribute
2020
/// </summary>
2121
public string Placeholder { get; set; }
2222

23-
internal ModalSelectInputAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId)
23+
internal ModalSelectComponentAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId)
2424
{
2525
MinValues = minValues;
2626
MaxValues = maxValues;

src/Discord.Net.Interactions/Attributes/Modals/ModalSelectMenuInputAttribute.cs renamed to src/Discord.Net.Interactions/Attributes/Modals/ModalSelectMenuAttribute.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
namespace Discord.Interactions.Attributes.Modals;
1+
namespace Discord.Interactions;
22

33
/// <summary>
44
/// Marks a <see cref="IModal"/> property as a select menu input.
55
/// </summary>
6-
public sealed class ModalSelectMenuInputAttribute : ModalSelectInputAttribute
6+
public sealed class ModalSelectMenuAttribute : ModalSelectComponentAttribute
77
{
88
/// <inheritdoc />
99
public override ComponentType ComponentType => ComponentType.SelectMenu;
1010

1111
/// <summary>
12-
/// Create a new <see cref="ModalSelectMenuInputAttribute"/>.
12+
/// Create a new <see cref="ModalSelectMenuAttribute"/>.
1313
/// </summary>
1414
/// <param name="customId">Custom ID of the select menu component.</param>
1515
/// <param name="minValues">Minimum number of values that can be selected.</param>
1616
/// <param name="maxValues">Maximum number of values that can be selected.</param>
17-
public ModalSelectMenuInputAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues)
18-
{
19-
}
17+
public ModalSelectMenuAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
2018
}

‎src/Discord.Net.Interactions/Attributes/Modals/ModalSelectMenuOptionAttribute.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
using System;
22

3-
namespace Discord.Interactions.Attributes.Modals;
3+
namespace Discord.Interactions;
44

55
/// <summary>
66
/// Adds a select menu option to the marked field.
77
/// </summary>
8+
/// <remarks>
9+
/// To add additional metadata to enum fields, use <see cref="SelectMenuOptionAttribute"/> instead.
10+
/// </remarks>
811
[AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
912
public class ModalSelectMenuOptionAttribute : Attribute
1013
{
@@ -34,7 +37,7 @@ public class ModalSelectMenuOptionAttribute : Attribute
3437
public bool IsDefault { get; set; }
3538

3639
/// <summary>
37-
/// Create a new <see cref="ModalSelectInputAttribute"/>.
40+
/// Create a new <see cref="ModalSelectComponentAttribute"/>.
3841
/// </summary>
3942
/// <param name="label">Label of the option.</param>
4043
/// <param name="value">Value of the option.</param>

‎src/Discord.Net.Interactions/Attributes/Modals/ModalTextDisplayAttribute.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Discord.Interactions.Attributes.Modals;
2-
31
namespace Discord.Interactions;
42

53
/// <summary>

0 commit comments

Comments
 (0)