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

.voicepresence rework

Browse Source
This commit is contained in:
Master Kwoth 2016-05-05 02:25:06 +02:00
parent 71b3f47dcb
commit e5cac96306
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,22 +212,41 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
if (loggingPresences.TryGetValue(e.Server, out ch)) if (loggingPresences.TryGetValue(e.Server, out ch))
if (e.Before.Status != e.After.Status) if (e.Before.Status != e.After.Status)
{ {
await ch.SendMessage($"`[{DateTime.Now:HH:mm:ss}]`**{e.Before.Name}** is now **{e.After.Status}**.").ConfigureAwait(false); await ch.SendMessage($"`{prettyCurrentTime}`**{e.Before.Name}** is now **{e.After.Status}**.").ConfigureAwait(false);
} }
} }
catch { } catch { }
try try
{ {
if (e.Before.VoiceChannel != null && voiceChannelLog.ContainsKey(e.Before.VoiceChannel)) Channel notifyChBefore = null;
Channel notifyChAfter = null;
var beforeVch = e.Before.VoiceChannel;
var afterVch = e.After.VoiceChannel;
var notifyLeave = false;
var notifyJoin = false;
if ((beforeVch != null || afterVch != null) && (beforeVch != afterVch)) // this means we need to notify for sure.
{ {
if (e.After.VoiceChannel != e.Before.VoiceChannel) if (beforeVch != null && voiceChannelLog.TryGetValue(beforeVch, out notifyChBefore))
await voiceChannelLog[e.Before.VoiceChannel].SendMessage($"🎼`{e.Before.Name} has left the` {e.Before.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false); {
} notifyLeave = true;
if (e.After.VoiceChannel != null && voiceChannelLog.ContainsKey(e.After.VoiceChannel)) }
{ if (afterVch != null && voiceChannelLog.TryGetValue(afterVch, out notifyChAfter))
if (e.After.VoiceChannel != e.Before.VoiceChannel) {
await voiceChannelLog[e.After.VoiceChannel].SendMessage($"🎼`{e.After.Name} has joined the`{e.After.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false); notifyJoin = true;
}
if ((notifyLeave && notifyJoin) && (notifyChAfter == notifyChBefore))
{
await notifyChAfter.SendMessage($"🎼`{prettyCurrentTime}` {e.Before.Name} moved from **{beforeVch.Mention}** to **{afterVch.Mention}** voice channel.").ConfigureAwait(false);
}
else if (notifyJoin)
{
await notifyChAfter.SendMessage($"🎼`{prettyCurrentTime}` {e.Before.Name} has joined **{afterVch.Mention}** voice channel.").ConfigureAwait(false);
}
else if (notifyLeave)
{
await notifyChBefore.SendMessage($"🎼`{prettyCurrentTime}` {e.Before.Name} has left **{beforeVch.Mention}** voice channel.").ConfigureAwait(false);
}
} }
} }
catch { } catch { }

2
NadekoBot/Modules/Searches/SearchesModule.cs
View File

@ -460,7 +460,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
.Parameter("color", ParameterType.Unparsed) .Parameter("color", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
{ {
var arg1 = e.GetArg("color")?.Trim(); var arg1 = e.GetArg("color")?.Trim()?.Replace("#", "");
if (string.IsNullOrWhiteSpace(arg1)) if (string.IsNullOrWhiteSpace(arg1))
return; return;
var img = new Bitmap(50, 50); var img = new Bitmap(50, 50);