zotan/tgcli
1
0
Fork 0
Code Issues 10 Pull requests Releases Wiki Activity

Fix users with no username

Browse source
This commit is contained in:
Laura Hausmann 2023-01-14 04:41:45 +01:00
parent c211d5dfcd
commit 8a729a9d03
Signed by: zotan
GPG key ID: D044E84C5BE01605
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tgcli/Util.cs
View file

@ -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]";
}

6
tgcli/tgcli.cs
View file

@ -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;