From 7ee8dee3eeb24d31e0005bbd41356043ac9fe8f2 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 19:25:38 +0530 Subject: [PATCH 01/14] added emojis to quotes --- .../Modules/Utility/Commands/QuoteCommands.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 36e31eb0..670968fb 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -31,10 +31,10 @@ namespace NadekoBot.Modules.Utility } if (quotes.Any()) - await channel.SendMessageAsync($"`Page {page + 1} of quotes:`\n```xl\n" + String.Join("\n", quotes.Select((q) => $"{q.Keyword,-20} by {q.AuthorName}")) + "\n```") + await channel.SendMessageAsync($"đŸ’Ŧ **Page {page + 1}** of **quotes:**\n```xl\n" + String.Join("\n", quotes.Select((q) => $"{q.Keyword,-20} by {q.AuthorName}")) + "\n```") .ConfigureAwait(false); else - await channel.SendMessageAsync("`No quotes on this page.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹī¸ **No quotes** on this page.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Utility if (quote == null) return; - await channel.SendMessageAsync("đŸ“Ŗ " + quote.Text.SanitizeMentions()); + await channel.SendMessageAsync("🖊 " + quote.Text.SanitizeMentions()); } [NadekoCommand, Usage, Description, Aliases] @@ -83,7 +83,7 @@ namespace NadekoBot.Modules.Utility }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync("`Quote added.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ **Quote added.**").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -105,7 +105,7 @@ namespace NadekoBot.Modules.Utility if (qs==null || !qs.Any()) { - response = "`No quotes found.`"; + response = "ℹī¸ **No quotes found.**"; return; } @@ -113,7 +113,7 @@ namespace NadekoBot.Modules.Utility uow.Quotes.Remove(q); await uow.CompleteAsync().ConfigureAwait(false); - response = "`Deleted a random quote`"; + response = "🗑 **Deleted a random quote.**"; } await channel.SendMessageAsync(response); } @@ -139,7 +139,7 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync(); } - await channel.SendMessageAsync($"`Deleted all quotes with '{keyword}' keyword`"); + await channel.SendMessageAsync($"🗑 **Deleted all quotes** with **{keyword}** keyword."); } } } From 58ab9ad5819dc713c8e1cf64a9dfbe293c4d5af8 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 19:47:29 +0530 Subject: [PATCH 02/14] added emojis to totube --- src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs index dbceb1a2..4f7ffd2f 100644 --- a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs @@ -25,7 +25,7 @@ namespace NadekoBot.Modules.Utility target = res.RequestMessage.RequestUri; } - await channel.SendMessageAsync($"{imsg.Author.Mention}, `Here is the link:` {target}") + await channel.SendMessageAsync($"🎞 {imsg.Author.Mention}, **Your new video room created. Join and invite to watch videos together with friends:** {target}") .ConfigureAwait(false); } From 33b9681ba7965acf3e42fc8d1f702bea271af801 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 20:14:31 +0530 Subject: [PATCH 03/14] added emojis nothing much changed --- src/NadekoBot/Modules/Utility/Commands/Remind.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index 172282f1..391e9109 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -124,7 +124,7 @@ namespace NadekoBot.Modules.Utility if (ch == null) { - await channel.SendMessageAsync($"{umsg.Author.Mention} Something went wrong (channel cannot be found) ;(").ConfigureAwait(false); + await channel.SendMessageAsync($"⚠ī¸ {umsg.Author.Mention} Something went wrong (channel cannot be found) ;(").ConfigureAwait(false); return; } @@ -132,7 +132,7 @@ namespace NadekoBot.Modules.Utility if (m.Length == 0) { - await channel.SendMessageAsync("Not a valid time format blablabla").ConfigureAwait(false); + await channel.SendMessageAsync("❎ **Not a valid time format.** type `-h .remind`").ConfigureAwait(false); return; } @@ -157,7 +157,7 @@ namespace NadekoBot.Modules.Utility (groupName == "hours" && value > 23) || (groupName == "minutes" && value > 59)) { - await channel.SendMessageAsync($"Invalid {groupName} value.").ConfigureAwait(false); + await channel.SendMessageAsync($"⚠ī¸ Invalid {groupName} value.").ConfigureAwait(false); return; } else @@ -187,7 +187,7 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync(); } - try { await channel.SendMessageAsync($"⏰ I will remind \"{(ch is ITextChannel ? ((ITextChannel)ch).Name : umsg.Author.Username)}\" to \"{message.SanitizeMentions()}\" in {output}. ({time:d.M.yyyy.} at {time:HH:mm})").ConfigureAwait(false); } catch { } + try { await channel.SendMessageAsync($"⏰ I will remind **\"{(ch is ITextChannel ? ((ITextChannel)ch).Name : umsg.Author.Username)}\"** to **\"{message.SanitizeMentions()}\"** in **{output}** `({time:d.M.yyyy.} at {time:HH:mm})`").ConfigureAwait(false); } catch { } await StartReminder(rem); } @@ -206,8 +206,8 @@ namespace NadekoBot.Modules.Utility uow.BotConfig.GetOrCreate().RemindMessageFormat = arg.Trim(); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync("`New remind template set.`"); + await channel.SendMessageAsync("🆗 New remind template set."); } } } -} \ No newline at end of file +} From 29adf7213aba3f0a15135681f0821c2cb8169456 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 21:16:18 +0530 Subject: [PATCH 04/14] changed brightness emoji to temperature for weather only. nothing else is changed --- src/NadekoBot/Modules/Searches/Searches.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 70ac29b6..b460d08a 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -47,7 +47,7 @@ namespace NadekoBot.Modules.Searches $@"🌍 **Weather for** 【{obj["target"]}】 📏 **Lat,Long:** ({obj["latitude"]}, {obj["longitude"]}) ☁ **Condition:** {obj["condition"]} 😓 **Humidity:** {obj["humidity"]}% 💨 **Wind Speed:** {obj["windspeedk"]}km/h / {obj["windspeedm"]}mph -🔆 **Temperature:** {obj["centigrade"]}°C / {obj["fahrenheit"]}°F 🔆 **Feels like:** {obj["feelscentigrade"]}°C / {obj["feelsfahrenheit"]}°F +🌡 **Temperature:** {obj["centigrade"]}°C / {obj["fahrenheit"]}°F 🔆 **Feels like:** {obj["feelscentigrade"]}°C / {obj["feelsfahrenheit"]}°F 🌄 **Sunrise:** {obj["sunrise"]} 🌇 **Sunset:** {obj["sunset"]}").ConfigureAwait(false); } @@ -762,4 +762,4 @@ ELO: [{playerELO.ToString()}] return false; } } -} \ No newline at end of file +} From 8569d6bd8e95c10aeeb82368f32f3fb7d62ab26b Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 21:53:17 +0530 Subject: [PATCH 05/14] emoji added to osu profile link --- src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs index 9f78461a..f31e8eea 100644 --- a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs @@ -48,7 +48,7 @@ namespace NadekoBot.Modules.Searches MemoryStream ms = new MemoryStream(); res.CopyTo(ms); ms.Position = 0; - await channel.SendFileAsync(ms, $"{usr}.png", $"`Profile Link:`https://osu.ppy.sh/u/{Uri.EscapeDataString(usr)}\n`Image provided by https://lemmmy.pw/osusig`").ConfigureAwait(false); + await channel.SendFileAsync(ms, $"{usr}.png", $"🎧 **Profile Link:**https://osu.ppy.sh/u/{Uri.EscapeDataString(usr)}\n`Image provided by https://lemmmy.pw/osusig`").ConfigureAwait(false); } catch (Exception ex) { @@ -273,4 +273,4 @@ namespace NadekoBot.Modules.Searches (mods & (1 << pos)) != 0; } } -} \ No newline at end of file +} From 1552c16707651ceb97a1919b71024073f67c02f0 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 22:12:55 +0530 Subject: [PATCH 06/14] added raffle ticket - added raffle ticket emoji. - made raffle look nice. --- src/NadekoBot/Modules/Gambling/Gambling.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 12626123..9227a09e 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -42,7 +42,7 @@ namespace NadekoBot.Modules.Gambling var members = role.Members().Where(u => u.Status != UserStatus.Offline && u.Status != UserStatus.Unknown); var membersArray = members as IUser[] ?? members.ToArray(); var usr = membersArray[new NadekoRandom().Next(0, membersArray.Length)]; - await channel.SendMessageAsync($"**Raffled user:** {usr.Username} (id: {usr.Id})").ConfigureAwait(false); + await channel.SendMessageAsync($"🎟 Raffled user: **{usr.Username}** ID: `{usr.Id}`").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] From 62d5ed58c692bcb20465f890c9aab226430cc152 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 21 Nov 2016 23:50:49 +0530 Subject: [PATCH 07/14] better repeat - emojis - time is now `highlighted` - text to repeat is now bold --- .../Modules/Administration/Commands/MessageRepeater.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs index cdba854e..6c588280 100644 --- a/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs @@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Administration RepeatRunner rep; if (!repeaters.TryGetValue(channel.Id, out rep)) { - await channel.SendMessageAsync("`No repeating message found on this server.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹī¸ **No repeating message found on this server.**").ConfigureAwait(false); return; } rep.Reset(); @@ -110,10 +110,10 @@ namespace NadekoBot.Modules.Administration await uow.CompleteAsync(); } rep.Stop(); - await channel.SendMessageAsync("`Stopped repeating a message.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ **Stopped repeating a message.**").ConfigureAwait(false); } else - await channel.SendMessageAsync("`No message is repeating.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹī¸ **No message is repeating.**").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -159,8 +159,8 @@ namespace NadekoBot.Modules.Administration return old; }); - await channel.SendMessageAsync($"Repeating \"{rep.Repeater.Message}\" every {rep.Repeater.Interval.Days} days, {rep.Repeater.Interval.Hours} hours and {rep.Repeater.Interval.Minutes} minutes.").ConfigureAwait(false); + await channel.SendMessageAsync($"🔁 Repeating **\"{rep.Repeater.Message}\"** every `{rep.Repeater.Interval.Days} days, {rep.Repeater.Interval.Hours} hours and {rep.Repeater.Interval.Minutes} minutes`.").ConfigureAwait(false); } } } -} \ No newline at end of file +} From 9797aebdbab723ec151e62d4e89e6476df1b4485 Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 00:52:28 +0530 Subject: [PATCH 08/14] two changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 🆙 **Migration done.** - ⚠ī¸ **Error while migrating, check `logs` for more informations.** --- src/NadekoBot/Modules/Administration/Commands/Migration.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/Migration.cs b/src/NadekoBot/Modules/Administration/Commands/Migration.cs index fbf24492..5be28145 100644 --- a/src/NadekoBot/Modules/Administration/Commands/Migration.cs +++ b/src/NadekoBot/Modules/Administration/Commands/Migration.cs @@ -54,12 +54,12 @@ namespace NadekoBot.Modules.Administration break; } } - await umsg.Channel.SendMessageAsync("Migration done.").ConfigureAwait(false); + await umsg.Channel.SendMessageAsync("🆙 **Migration done.**").ConfigureAwait(false); } catch (Exception ex) { _log.Error(ex); - await umsg.Channel.SendMessageAsync(":warning: Error while migrating, check logs for more informations.").ConfigureAwait(false); + await umsg.Channel.SendMessageAsync("⚠ī¸ **Error while migrating, check `logs` for more informations.**").ConfigureAwait(false); } } From 8d954e5050e5b8dbbfe053d214823b03559813a9 Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 01:01:28 +0530 Subject: [PATCH 09/14] added emojis --- .../Commands/PlayingRotateCommands.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/PlayingRotateCommands.cs b/src/NadekoBot/Modules/Administration/Commands/PlayingRotateCommands.cs index 96dc0ad6..3e047508 100644 --- a/src/NadekoBot/Modules/Administration/Commands/PlayingRotateCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/PlayingRotateCommands.cs @@ -104,9 +104,9 @@ namespace NadekoBot.Modules.Administration await uow.CompleteAsync(); } if (RotatingStatuses) - await channel.SendMessageAsync("`Rotating playing status enabled.`"); + await channel.SendMessageAsync("🆗 **Rotating playing status enabled.**"); else - await channel.SendMessageAsync("`Rotating playing status disabled.`"); + await channel.SendMessageAsync("ℹī¸ **Rotating playing status disabled.**"); } [NadekoCommand, Usage, Description, Aliases] @@ -125,7 +125,7 @@ namespace NadekoBot.Modules.Administration await uow.CompleteAsync(); } - await channel.SendMessageAsync("`Added.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ **Added.**").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -137,11 +137,11 @@ namespace NadekoBot.Modules.Administration if (!RotatingStatusMessages.Any()) - await channel.SendMessageAsync("`No rotating playing statuses set.`"); + await channel.SendMessageAsync("❎ **No rotating playing statuses set.**"); else { var i = 1; - await channel.SendMessageAsync($"{umsg.Author.Mention} `Here is a list of rotating statuses:`\n\n\t" + string.Join("\n\t", RotatingStatusMessages.Select(rs => $"`{i++}.` {rs.Status}"))); + await channel.SendMessageAsync($"ℹī¸ {umsg.Author.Mention} `Here is a list of rotating statuses:`\n\n\t" + string.Join("\n\t", RotatingStatusMessages.Select(rs => $"`{i++}.` {rs.Status}"))); } } @@ -166,8 +166,8 @@ namespace NadekoBot.Modules.Administration RotatingStatusMessages.RemoveAt(index); await uow.CompleteAsync(); } - await channel.SendMessageAsync($"`Removed the the playing message:` {msg}").ConfigureAwait(false); + await channel.SendMessageAsync($"🗑 **Removed the the playing message:** {msg}").ConfigureAwait(false); } } } -} \ No newline at end of file +} From b403e804ff832437f7da66add2923ae80c30b454 Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 01:14:12 +0530 Subject: [PATCH 10/14] emojis and few other changes --- .../Administration/Commands/RatelimitCommand.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs index 587d0b65..224461b5 100644 --- a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs @@ -97,7 +97,7 @@ namespace NadekoBot.Modules.Administration if (RatelimitingChannels.TryRemove(channel.Id, out throwaway)) { throwaway.cancelSource.Cancel(); - await channel.SendMessageAsync("`Slow mode disabled.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹī¸ **Slow mode disabled.**").ConfigureAwait(false); return; } } @@ -112,7 +112,7 @@ namespace NadekoBot.Modules.Administration if (msg < 1 || perSec < 1 || msg > 100 || perSec > 3600) { - await channel.SendMessageAsync("`Invalid parameters.`"); + await channel.SendMessageAsync("⚠ī¸ `Invalid parameters.`"); return; } var toAdd = new Ratelimiter() @@ -123,11 +123,11 @@ namespace NadekoBot.Modules.Administration }; if(RatelimitingChannels.TryAdd(channel.Id, toAdd)) { - await channel.SendMessageAsync("`Slow mode initiated.` " + - $"Users can't send more than {toAdd.MaxMessages} message(s) every {toAdd.PerSeconds} second(s).") + await channel.SendMessageAsync("✅ **Slow mode initiated: " + + $"Users can't send more than `{toAdd.MaxMessages} message(s)` every `{toAdd.PerSeconds} second(s)`.**") .ConfigureAwait(false); } } } } -} \ No newline at end of file +} From aa8d67a1dbac897810bc33a31ab7d24f428b933e Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 01:18:08 +0530 Subject: [PATCH 11/14] changed times - days to day(s) - hours to hour(s) - minutes to minute(s) --- .../Modules/Administration/Commands/MessageRepeater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs index 6c588280..953f2446 100644 --- a/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs @@ -159,7 +159,7 @@ namespace NadekoBot.Modules.Administration return old; }); - await channel.SendMessageAsync($"🔁 Repeating **\"{rep.Repeater.Message}\"** every `{rep.Repeater.Interval.Days} days, {rep.Repeater.Interval.Hours} hours and {rep.Repeater.Interval.Minutes} minutes`.").ConfigureAwait(false); + await channel.SendMessageAsync($"🔁 Repeating **\"{rep.Repeater.Message}\"** every `{rep.Repeater.Interval.Days} day(s), {rep.Repeater.Interval.Hours} hour(s) and {rep.Repeater.Interval.Minutes} minute(s)`.").ConfigureAwait(false); } } } From b6811afb34953faa44d98cf90896e12d6253d0f2 Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 01:24:53 +0530 Subject: [PATCH 12/14] chaned time and days - days to day(s) - months to month(s) etc --- .../Modules/Utility/Commands/Remind.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index 391e9109..a0e006a7 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -151,11 +151,11 @@ namespace NadekoBot.Modules.Utility continue; } else if (value < 1 || - (groupName == "months" && value > 1) || - (groupName == "weeks" && value > 4) || - (groupName == "days" && value >= 7) || - (groupName == "hours" && value > 23) || - (groupName == "minutes" && value > 59)) + (groupName == "month(s)" && value > 1) || + (groupName == "week(s)" && value > 4) || + (groupName == "day(s)" && value >= 7) || + (groupName == "hour(s)" && value > 23) || + (groupName == "minute(s)" && value > 59)) { await channel.SendMessageAsync($"⚠ī¸ Invalid {groupName} value.").ConfigureAwait(false); return; @@ -164,11 +164,11 @@ namespace NadekoBot.Modules.Utility namesAndValues[groupName] = value; output += m.Groups[groupName].Value + " " + groupName + " "; } - var time = DateTime.Now + new TimeSpan(30 * namesAndValues["months"] + - 7 * namesAndValues["weeks"] + - namesAndValues["days"], - namesAndValues["hours"], - namesAndValues["minutes"], + var time = DateTime.Now + new TimeSpan(30 * namesAndValues["month(s)"] + + 7 * namesAndValues["week(s)"] + + namesAndValues["day(s)"], + namesAndValues["hour(s)"], + namesAndValues["minute(s)"], 0); var rem = new Reminder From 2a3fedec358db879975a33027cd5d1b2e4523f2f Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 02:16:24 +0530 Subject: [PATCH 13/14] reverted last change --- .../Modules/Utility/Commands/Remind.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index a0e006a7..391e9109 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -151,11 +151,11 @@ namespace NadekoBot.Modules.Utility continue; } else if (value < 1 || - (groupName == "month(s)" && value > 1) || - (groupName == "week(s)" && value > 4) || - (groupName == "day(s)" && value >= 7) || - (groupName == "hour(s)" && value > 23) || - (groupName == "minute(s)" && value > 59)) + (groupName == "months" && value > 1) || + (groupName == "weeks" && value > 4) || + (groupName == "days" && value >= 7) || + (groupName == "hours" && value > 23) || + (groupName == "minutes" && value > 59)) { await channel.SendMessageAsync($"⚠ī¸ Invalid {groupName} value.").ConfigureAwait(false); return; @@ -164,11 +164,11 @@ namespace NadekoBot.Modules.Utility namesAndValues[groupName] = value; output += m.Groups[groupName].Value + " " + groupName + " "; } - var time = DateTime.Now + new TimeSpan(30 * namesAndValues["month(s)"] + - 7 * namesAndValues["week(s)"] + - namesAndValues["day(s)"], - namesAndValues["hour(s)"], - namesAndValues["minute(s)"], + var time = DateTime.Now + new TimeSpan(30 * namesAndValues["months"] + + 7 * namesAndValues["weeks"] + + namesAndValues["days"], + namesAndValues["hours"], + namesAndValues["minutes"], 0); var rem = new Reminder From ffe8625055ce741fbd7e1872b3fdb362377bbda4 Mon Sep 17 00:00:00 2001 From: samvaio Date: Tue, 22 Nov 2016 02:27:42 +0530 Subject: [PATCH 14/14] added a space betwn profile and link --- src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs index f31e8eea..e3d663a5 100644 --- a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs @@ -48,7 +48,7 @@ namespace NadekoBot.Modules.Searches MemoryStream ms = new MemoryStream(); res.CopyTo(ms); ms.Position = 0; - await channel.SendFileAsync(ms, $"{usr}.png", $"🎧 **Profile Link:**https://osu.ppy.sh/u/{Uri.EscapeDataString(usr)}\n`Image provided by https://lemmmy.pw/osusig`").ConfigureAwait(false); + await channel.SendFileAsync(ms, $"{usr}.png", $"🎧 **Profile Link: **https://osu.ppy.sh/u/{Uri.EscapeDataString(usr)}\n`Image provided by https://lemmmy.pw/osusig`").ConfigureAwait(false); } catch (Exception ex) {