Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Develop

See merge request discord-bots/chaosbot!15
This commit is contained in:
Sean "Solao Bajiuik" Stoves 2020-08-10 00:05:02 -04:00
commit 7c4ea8e2d5
3 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChaosBot/Discord/Modules/User/Lodestone.cs
View File

@ -198,7 +198,7 @@ namespace ChaosBot.Discord.Modules.User
lsChar.DiscordGuildId = Context.Guild.Id;
lsChar.Name = character.Character.Name;
lsChar.Avatar = character.Character.Avatar;
await dbContext.LodestoneCharacter.Upsert(lsChar)
.On(x => new {x.DiscordGuildId, x.LodestoneId}).RunAsync();
}
@ -207,6 +207,10 @@ namespace ChaosBot.Discord.Modules.User
sb.AppendLine(
$"{Context.User.Mention} has been successfully linked to {character.Character.Name}");
embed.Description = sb.ToString();
IGuildUser nUser = await Context.Guild.GetUserAsync(Context.User.Id);
await nUser.ModifyAsync(x => { x.Nickname = character.Character.Name; });
await ReplyAsync(null, false, embed.Build());
}
else

29
ChaosBot/Discord/Services/CommandHandler.cs
View File

@ -98,18 +98,8 @@ namespace ChaosBot.Discord.Services
.On(x => new {x.DiscordGuildId, x.DiscordUserId}).RunAsync();
}
string ConfigSet = ConfigurationRepository.GetValue<string>("LevelUp:Channel", user.Guild.Id, "false");
if (ConfigSet != "false")
{
ulong channelId = Convert.ToUInt64(ConfigSet.Substring(2, ConfigSet.Length - 3));
await user.Guild.GetTextChannel(channelId).SendMessageAsync(
$"Welcome {user.Mention}!");
}
else
{
await user.Guild.SystemChannel.SendMessageAsync($"Welcome {user.Mention}!");
}
await user.Guild.SystemChannel.SendMessageAsync($"{user.Username} has joined the server.");
}
@ -172,20 +162,7 @@ namespace ChaosBot.Discord.Services
.On(x => new { x.DiscordGuildId, x.DiscordUserId}).RunAsync();
}
string ConfigSet = ConfigurationRepository.GetValue<string>("LevelUp:Channel", user.Guild.Id, "false");
if (ConfigSet != "false")
{
ulong channelId = Convert.ToUInt64(ConfigSet.Substring(2, ConfigSet.Length - 3));
await user.Guild.GetTextChannel(channelId).SendMessageAsync(
$"Goodbye {user.Mention}!");
}
else
{
await user.Guild.SystemChannel.SendMessageAsync($"Goodbye {user.Mention}!");
}
await user.Guild.SystemChannel.SendMessageAsync($"{user.Username} has left the server.");
}
catch (Exception ex)
{

8
ChaosBot/Discord/Services/ExperienceHandler.cs
View File

@ -69,10 +69,10 @@ namespace ChaosBot.Discord.Services
{
ulong channelId = Convert.ToUInt64(ConfigSet.Substring(2, ConfigSet.Length - 3));
await context.Guild.GetTextChannel(channelId).SendMessageAsync(
$"Grats <@{context.User.Id}>! You have reached level 1 :wot:");
$"Grats <@{context.User.Id}>! You have reached level 1 <:wot:740387232514572310>");
}
else
await context.Channel.SendMessageAsync($"Grats <@{context.User.Id}>! You have reached level 1 :wot:");
await context.Channel.SendMessageAsync($"Grats <@{context.User.Id}>! You have reached level 1! <:wot:740387232514572310>");
}
}
}
@ -102,10 +102,10 @@ namespace ChaosBot.Discord.Services
{
ulong channelId = Convert.ToUInt64(ConfigSet.Substring(2, ConfigSet.Length - 3));
await context.Guild.GetTextChannel(channelId).SendMessageAsync(
$"Grats <@{usrExperience.DiscordUserId}>! You have reached level {curLevel} :wot:");
$"Grats <@{usrExperience.DiscordUserId}>! You have reached level {curLevel} <:wot:740387232514572310>");
}
else
await context.Channel.SendMessageAsync($"Grats <@{usrExperience.DiscordUserId}>! You have reached level {curLevel} :wot:");
await context.Channel.SendMessageAsync($"Grats <@{usrExperience.DiscordUserId}>! You have reached level {curLevel} <:wot:740387232514572310>");
}
}
catch (Exception ex)