From 8a729a9d03cd9df911efd13f9ceaf00492439fac Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Sat, 14 Jan 2023 04:41:45 +0100
Subject: [PATCH] Fix users with no username

---
 tgcli/Util.cs  | 8 ++++----
 tgcli/tgcli.cs | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tgcli/Util.cs b/tgcli/Util.cs
index 2839509..44d15ce 100644
--- a/tgcli/Util.cs
+++ b/tgcli/Util.cs
@@ -294,7 +294,7 @@ namespace tgcli {
 			client.ExecuteAsync(new LogOut()).Wait();
 		}
 
-		public static string GetFormattedUsernameFromSender(MessageSender sender) {
+		public static string GetFormattedUsername(MessageSender sender) {
 			return sender switch {
 				MessageSender.MessageSenderUser user => GetFormattedUsername(GetUser(user.UserId)),
 				MessageSender.MessageSenderChat chat => GetFormattedUsername(GetChat(chat.ChatId)),
@@ -302,8 +302,8 @@ namespace tgcli {
 			};
 		}
 
-		public static string GetFormattedUsername(User sender) {
-			var username = sender.Usernames.ActiveUsernames.First();
+		private static string GetFormattedUsername(User sender) {
+			var username = sender.Usernames.ActiveUsernames.FirstOrDefault();
 			if (string.IsNullOrWhiteSpace(username))
 				username = sender.FirstName + " " + sender.LastName;
 			else
@@ -312,7 +312,7 @@ namespace tgcli {
 			return username;
 		}
 
-		public static string GetFormattedUsername(Chat sender) {
+		private static string GetFormattedUsername(Chat sender) {
 			return $"{sender.Title} [as chat]";
 		}
 
diff --git a/tgcli/tgcli.cs b/tgcli/tgcli.cs
index 556ec1c..8075d61 100644
--- a/tgcli/tgcli.cs
+++ b/tgcli/tgcli.cs
@@ -410,7 +410,7 @@ namespace tgcli {
 			else
 				text = $"[unsupported {msg.Content.DataType}]";
 			var chat      = GetChat(msg.ChatId);
-			var username  = TruncateString(GetFormattedUsernameFromSender(msg.SenderId), 10);
+			var username  = TruncateString(GetFormattedUsername(msg.SenderId), 10);
 			var time      = FormatTime(msg.Date);
 			var isChannel = msg.IsChannelPost;
 			var isPrivate = chat.Type is ChatType.ChatTypePrivate || chat.Type is ChatType.ChatTypeSecret;
@@ -457,7 +457,7 @@ namespace tgcli {
 			else
 				text = $"[unsupported {msg.Content.DataType}]";
 			var chat      = GetChat(msg.ChatId);
-			var username  = TruncateString(GetFormattedUsernameFromSender(msg.SenderId), 10);
+			var username  = TruncateString(GetFormattedUsername(msg.SenderId), 10);
 			var time      = FormatTime(msg.Date);
 			var isChannel = msg.IsChannelPost;
 			var isPrivate = chat.Type is ChatType.ChatTypePrivate || chat.Type is ChatType.ChatTypeSecret;
@@ -493,7 +493,7 @@ namespace tgcli {
 				text = $"[unsupported {msg.NewContent.DataType}]";
 			var message   = GetMessage(msg.ChatId, msg.MessageId);
 			var chat      = GetChat(msg.ChatId);
-			var username  = TruncateString(GetFormattedUsernameFromSender(message.SenderId), 10);
+			var username  = TruncateString(GetFormattedUsername(message.SenderId), 10);
 			var time      = FormatTime(message.EditDate);
 			var isChannel = message.IsChannelPost;
 			var isPrivate = chat.Type is ChatType.ChatTypePrivate;