From 91c43cc6cc02aac0fc15b3f2fb59089824d2897a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= <omeragacan@gmail.com>
Date: Fri, 28 Aug 2020 12:14:32 +0300
Subject: [PATCH] Update CHANGELOG, remove an old TODO

---
 CHANGELOG.md                | 8 ++++++++
 libtiny_client/src/state.rs | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24a0be25..d4570f89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,14 @@
 - `/names` now sorts nicks lexicographically. (#235)
 - tiny now re-sets current away status on reconnect. Previously the away status
   would be lost. (#234)
+- To make joining channels with +R mode (which means joining is only allowed
+  after identification via NickServ) more robust, tiny now makes 3 attempts to
+  join a channel (with a 10-second break after each attempt) when it gets a 477
+  response and the user has NickServ identification enabled (`nickserv_ident`
+  field in the config). Even though we send IDENTIFY messages (after
+  RPL_WELCOME) before JOIN messages (after RPL_ENDOFMOTD), sometimes
+  identification takes so long JOIN command fails with a 477. We now try joining
+  again with 10 seconds breaks, up to 3 times. (#236, #240)
 
 # 2020/06/28: 0.6.0
 
diff --git a/libtiny_client/src/state.rs b/libtiny_client/src/state.rs
index d3395421..41e7810e 100644
--- a/libtiny_client/src/state.rs
+++ b/libtiny_client/src/state.rs
@@ -100,7 +100,7 @@ struct StateInner {
     /// order, in TUI?
     chans: Vec<Chan>,
 
-    /// Away reason if away mode is on. `None` otherwise. TODO: I don't think the message is used?
+    /// Away reason if away mode is on. `None` otherwise.
     away_status: Option<String>,
 
     /// servername to be used in PING messages. Read from 002 RPL_YOURHOST. `None` until 002.