From 1d27b4e7e88888bba4c2cd9b0f512c642e8ffbd2 Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Fri, 14 Jan 2022 23:40:24 +0100
Subject: [PATCH] Updated changelog

---
 CHANGELOG.md                                  | 50 ++++++++++++++++++-
 .../Common/Replacements/ReplacementBuilder.cs |  5 +-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bb5f4c31..e549a5e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,58 @@
 # Changelog
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
+#todo .trans fix
 
 ## Unreleased
 
--
+## Changes
+
+### Fixed
+
+- Fixed an extra whitespace in usage part of command help if the command has no arguments  
+- Possible small fix for `.prune` ratelimiting  
+- `.gvc` should now properly trigger when a user is already in a gvc and changes his activity   
+- `.gvc` should now properly detect multiple activities  
+- Fixed reference to non-existent command in bot.yml
+
+### Changed
+- CustomReactions module (and customreactions db table) has been renamed to Expressions.
+  - This was done to remove confusion about how it relates to discord Reactions (it doesn't, it was created and named before discord reactions existed) 
+  - Expression command now start with ex/expr and end with the name of the action or setting. 
+  - For example `.exd` (`.dcr`) is expression delete, `.exa` (`.acr`)
+  - Permissions (`.lp`) be automatically updated with "ACTUALEXPRESSIONS", "EXPRESSIONS" instead of "ACTUALCUSTOMREACTIONS" and "CUSTOMREACTIONS"
+  - Permissions for `.ecr` (now `.exe`), `.scr` (now `.exs`), `.dcr` (now `.exd`), `.acr` (now `.exa`), `.lcr` (now `.exl`) will be automatically updated
+  - If you have custom permissions for other CustomReaction commands
+  - Some of the old aliases like `.acr` `.dcr` `.lcr` and a few others have been kept
+- Currency output format improvement (will use guild locale now for some commands)    
+- [dev] CommandStrings will now use methodname as the key, and **not** the command name (first entry in aliases.yml)
+  - In other words aliases.yml and commands.en-US.yml will use the same keys (once again)
+- [dev] Reorganized module and submodule folders  
+- [dev] Permissionv2 db table renamed to Permissions 
+- [dev] Moved FilterWordsChannelId to a separate table
+
+### Removed
+- Removed `.bce` - use `.config` or `.config bot` specifically for bot config  
+- Removed obsolete placeholders: %users% %servers% %userfull% %username% %userdiscrim% %useravatar% %id% %uid% %chname% %cid% %sid% %members% %server_time% %shardid% %time% %mention%  
+- Removed some obsolete commands and strings  
+
+## [3.0.13] - 14.04.2021
+
+### Fixed
+
+- Fixed `.greetdm` causing ratelimits during raids
+- Fixed `.gelbooru`
+
+## [3.0.12] - 06.01.2021
+
+### Fixed
+- `.smch` Fixed
+- `.trans` command will now work properly with capitilized language names
+- Ban message color with plain text fixed
+- Fixed some grpc coordinator bugs
+- Fixed a string in `.xpex`
+- Google version of .img will now have safe search enabled
+- Fixed a small bug in `.hangman`
 
 ## [3.0.11] - 17.12.2021
 
diff --git a/src/NadekoBot/Common/Replacements/ReplacementBuilder.cs b/src/NadekoBot/Common/Replacements/ReplacementBuilder.cs
index 2b52fe87d..d9c211456 100644
--- a/src/NadekoBot/Common/Replacements/ReplacementBuilder.cs
+++ b/src/NadekoBot/Common/Replacements/ReplacementBuilder.cs
@@ -44,7 +44,7 @@ public class ReplacementBuilder
             () => DateTime.Now.ToString("HH:mm " + TimeZoneInfo.Local.StandardName.GetInitials()));
         _reps.TryAdd("%bot.discrim%", () => client.CurrentUser.Discriminator);
         _reps.TryAdd("%bot.id%", () => client.CurrentUser.Id.ToString());
-        _reps.TryAdd("%bot.avatar%", () => client.CurrentUser.RealAvatarUrl()?.ToString());
+        _reps.TryAdd("%bot.avatar%", () => client.CurrentUser.RealAvatarUrl().ToString());
 
         WithStats(client);
         return this;
@@ -76,6 +76,7 @@ public class ReplacementBuilder
 
     public ReplacementBuilder WithChannel(IMessageChannel ch)
     {
+        _reps.TryAdd("%channel%", () => ch.Name);
         _reps.TryAdd("%channel.mention%", () => (ch as ITextChannel)?.Mention ?? "#" + ch.Name);
         _reps.TryAdd("%channel.name%", () => ch.Name);
         _reps.TryAdd("%channel.id%", () => ch.Id.ToString());
@@ -98,7 +99,7 @@ public class ReplacementBuilder
         _reps.TryAdd("%user.fullname%", () => string.Join(" ", users.Select(user => user.ToString())));
         _reps.TryAdd("%user.name%", () => string.Join(" ", users.Select(user => user.Username)));
         _reps.TryAdd("%user.discrim%", () => string.Join(" ", users.Select(user => user.Discriminator)));
-        _reps.TryAdd("%user.avatar%", () => string.Join(" ", users.Select(user => user.RealAvatarUrl()?.ToString())));
+        _reps.TryAdd("%user.avatar%", () => string.Join(" ", users.Select(user => user.RealAvatarUrl().ToString())));
         _reps.TryAdd("%user.id%", () => string.Join(" ", users.Select(user => user.Id.ToString())));
         _reps.TryAdd("%user.created_time%",
             () => string.Join(" ", users.Select(user => user.CreatedAt.ToString("HH:mm"))));