minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-04 08:34:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged v3 branch updates

Browse Source
This commit is contained in:
Kwoth
2021-12-21 23:36:31 +01:00
parent 0b8c3b3f2b 52b2c0910c
commit f78e4d457c
8 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NadekoBot/Modules/Administration/Services/UserPunishService.cs
View File

@@ -487,7 +487,7 @@ WHERE GuildId={guildId}
{
template = JsonConvert.SerializeObject(new
{
color = _bcs.Data.Color.Error,
color = _bcs.Data.Color.Error.PackedValue >> 8,
description = defaultMessage
});
}
@@ -502,7 +502,7 @@ WHERE GuildId={guildId}
{
template = JsonConvert.SerializeObject(new
{
color = _bcs.Data.Color.Error,
color = _bcs.Data.Color.Error.PackedValue >> 8,
description = template
});
}

4
src/NadekoBot/Modules/Xp/Services/XpService.cs
View File

@@ -166,10 +166,6 @@ public class XpService : INService
{
var xp = item.Sum(x => x.XpAmount);
//1. Mass query discord users and userxpstats and get them from local dict
//2. (better but much harder) Move everything to the database, and get old and new xp
// amounts for every user (in order to give rewards)
var usr = uow.GetOrCreateUserXpStats(item.Key.GuildId, item.Key.User.Id);
var du = uow.GetOrCreateUser(item.Key.User);

2
src/NadekoBot/Modules/Xp/Xp.cs
View File

@@ -270,7 +270,7 @@ public partial class Xp : NadekoModule<XpService>
}
else
{
await ReplyConfirmLocalizedAsync(strs.excluded(Format.Bold(channel.ToString())));
await ReplyConfirmLocalizedAsync(strs.not_excluded(Format.Bold(channel.ToString())));
}
}