mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We can call it done. Updated .logserver, ref #111 . Need to add redirection to file now

Browse Source
This commit is contained in:
Master Kwoth 2016-05-03 17:35:15 +02:00
parent 0a1d4c7e4c
commit c8e0b7cb1d
1 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
NadekoBot/Modules/Administration/Commands/LogCommand.cs
View File

@ -1,6 +1,7 @@
using Discord; using Discord;
using Discord.Commands; using Discord.Commands;
using NadekoBot.Classes; using NadekoBot.Classes;
using NadekoBot.Extensions;
using NadekoBot.Modules.Permissions.Classes; using NadekoBot.Modules.Permissions.Classes;
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
@ -25,6 +26,8 @@ namespace NadekoBot.Modules.Administration.Commands
NadekoBot.Client.MessageUpdated += MsgUpdtd; NadekoBot.Client.MessageUpdated += MsgUpdtd;
NadekoBot.Client.UserUpdated += UsrUpdtd; NadekoBot.Client.UserUpdated += UsrUpdtd;
NadekoBot.Client.UserBanned += UsrBanned; NadekoBot.Client.UserBanned += UsrBanned;
NadekoBot.Client.UserLeft += UsrLeft;
NadekoBot.Client.UserJoined += UsrJoined;
NadekoBot.Client.MessageReceived += async (s, e) => NadekoBot.Client.MessageReceived += async (s, e) =>
@ -47,6 +50,23 @@ namespace NadekoBot.Modules.Administration.Commands
}; };
} }
private async void UsrJoined(object sender, UserEventArgs e)
{
throw new NotImplementedException();
}
private async void UsrLeft(object sender, UserEventArgs e)
{
try
{
Channel ch;
if (!logs.TryGetValue(e.Server, out ch))
return;
await ch.SendMessage($"`[{prettyCurrentTime}]` `User left the server:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
}
catch { }
}
private async void UsrBanned(object sender, UserEventArgs e) private async void UsrBanned(object sender, UserEventArgs e)
{ {
try try
@ -54,7 +74,7 @@ namespace NadekoBot.Modules.Administration.Commands
Channel ch; Channel ch;
if (!logs.TryGetValue(e.Server, out ch)) if (!logs.TryGetValue(e.Server, out ch))
return; return;
await ch.SendMessage($"`User banned:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false); await ch.SendMessage($"❗`[{prettyCurrentTime}]` `User banned:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
} }
catch { } catch { }
} }
@ -82,7 +102,7 @@ namespace NadekoBot.Modules.Administration.Commands
if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch) if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
return; return;
await ch.SendMessage( await ch.SendMessage(
$@"🕔`[{prettyCurrentTime}]` **New Message** `{e.Channel.Mention}` $@"🕔`[{prettyCurrentTime}]` **New Message** `#{e.Channel.Name}`
👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text}").ConfigureAwait(false); 👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text}").ConfigureAwait(false);
} }
catch { } catch { }
@ -97,7 +117,7 @@ $@"🕔`[{prettyCurrentTime}]` **New Message** `{e.Channel.Mention}`
if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch) if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
return; return;
await ch.SendMessage( await ch.SendMessage(
$@"🕔`[{prettyCurrentTime}]` **Message** 🚮 `{e.Channel.Mention}` $@"🕔`[{prettyCurrentTime}]` **Message** 🚮 `#{e.Channel.Name}`
👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text}").ConfigureAwait(false); 👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text}").ConfigureAwait(false);
} }
catch { } catch { }
@ -112,9 +132,10 @@ $@"🕔`[{prettyCurrentTime}]` **Message** 🚮 `{e.Channel.Mention}`
if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch) if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
return; return;
await ch.SendMessage( await ch.SendMessage(
$@"🕔`[{prettyCurrentTime}]` **Message** 📝 `{e.Channel.Mention}`👤`{e.User?.ToString() ?? ("NULL")}` $@"🕔`[{prettyCurrentTime}]` **Message** 📝 `#{e.Channel.Name}`
\\t`Old:` {e.Before.Text} 👤`{e.User?.ToString() ?? ("NULL")}
\\t`New:` {e.After.Text}").ConfigureAwait(false); `Old:` {e.Before.Text}
`New:` {e.After.Text}").ConfigureAwait(false);
} }
catch { } catch { }
} }
@ -151,14 +172,29 @@ $@"🕔`[{prettyCurrentTime}]` **Message** 📝 `{e.Channel.Mention}`👤`{e.Use
Channel ch; Channel ch;
if (!logs.TryGetValue(e.Server, out ch)) if (!logs.TryGetValue(e.Server, out ch))
return; return;
string str = $"`Type:` **User updated** `Time:` **{DateTime.Now}** `User:` **{e.Before.Name}**\n"; string str = $"🕔`[{prettyCurrentTime}]`";
if (e.Before.Name != e.After.Name) if (e.Before.Name != e.After.Name)
str += $"`New name:` **{e.After.Name}**"; str += $"**Name Changed**\n\t`{e.Before.Name}` => `{e.After.Name}`";
else if (e.Before.AvatarUrl != e.After.AvatarUrl) else if (e.Before.AvatarUrl != e.After.AvatarUrl)
str += $"`New Avatar:` {e.After.AvatarUrl}"; str += $"**Avatar Changed**\n\t {e.Before.AvatarUrl.ShortenUrl()} `=>` {e.After.AvatarUrl.ShortenUrl()}";
else if (!e.Before.Roles.SequenceEqual(e.After.Roles)) else if (!e.Before.Roles.SequenceEqual(e.After.Roles))
{ {
str += $"`Roles Changed:` {string.Join(", ", e.Before.Roles)} => {string.Join(", ", e.After.Roles)}"; if (e.Before.Roles.Count() < e.After.Roles.Count())
{
var diffRoles = e.After.Roles.Where(r => !e.Before.Roles.Contains(r)).Select(r => "`" + r.Name + "`");
str += $"**User's Roles changed +**\n👤`{e.Before?.ToString()}`\n\tNow has {string.Join(", ", diffRoles)} role.";
}
else if (e.Before.Roles.Count() > e.After.Roles.Count())
{
var diffRoles = e.Before.Roles.Where(r => !e.After.Roles.Contains(r)).Select(r => "`" + r.Name + "`");
str += $"**User's Roles changed -**👤`{e.Before?.ToString()}`\n\tNo longer has {string.Join(", ", diffRoles)} role.";
}
else
{
Console.WriteLine("SEQUENCE NOT EQUAL BUT NO DIFF ROLES - REPORT TO KWOTH on #NADEKOLOG server");
return;
}
} }
else else
return; return;