diff --git a/src/EllieBot/Db/Extensions/GuildConfigExtensions.cs b/src/EllieBot/Db/Extensions/GuildConfigExtensions.cs
index cf8bfd8..5373049 100644
--- a/src/EllieBot/Db/Extensions/GuildConfigExtensions.cs
+++ b/src/EllieBot/Db/Extensions/GuildConfigExtensions.cs
@@ -32,9 +32,9 @@ public static class GuildConfigExtensions
/// <returns>Guild'p stream role settings</returns>
public static async Task<StreamRoleSettings> GetOrCreateStreamRoleSettings(this DbContext ctx, ulong guildId)
{
- var srs = await ctx.GetTable<StreamRoleSettings>()
+ var srs = ctx.Set<StreamRoleSettings>()
.Where(x => x.GuildId == guildId)
- .FirstOrDefaultAsyncEF();
+ .FirstOrDefault();
if (srs is not null)
return srs;
diff --git a/src/EllieBot/data/commandlist.json b/src/EllieBot/data/commandlist.json
index 3b1e8f7..278cb56 100644
--- a/src/EllieBot/data/commandlist.json
+++ b/src/EllieBot/data/commandlist.json
@@ -1621,191 +1621,6 @@
"ManageRoles Server Permission"
]
},
- {
- "Aliases": [
- ".iam"
- ],
- "Description": "Adds a role to you that you choose. Role must be on the list of self-assignable roles.",
- "Usage": [
- ".iam Gamer"
- ],
- "Submodule": "SelfAssignedRolesHelpers",
- "Module": "Administration",
- "Options": null,
- "Requirements": []
- },
- {
- "Aliases": [
- ".iamnot",
- ".iamn"
- ],
- "Description": "Removes a specified role from you. Role must be on the list of self-assignable roles.",
- "Usage": [
- ".iamnot Gamer"
- ],
- "Submodule": "SelfAssignedRolesHelpers",
- "Module": "Administration",
- "Options": null,
- "Requirements": []
- },
- {
- "Aliases": [
- ".sar ad",
- ".sar autodel",
- ".sar adsarm"
- ],
- "Description": "Toggles the automatic deletion of the user's message and Ellie's confirmations for `.iam` and `.iamn` commands.",
- "Usage": [
- ".sar ad"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageMessages Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar add",
- ".sar a",
- ".sar asar"
- ],
- "Description": "Adds a role to the list of self-assignable roles. You can also specify a group. If 'Exclusive self-assignable roles' feature is enabled (`.tesar`), users will be able to pick one role per group.",
- "Usage": [
- ".sar add Gamer",
- ".sar add 1 Alliance",
- ".sar add 1 Horde"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar groupname",
- ".sar gn",
- ".sar sargn"
- ],
- "Description": "Sets a self assignable role group name. Provide no name to remove.",
- "Usage": [
- ".sar groupname 1 Faction",
- ".sar groupname 2"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar remove",
- ".sar rm",
- ".sar rem",
- ".sar rsar"
- ],
- "Description": "Removes a specified role from the list of self-assignable roles.",
- "Usage": [
- ".sar remove Gamer",
- ".sar remove Alliance",
- ".sar remove Horde"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar list",
- ".sar l",
- ".sar ls",
- ".sar lsar"
- ],
- "Description": "Lists self-assignable roles. Shows 20 roles per page.",
- "Usage": [
- ".sar list",
- ".sar list 2"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": []
- },
- {
- "Aliases": [
- ".sar exclusive",
- ".sar ex",
- ".sar excl",
- ".sar tesar"
- ],
- "Description": "Toggles the sar group as exclusive.\nWhile enabled, users can only have one self-assignable role from that group.",
- "Usage": [
- ".sar exclusive 1"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar rolelvlreq",
- ".sar rlr"
- ],
- "Description": "Set a level requirement on a self-assignable role.",
- "Usage": [
- ".sar rolelvlreq 5 SomeRole"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar grouprolereq",
- ".sar grr"
- ],
- "Description": "Set a role that users have to have in order to assign a self-assignable role from the specified group.",
- "Usage": [
- ".sar grouprolereq 1 SomeRole"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
- {
- "Aliases": [
- ".sar groupdelete",
- ".sar gd",
- ".sar gdel"
- ],
- "Description": "Deletes a self-assignable role group",
- "Usage": [
- ".sar groupdelete 0"
- ],
- "Submodule": "sar",
- "Module": "Administration",
- "Options": null,
- "Requirements": [
- "ManageRoles Server Permission"
- ]
- },
{
"Aliases": [
".cacheusers"
@@ -2250,6 +2065,191 @@
"Bot Owner Only"
]
},
+ {
+ "Aliases": [
+ ".iam"
+ ],
+ "Description": "Adds a role to you that you choose. Role must be on the list of self-assignable roles.",
+ "Usage": [
+ ".iam Gamer"
+ ],
+ "Submodule": "SelfAssignedRolesHelpers",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": []
+ },
+ {
+ "Aliases": [
+ ".iamnot",
+ ".iamn"
+ ],
+ "Description": "Removes a specified role from you. Role must be on the list of self-assignable roles.",
+ "Usage": [
+ ".iamnot Gamer"
+ ],
+ "Submodule": "SelfAssignedRolesHelpers",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": []
+ },
+ {
+ "Aliases": [
+ ".sar ad",
+ ".sar autodel",
+ ".sar adsarm"
+ ],
+ "Description": "Toggles the automatic deletion of the user's message and Ellie's confirmations for `.iam` and `.iamn` commands.",
+ "Usage": [
+ ".sar ad"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageMessages Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar add",
+ ".sar a",
+ ".sar asar"
+ ],
+ "Description": "Adds a role to the list of self-assignable roles. You can also specify a group. If 'Exclusive self-assignable roles' feature is enabled (`.tesar`), users will be able to pick one role per group.",
+ "Usage": [
+ ".sar add Gamer",
+ ".sar add 1 Alliance",
+ ".sar add 1 Horde"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar groupname",
+ ".sar gn",
+ ".sar sargn"
+ ],
+ "Description": "Sets a self assignable role group name. Provide no name to remove.",
+ "Usage": [
+ ".sar groupname 1 Faction",
+ ".sar groupname 2"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar remove",
+ ".sar rm",
+ ".sar rem",
+ ".sar rsar"
+ ],
+ "Description": "Removes a specified role from the list of self-assignable roles.",
+ "Usage": [
+ ".sar remove Gamer",
+ ".sar remove Alliance",
+ ".sar remove Horde"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar list",
+ ".sar l",
+ ".sar ls",
+ ".sar lsar"
+ ],
+ "Description": "Lists self-assignable roles. Shows 20 roles per page.",
+ "Usage": [
+ ".sar list",
+ ".sar list 2"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": []
+ },
+ {
+ "Aliases": [
+ ".sar exclusive",
+ ".sar ex",
+ ".sar excl",
+ ".sar tesar"
+ ],
+ "Description": "Toggles the sar group as exclusive.\nWhile enabled, users can only have one self-assignable role from that group.",
+ "Usage": [
+ ".sar exclusive 1"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar rolelvlreq",
+ ".sar rlr"
+ ],
+ "Description": "Set a level requirement on a self-assignable role.",
+ "Usage": [
+ ".sar rolelvlreq 5 SomeRole"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar grouprolereq",
+ ".sar grr"
+ ],
+ "Description": "Set a role that users have to have in order to assign a self-assignable role from the specified group.",
+ "Usage": [
+ ".sar grouprolereq 1 SomeRole"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
+ {
+ "Aliases": [
+ ".sar groupdelete",
+ ".sar gd",
+ ".sar gdel"
+ ],
+ "Description": "Deletes a self-assignable role group",
+ "Usage": [
+ ".sar groupdelete 0"
+ ],
+ "Submodule": "sar",
+ "Module": "Administration",
+ "Options": null,
+ "Requirements": [
+ "ManageRoles Server Permission"
+ ]
+ },
{
"Aliases": [
".logserver"
@@ -4389,6 +4389,23 @@
"Options": null,
"Requirements": []
},
+ {
+ "Aliases": [
+ ".questlog",
+ ".qlog",
+ ".quest",
+ ".quests",
+ ".dailies"
+ ],
+ "Description": "Shows your active quests and progress.",
+ "Usage": [
+ ".questlog"
+ ],
+ "Submodule": "QuestCommands",
+ "Module": "Games",
+ "Options": null,
+ "Requirements": []
+ },
{
"Aliases": [
".typestart"
@@ -5932,25 +5949,6 @@
]
}
],
- "QuestCommands": [
- {
- "Aliases": [
- ".questlog",
- ".qlog",
- ".quest",
- ".quests",
- ".dailies"
- ],
- "Description": "Shows your active quests and progress.",
- "Usage": [
- ".questlog"
- ],
- "Submodule": "QuestCommands",
- "Module": "QuestCommands",
- "Options": null,
- "Requirements": []
- }
- ],
"Searches": [
{
"Aliases": [