Merge branch 'master' of ssh://git.boerlage.me:31022/open/Geekbot.net

This commit is contained in:
Runebaas 2018-02-13 22:29:58 +01:00
commit d750513bc8
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
3 changed files with 6 additions and 4 deletions

View file

@ -42,6 +42,8 @@ namespace Geekbot.net.Lib
{
var errorString = errorMessage == "def" ? _translation.GetString(Context.Guild.Id, "errorHandler", "SomethingWentWrong") : errorMessage;
var errorObj = SimpleConextConverter.ConvertContext(Context);
if (e.Message.Contains("50007")) return;
if (e.Message.Contains("50013")) return;
_logger.Error("Geekbot", "An error ocured", e, errorObj);
if (!string.IsNullOrEmpty(errorMessage))
{
@ -49,7 +51,7 @@ namespace Geekbot.net.Lib
}
if (_raven == null) return;
var sentryEvent = new SentryEvent(e)
{
Tags =

View file

@ -39,7 +39,7 @@ namespace Tests.Lib
[Theory, MemberData(nameof(NumberToEmojiTestData))]
public async Task NumberToEmoji(int number, string expectedResult)
public void NumberToEmoji(int number, string expectedResult)
{
var emojiConverter = new EmojiConverter();
var result = emojiConverter.numberToEmoji(number);
@ -65,7 +65,7 @@ namespace Tests.Lib
[Theory, MemberData(nameof(textToEmojiTestData))]
public async Task TextToEmoji(string text, string expectedResult)
public void TextToEmoji(string text, string expectedResult)
{
var emojiConverter = new EmojiConverter();
var result = emojiConverter.textToEmoji(text);

View file

@ -39,7 +39,7 @@ namespace Tests.Lib
[Theory, MemberData(nameof(LevelCalcTestData))]
public async Task GetLevel(int messages, int expectedResult)
public void GetLevel(int messages, int expectedResult)
{
var levelCalc = new LevelCalc();
var result = levelCalc.GetLevel(messages);