From 91f837b38490b3569981facc38a7c7bc24fdd485 Mon Sep 17 00:00:00 2001 From: Meysam Navaei Date: Wed, 13 Dec 2017 17:42:20 +0330 Subject: [PATCH] . --- TLSharp.Core/TelegramClient.cs | 26 ++++++++++--------- .../TL/Messages/TLRequestForwardMessage.cs | 1 + 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/TLSharp.Core/TelegramClient.cs b/TLSharp.Core/TelegramClient.cs index e69d9d5..1e4ab5b 100644 --- a/TLSharp.Core/TelegramClient.cs +++ b/TLSharp.Core/TelegramClient.cs @@ -109,10 +109,10 @@ namespace TLSharp.Core } } - private async Task RequestWithDcMigration(TLMethod request) + private async Task RequestWithDcMigration(TLMethod request) { var completed = false; - while(!completed) + while (!completed) { try { @@ -120,7 +120,7 @@ namespace TLSharp.Core await _sender.Receive(request); completed = true; } - catch(DataCenterMigrationException e) + catch (DataCenterMigrationException e) { await ReconnectToDcAsync(e.DC); // prepare the request for another try @@ -170,8 +170,8 @@ namespace TLSharp.Core throw new ArgumentNullException(nameof(phoneCodeHash)); if (String.IsNullOrWhiteSpace(code)) - throw new ArgumentNullException(nameof(code)); - + throw new ArgumentNullException(nameof(code)); + var request = new TLRequestSignIn() { PhoneNumber = phoneNumber, PhoneCodeHash = phoneCodeHash, PhoneCode = code }; await RequestWithDcMigration(request); @@ -179,8 +179,8 @@ namespace TLSharp.Core OnUserAuthenticated(((TLUser)request.Response.User)); return ((TLUser)request.Response.User); - } - + } + public async Task GetPasswordSetting() { var request = new TLRequestGetPassword(); @@ -210,8 +210,8 @@ namespace TLSharp.Core public async Task SignUpAsync(string phoneNumber, string phoneCodeHash, string code, string firstName, string lastName) { - var request = new TLRequestSignUp() { PhoneNumber = phoneNumber, PhoneCode = code, PhoneCodeHash = phoneCodeHash, FirstName = firstName, LastName = lastName }; - + var request = new TLRequestSignUp() { PhoneNumber = phoneNumber, PhoneCode = code, PhoneCodeHash = phoneCodeHash, FirstName = firstName, LastName = lastName }; + await RequestWithDcMigration(request); OnUserAuthenticated(((TLUser)request.Response.User)); @@ -251,7 +251,7 @@ namespace TLSharp.Core }); } - public async Task ForwardMessageAsync(TLAbsInputPeer target, int messageId) + public async Task ForwardMessageAsync(TLAbsInputPeer peerfrom, TLAbsInputPeer peerto, int messageId) { if (!IsUserAuthorized()) throw new InvalidOperationException("Authorize user first!"); @@ -259,8 +259,10 @@ namespace TLSharp.Core return await SendRequestAsync( new TLRequestForwardMessage() { - Peer = target, + //MessageId = _session.GetNewMessageId(), Id = messageId, + Peer = peerfrom, + PeerTo = peerto, RandomId = Helpers.GenerateRandomLong() }); } @@ -305,7 +307,7 @@ namespace TLSharp.Core Media = new TLInputMediaUploadedDocument() { File = file, - Caption = caption, + Caption = caption, MimeType = mimeType, Attributes = attributes }, diff --git a/TeleSharp.TL/TL/Messages/TLRequestForwardMessage.cs b/TeleSharp.TL/TL/Messages/TLRequestForwardMessage.cs index cb704cd..2a12da4 100644 --- a/TeleSharp.TL/TL/Messages/TLRequestForwardMessage.cs +++ b/TeleSharp.TL/TL/Messages/TLRequestForwardMessage.cs @@ -19,6 +19,7 @@ namespace TeleSharp.TL.Messages } public TLAbsInputPeer Peer { get; set; } + public TLAbsInputPeer PeerTo { get; set; } public int Id { get; set; } public long RandomId { get; set; } public TLAbsUpdates Response { get; set; }