mirror of
https://github.com/TeamOctolings/Octobot.git
synced 2025-01-31 00:19:00 +03:00
Add "Member left" message (#234)
Closes #231 --------- Signed-off-by: mctaylors <cantsendmails@mctaylors.ru> Signed-off-by: Macintxsh <95250141+mctaylors@users.noreply.github.com>
This commit is contained in:
parent
2342116e87
commit
cd75780582
10 changed files with 132 additions and 15 deletions
|
@ -585,6 +585,12 @@
|
|||
<data name="ButtonReportIssue" xml:space="preserve">
|
||||
<value>Report an issue</value>
|
||||
</data>
|
||||
<data name="DefaultLeaveMessage" xml:space="preserve">
|
||||
<value>See you soon, {0}!</value>
|
||||
</data>
|
||||
<data name="SettingsLeaveMessage" xml:space="preserve">
|
||||
<value>Leave message</value>
|
||||
</data>
|
||||
<data name="InvalidTimeSpan" xml:space="preserve">
|
||||
<value>Time specified incorrectly!</value>
|
||||
</data>
|
||||
|
|
|
@ -585,6 +585,12 @@
|
|||
<data name="ButtonReportIssue" xml:space="preserve">
|
||||
<value>Сообщить о проблеме</value>
|
||||
</data>
|
||||
<data name="DefaultLeaveMessage" xml:space="preserve">
|
||||
<value>До скорой встречи, {0}!</value>
|
||||
</data>
|
||||
<data name="SettingsLeaveMessage" xml:space="preserve">
|
||||
<value>Сообщение о выходе</value>
|
||||
</data>
|
||||
<data name="InvalidTimeSpan" xml:space="preserve">
|
||||
<value>Неправильно указано время!</value>
|
||||
</data>
|
||||
|
|
|
@ -585,6 +585,12 @@
|
|||
<data name="ButtonReportIssue" xml:space="preserve">
|
||||
<value>зарепортить баг</value>
|
||||
</data>
|
||||
<data name="DefaultLeaveMessage" xml:space="preserve">
|
||||
<value>ну, мы потеряли {0}</value>
|
||||
</data>
|
||||
<data name="SettingsLeaveMessage" xml:space="preserve">
|
||||
<value>до свидания (типо настройка)</value>
|
||||
</data>
|
||||
<data name="InvalidTimeSpan" xml:space="preserve">
|
||||
<value>ты там правильно напиши таймспан</value>
|
||||
</data>
|
||||
|
|
|
@ -181,17 +181,19 @@ public class BanCommandGroup : CommandGroup
|
|||
await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
|
||||
}
|
||||
|
||||
var memberData = data.GetOrCreateMemberData(target.ID);
|
||||
memberData.BannedUntil
|
||||
= duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
|
||||
|
||||
var banResult = await _guildApi.CreateGuildBanAsync(
|
||||
guild.ID, target.ID, reason: $"({executor.GetTag()}) {reason}".EncodeHeader(),
|
||||
ct: ct);
|
||||
if (!banResult.IsSuccess)
|
||||
{
|
||||
memberData.BannedUntil = null;
|
||||
return Result.FromError(banResult.Error);
|
||||
}
|
||||
|
||||
var memberData = data.GetOrCreateMemberData(target.ID);
|
||||
memberData.BannedUntil
|
||||
= duration is not null ? DateTimeOffset.UtcNow.Add(duration.Value) : DateTimeOffset.MaxValue;
|
||||
memberData.Roles.Clear();
|
||||
|
||||
var embed = new EmbedBuilder().WithSmallTitle(
|
||||
|
|
|
@ -143,17 +143,19 @@ public class KickCommandGroup : CommandGroup
|
|||
await _channelApi.CreateMessageWithEmbedResultAsync(dmChannel.ID, embedResult: dmEmbed, ct: ct);
|
||||
}
|
||||
|
||||
var memberData = data.GetOrCreateMemberData(target.ID);
|
||||
memberData.Kicked = true;
|
||||
|
||||
var kickResult = await _guildApi.RemoveGuildMemberAsync(
|
||||
guild.ID, target.ID, $"({executor.GetTag()}) {reason}".EncodeHeader(),
|
||||
ct);
|
||||
if (!kickResult.IsSuccess)
|
||||
{
|
||||
memberData.Kicked = false;
|
||||
return Result.FromError(kickResult.Error);
|
||||
}
|
||||
|
||||
var memberData = data.GetOrCreateMemberData(target.ID);
|
||||
memberData.Roles.Clear();
|
||||
memberData.Kicked = true;
|
||||
|
||||
var title = string.Format(Messages.UserKicked, target.GetTag());
|
||||
var description = MarkdownExtensions.BulletPoint(string.Format(Messages.DescriptionActionReason, reason));
|
||||
|
|
|
@ -39,6 +39,7 @@ public class SettingsCommandGroup : CommandGroup
|
|||
[
|
||||
GuildSettings.Language,
|
||||
GuildSettings.WelcomeMessage,
|
||||
GuildSettings.LeaveMessage,
|
||||
GuildSettings.ReceiveStartupMessages,
|
||||
GuildSettings.RemoveRolesOnMute,
|
||||
GuildSettings.ReturnRolesOnRejoin,
|
||||
|
|
|
@ -13,17 +13,29 @@ public static class GuildSettings
|
|||
public static readonly LanguageOption Language = new("Language", "en");
|
||||
|
||||
/// <summary>
|
||||
/// Controls what message should be sent in <see cref="PublicFeedbackChannel" /> when a new member joins the server.
|
||||
/// Controls what message should be sent in <see cref="PublicFeedbackChannel" /> when a new member joins the guild.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// <list type="bullet">
|
||||
/// <item>No message will be sent if set to "off", "disable" or "disabled".</item>
|
||||
/// <item><see cref="Messages.DefaultWelcomeMessage" /> will be sent if set to "default" or "reset"</item>
|
||||
/// <item><see cref="Messages.DefaultWelcomeMessage" /> will be sent if set to "default" or "reset".</item>
|
||||
/// </list>
|
||||
/// </remarks>
|
||||
/// <seealso cref="GuildMemberJoinedResponder" />
|
||||
public static readonly Option<string> WelcomeMessage = new("WelcomeMessage", "default");
|
||||
|
||||
/// <summary>
|
||||
/// Controls what message should be sent in <see cref="PublicFeedbackChannel" /> when a member leaves the guild.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// <list type="bullet">
|
||||
/// <item>No message will be sent if set to "off", "disable" or "disabled".</item>
|
||||
/// <item><see cref="Messages.DefaultLeaveMessage" /> will be sent if set to "default" or "reset".</item>
|
||||
/// </list>
|
||||
/// </remarks>
|
||||
/// <seealso cref="GuildMemberLeftResponder" />
|
||||
public static readonly Option<string> LeaveMessage = new("LeaveMessage", "default");
|
||||
|
||||
/// <summary>
|
||||
/// Controls whether or not the <see cref="Messages.Ready" /> message should be sent
|
||||
/// in <see cref="PrivateFeedbackChannel" /> on startup.
|
||||
|
|
|
@ -14,6 +14,7 @@ public enum AllOptionsEnum
|
|||
{
|
||||
[UsedImplicitly] Language,
|
||||
[UsedImplicitly] WelcomeMessage,
|
||||
[UsedImplicitly] LeaveMessage,
|
||||
[UsedImplicitly] ReceiveStartupMessages,
|
||||
[UsedImplicitly] RemoveRolesOnMute,
|
||||
[UsedImplicitly] ReturnRolesOnRejoin,
|
||||
|
|
24
src/Messages.Designer.cs
generated
24
src/Messages.Designer.cs
generated
|
@ -1037,18 +1037,26 @@ namespace Octobot {
|
|||
}
|
||||
}
|
||||
|
||||
internal static string InvalidTimeSpan
|
||||
{
|
||||
get
|
||||
{
|
||||
internal static string DefaultLeaveMessage {
|
||||
get {
|
||||
return ResourceManager.GetString("DefaultLeaveMessage", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
internal static string SettingsLeaveMessage {
|
||||
get {
|
||||
return ResourceManager.GetString("SettingsLeaveMessage", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
internal static string InvalidTimeSpan {
|
||||
get {
|
||||
return ResourceManager.GetString("InvalidTimeSpan", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
internal static string UserInfoKicked
|
||||
{
|
||||
get
|
||||
{
|
||||
internal static string UserInfoKicked {
|
||||
get {
|
||||
return ResourceManager.GetString("UserInfoKicked", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
|
73
src/Responders/GuildMemberLeftResponder.cs
Normal file
73
src/Responders/GuildMemberLeftResponder.cs
Normal file
|
@ -0,0 +1,73 @@
|
|||
using JetBrains.Annotations;
|
||||
using Octobot.Data;
|
||||
using Octobot.Extensions;
|
||||
using Octobot.Services;
|
||||
using Remora.Discord.API.Abstractions.Gateway.Events;
|
||||
using Remora.Discord.API.Abstractions.Rest;
|
||||
using Remora.Discord.Extensions.Embeds;
|
||||
using Remora.Discord.Gateway.Responders;
|
||||
using Remora.Results;
|
||||
|
||||
namespace Octobot.Responders;
|
||||
|
||||
/// <summary>
|
||||
/// Handles sending a guild's <see cref="GuildSettings.LeaveMessage" /> if one is set.
|
||||
/// </summary>
|
||||
/// <seealso cref="GuildSettings.LeaveMessage" />
|
||||
[UsedImplicitly]
|
||||
public class GuildMemberLeftResponder : IResponder<IGuildMemberRemove>
|
||||
{
|
||||
private readonly IDiscordRestChannelAPI _channelApi;
|
||||
private readonly IDiscordRestGuildAPI _guildApi;
|
||||
private readonly GuildDataService _guildData;
|
||||
|
||||
public GuildMemberLeftResponder(
|
||||
IDiscordRestChannelAPI channelApi, GuildDataService guildData, IDiscordRestGuildAPI guildApi)
|
||||
{
|
||||
_channelApi = channelApi;
|
||||
_guildData = guildData;
|
||||
_guildApi = guildApi;
|
||||
}
|
||||
|
||||
public async Task<Result> RespondAsync(IGuildMemberRemove gatewayEvent, CancellationToken ct = default)
|
||||
{
|
||||
var user = gatewayEvent.User;
|
||||
var data = await _guildData.GetData(gatewayEvent.GuildID, ct);
|
||||
var cfg = data.Settings;
|
||||
|
||||
var memberData = data.GetOrCreateMemberData(user.ID);
|
||||
if (memberData.BannedUntil is not null || memberData.Kicked)
|
||||
{
|
||||
return Result.FromSuccess();
|
||||
}
|
||||
|
||||
if (GuildSettings.WelcomeMessagesChannel.Get(cfg).Empty()
|
||||
|| GuildSettings.LeaveMessage.Get(cfg) is "off" or "disable" or "disabled")
|
||||
{
|
||||
return Result.FromSuccess();
|
||||
}
|
||||
|
||||
Messages.Culture = GuildSettings.Language.Get(cfg);
|
||||
var leaveMessage = GuildSettings.LeaveMessage.Get(cfg) is "default" or "reset"
|
||||
? Messages.DefaultLeaveMessage
|
||||
: GuildSettings.LeaveMessage.Get(cfg);
|
||||
|
||||
var guildResult = await _guildApi.GetGuildAsync(gatewayEvent.GuildID, ct: ct);
|
||||
if (!guildResult.IsDefined(out var guild))
|
||||
{
|
||||
return Result.FromError(guildResult);
|
||||
}
|
||||
|
||||
var embed = new EmbedBuilder()
|
||||
.WithSmallTitle(string.Format(leaveMessage, user.GetTag(), guild.Name), user)
|
||||
.WithGuildFooter(guild)
|
||||
.WithTimestamp(DateTimeOffset.UtcNow)
|
||||
.WithColour(ColorsList.Black)
|
||||
.Build();
|
||||
|
||||
return await _channelApi.CreateMessageWithEmbedResultAsync(
|
||||
GuildSettings.WelcomeMessagesChannel.Get(cfg), embedResult: embed,
|
||||
allowedMentions: Octobot.NoMentions, ct: ct);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in a new issue