Updated data files and GlobalUsings.cs

src/EllieBot/GlobalUsings.cs

@@ -3,16 +3,15 @@ global using NonBlocking;
 
 // packages
 global using Serilog;
-global using Humanizer;
 
 // elliebot
 global using EllieBot;
+global using EllieBot.Db;
 global using EllieBot.Services;
 global using Ellie.Common; // new project
 global using EllieBot.Common; // old + elliebot specific things
 global using EllieBot.Common.Attributes;
 global using EllieBot.Extensions;
-global using Ellie.Marmalade;
 
 // discord
 global using Discord;

src/EllieBot/data/aliases.yml

@@ -185,6 +185,9 @@ threaddelete:
 prune:
   - prune
   - clear
+prunecancel:
+  - prunecancel
+  - prunec
 die:
   - die
 setname:
@@ -195,6 +198,8 @@ setnick:
 setavatar:
   - setavatar
   - setav
+setbanner:
+  - setbanner
 setgame:
   - setgame
 send:
@@ -416,8 +421,6 @@ typestop:
   - typestop
 typeadd:
   - typeadd
-pollend:
-  - pollend
 pick:
   - pick
 plant:
@@ -432,8 +435,6 @@ choose:
   - choose
 rps:
   - rps
-linux:
-  - linux
 next:
   - next
   - n
@@ -461,9 +462,6 @@ queuesearch:
   - queuesearch
   - qs
   - yqs
-soundcloudqueue:
-  - soundcloudqueue
-  - sq
 listqueue:
   - listqueue
   - lq
@@ -477,9 +475,6 @@ volume:
 playlist:
   - playlist
   - pl
-soundcloudpl:
-  - soundcloudpl
-  - scpl
 localplaylist:
   - localplaylist
   - lopl
@@ -511,6 +506,8 @@ queuerepeat:
 queueautoplay:
   - queueautoplay
   - qap
+queuefairplay:
+  - qfp
 save:
   - save
 streamrole:
@@ -647,8 +644,6 @@ chucknorris:
 magicitem:
   - magicitem
   - mi
-safebooru:
-  - safebooru
 wiki:
   - wiki
   - wikipedia
@@ -658,25 +653,6 @@ color:
 avatar:
   - avatar
   - av
-hentai:
-  - hentai
-danbooru:
-  - danbooru
-derpibooru:
-  - derpibooru
-  - derpi
-gelbooru:
-  - gelbooru
-rule34:
-  - rule34
-e621:
-  - e621
-boobs:
-  - boobs
-butts:
-  - butts
-  - ass
-  - butt
 translate:
   - translate
   - trans
@@ -757,10 +733,6 @@ chatmute:
   - chatmute
 voicemute:
   - voicemute
-konachan:
-  - konachan
-sankaku:
-  - sankaku
 muterole:
   - muterole
   - setmuterole
@@ -774,13 +746,6 @@ unmute:
   - unmute
 xkcd:
   - xkcd
-placelist:
-  - placelist
-place:
-  - place
-poll:
-  - poll
-  - ppoll
 autotranslang:
   - autotranslang
   - atl
@@ -797,8 +762,6 @@ typelist:
   - typelist
 listservers:
   - listservers
-hentaibomb:
-  - hentaibomb
 cleverbot:
   - cleverbot
   - chatgpt
@@ -807,8 +770,6 @@ shorten:
 wikia:
   - wikia
   - fandom
-yandere:
-  - yandere
 magicthegathering:
   - magicthegathering
   - mtg
@@ -833,8 +794,6 @@ define:
   - def
 activity:
   - activity
-autohentai:
-  - autohentai
 setstatus:
   - setstatus
 invitecreate:
@@ -848,8 +807,6 @@ invitedelete:
   - invitedelete
   - invrm
   - invdel
-pollstats:
-  - pollstats
 antilist:
   - antilist
   - antilst
@@ -919,8 +876,6 @@ languageset:
 languageslist:
   - languageslist
   - langli
-rategirl:
-  - rategirl
 aliaslist:
   - aliaslist
   - cmdmaplist
@@ -1055,9 +1010,6 @@ configreload:
   - creload
   - confreload
   - crel
-nsfwtagblacklist:
-  - nsfwtagbl
-  - nsfwtbl
 experience:
   - experience
   - xp
@@ -1137,10 +1089,8 @@ clubleaderboard:
   - clubs
 clubadmin:
   - clubadmin
-autoboobs:
+clubrename:
-  - autoboobs
+  - clubrename
-autobutts:
-  - autobutts
 eightball:
   - eightball
   - 8ball
@@ -1163,6 +1113,8 @@ sqlexec:
   - sqlexec
 sqlselect:
   - sqlselect
+sqlselectcsv:
+  - sqlselectcsv
 deletewaifus:
   - deletewaifus
 deletewaifu:
@@ -1211,19 +1163,19 @@ pathofexilecurrency:
   - poec
 rollduel:
   - rollduel
-reactionroleadd:
+reroadd:
-  - reactionroleadd
+  - reroadd
   - reroa
-reactionroleslist:
+rerolist:
-  - reactionroleslist
+  - rerolist
   - reroli
-reactionrolesremove:
+reroremove:
-  - reactionrolesremove
+  - reroremove
   - rerorm
-reactionrolesdeleteall:
+rerodeleteall:
   - rerodeleteall
   - rerodela
-reactionrolestransfer:
+rerotransfer:
   - rerotransfer
   - rerot
 blackjack:
@@ -1247,10 +1199,9 @@ delete:
 roleid:
   - roleid
   - rid
-nsfwtoggle:
+agerestricttoggle:
   - nsfwtoggle
-  - nsfw
+  - artoggle
-  - nsfwtgl
 economy:
   - economy
 purgeuser:
@@ -1356,6 +1307,9 @@ marmaladelist:
 marmaladeinfo:
   - marmaladeinfo
   - mainfo
+marmaladesearch:
+  - marmaladesearch
+  - masearchW
 # Bank stuff
 bankdeposit:
   - deposit
@@ -1389,3 +1343,56 @@ doas:
   - execas
 cacheusers:
   - cacheusers
+giveawaystart:
+  - start
+giveawayend:
+  - end
+giveawaycancel:
+  - cancel
+giveawayreroll:
+  - reroll
+giveawaylist:
+  - list
+# todos
+todoadd:
+  - add
+  - a
+todolist:
+  - list
+  - ls
+tododelete:
+  - delete
+  - del
+  - remove
+  - rm
+todoclear:
+  - clear
+  - clr
+  - cls
+todocomplete:
+  - complete
+  - done
+  - finish
+todoarchiveadd:
+  - add
+  - create
+  - new
+todoarchiveshow:
+  - show
+todoarchivelist:
+  - list
+  - ls
+todoarchivedelete:
+  - delete
+  - del
+  - remove
+  - rm
+todoedit:
+  - edit
+  - change
+todoshow:
+  - show
+  - sh
+  - see
+stickyroles:
+  - stickyroles

src/EllieBot/data/bot.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 5
+version: 7
 # Most commands, when executed, have a small colored line
 # next to the response. The color depends whether the command
 # is completed, errored or in progress (pending)
@@ -28,6 +28,11 @@ forwardToAllOwners: false
 # Any messages sent by users in Bot's DM to be forwarded to the specified channel.
 # This option will only work when ForwardToAllOwners is set to false
 forwardToChannel:
+# Should the bot ignore messages from other bots?
+# Settings this to false might get your bot banned if it gets into a spam loop with another bot.
+# This will only affect command executions, other features will still block bots from access.
+# Default true
+ignoreOtherBots: true
 # When a user DMs the bot with a message which is not a command
 # they will receive this message. Leave empty for no response. The string which will be sent whenever someone DMs the bot.
 # Supports embeds. How it looks: https://puu.sh/B0BLV.png

src/EllieBot/data/gambling.yml

@@ -1,12 +1,12 @@
 # DO NOT CHANGE
-version: 6
+version: 7
 # Currency settings
 currency:
-# What is the emoji/character which represents the currency
+  # What is the emoji/character which represents the currency
   sign: "💵"
   # What is the name of the currency
   name: Ellie Cash
-  # For how long will the transactions be kept in the database (curtrs)
+  # For how long (in days) will the transactions be kept in the database (curtrs)
   # Set 0 to disable cleanup (keep transactions forever)
   transactionsLifetime: 0
 # Minimum amount users can bet (>=0)
@@ -16,13 +16,13 @@ minBet: 0
 maxBet: 0
 # Settings for betflip command
 betFlip:
-# Bet multiplier if user guesses correctly
+  # Bet multiplier if user guesses correctly
   multiplier: 1.95
 # Settings for betroll command
 betRoll:
-# When betroll is played, user will roll a number 0-100.
+  # When betroll is played, user will roll a number 0-100.
-# This setting will describe which multiplier is used for when the roll is higher than the given number.
+  # This setting will describe which multiplier is used for when the roll is higher than the given number.
-# Doesn't have to be ordered.
+  # Doesn't have to be ordered.
   pairs:
     - whenAbove: 99
       multiplyBy: 10
@@ -32,9 +32,9 @@ betRoll:
       multiplyBy: 2
 # Automatic currency generation settings.
 generation:
-# when currency is generated, should it also have a random password
+  # when currency is generated, should it also have a random password
-# associated with it which users have to type after the .pick command
+  # associated with it which users have to type after the .pick command
-# in order to get it
+  # in order to get it
   hasPassword: true
   # Every message sent has a certain % chance to generate the currency
   # specify the percentage here (1 being 100%, 0 being 0% - for example
@@ -50,16 +50,16 @@ generation:
 # Settings for timely command
 # (letting people claim X amount of currency every Y hours)
 timely:
-# How much currency will the users get every time they run .timely command
+  # How much currency will the users get every time they run .timely command
-# setting to 0 or less will disable this feature
+  # setting to 0 or less will disable this feature
   amount: 120
   # How often (in hours) can users claim currency with .timely command
   # setting to 0 or less will disable this feature
   cooldown: 12
 # How much will each user's owned currency decay over time.
 decay:
-# Percentage of user's current currency which will be deducted every 24h.
+  # Percentage of user's current currency which will be deducted every 24h.
-# 0 - 1 (1 is 100%, 0.5 50%, 0 disabled)
+  # 0 - 1 (1 is 100%, 0.5 50%, 0 disabled)
   percent: 0
   # Maximum amount of user's currency that can decay at each interval. 0 for unlimited.
   maxDecay: 0
@@ -67,9 +67,17 @@ decay:
   minThreshold: 99
   # How often, in hours, does the decay run. Default is 24 hours
   hourInterval: 24
+# What is the bot's cut on some transactions
+botCuts:
+  # Shop sale cut percentage.
+  # Whenever a user buys something from the shop, bot will take a cut equal to this percentage.
+  # The rest goes to the user who posted the item/role/whatever to the shop.
+  # This is a good way to reduce the amount of currency in circulation therefore keeping the inflation in check.
+  # Default 0.1 (10%).
+  shopSaleCut: 0.1
 # Settings for LuckyLadder command
 luckyLadder:
-# Self-Explanatory. Has to have 8 values, otherwise the command won't work.
+  # Self-Explanatory. Has to have 8 values, otherwise the command won't work.
   multipliers:
     - 2.4
     - 1.7
@@ -81,7 +89,7 @@ luckyLadder:
     - 0.1
 # Settings related to waifus
 waifu:
-# Minimum price a waifu can have
+  # Minimum price a waifu can have
   minPrice: 50
   multipliers:
     # Multiplier for waifureset. Default 150.
@@ -257,5 +265,5 @@ patreonCurrencyPerCent: 1
 voteReward: 100
 # Slot config
 slots:
-# Hex value of the color which the numbers on the slot image will have.
+  # Hex value of the color which the numbers on the slot image will have.
   currencyFontColor: ff0000

src/EllieBot/data/strings/responses/responses.en-US.json

@@ -35,6 +35,9 @@
   "banned_user": "User Banned",
   "ban_prune_disabled": "Banned user's messages will no longer be deleted.",
   "ban_prune": "Bot will prune up to {0} day(s) worth of messages from banned user.",
+  "prune_cancelled": "Pruning was cancelled.",
+  "prune_not_found": "No active prune was found on this server.",
+  "prune_progress": "Pruning... {0}/{1} messages deleted.",
   "timeoutdm": "You have been timed out in {0} server.\nReason: {1}",
   "timedout_user": "User Timed Out",
   "remove_roles_pl": "have had their roles removed",
@@ -184,6 +187,7 @@
   "setrole": "Successfully added role {0} to user {1}",
   "setrole_err": "Failed to add role. I have insufficient permissions.",
   "set_avatar": "New avatar set!",
+  "set_banner": "New banner set!",
   "set_channel_name": "New channel name set.",
   "set_game": "New game set!",
   "set_stream": "New stream set!",
@@ -376,6 +380,7 @@
   "id": "Id",
   "now_playing": "Now playing",
   "no_player": "No active music player.",
+  "music_fairplay": "Music queue has been fairly reordered.",
   "no_search_results": "No search results.",
   "player_queue": "Player queue - Page {0}/{1}",
   "playing_track": "Playing track #{0}",
@@ -709,6 +714,7 @@
   "shop_item_add": "Shop item added",
   "shop_none": "No shop items found on this page.",
   "shop_role": "You will get {0} role.",
+  "shop_command_invalid_context": "Unable to retrieve user, channel or server in order to execute the command.",
   "type": "Type",
   "gvc_disabled": "Game Voice Channel feature has been disabled on this server.",
   "gvc_enabled": "{0} is a Game Voice Channel now.",
@@ -838,10 +844,9 @@
   "server_leaderboard": "Server XP Leaderboard",
   "global_leaderboard": "Global XP Leaderboard",
   "modified": "Modified server XP of the user {0} by {1}",
-  "club_insuff_lvl": "You're insufficient level to join that club.",
+  "club_already_applied": "You've already applied to that club.",
   "club_join_banned": "You're banned from that club.",
   "club_already_in": "You are already a member of a club.",
-  "club_create_error_name": "Failed creating the club. A club with that name already exists.",
   "club_name_too_long": "Club name is too long.",
   "club_created": "Club {0} successfully created!",
   "club_create_insuff_lvl": "You don't meet the minimum level requirements in order to create a club.",
@@ -876,6 +881,8 @@
   "club_apps_for": "Applicants for {0} club",
   "club_leaderboard": "Club leaderboard - page {0}",
   "club_kick_hierarchy": "Only club owner can kick club admins. Owner can't be kicked.",
+  "club_renamed": "Club has been renamed to {0}",
+  "club_name_taken": "A club with that name already exists.",
   "template_reloaded": "Xp template has been reloaded.",
   "expr_edited": "Expression Edited",
   "self_assign_are_exclusive": "You can only choose 1 role from each group.",
@@ -982,7 +989,7 @@
   "module_description_gambling": "Bet on dice rolls, blackjack, slots, coinflips and others",
   "module_description_games": "Play trivia, nunchi, hangman, connect4 and other games",
   "module_description_nsfw": "NSFW commands.",
-  "module_description_music": "Play music from youtube, local files soundcloud and radio streams",
+  "module_description_music": "Play music from youtube, local files and radio streams",
   "module_description_utility": "Manage custom quotes, repeating messages and check facts about the server",
   "module_description_administration": "Moderation, punish users, setup self assignable roles and greet messages",
   "module_description_expressions": "Setup custom bot responses to certain words or phrases",
@@ -990,6 +997,7 @@
   "module_description_searches": "Search for jokes, images of animals, anime and manga",
   "module_description_xp": "Gain xp based on chat activity, check users' xp cards",
   "module_description_marmalade": "**Bot Owner only.** Load, unload and handle dynamic modules. Read more [here](https://docs.elliebot.net/v4/)",
+  "module_description_patronage": "Commands related to supporting the bot",
   "module_description_missing": "Description is missing for this module.",
   "purge_user_confirm": "Are you sure that you want to purge {0} from the database?",
   "expr_import_no_input": "Invalid input. No valid file upload or input text found.",
@@ -1016,7 +1024,7 @@
   "commands_count": "Commands ({0})",
   "no_marmalade_loaded": "There are no loaded marmalades.",
   "no_marmalade_available": "No marmalade available.",
-  "loaded_marmalades": "Loaded Marmaladee",
+  "loaded_marmalades": "Loaded Marmalades",
   "marmalade_not_loaded": "Marmalade with that name is not loaded.",
   "marmalade_possibly_cant_unload": "Marmalade is probably not fully unloaded. Please restart the bot if issues arise.",
   "marmalade_loaded": "Marmalade {0} has been loaded.",
@@ -1060,5 +1068,31 @@
   "thread_created": "Thread Created",
   "supported_languages": "Supported Languages",
   "cache_users_pending": "Updating users, please wait...",
-  "cache_users_done": "{0} users were added and {1} users were updated."
+  "cache_users_done": "{0} users were added and {1} users were updated.",
+  "sticky_roles_enabled": "Sticky roles enabled. Leaving users' roles will be restored when they rejoin the server.",
+  "sticky_roles_disabled": "Sticky roles disabled.",
+  "giveaway_duration_invalid": "Giveaway may not be shorter than 1 minute or longer than 30 days",
+  "giveaway_started": "Giveaway Started!",
+  "giveaway_max_amount_reached": "You've reached the maximum amount of giveaways you can have on this server.",
+  "giveaway_not_found": "Giveaway not found.",
+  "giveaway_ended": "Giveaway ended",
+  "no_givaways": "There are no active giveaways on this server.",
+  "giveaway_cancelled": "Giveaway cancelled.",
+  "giveaway_starting": "Starting giveaway...",
+  "winner": "Winner",
+  "giveaway_list": "List of active giveways",
+  "todo_list_empty": "Your todo list is empty.",
+  "todo_list": "Todo List",
+  "todo_stats": "{0} items | {1} completed | {2} remaining",
+  "todo_add_max_limit": "You'reached the maximum amount of todos you can have.",
+  "todo_not_found": "Todo not found.",
+  "todo_cleared": "All unarchived todos have been cleared.",
+  "todo_no_todos": "There are no todos in your todo list.",
+  "todo_archive_max_limit": "You've reached the maximum amount of archived todos you can have.",
+  "todo_archive_empty": "You have no archived todos.",
+  "todo_archive_list": "Archived Todo Lists",
+  "todo_archive_not_found": "Archived todo list not found.",
+  "todo_archived_list": "Archived Todo List",
+  "search_results": "Search results",
+  "queue_search_results": "Type the number of the search result to queue up that track."
 }

src/EllieBot/data/units.json

@@ -719,6 +719,17 @@
     "UnitType": "time",
     "Modifier": 60.0
   },
+  {
+    "Triggers": [
+      "second",
+      "seconds",
+      "sec",
+      "secs",
+      "s"
+    ],
+    "UnitType": "time",
+    "Modifier": 1
+  },
   {
     "Triggers": [
       "year",