kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replacing Client in ResultBase and subclasses

Browse Source 
- replace Client with Device to allow more access
- making Client in DeviceSession public to allow access from outside
This commit is contained in:
FlorianDahn 2022-05-15 15:41:24 +02:00
parent d08cbe8b0e
commit 72a1fa3c99
3 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
TelegramBotBase/Base/DataResult.cs
View File

@ -109,7 +109,7 @@ namespace TelegramBotBase.Base
public async Task<InputOnlineFile> DownloadDocument() public async Task<InputOnlineFile> DownloadDocument()
{ {
var encryptedContent = new System.IO.MemoryStream(this.Document.FileSize.Value); var encryptedContent = new System.IO.MemoryStream(this.Document.FileSize.Value);
var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, encryptedContent); var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, encryptedContent);
return new InputOnlineFile(encryptedContent, this.Document.FileName); return new InputOnlineFile(encryptedContent, this.Document.FileName);
} }
@ -122,9 +122,9 @@ namespace TelegramBotBase.Base
/// <returns></returns> /// <returns></returns>
public async Task DownloadDocument(String path) public async Task DownloadDocument(String path)
{ {
var file = await this.Client.TelegramClient.GetFileAsync(this.Document.FileId); var file = await Device.Client.TelegramClient.GetFileAsync(this.Document.FileId);
FileStream fs = new FileStream(path, FileMode.Create); FileStream fs = new FileStream(path, FileMode.Create);
await this.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs); await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
fs.Close(); fs.Close();
fs.Dispose(); fs.Dispose();
} }
@ -136,7 +136,7 @@ namespace TelegramBotBase.Base
public async Task<byte[]> DownloadRawDocument() public async Task<byte[]> DownloadRawDocument()
{ {
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, ms); await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, ms);
return ms.ToArray(); return ms.ToArray();
} }
@ -156,7 +156,7 @@ namespace TelegramBotBase.Base
public async Task<String> DownloadRawTextDocument(Encoding encoding) public async Task<String> DownloadRawTextDocument(Encoding encoding)
{ {
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, ms); await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Document.FileId, ms);
ms.Position = 0; ms.Position = 0;
@ -168,16 +168,16 @@ namespace TelegramBotBase.Base
public async Task<InputOnlineFile> DownloadVideo() public async Task<InputOnlineFile> DownloadVideo()
{ {
var encryptedContent = new System.IO.MemoryStream(this.Video.FileSize.Value); var encryptedContent = new System.IO.MemoryStream(this.Video.FileSize.Value);
var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Video.FileId, encryptedContent); var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Video.FileId, encryptedContent);
return new InputOnlineFile(encryptedContent, ""); return new InputOnlineFile(encryptedContent, "");
} }
public async Task DownloadVideo(String path) public async Task DownloadVideo(String path)
{ {
var file = await this.Client.TelegramClient.GetFileAsync(this.Video.FileId); var file = await Device.Client.TelegramClient.GetFileAsync(this.Video.FileId);
FileStream fs = new FileStream(path, FileMode.Create); FileStream fs = new FileStream(path, FileMode.Create);
await this.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs); await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
fs.Close(); fs.Close();
fs.Dispose(); fs.Dispose();
} }
@ -185,16 +185,16 @@ namespace TelegramBotBase.Base
public async Task<InputOnlineFile> DownloadAudio() public async Task<InputOnlineFile> DownloadAudio()
{ {
var encryptedContent = new System.IO.MemoryStream(this.Audio.FileSize.Value); var encryptedContent = new System.IO.MemoryStream(this.Audio.FileSize.Value);
var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Audio.FileId, encryptedContent); var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(this.Audio.FileId, encryptedContent);
return new InputOnlineFile(encryptedContent, ""); return new InputOnlineFile(encryptedContent, "");
} }
public async Task DownloadAudio(String path) public async Task DownloadAudio(String path)
{ {
var file = await this.Client.TelegramClient.GetFileAsync(this.Audio.FileId); var file = await Device.Client.TelegramClient.GetFileAsync(this.Audio.FileId);
FileStream fs = new FileStream(path, FileMode.Create); FileStream fs = new FileStream(path, FileMode.Create);
await this.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs); await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
fs.Close(); fs.Close();
fs.Dispose(); fs.Dispose();
} }
@ -203,7 +203,7 @@ namespace TelegramBotBase.Base
{ {
var photo = this.Photos[index]; var photo = this.Photos[index];
var encryptedContent = new System.IO.MemoryStream(photo.FileSize.Value); var encryptedContent = new System.IO.MemoryStream(photo.FileSize.Value);
var file = await this.Client.TelegramClient.GetInfoAndDownloadFileAsync(photo.FileId, encryptedContent); var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(photo.FileId, encryptedContent);
return new InputOnlineFile(encryptedContent, ""); return new InputOnlineFile(encryptedContent, "");
} }
@ -211,9 +211,9 @@ namespace TelegramBotBase.Base
public async Task DownloadPhoto(int index, String path) public async Task DownloadPhoto(int index, String path)
{ {
var photo = this.Photos[index]; var photo = this.Photos[index];
var file = await this.Client.TelegramClient.GetFileAsync(photo.FileId); var file = await Device.Client.TelegramClient.GetFileAsync(photo.FileId);
FileStream fs = new FileStream(path, FileMode.Create); FileStream fs = new FileStream(path, FileMode.Create);
await this.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs); await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
fs.Close(); fs.Close();
fs.Dispose(); fs.Dispose();
} }

11
TelegramBotBase/Base/ResultBase.cs
View File

@ -10,15 +10,6 @@ namespace TelegramBotBase.Base
{ {
public class ResultBase : EventArgs public class ResultBase : EventArgs
{ {
public MessageClient Client
{
get
{
return Device.ActiveForm.Client;
}
}
public DeviceSession Device public DeviceSession Device
{ {
get; get;
@ -56,7 +47,7 @@ namespace TelegramBotBase.Base
{ {
try try
{ {
await this.Client.TelegramClient.DeleteMessageAsync(this.DeviceId, (messageId == -1 ? this.MessageId : messageId)); await Device.Client.TelegramClient.DeleteMessageAsync(this.DeviceId, (messageId == -1 ? this.MessageId : messageId));
} }
catch catch
{ {

2
TelegramBotBase/Sessions/DeviceSession.cs
View File

@ -84,7 +84,7 @@ namespace TelegramBotBase.Sessions
/// </summary> /// </summary>
public Message LastMessage { get; set; } public Message LastMessage { get; set; }
private MessageClient Client public MessageClient Client
{ {
get get
{ {