diff --git a/EventBot/Misc/EventRoleTypeReader.cs b/EventBot/Misc/EventRoleTypeReader.cs index 0a6a4e6..1cfee02 100644 --- a/EventBot/Misc/EventRoleTypeReader.cs +++ b/EventBot/Misc/EventRoleTypeReader.cs @@ -15,16 +15,16 @@ namespace EventBot.Misc { var database = services.GetRequiredService(); if (context.Guild == null) - return Task.FromResult(TypeReaderResult.FromError(CommandError.UnmetPrecondition, "Event roles are available only inside guild context.")); + return Task.FromResult(TypeReaderResult.FromError(CommandError.UnmetPrecondition, "Event roles are available only inside a discord server.")); EventRole er = null; if (int.TryParse(input, out int id)) er = database.EventRoles.FirstOrDefault(r => r.Id == id); else - return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "Event role id is not a valid number.")); + return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "Event role IS is not a valid number.")); if(er == null) return Task.FromResult(TypeReaderResult.FromError(CommandError.ObjectNotFound, "Specified event role was not found.")); if(er.Event?.GuildId != context.Guild.Id) - return Task.FromResult(TypeReaderResult.FromError(CommandError.Exception, "Cross guild event role access is denied.")); + return Task.FromResult(TypeReaderResult.FromError(CommandError.Exception, "Cross server event role access is denied.")); return Task.FromResult(TypeReaderResult.FromSuccess(er)); } } diff --git a/EventBot/Misc/EventTypeReader.cs b/EventBot/Misc/EventTypeReader.cs index f56cf74..1832989 100644 --- a/EventBot/Misc/EventTypeReader.cs +++ b/EventBot/Misc/EventTypeReader.cs @@ -15,14 +15,14 @@ namespace EventBot.Misc { var events = services.GetRequiredService(); if (context.Guild == null) - return Task.FromResult(TypeReaderResult.FromError(CommandError.UnmetPrecondition, "Events are available only inside guild context.")); + return Task.FromResult(TypeReaderResult.FromError(CommandError.UnmetPrecondition, "Events are available only inside a discord server.")); Event ev; if (input == null) ev = events.FindEventBy(context.Guild, true); else if (int.TryParse(input, out int id)) ev = events.FindEventBy(context.Guild, id, true); else - return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "Event id is not a number.")); + return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "Event ID is not a number.")); return Task.FromResult(TypeReaderResult.FromSuccess(ev)); } diff --git a/EventBot/Services/EventManagementService.cs b/EventBot/Services/EventManagementService.cs index 1fa242e..8b81a0b 100644 --- a/EventBot/Services/EventManagementService.cs +++ b/EventBot/Services/EventManagementService.cs @@ -30,7 +30,7 @@ namespace EventBot.Services public async Task TryJoinEvent(IGuildUser user, EventRole er, string extra, bool extraChecks = true) { if (er.Event.GuildId != user.GuildId) - throw new Exception("Cross guild events are forbidden."); + throw new Exception("Cross server events are forbidden."); if (extraChecks && er.ReamainingOpenings <= 0) throw new Exception("No openings are left."); if(er.Event.Participants.Where(p => p.UserId == user.Id).Count() > 0)