diff --git a/tdsharp b/tdsharp
deleted file mode 160000
index 45f1281..0000000
--- a/tdsharp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45f128104467b249bddccaa91ea8a6c9fac05d66
diff --git a/telegram/libtdjson.dylib b/telegram/libtdjson.dylib
deleted file mode 100755
index e79b4e0..0000000
Binary files a/telegram/libtdjson.dylib and /dev/null differ
diff --git a/telegram/libtdjson.so b/telegram/libtdjson.so
deleted file mode 100755
index 7611a0e..0000000
Binary files a/telegram/libtdjson.so and /dev/null differ
diff --git a/telegram/telegram.csproj b/telegram/telegram.csproj
deleted file mode 100644
index d741cd5..0000000
--- a/telegram/telegram.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
- Always
-
-
- Always
-
-
-
-
-
-
-
-
diff --git a/tgcli.sln b/tgcli.sln
index 9e35c0a..54ce9b7 100644
--- a/tgcli.sln
+++ b/tgcli.sln
@@ -1,10 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "telegram", "telegram\telegram.csproj", "{26C5A85E-DDBB-4358-84A7-4A6A577428CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDLib", "tdsharp\TDLib\TDLib.csproj", "{9134FECE-FD08-418D-B3FF-E1FB135A98C8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDLib.Api", "tdsharp\TDLib.Api\TDLib.Api.csproj", "{3BCC90D7-1303-42EE-ACF6-11DA6251A52F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tgcli", "tgcli\tgcli.csproj", "{26C5A85E-DDBB-4358-84A7-4A6A577428CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,13 +12,5 @@ Global
{26C5A85E-DDBB-4358-84A7-4A6A577428CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26C5A85E-DDBB-4358-84A7-4A6A577428CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26C5A85E-DDBB-4358-84A7-4A6A577428CB}.Release|Any CPU.Build.0 = Release|Any CPU
- {9134FECE-FD08-418D-B3FF-E1FB135A98C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9134FECE-FD08-418D-B3FF-E1FB135A98C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9134FECE-FD08-418D-B3FF-E1FB135A98C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9134FECE-FD08-418D-B3FF-E1FB135A98C8}.Release|Any CPU.Build.0 = Release|Any CPU
- {3BCC90D7-1303-42EE-ACF6-11DA6251A52F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3BCC90D7-1303-42EE-ACF6-11DA6251A52F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3BCC90D7-1303-42EE-ACF6-11DA6251A52F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3BCC90D7-1303-42EE-ACF6-11DA6251A52F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
diff --git a/tgcli.sln.DotSettings b/tgcli.sln.DotSettings
index 304ddbf..7533cda 100644
--- a/tgcli.sln.DotSettings
+++ b/tgcli.sln.DotSettings
@@ -74,10 +74,12 @@
True
False
6
+ True
True
True
True
True
+ True
;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute;System.CodeDom.Compiler.GeneratedCodeAttribute;Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode*
<data><AttributeFilter ClassMask="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" IsEnabled="True" /><AttributeFilter ClassMask="System.CodeDom.Compiler.GeneratedCodeAttribute" IsEnabled="True" /><AttributeFilter ClassMask="Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode*" IsEnabled="True" /></data>
True
@@ -98,5 +100,6 @@
True
2704f639-7a6d-4dc0-8931-351a3f933333
2704f639-7a6d-4dc0-8931-351a3f933333
+ False
/Users/laura/Library/Preferences/Rider2019.3/resharper-host/Sessions
False
\ No newline at end of file
diff --git a/telegram/Command.cs b/tgcli/Command.cs
similarity index 99%
rename from telegram/Command.cs
rename to tgcli/Command.cs
index 9493ca5..fd1e705 100644
--- a/telegram/Command.cs
+++ b/tgcli/Command.cs
@@ -2,10 +2,10 @@ using System;
using System.Collections.Generic;
using System.Linq;
using TdLib;
-using static telegram.tgcli;
-using static telegram.Util;
+using static tgcli.tgcli;
+using static tgcli.Util;
-namespace telegram {
+namespace tgcli {
public abstract class Command {
public string trigger;
public string shortcut;
@@ -24,7 +24,7 @@ namespace telegram {
}
public static class CommandManager {
- public static readonly List Commands = new List {
+ public static readonly List Commands = new() {
new ClearCommand(),
new CloseCommand(),
new EditCommand(),
@@ -552,7 +552,7 @@ namespace telegram {
string line;
var type = (TdApi.ChatType.ChatTypePrivate) chat.Type;
var user = GetUser(type.UserId);
- line = $"{Ansi.Bold}{Ansi.Yellow}@{user.Username} {Ansi.Magenta}{chat.Title}";
+ line = $"{Ansi.Bold}{Ansi.Yellow}@{user.Usernames.ActiveUsernames.First()} {Ansi.Magenta}{chat.Title}";
messageQueue.Add(line);
});
}
@@ -794,4 +794,4 @@ namespace telegram {
LogOut();
}
}
-}
\ No newline at end of file
+}
diff --git a/telegram/Util.cs b/tgcli/Util.cs
similarity index 74%
rename from telegram/Util.cs
rename to tgcli/Util.cs
index 4197e5b..2839509 100644
--- a/telegram/Util.cs
+++ b/tgcli/Util.cs
@@ -4,9 +4,9 @@ using System.Linq;
using System.Threading;
using NeoSmart.Unicode;
using static TdLib.TdApi;
-using static telegram.tgcli;
+using static tgcli.tgcli;
-namespace telegram {
+namespace tgcli {
public class Util {
public static class Ansi {
public const string ResetAll = "\x1B[0m";
@@ -20,9 +20,9 @@ namespace telegram {
public const string BoldOff = "\x1b[22m";
}
- public static User GetUser(int uid) {
+ public static User GetUser(long uid) {
try {
- var uinfo = client.ExecuteAsync(new GetUser {UserId = uid}).Result;
+ var uinfo = client.ExecuteAsync(new GetUser { UserId = uid }).Result;
return uinfo;
}
catch {
@@ -35,7 +35,7 @@ namespace telegram {
public static Chat GetChat(long chatId) {
try {
- return client.ExecuteAsync(new GetChat {ChatId = chatId}).Result;
+ return client.ExecuteAsync(new GetChat { ChatId = chatId }).Result;
}
catch {
return null;
@@ -47,12 +47,12 @@ namespace telegram {
}
public static Message GetMessage(long chatId, long messageId) {
- return client.ExecuteAsync(new GetMessage {ChatId = chatId, MessageId = messageId}).Result;
+ return client.ExecuteAsync(new GetMessage { ChatId = chatId, MessageId = messageId }).Result;
}
public static int GetTotalMessages(long chatId) {
try {
- var response = client.ExecuteAsync(new SearchChatMessages {ChatId = chatId, Query = "+", Limit = 1});
+ var response = client.ExecuteAsync(new SearchChatMessages { ChatId = chatId, Query = "+", Limit = 1 });
return response.Result.TotalCount;
}
catch {
@@ -76,17 +76,17 @@ namespace telegram {
return history;
lock (@lock)
- messageQueue.Add($"{Ansi.Red}[tgcli] " + $"Limit cannot be less than one. Usage: /history ");
+ messageQueue.Add($"{Ansi.Red}[tgcli] " + "Limit cannot be less than one. Usage: /history ");
return history;
}
var response = client.ExecuteAsync(new GetChatHistory {
- ChatId = chatId,
- FromMessageId = fromMessageId,
- Limit = limit,
- Offset = offset,
- OnlyLocal = false
- })
+ ChatId = chatId,
+ FromMessageId = fromMessageId,
+ Limit = limit,
+ Offset = offset,
+ OnlyLocal = false
+ })
.Result;
if (response.Messages_.Length < limit && i > 1 && !isSecret) {
@@ -104,36 +104,19 @@ namespace telegram {
public static List GetUnreadChats(bool all = false) {
var output = new List();
- var offset = 0L;
- while (true) {
- if (offset == 0) {
- var response = client.ExecuteAsync(new GetChats {OffsetOrder = long.MaxValue, Limit = int.MaxValue}).Result;
- offset = GetChat(response.ChatIds.Last()).Order;
- output.AddRange(all
- ? response.ChatIds.Select(GetChat).Where(c => c.UnreadCount > 0 || c.IsMarkedAsUnread).ToList()
- : response.ChatIds.Select(GetChat)
- .Where(c => (c.UnreadCount > 0 || c.IsMarkedAsUnread) && c.NotificationSettings.MuteFor == 0)
- .ToList());
- }
- else {
- var response = client.ExecuteAsync(new GetChats {OffsetOrder = offset, Limit = int.MaxValue}).Result;
- if (response.ChatIds.Length == 0)
- break;
- offset = GetChat(response.ChatIds.Last()).Order;
- output.AddRange(all
- ? response.ChatIds.Select(GetChat).Where(c => c.UnreadCount > 0 || c.IsMarkedAsUnread).ToList()
- : response.ChatIds.Select(GetChat)
- .Where(c => (c.UnreadCount > 0 || c.IsMarkedAsUnread) && c.NotificationSettings.MuteFor == 0)
- .ToList());
- }
- }
+ var response = client.ExecuteAsync(new GetChats { Limit = int.MaxValue }).Result;
+ output.AddRange(all
+ ? response.ChatIds.Select(GetChat).Where(c => c.UnreadCount > 0 || c.IsMarkedAsUnread).ToList()
+ : response.ChatIds.Select(GetChat)
+ .Where(c => (c.UnreadCount > 0 || c.IsMarkedAsUnread) && c.NotificationSettings.MuteFor == 0)
+ .ToList());
return output;
}
public static List GetChats() {
- var response = client.ExecuteAsync(new GetChats {OffsetOrder = long.MaxValue, Limit = int.MaxValue}).Result;
+ var response = client.ExecuteAsync(new GetChats { Limit = int.MaxValue }).Result;
return response.ChatIds.Select(GetChat).ToList();
}
@@ -142,18 +125,18 @@ namespace telegram {
return new List();
}
- var response = client.ExecuteAsync(new SearchPublicChats {Query = query}).Result;
+ var response = client.ExecuteAsync(new SearchPublicChats { Query = query }).Result;
var chats = response.ChatIds.Select(GetChat).ToList();
- chats.AddRange(client.ExecuteAsync(new SearchChats {Query = query, Limit = int.MaxValue}).Result.ChatIds.Select(GetChat));
+ chats.AddRange(client.ExecuteAsync(new SearchChats { Query = query, Limit = int.MaxValue }).Result.ChatIds.Select(GetChat));
return chats;
}
public static Chat GetChatByUsernameGlobal(string username) {
try {
- var response = client.ExecuteAsync(new SearchPublicChat {Username = username}).Result;
+ var response = client.ExecuteAsync(new SearchPublicChat { Username = username }).Result;
return response;
}
catch {
@@ -161,9 +144,9 @@ namespace telegram {
}
}
- public static int GetUserIdByUsername(string username) {
+ public static long GetUserIdByUsername(string username) {
try {
- var response = client.ExecuteAsync(new SearchPublicChat {Username = username}).Result;
+ var response = client.ExecuteAsync(new SearchPublicChat { Username = username }).Result;
if (response.Type is ChatType.ChatTypePrivate priv)
return priv.UserId;
@@ -180,24 +163,24 @@ namespace telegram {
}
public static List GetSecretChats() {
- var response = client.ExecuteAsync(new GetChats {OffsetOrder = long.MaxValue, Limit = int.MaxValue}).Result;
+ var response = client.ExecuteAsync(new GetChats { Limit = int.MaxValue }).Result;
return response.ChatIds.Select(GetChat).Where(c => c.Type is ChatType.ChatTypeSecret).ToList();
}
public static void CloseSecretChat(int secretChatId) {
- client.ExecuteAsync(new CloseSecretChat() {SecretChatId = secretChatId}).Wait();
+ client.ExecuteAsync(new CloseSecretChat { SecretChatId = secretChatId }).Wait();
}
- public static Chat CreateSecretChat(int userId) {
- return client.ExecuteAsync(new CreateNewSecretChat {UserId = userId}).Result;
+ public static Chat CreateSecretChat(long userId) {
+ return client.ExecuteAsync(new CreateNewSecretChat { UserId = userId }).Result;
}
public static void DeleteChatHistory(long chatId) {
- client.ExecuteAsync(new DeleteChatHistory {ChatId = chatId, RemoveFromChatList = true, Revoke = true}).Wait();
+ client.ExecuteAsync(new DeleteChatHistory { ChatId = chatId, RemoveFromChatList = true, Revoke = true }).Wait();
}
public static SecretChat GetSecretChat(int secretChatId) {
- var response = client.ExecuteAsync(new GetSecretChat {SecretChatId = secretChatId}).Result;
+ var response = client.ExecuteAsync(new GetSecretChat { SecretChatId = secretChatId }).Result;
return response;
}
@@ -239,7 +222,7 @@ namespace telegram {
Emojis.ForEach(em => message = message.Replace(em.Item1, em.Item2));
client.ExecuteAsync(new SendMessage {
ChatId = chatId,
- InputMessageContent = new InputMessageContent.InputMessageText {Text = new FormattedText() {Text = message}},
+ InputMessageContent = new InputMessageContent.InputMessageText { Text = new FormattedText { Text = message } },
ReplyToMessageId = replyTo,
});
currentUserRead = false;
@@ -251,7 +234,7 @@ namespace telegram {
var msg = client.ExecuteAsync(new EditMessageText {
ChatId = message.ChatId,
MessageId = message.Id,
- InputMessageContent = new InputMessageContent.InputMessageText {Text = new FormattedText() {Text = newText}}
+ InputMessageContent = new InputMessageContent.InputMessageText { Text = new FormattedText { Text = newText } }
})
.Result;
@@ -259,21 +242,21 @@ namespace telegram {
}
public static void MarkRead(long chatId, long messageId) {
- client.ExecuteAsync(new ViewMessages {ChatId = chatId, MessageIds = new[] {messageId}, ForceRead = true});
+ client.ExecuteAsync(new ViewMessages { ChatId = chatId, MessageIds = new[] { messageId }, ForceRead = true });
}
public static void MarkUnread(long chatId) {
- client.ExecuteAsync(new ToggleChatIsMarkedAsUnread {ChatId = chatId, IsMarkedAsUnread = true,});
+ client.ExecuteAsync(new ToggleChatIsMarkedAsUnread { ChatId = chatId, IsMarkedAsUnread = true, });
}
public static long SearchChatId(string query) {
try {
- var results = client.ExecuteAsync(new SearchChats {Query = query, Limit = 5}).Result;
+ var results = client.ExecuteAsync(new SearchChats { Query = query, Limit = 5 }).Result;
- if (query.StartsWith("@"))
- return results.ChatIds.First(p => GetChat(p).Type is ChatType.ChatTypePrivate type && GetUser(type.UserId).Username == query.Substring(1));
-
- return results.ChatIds.First(p => !(GetChat(p).Type is ChatType.ChatTypeSecret));
+ return query.StartsWith("@")
+ ? results.ChatIds.First(p => GetChat(p).Type is ChatType.ChatTypePrivate type
+ && GetUser(type.UserId).Usernames.ActiveUsernames.Contains(query[1..]))
+ : results.ChatIds.First(p => !(GetChat(p).Type is ChatType.ChatTypeSecret));
}
catch {
lock (@lock)
@@ -282,21 +265,21 @@ namespace telegram {
}
}
- public static int SearchUserInChats(string query) {
- var results = client.ExecuteAsync(new SearchChatsOnServer {Query = query, Limit = 5}).Result;
+ public static long SearchUserInChats(string query) {
+ var results = client.ExecuteAsync(new SearchChatsOnServer { Query = query, Limit = 5 }).Result;
if (results.ChatIds.Length == 0)
return 0;
- var output = results.ChatIds.Select(GetChat).Where(p => p.Type is ChatType.ChatTypePrivate).Select(p => ((ChatType.ChatTypePrivate) p.Type).UserId);
+ var output = results.ChatIds.Select(GetChat).Where(p => p.Type is ChatType.ChatTypePrivate).Select(p => ((ChatType.ChatTypePrivate)p.Type).UserId);
return output.Any() ? output.First() : 0;
}
- public static int SearchContacts(string query) {
+ public static long SearchContacts(string query) {
//TODO implement when TDLib 1.6 is released
try {
- var results = client.ExecuteAsync(new SearchContacts {Query = query, Limit = 5}).Result;
+ var results = client.ExecuteAsync(new SearchContacts { Query = query, Limit = 5 }).Result;
- return query.StartsWith("@") ? results.UserIds.First(p => GetUser(p).Username == query.Substring(1)) : results.UserIds.First();
+ return query.StartsWith("@") ? results.UserIds.First(p => GetUser(p).Usernames.ActiveUsernames.Contains(query[1..])) : results.UserIds.First();
}
catch {
lock (@lock)
@@ -311,8 +294,16 @@ namespace telegram {
client.ExecuteAsync(new LogOut()).Wait();
}
+ public static string GetFormattedUsernameFromSender(MessageSender sender) {
+ return sender switch {
+ MessageSender.MessageSenderUser user => GetFormattedUsername(GetUser(user.UserId)),
+ MessageSender.MessageSenderChat chat => GetFormattedUsername(GetChat(chat.ChatId)),
+ _ => throw new InvalidCastException()
+ };
+ }
+
public static string GetFormattedUsername(User sender) {
- var username = sender.Username;
+ var username = sender.Usernames.ActiveUsernames.First();
if (string.IsNullOrWhiteSpace(username))
username = sender.FirstName + " " + sender.LastName;
else
@@ -321,6 +312,10 @@ namespace telegram {
return username;
}
+ public static string GetFormattedUsername(Chat sender) {
+ return $"{sender.Title} [as chat]";
+ }
+
public static string FormatTime(long unix) {
var time = DateTimeOffset.FromUnixTimeSeconds(unix).DateTime.ToLocalTime();
var currentTime = DateTime.Now.ToLocalTime();
@@ -365,10 +360,10 @@ namespace telegram {
return input.Length < maxLen ? input : "<" + input.Substring(input.Length - maxLen + 2);
}
- public static readonly List> Emojis = new List> {
+ public static readonly List> Emojis = new() {
new Tuple("⏎ ", "\n"),
new Tuple(":xd:", Emoji.FaceWithTearsOfJoy.Sequence.AsString),
- new Tuple(":check:", Emoji.WhiteHeavyCheckMark.Sequence.AsString),
+ new Tuple(":check:", Emoji.CheckMark.Sequence.AsString),
new Tuple(":thinking:", Emoji.ThinkingFace.Sequence.AsString),
new Tuple(":eyes:", Emoji.Eyes.Sequence.AsString),
new Tuple(":heart:", Emoji.RedHeart.Sequence.AsString),
@@ -434,7 +429,7 @@ namespace telegram {
currentInputLine = part1 + part2.Substring(1);
}
- public static readonly List SpecialKeys = new List {
+ public static readonly List SpecialKeys = new() {
ConsoleKey.Backspace,
ConsoleKey.Tab,
ConsoleKey.Clear,
@@ -528,4 +523,4 @@ namespace telegram {
ConsoleKey.OemClear
};
}
-}
\ No newline at end of file
+}
diff --git a/telegram/tgcli.cs b/tgcli/tgcli.cs
similarity index 67%
rename from telegram/tgcli.cs
rename to tgcli/tgcli.cs
index 09229ac..556ec1c 100644
--- a/telegram/tgcli.cs
+++ b/tgcli/tgcli.cs
@@ -5,12 +5,13 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Td = TdLib;
-using static telegram.Util;
-using static telegram.CommandManager;
+using static TdLib.TdApi;
+using static tgcli.Util;
+using static tgcli.CommandManager;
// ReSharper disable SwitchStatementMissingSomeEnumCasesNoDefault
-namespace telegram {
+namespace tgcli {
/*
* TODO:
* fix newlines with input nav...
@@ -24,23 +25,23 @@ namespace telegram {
// ReSharper disable once InconsistentNaming
public static class tgcli {
- public static volatile Td.TdClient client = new Td.TdClient();
- public static string dbdir = "";
- public static volatile bool authorized;
- public static volatile string connectionState = "Connecting";
- public static long currentChatId = 0;
- public static volatile int currentChatUserId = 0;
- public static volatile bool currentUserRead;
- public static volatile Td.TdApi.Message lastMessage;
- public static volatile bool quitting;
- public static volatile string currentInputLine = "";
- public static volatile int currentInputPos;
- public static volatile List messageQueue = new List();
- public static volatile List missedMessages = new List();
- public static volatile string prefix = "[tgcli";
- public static volatile bool silent;
+ public static volatile Td.TdClient client = new();
+ public static string dbdir = "";
+ public static volatile bool authorized;
+ public static volatile string connectionState = "Connecting";
+ public static long currentChatId = 0;
+ public static long currentChatUserId = 0;
+ public static volatile bool currentUserRead;
+ public static volatile Message lastMessage;
+ public static volatile bool quitting;
+ public static volatile string currentInputLine = "";
+ public static volatile int currentInputPos;
+ public static volatile List messageQueue = new();
+ public static volatile List missedMessages = new();
+ public static volatile string prefix = "[tgcli";
+ public static volatile bool silent;
- public static volatile object @lock = new object();
+ public static volatile object @lock = new();
private static void Main(string[] args) {
if (args.Length == 1 && args[0] == "-s")
@@ -50,19 +51,19 @@ namespace telegram {
if (!Directory.Exists(dbdir))
Directory.CreateDirectory(dbdir);
- client.Send(new Td.TdApi.SetLogStream {
- LogStream = new Td.TdApi.LogStream.LogStreamFile {Path = Path.Combine(dbdir, "tdlib.log"), MaxFileSize = 10000000}
+ client.Send(new SetLogStream {
+ LogStream = new LogStream.LogStreamFile { Path = Path.Combine(dbdir, "tdlib.log"), MaxFileSize = 10000000 }
});
- client.Send(new Td.TdApi.SetLogVerbosityLevel {NewVerbosityLevel = 2});
+ client.Send(new SetLogVerbosityLevel { NewVerbosityLevel = 2 });
Console.Clear();
ClearCurrentConsoleLine();
client.UpdateReceived += HandleUpdate;
- OnAuthUpdate(new Td.TdApi.Update.UpdateAuthorizationState() {
- AuthorizationState = new Td.TdApi.AuthorizationState.AuthorizationStateWaitTdlibParameters()
+ OnAuthUpdate(new Update.UpdateAuthorizationState {
+ AuthorizationState = new AuthorizationState.AuthorizationStateWaitTdlibParameters()
});
while (!authorized) {
@@ -81,16 +82,16 @@ namespace telegram {
OnKeyPressed(key);
}
- private static void HandleUpdate(object sender, Td.TdApi.Update e) {
+ private static void HandleUpdate(object sender, Update e) {
switch (e) {
- case Td.TdApi.Update.UpdateAuthorizationState state:
+ case Update.UpdateAuthorizationState state:
OnAuthUpdate(state);
break;
- case Td.TdApi.Update.UpdateNewMessage message: {
+ case Update.UpdateNewMessage message: {
Task.Run(() => AddMessageToQueue(message.Message));
break;
}
- case Td.TdApi.Update.UpdateMessageContent message:
+ case Update.UpdateMessageContent message:
Task.Run(() => AddMessageToQueue(message));
Task.Run(() => {
var msg = GetMessage(message.ChatId, message.MessageId);
@@ -99,19 +100,19 @@ namespace telegram {
}
});
break;
- case Td.TdApi.Update.UpdateMessageSendSucceeded sentMsg:
+ case Update.UpdateMessageSendSucceeded sentMsg:
lastMessage = sentMsg.Message;
break;
- case Td.TdApi.Update.UpdateChatReadOutbox update:
+ case Update.UpdateChatReadOutbox update:
if (lastMessage != null && lastMessage.ChatId == update.ChatId) {
currentUserRead = true;
ScreenUpdate();
}
break;
- case Td.TdApi.Update.UpdateConnectionState state:
+ case Update.UpdateConnectionState state:
switch (state.State) {
- case Td.TdApi.ConnectionState.ConnectionStateConnecting _:
+ case ConnectionState.ConnectionStateConnecting _:
connectionState = "Connecting";
if (!authorized)
return;
@@ -119,7 +120,7 @@ namespace telegram {
messageQueue.Add($"{Ansi.Yellow}[tgcli] Connecting to Telegram servers...");
ScreenUpdate();
break;
- case Td.TdApi.ConnectionState.ConnectionStateConnectingToProxy _:
+ case ConnectionState.ConnectionStateConnectingToProxy _:
connectionState = "Connecting";
if (!authorized)
return;
@@ -127,7 +128,7 @@ namespace telegram {
messageQueue.Add($"{Ansi.Yellow}[tgcli] Connecting to Proxy...");
ScreenUpdate();
break;
- case Td.TdApi.ConnectionState.ConnectionStateReady _:
+ case ConnectionState.ConnectionStateReady _:
if (!authorized)
return;
@@ -139,7 +140,7 @@ namespace telegram {
});
ScreenUpdate();
break;
- case Td.TdApi.ConnectionState.ConnectionStateUpdating _:
+ case ConnectionState.ConnectionStateUpdating _:
connectionState = "Updating";
if (!authorized)
return;
@@ -147,7 +148,7 @@ namespace telegram {
messageQueue.Add($"{Ansi.Yellow}[tgcli] Updating message cache...");
ScreenUpdate();
break;
- case Td.TdApi.ConnectionState.ConnectionStateWaitingForNetwork _:
+ case ConnectionState.ConnectionStateWaitingForNetwork _:
connectionState = "Waiting for Network";
if (!authorized)
return;
@@ -158,16 +159,16 @@ namespace telegram {
}
break;
- case Td.TdApi.Update.UpdateSecretChat update:
+ case Update.UpdateSecretChat update:
var chat = update.SecretChat;
switch (chat.State) {
- case Td.TdApi.SecretChatState.SecretChatStateClosed _:
+ case SecretChatState.SecretChatStateClosed _:
lock (@lock)
messageQueue.Add($"{Ansi.Red}[tgcli] Secret chat with {chat.Id} was closed.");
ScreenUpdate();
break;
- case Td.TdApi.SecretChatState.SecretChatStatePending _: break;
- case Td.TdApi.SecretChatState.SecretChatStateReady _:
+ case SecretChatState.SecretChatStatePending _: break;
+ case SecretChatState.SecretChatStateReady _:
lock (@lock)
messageQueue.Add($"{Ansi.Green}[tgcli] Secret chat {chat.Id} connected.");
ScreenUpdate();
@@ -329,60 +330,58 @@ namespace telegram {
}
}
- private static void OnAuthUpdate(Td.TdApi.Update.UpdateAuthorizationState state) {
+ private static void OnAuthUpdate(Update.UpdateAuthorizationState state) {
switch (state.AuthorizationState) {
- case Td.TdApi.AuthorizationState.AuthorizationStateWaitTdlibParameters _:
- client.Send(new Td.TdApi.SetTdlibParameters {
- Parameters = new Td.TdApi.TdlibParameters {
- ApiId = 600606,
- ApiHash = "c973f46778be4b35481ce45e93271e82",
- DatabaseDirectory = dbdir,
- UseMessageDatabase = true,
- SystemLanguageCode = "en_US",
- DeviceModel = Environment.MachineName,
- SystemVersion = ".NET Core CLR " + Environment.Version,
- ApplicationVersion = "0.2a",
- EnableStorageOptimizer = true,
- UseSecretChats = true
- }
+ case AuthorizationState.AuthorizationStateWaitTdlibParameters _:
+ client.Send(new SetTdlibParameters {
+ ApiId = 600606,
+ ApiHash = "c973f46778be4b35481ce45e93271e82",
+ DatabaseDirectory = dbdir,
+ UseMessageDatabase = true,
+ SystemLanguageCode = "en_US",
+ DeviceModel = Environment.MachineName,
+ SystemVersion = ".NET Core CLR " + Environment.Version,
+ ApplicationVersion = "0.2a",
+ EnableStorageOptimizer = true,
+ UseSecretChats = true
});
break;
- case Td.TdApi.AuthorizationState.AuthorizationStateWaitEncryptionKey _:
- client.Send(new Td.TdApi.CheckDatabaseEncryptionKey());
- break;
- case Td.TdApi.AuthorizationState.AuthorizationStateWaitPhoneNumber _: {
+// case AuthorizationState.AuthorizationStateWaitEncryptionKey _:
+// client.Send(new Td.TdApi.CheckDatabaseEncryptionKey());
+// break;
+ case AuthorizationState.AuthorizationStateWaitPhoneNumber _: {
Console.Write("[tgcli] login> ");
var phone = Console.ReadLine();
- client.Send(new Td.TdApi.SetAuthenticationPhoneNumber {PhoneNumber = phone});
+ client.Send(new SetAuthenticationPhoneNumber { PhoneNumber = phone });
break;
}
- case Td.TdApi.AuthorizationState.AuthorizationStateWaitCode _: {
+ case AuthorizationState.AuthorizationStateWaitCode _: {
Console.Write("[tgcli] code> ");
var code = Console.ReadLine();
- client.Send(new Td.TdApi.CheckAuthenticationCode {Code = code});
+ client.Send(new CheckAuthenticationCode { Code = code });
break;
}
- case Td.TdApi.AuthorizationState.AuthorizationStateWaitPassword _: {
+ case AuthorizationState.AuthorizationStateWaitPassword _: {
Console.Write("[tgcli] 2fa password> ");
var pass = ReadConsolePassword();
- client.Send(new Td.TdApi.CheckAuthenticationPassword {Password = pass});
+ client.Send(new CheckAuthenticationPassword { Password = pass });
break;
}
- case Td.TdApi.AuthorizationState.AuthorizationStateReady _:
+ case AuthorizationState.AuthorizationStateReady _:
Console.WriteLine("[tgcli] logged in.");
authorized = true;
connectionState = "Ready";
break;
- case Td.TdApi.AuthorizationState.AuthorizationStateClosed _:
+ case AuthorizationState.AuthorizationStateClosed _:
messageQueue.Add($"{Ansi.Yellow}[tgcli] Logged out successfully. All local data has been deleted.");
ScreenUpdate();
Environment.Exit(0);
break;
- case Td.TdApi.AuthorizationState.AuthorizationStateClosing _:
+ case AuthorizationState.AuthorizationStateClosing _:
messageQueue.Add($"{Ansi.Yellow}[tgcli] Logging out...");
ScreenUpdate();
break;
- case Td.TdApi.AuthorizationState.AuthorizationStateLoggingOut _:
+ case AuthorizationState.AuthorizationStateLoggingOut _:
if (authorized)
return;
@@ -396,35 +395,34 @@ namespace telegram {
}
}
- public static string FormatMessage(Td.TdApi.Message msg) {
+ public static string FormatMessage(Message msg) {
string text;
- if (msg.Content is Td.TdApi.MessageContent.MessageText messageText)
+ if (msg.Content is MessageContent.MessageText messageText)
text = messageText.Text.Text;
- else if (msg.Content is Td.TdApi.MessageContent.MessagePhoto photo)
+ else if (msg.Content is MessageContent.MessagePhoto photo)
text = !string.IsNullOrWhiteSpace(photo.Caption.Text)
- ? $"[unsupported {msg.Content.DataType}] {photo.Caption.Text}"
- : $"[unsupported {msg.Content.DataType}]";
- else if (msg.Content is Td.TdApi.MessageContent.MessageDocument document)
+ ? $"[unsupported {msg.Content.DataType}] {photo.Caption.Text}"
+ : $"[unsupported {msg.Content.DataType}]";
+ else if (msg.Content is MessageContent.MessageDocument document)
text = !string.IsNullOrWhiteSpace(document.Caption.Text)
- ? $"[unsupported {msg.Content.DataType}] {document.Caption.Text}"
- : $"[unsupported {msg.Content.DataType}]";
+ ? $"[unsupported {msg.Content.DataType}] {document.Caption.Text}"
+ : $"[unsupported {msg.Content.DataType}]";
else
text = $"[unsupported {msg.Content.DataType}]";
- var sender = GetUser(msg.SenderUserId);
var chat = GetChat(msg.ChatId);
- var username = TruncateString(GetFormattedUsername(sender), 10);
+ var username = TruncateString(GetFormattedUsernameFromSender(msg.SenderId), 10);
var time = FormatTime(msg.Date);
var isChannel = msg.IsChannelPost;
- var isPrivate = chat.Type is Td.TdApi.ChatType.ChatTypePrivate || chat.Type is Td.TdApi.ChatType.ChatTypeSecret;
- var isSecret = chat.Type is Td.TdApi.ChatType.ChatTypeSecret;
+ var isPrivate = chat.Type is ChatType.ChatTypePrivate || chat.Type is ChatType.ChatTypeSecret;
+ var isSecret = chat.Type is ChatType.ChatTypeSecret;
var isReply = msg.ReplyToMessageId != 0;
chat.Title = TruncateString(chat.Title, 20);
- Td.TdApi.Message replyMessage;
+ Message replyMessage;
var msgPrefix = $"{Ansi.Bold}{Ansi.Green}[{time}] {(isSecret ? $"{Ansi.Red}[sec] " : "")}{Ansi.Cyan}{chat.Title} "
- + $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}";
+ + $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}";
var finalOutput = msgPrefix;
var indent = new string(' ', GetActualStringWidth(msgPrefix));
@@ -452,26 +450,25 @@ namespace telegram {
return finalOutput;
}
- public static string FormatMessageReply(Td.TdApi.Message msg, string origPrefix) {
+ public static string FormatMessageReply(Message msg, string origPrefix) {
string text;
- if (msg.Content is Td.TdApi.MessageContent.MessageText messageText)
+ if (msg.Content is MessageContent.MessageText messageText)
text = messageText.Text.Text;
else
text = $"[unsupported {msg.Content.DataType}]";
- var sender = GetUser(msg.SenderUserId);
var chat = GetChat(msg.ChatId);
- var username = GetFormattedUsername(sender);
+ var username = TruncateString(GetFormattedUsernameFromSender(msg.SenderId), 10);
var time = FormatTime(msg.Date);
var isChannel = msg.IsChannelPost;
- var isPrivate = chat.Type is Td.TdApi.ChatType.ChatTypePrivate || chat.Type is Td.TdApi.ChatType.ChatTypeSecret;
- var isSecret = chat.Type is Td.TdApi.ChatType.ChatTypeSecret;
+ var isPrivate = chat.Type is ChatType.ChatTypePrivate || chat.Type is ChatType.ChatTypeSecret;
+ var isSecret = chat.Type is ChatType.ChatTypeSecret;
chat.Title = TruncateString(chat.Title, 20);
var finalOutput = "";
var replyPrefix = $"{origPrefix}{Ansi.Yellow}Re: {Ansi.Bold}{Ansi.Green}[{time}] "
- + $"{(isSecret ? $"{Ansi.Red}[sec] " : "")}{Ansi.Cyan}{chat.Title} "
- + $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}";
+ + $"{(isSecret ? $"{Ansi.Red}[sec] " : "")}{Ansi.Cyan}{chat.Title} "
+ + $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}";
var indent = new string(' ', GetActualStringWidth(replyPrefix));
var arrows = $"{(msg.IsOutgoing ? $"{Ansi.Blue}»»»" : $"{Ansi.Magenta}«««")} ";
@@ -488,28 +485,27 @@ namespace telegram {
return finalOutput;
}
- private static string FormatMessage(Td.TdApi.Update.UpdateMessageContent msg) {
+ private static string FormatMessage(Update.UpdateMessageContent msg) {
string text;
- if (msg.NewContent is Td.TdApi.MessageContent.MessageText messageText)
+ if (msg.NewContent is MessageContent.MessageText messageText)
text = messageText.Text.Text;
else
text = $"[unsupported {msg.NewContent.DataType}]";
var message = GetMessage(msg.ChatId, msg.MessageId);
- var sender = GetUser(message.SenderUserId);
var chat = GetChat(msg.ChatId);
- var username = GetFormattedUsername(sender);
+ var username = TruncateString(GetFormattedUsernameFromSender(message.SenderId), 10);
var time = FormatTime(message.EditDate);
var isChannel = message.IsChannelPost;
- var isPrivate = chat.Type is Td.TdApi.ChatType.ChatTypePrivate;
+ var isPrivate = chat.Type is ChatType.ChatTypePrivate;
return $"{Ansi.Bold}{Ansi.Green}[{time}] {Ansi.Cyan}{chat.Title} "
- + $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}"
- + $"{(message.IsOutgoing ? $"{Ansi.Blue}»»»" : $"{Ansi.Magenta}«««")} "
- + $"{text}"
- + $"{Ansi.Yellow}*";
+ + $"{(isPrivate || isChannel ? "" : $"{Ansi.Yellow}{username} ")}"
+ + $"{(message.IsOutgoing ? $"{Ansi.Blue}»»»" : $"{Ansi.Magenta}«««")} "
+ + $"{text}"
+ + $"{Ansi.Yellow}*";
}
- public static void AddMessageToQueue(Td.TdApi.Message msg) {
+ public static void AddMessageToQueue(Message msg) {
//handle muted
if (GetChat(msg.ChatId).NotificationSettings.MuteFor > 0 && currentChatId != msg.ChatId)
return;
@@ -532,7 +528,7 @@ namespace telegram {
ScreenUpdate();
}
- public static void AddMessageToQueue(Td.TdApi.Update.UpdateMessageContent msg) {
+ public static void AddMessageToQueue(Update.UpdateMessageContent msg) {
//handle muted
if (GetChat(msg.ChatId).NotificationSettings.MuteFor > 0 && currentChatId != msg.ChatId || GetMessage(msg.ChatId, msg.MessageId).EditDate == 0)
return;
@@ -548,4 +544,4 @@ namespace telegram {
ScreenUpdate();
}
}
-}
\ No newline at end of file
+}
diff --git a/tgcli/tgcli.csproj b/tgcli/tgcli.csproj
new file mode 100644
index 0000000..2f02114
--- /dev/null
+++ b/tgcli/tgcli.csproj
@@ -0,0 +1,14 @@
+
+
+
+ Exe
+ net70
+
+
+
+
+
+
+
+
+