Emotions-stuff/elliebot
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 23 Packages Wiki Activity

Added admin-only .warndelete command

Browse source
This commit is contained in:
Toastie (DCS Team) 2024-07-27 19:13:39 +12:00
parent e4cc5f4e80
commit 9094b4e144
Signed by: toastie_t0ast
GPG key ID: 27F3B6855AFD40A4
5 changed files with 176 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/EllieBot/Modules/Administration/UserPunish/UserPunishCommands.cs
View file

@ -273,6 +273,31 @@ public partial class Administration
.SendAsync();
}
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public Task WarnDelete(IGuildUser user, int index)
=> WarnDelete(user.Id, index);
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPermission.Administrator)]
public async Task WarnDelete(ulong userId, int index)
{
if (--index < 0)
return;
var warn = await _service.WarnDelete(userId, index);
if (warn is null)
{
await Response().Error(strs.warning_not_found).SendAsync();
return;
}
await Response().Confirm(strs.warning_deleted(Format.Bold(index.ToString()))).SendAsync();
}
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.BanMembers)]
@ -286,6 +311,7 @@ public partial class Administration
{
if (index < 0)
return;
var success = await _service.WarnClearAsync(ctx.Guild.Id, userId, index, ctx.User.ToString());
var userStr = Format.Bold((ctx.Guild as SocketGuild)?.GetUser(userId)?.ToString() ?? userId.ToString());
if (index == 0)

26
src/EllieBot/Modules/Administration/UserPunish/UserPunishService.cs
View file

@ -89,7 +89,8 @@ public class UserPunishService : IEService, IReadyExecutor
{
ps = uow.GuildConfigsForId(guildId, set => set.Include(x => x.WarnPunishments)).WarnPunishments;
previousCount = uow.Set<Warning>().ForId(guildId, userId)
previousCount = uow.Set<Warning>()
.ForId(guildId, userId)
.Where(w => !w.Forgiven && w.UserId == userId)
.Sum(x => x.Weight);
@ -483,7 +484,8 @@ public class UserPunishService : IEService, IReadyExecutor
}
else if (template is null)
{
uow.Set<BanTemplate>().Add(new()
uow.Set<BanTemplate>()
.Add(new()
{
GuildId = guildId,
Text = text
@ -594,4 +596,24 @@ public class UserPunishService : IEService, IReadyExecutor
var output = SmartText.CreateFrom(template);
return await _repSvc.ReplaceAsync(output, repCtx);
}
public async Task<Warning> WarnDelete(ulong userId, int index)
{
await using var uow = _db.GetDbContext();
var warn = await uow.GetTable<Warning>()
.Where(x => x.UserId == userId)
.OrderByDescending(x => x.DateAdded)
.Skip(index)
.FirstOrDefaultAsyncLinqToDB();
if (warn is not null)
{
await uow.GetTable<Warning>()
.Where(x => x.Id == warn.Id)
.DeleteAsync();
}
return warn;
}
}

4
src/EllieBot/data/aliases.yml
View file

@ -947,6 +947,10 @@ warnexpire:
warnclear:
- warnclear
- warnc
warndelete:
- warndelete
- warnrm
- warnd
warnpunishlist:
- warnpunishlist
- warnpl

58
src/EllieBot/data/strings/commands/commands.en-US.yml
View file

@ -576,7 +576,7 @@ deleterole:
- Awesome Role
params:
- role:
desc: "The role being deleted, as identified by its unique identifier."
desc: "The role being deleted, as identified by its id."
rolecolor:
desc: Set a role's color using its hex value. Provide no color in order to see the hex value of the color of the specified role. The role you specify has to be lower in the role hierarchy than your highest role.
ex:
@ -605,11 +605,11 @@ ban:
- time:
desc: "The duration of the temporary ban."
userId:
desc: "The unique identifier of the user being banned."
desc: "The id of the user being banned."
msg:
desc: "The reason for the ban is provided in this message."
- userId:
desc: "The unique identifier of the user being banned."
desc: "The id of the user being banned."
msg:
desc: "The reason for the ban is provided in this message."
- user:
@ -627,7 +627,7 @@ softban:
msg:
desc: "The reason for the ban is described in this string."
- userId:
desc: "The unique identifier for the user being banned and then unbanned."
desc: "The id of the user being banned and then unbanned."
msg:
desc: "The reason for the ban is described in this string."
kick:
@ -1203,7 +1203,7 @@ userblacklist:
- action:
desc: "The type of operation to perform on the user, either adding or removing them from the blacklist."
id:
desc: "The unique identifier of the user to be added, removed, or listed."
desc: "The id of the user to be added, removed, or listed."
- action:
desc: "The type of operation to perform on the user, either adding or removing them from the blacklist."
usr:
@ -1223,7 +1223,7 @@ channelblacklist:
- action:
desc: "The type of operation to perform on the channel, either adding it to the blacklist or removing it from it."
id:
desc: "The unique identifier of the channel being added, removed, or listed."
desc: "The id of the channel being added, removed, or listed."
serverblacklist:
desc: |-
Either [add]s or [rem]oves a server, or servers specified by an ID from a blacklist.
@ -1239,7 +1239,7 @@ serverblacklist:
- action:
desc: "The type of operation to perform on the server(s). It can be either adding or removing them from the blacklist."
id:
desc: "The unique identifier of the server being added, removed, or listed."
desc: "The id of the server being added, removed, or listed."
- action:
desc: "The type of operation to perform on the server(s). It can be either adding or removing them from the blacklist."
guild:
@ -1296,7 +1296,7 @@ quoteshow:
- 123
params:
- quoteId:
desc: "The unique identifier for the quote being queried."
desc: "The id of the quote being queried."
quotesearch:
desc: 'Shows a random quote given a search query. Partially matches in several ways: 1) Only content of any quote, 2) only by author, 3) keyword and content, 3) or keyword and author'
ex:
@ -1317,14 +1317,14 @@ quoteid:
- 123456
params:
- quoteId:
desc: "The unique identifier for the quote to be displayed."
desc: "The id of the quote to be displayed."
quotedelete:
desc: Deletes a quote with the specified ID. You have to either have the Manage Messages permission or be the creator of the quote to delete it.
ex:
- 123456
params:
- quoteId:
desc: "The unique identifier for the quote being deleted."
desc: "The id of the quote being deleted."
quotedeleteauthor:
desc: Deletes all quotes by the specified author. If the author is not you, then ManageMessage server permission is required.
ex:
@ -1822,7 +1822,7 @@ load:
- 5
params:
- id:
desc: "The unique identifier of the playlist to be loaded."
desc: "The id of the playlist to be loaded."
playlists:
desc: Lists all playlists. Paginated, 20 per page.
ex:
@ -1836,7 +1836,7 @@ playlistshow:
- 1
params:
- id:
desc: "The unique identifier for the playlist to retrieve songs from."
desc: "The id of the playlist to retrieve songs from."
page:
desc: "The current page number for the pagination."
deleteplaylist:
@ -2232,7 +2232,7 @@ currencytransaction:
- 3yvd
params:
- id:
desc: "The unique identifier for the transaction being queried."
desc: "The id of the transaction being queried."
listperms:
desc: Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions.
ex:
@ -2721,6 +2721,7 @@ slot:
You can specify 'all', 'half' or 'X%' instead of the amount to bet that part of your current balance.
ex:
- 5
- 'all'
params:
- amount:
desc: "The amount of currency to bet."
@ -3177,6 +3178,13 @@ warnclear:
desc: "The ID of the user whose warnings are being cleared."
index:
desc: "The index of the warning to be cleared, or 0 to clear all warnings."
warndelete:
desc: Deletes a warning from a user by its index.
ex:
- 3
params:
- index:
desc: "The index of the warning to be deleted."
warnpunishlist:
desc: Lists punishments for warnings.
ex:
@ -3767,7 +3775,7 @@ expredit:
- 123 I'm a magical girl
params:
- id:
desc: "The unique identifier for the expression being edited."
desc: "The id of the expression being edited."
message:
desc: "The text that will replace the original response in the expression's output."
say:
@ -4080,7 +4088,7 @@ xpshopbuy:
- type:
desc: "The type of item to purchase, such as a skill or a cosmetic."
key:
desc: "The unique identifier for the item being purchased."
desc: "The id of the item being purchased."
xpshopuse:
desc: Use a previously purchased item from the xp shop by specifying the type and the key of the item.
ex:
@ -4090,7 +4098,7 @@ xpshopuse:
- type:
desc: "The type of item to be used, such as an experience point or a skill upgrade."
key:
desc: "The unique identifier for the item in the XP shop that you want to use."
desc: "The id of the item in the XP shop that you want to use."
bible:
desc: Shows bible verse. You need to supply book name and chapter:verse
ex:
@ -4118,13 +4126,13 @@ edit:
- '#other-channel 771562360594628608 {{"description":"hello"}}'
params:
- messageId:
desc: "The unique identifier of the message being edited."
desc: "The id of the message being edited."
text:
desc: "The new text content of the edited message."
- channel:
desc: "The target channel where the edited message will be sent or updated in."
messageId:
desc: "The unique identifier of the message being edited."
desc: "The id of the message being edited."
text:
desc: "The new text content of the edited message."
delete:
@ -4135,13 +4143,13 @@ delete:
- 771562360594628608 5m
params:
- messageId:
desc: "The unique identifier of a specific message within a channel, used to target the deletion operation."
desc: "The id of a specific message within a channel, used to target the deletion operation."
time:
desc: "The duration after which the message should be automatically deleted."
- channel:
desc: "The channel where the message is located or should be searched for."
messageId:
desc: "The unique identifier of a specific message within a channel, used to target the deletion operation."
desc: "The id of a specific message within a channel, used to target the deletion operation."
time:
desc: "The duration after which the message should be automatically deleted."
roleid:
@ -4294,7 +4302,7 @@ banktake:
- amount:
desc: "The total value of funds being withdrawn."
userId:
desc: "The unique identifier for the user whose account is being accessed."
desc: "The id of the user whose account is being accessed."
bankaward:
desc: Award the specified amount of currency to a user's bank
ex:
@ -4485,7 +4493,7 @@ todoedit:
- abc This is an updated entry
params:
- todoId:
desc: "The unique identifier for the todo item being edited."
desc: "The id of the todo item being edited."
newMessage:
desc: "The text of a new task description or update to an existing one."
todocomplete:
@ -4494,14 +4502,14 @@ todocomplete:
- 4a
params:
- todoId:
desc: "The unique identifier for the todo item being marked as completed."
desc: "The id of the todo item being marked as completed."
tododelete:
desc: Deletes a todo with the specified ID.
ex:
- abc
params:
- todoId:
desc: "The unique identifier for the todo item being deleted."
desc: "The id of the todo item being deleted."
todoclear:
desc: Deletes all unarchived todos.
ex:
@ -4535,7 +4543,7 @@ todoshow:
- 4a
params:
- todoId:
desc: "The unique identifier for the todo item being displayed."
desc: "The id of the todo item being displayed."
todoarchivedelete:
desc: Deletes the archived todo list with the specified ID.
ex:

2
src/EllieBot/data/strings/responses/responses.en-US.json
View file

@ -702,6 +702,7 @@
"warn_count": "{0} current, {1} total",
"warnlog_for": "Warnlog for {0}",
"warnpl_none": "No punishments set.",
"warning_not_found": "Warning not found.",
"warn_expire_set_delete": "Warnings will be deleted after {0} days.",
"warn_expire_set_clear": "Warnings will be cleared after {0} days.",
"warn_expire_reset": "Warnings will no longer expire.",
@ -712,6 +713,7 @@
"warn_punish_rem": "Having {0} warnings will no longer trigger a punishment.",
"warn_punish_set": "I will apply {0} punishment to users with {1} warnings.",
"warn_punish_set_timed": "I will apply {0} punishment for {2} to users with {1} warnings.",
"warning_deleted": "Warning {0} has been deleted.",
"time_new": "Time",
"timezone": "Timezone",
"timezone_db_api_key": "You need to activate your TimezoneDB API key. You can do so by clicking on the link you've received in the email with your API key.",