Fixed some issues with naming schemes

TODO.md

@@ -2,4 +2,5 @@
 
  - Finish the full system rewrite
  - Finish the EllieBot.Tests project
- - Finish the EllieBot project
+ - Finish the EllieBot project
+    - Fix the issues MarmaladeLoaderService.cs

src/EllieBot/creds_example.yml

@@ -11,7 +11,7 @@ usePrivilegedIntents: true
 # Leave at 1 if you don't know what you're doing.
 #
 # note: If you are planning to have more than one shard, then you must change botCache to 'redis'.
-# Also, in that case you should be using NadekoBot.Coordinator to start the bot, and it will correctly override this value.
+# Also, in that case you should be using EllieBot.Coordinator to start the bot, and it will correctly override this value.
 totalShards: 1
 # Login to https://console.cloud.google.com, create a new project, go to APIs & Services -> Library -> YouTube Data API and enable it.
 # Then, go to APIs and Services -> Credentials and click Create credentials -> API key.
@@ -27,21 +27,21 @@ googleApiKey: ""
 google:
   searchId:
   imageSearchId:
-# Settings for voting system for discordbots. Meant for use on global Nadeko.
+# Settings for voting system for discordbots. Meant for use on global Ellie.
 votes:
   # top.gg votes service url
-  # This is the url of your instance of the NadekoBot.Votes api
+  # This is the url of your instance of the EllieBot.Votes api
   # Example: https://votes.my.cool.bot.com
   topggServiceUrl: ""
   # Authorization header value sent to the TopGG service url with each request
-  # This should be equivalent to the TopggKey in your NadekoBot.Votes api appsettings.json file
+  # This should be equivalent to the TopggKey in your EllieBot.Votes api appsettings.json file
   topggKey: ""
   # discords.com votes service url
-  # This is the url of your instance of the NadekoBot.Votes api
+  # This is the url of your instance of the EllieBot.Votes api
   # Example: https://votes.my.cool.bot.com
   discordsServiceUrl: ""
   # Authorization header value sent to the Discords service url with each request
-  # This should be equivalent to the DiscordsKey in your NadekoBot.Votes api appsettings.json file
+  # This should be equivalent to the DiscordsKey in your EllieBot.Votes api appsettings.json file
   discordsKey: ""
 # Patreon auto reward system settings.
 # go to https://www.patreon.com/portal -> my clients -> create client
@@ -72,10 +72,10 @@ db:
   type: sqlite
   # Database connection string.
   # You MUST change this if you're not using "sqlite" type.
-  # Default is "Data Source=data/NadekoBot.db"
+  # Default is "Data Source=data/EllieBot.db"
-  # Example for mysql: "Server=localhost;Port=3306;Uid=root;Pwd=my_super_secret_mysql_password;Database=nadeko"
+  # Example for mysql: "Server=localhost;Port=3306;Uid=root;Pwd=my_super_secret_mysql_password;Database=ellie"
-  # Example for postgresql: "Server=localhost;Port=5432;User Id=postgres;Password=my_super_secret_postgres_password;Database=nadeko;"
+  # Example for postgresql: "Server=localhost;Port=5432;User Id=postgres;Password=my_super_secret_postgres_password;Database=ellie;"
-  connectionString: Data Source=data/NadekoBot.db
+  connectionString: Data Source=data/EllieBot.db
 # Address and port of the coordinator endpoint. Leave empty for default.
 # Change only if you've changed the coordinator address or port.
 coordinatorUrl: http://localhost:3442
@@ -106,9 +106,9 @@ twitchClientSecret:
 # {1} -> total shards
 # Linux default
 # cmd: dotnet
-# args: "NadekoBot.dll -- {0}"
+# args: "EllieBot.dll -- {0}"
 # Windows default
-# cmd: NadekoBot.exe
+# cmd: EllieBot.exe
 # args: "{0}"
 restartCommand:
   cmd:

src/EllieBot/data/aliases.yml

@@ -1273,7 +1273,7 @@ quotesimport:
   - qimport
 showembed:
   - showembed
-# NadekoExpressions
+# EllieExpressions
 exprtoggleglobal:
   - exprtoggleglobal
   - extg

src/EllieBot/data/gambling.yml

@@ -250,7 +250,7 @@ waifu:
       name: ToiletPaper
       negative: true
 # Amount of currency selfhosters will get PER pledged dollar CENT.
-# 1 = 100 currency per $. Used almost exclusively on public nadeko.
+# 1 = 100 currency per $. Used almost exclusively on public ellie.
 patreonCurrencyPerCent: 1
 # Currency reward per vote.
 # This will work only if you've set up VotesApi and correct credentials for topgg and/or discords voting

src/EllieBot/data/searches.yml

@@ -20,7 +20,7 @@ imgSearchEngine: Google
 # - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
 ytProvider: Ytdlp
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
-# Nadeko will use a random one for each request.
+# Ellie will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`
 # Instances specified must support 'format=json' query parameter.
 # - In case you're running your own searx instance, set
@@ -34,7 +34,7 @@ ytProvider: Ytdlp
 # - If you're using a public instance, make sure that the instance you're using supports it (they usually don't)
 searxInstances: []
 # Set the invidious instance urls in case you want to use 'invidious' for `.youtube` search
-# Nadeko will use a random one for each request.
+# Ellie will use a random one for each request.
 # These instances may be used for music queue functionality in the future.
 # Use a fully qualified url. Example: https://my-invidious-instance.mydomain.com
 #

src/EllieBot/data/strings/commands/commands.en-US.yml

@@ -254,7 +254,7 @@ autoassignrole:
     - ""
     - "RoleName"
 leave:
-  desc: "Makes Nadeko leave the server. Either server name or server ID is required."
+  desc: "Makes Ellie leave the server. Either server name or server ID is required."
   args:
     - "123123123331"
 slowmode:
@@ -375,7 +375,7 @@ setchanlname:
   args:
     - "NewName"
 prune:
-  desc: "`{0}prune` removes all Nadeko's messages in the last 100 messages. `{0}prune X` removes last `X` number of messages from the channel (up to 100). `{0}prune @Someone` removes all Someone's messages in the last 100 messages. `{0}prune @Someone X` removes last `X` number of 'Someone's' messages in the channel."
+  desc: "`{0}prune` removes all Ellie's messages in the last 100 messages. `{0}prune X` removes last `X` number of messages from the channel (up to 100). `{0}prune @Someone` removes all Someone's messages in the last 100 messages. `{0}prune @Someone X` removes last `X` number of 'Someone's' messages in the channel."
   args:
     - ""
     - "-s"
@@ -399,7 +399,7 @@ setnick:
     - "BotNickname"
     - "@SomeUser New Nickname"
 setavatar:
-  desc: "Sets a new avatar image for the NadekoBot. Parameter is a direct link to an image."
+  desc: "Sets a new avatar image for the EllieBot. Parameter is a direct link to an image."
   args:
     - "https://i.imgur.com/xTG3a1I.jpg"
 setgame:
@@ -464,7 +464,7 @@ checkperms:
     - "me"
     - "bot"
 stats:
-  desc: "Shows some basic stats for Nadeko."
+  desc: "Shows some basic stats for Ellie."
   args:
     - ""
 userid:
@@ -793,7 +793,7 @@ choose:
   args:
     - "Get up;Sleep;Sleep more"
 rps:
-  desc: "Play a game of Rocket-Paperclip-Scissors with Nadeko. You can bet on it. Multiplier is the same as on betflip."
+  desc: "Play a game of Rocket-Paperclip-Scissors with Ellie. You can bet on it. Multiplier is the same as on betflip."
   args:
     - "r 100"
     - "scissors"
@@ -1311,7 +1311,7 @@ muterole:
     - ""
     - "Silenced"
 adsarm:
-  desc: "Toggles the automatic deletion of the user's message and Nadeko's confirmations for `{0}iam` and `{0}iamn` commands."
+  desc: "Toggles the automatic deletion of the user's message and Ellie's confirmations for `{0}iam` and `{0}iamn` commands."
   args:
     - ""
 setstream:
@@ -1476,7 +1476,7 @@ slottest:
   args:
     - "1000"
 slot:
-  desc: "Play Nadeko slots. 1 second cooldown per user."
+  desc: "Play Ellie slots. 1 second cooldown per user."
   args:
     - "5"
 affinity:
@@ -1634,7 +1634,7 @@ aliaslist:
     - ""
     - "3"
 alias:
-  desc: "Create a custom alias for a certain Nadeko command. Provide no alias to remove the existing one."
+  desc: "Create a custom alias for a certain Ellie command. Provide no alias to remove the existing one."
   args:
     - "allin {0}bf all h"
     - '"linux thingy" >loonix Spyware Windows'
@@ -2257,31 +2257,31 @@ deleteemptyservers:
   desc: "Deletes all servers in which the bot is the only member."
   args:
     - ""
-medusaload:
+marmaladeload:
   desc: |-
     Loads a marmalade with the specified name from the data/marmalades/ folder.
     Provide no name to see the list of loadable marmalades.
     Read about the marmalade system [here](https://docs.elliebot.net/v4/)
   args:
-    - "mycoolmedusa"
+    - "mycoolmarmalade"
     - ""
-medusaunload:
+marmaladeunload:
   desc: |-
     Unloads the previously loaded marmalade.
     Provide no name to see the list of unloadable marmalades. 
     Read about the marmalade system [here](https://docs.elliebot.net/v4/)
   args:
-    - "mycoolmedusa"
+    - "mycoolmarmalade"
     - ""
-medusainfo:
+marmaladeinfo:
   desc: |-
     Shows information about the specified marmalade such as the author, name, description, list of sneks, number of commands etc.
     Provide no name to see the basic information about all loaded marmalades. 
     Read about the marmalade system [here](https://docs.elliebot.net/v4/)
   args:
-    - "mycoolmedusa"
+    - "mycoolmarmalade"
     - ""
-medusalist:
+marmaladelist:
   desc: |-
     Lists all loaded and unloaded marmalades.
     Read about the marmalade system [here](https://docs.elliebot.net/v4/)
@@ -2324,7 +2324,7 @@ eval:
     `channel` - Channel in which the command is executed
     `user` - User executing the command
     `ctx` - Discord.Net command context
-    `services` - Nadeko's IServiceProvider
+    `services` - Ellie's IServiceProvider
   args:
     - "123 / 4.5f"
     - "await ctx.OkAsync();"