messages.setTyping

hellopyj · May 19, 2023 · 3f1a2f2 · 3f1a2f2
1 parent 4524b26
commit 3f1a2f2
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 15 deletions.
diff --git a/Ferrite.Core/Execution/Functions/BaseLayer/Messages/SetTypingFunc.cs b/Ferrite.Core/Execution/Functions/BaseLayer/Messages/SetTypingFunc.cs
@@ -0,0 +1,20 @@
+using Ferrite.Services;
+using Ferrite.TL;
+using Ferrite.TL.slim;
+
+namespace Ferrite.Core.Execution.Functions.BaseLayer.Messages;
+
+public class SetTypingFunc : ITLFunction
+{
+    private readonly IMessagesService _messages;
+
+    public SetTypingFunc(IMessagesService messages)
+    {
+        _messages = messages;
+    }
+    public async ValueTask<TLBytes?> Process(TLBytes q, TLExecutionContext ctx)
+    {
+        var result = await _messages.SetTyping(ctx.AuthKeyId, q);
+        return RpcResultGenerator.Generate(result, ctx.MessageId);
+    }
+}
diff --git a/Ferrite.Services/IMessagesService.cs b/Ferrite.Services/IMessagesService.cs
@@ -18,6 +18,7 @@
 
 using Ferrite.Data;
 using Ferrite.Data.Messages;
+using Ferrite.TL.slim;
 
 namespace Ferrite.Services;
 
@@ -46,6 +47,5 @@ Task<ServiceResult<MessagesDTO>> Search(long authKeyId, InputPeerDTO peer, strin
         int? topMessageId, MessagesFilterType filter, int minDate, int maxDate, int offsetId, int addOffset, 
         int limit, long maxId, long minId, long hash);
 
-    Task<ServiceResult<bool>> SetTyping(long authKeyId, InputPeerDTO peer,
-        SendMessageActionDTO action, int? topMessageId = null);
+    ValueTask<TLBool> SetTyping(long authKeyId, TLBytes q);
 }
diff --git a/Ferrite.Services/IUpdatesService.cs b/Ferrite.Services/IUpdatesService.cs
@@ -18,6 +18,7 @@
 using System;
 using Ferrite.Data;
 using Ferrite.Data.Updates;
+using Ferrite.TL.slim.layer150;
 
 namespace Ferrite.Services;
 
@@ -26,7 +27,7 @@ public interface IUpdatesService
     public Task<StateDTO> GetState(long authKeyId);
     public Task<ServiceResult<DifferenceDTO>> GetDifference(long authKeyId, int pts, int date,
         int qts, int? ptsTotalLimit = null);
-    public Task<bool> EnqueueUpdate(long userId, UpdateBase update);
+    public Task<bool> EnqueueUpdate(long userId, TLUpdate update);
     public Task<int> IncrementUpdatesSequence(long authKeyId);
 }
 
diff --git a/Ferrite.Services/MessagesService.cs b/Ferrite.Services/MessagesService.cs
@@ -20,6 +20,9 @@
 using Ferrite.Data.Messages;
 using Ferrite.Data.Repositories;
 using Ferrite.Data.Search;
+using Ferrite.TL.slim;
+using Ferrite.TL.slim.layer150;
+using Ferrite.TL.slim.layer150.messages;
 using Ferrite.Utils;
 using PeerSettingsDTO = Ferrite.Data.Messages.PeerSettingsDTO;
 
@@ -410,7 +413,7 @@ private async Task DeletePeerMessagesInternal(int maxId, int? minDate, int? maxD
     private async Task<int> DeleteMessagesInternal(int maxId, int? minDate, int? maxDate, IUpdatesContext userCtx,
         IReadOnlyCollection<MessageDTO> messages, AuthInfoDTO auth)
     {
-        List<int> deletedIds = new();
+        /*List<int> deletedIds = new();
         int pts = await userCtx.Pts();
         if (messages != null)
         {
@@ -430,7 +433,8 @@ private async Task<int> DeleteMessagesInternal(int maxId, int? minDate, int? max
             _updates.EnqueueUpdate(auth.UserId, deleteMessages);
         }
 
-        return pts;
+        return pts;*/
+        throw new NotImplementedException();
     }
 
     public async Task<ServiceResult<AffectedMessagesDTO>> DeleteMessages(long authKeyId, ICollection<int> id, bool revoke = false)
@@ -662,16 +666,19 @@ public async Task<ServiceResult<MessagesDTO>> Search(long authKeyId, InputPeerDT
         throw new NotImplementedException();
     }
 
-    public async Task<ServiceResult<bool>> SetTyping(long authKeyId, InputPeerDTO peer, SendMessageActionDTO action, int? topMessageId = null)
+    public async ValueTask<TLBool> SetTyping(long authKeyId, TLBytes q)
     {
-        /*var peerDTO = PeerFromInputPeer(peer);
+        using var peer = ((SetTyping)q).Get_Peer();
         var auth = await _unitOfWork.AuthorizationRepository.GetAuthorizationAsync(authKeyId);
-        if (peerDTO.PeerType == PeerType.User)
+        if (peer.Type == TLInputPeer.InputPeerType.InputPeerUser)
         {
-            var update = new UpdateUserTypingDTO(auth.UserId, action);
-            _updates.EnqueueUpdate(peerDTO.PeerId, update);
-            return new ServiceResult<bool>(true, true, ErrorMessages.None);
-        }*/
+            using TLUpdate update = UpdateUserTyping.Builder()
+                .UserId(auth.Value.AsAuthInfo().UserId)
+                .Action(((SetTyping)q).Action).
+                Build();
+            _updates.EnqueueUpdate(peer.AsInputPeerUser().UserId, update);
+            return new BoolTrue();
+        }
         throw new NotImplementedException();
     }
 

diff --git a/Ferrite.Services/UpdatesService.cs b/Ferrite.Services/UpdatesService.cs
@@ -20,6 +20,7 @@
 using Ferrite.Data;
 using Ferrite.Data.Repositories;
 using Ferrite.Data.Updates;
+using Ferrite.TL.slim.layer150;
 using Ferrite.Utils;
 using MessagePack;
 
@@ -101,7 +102,7 @@ public async Task<ServiceResult<DifferenceDTO>> GetDifference(long authKeyId, in
         throw new NotImplementedException();
     }
 
-    public async Task<bool> EnqueueUpdate(long userId, UpdateBase update)
+    public async Task<bool> EnqueueUpdate(long userId, TLUpdate update)
     {
         /*var user = _unitOfWork.UserRepository.GetUser(userId);
         var authorizations = await _unitOfWork.AuthorizationRepository.GetAuthorizationsAsync(user.Phone);

diff --git a/Ferrite.TL/currentLayer/messages/SetTyping.cs b/Ferrite.TL/currentLayer/messages/SetTyping.cs
@@ -111,7 +111,7 @@ public SendMessageAction Action
 
     public async Task<ITLObject> ExecuteAsync(TLExecutionContext ctx)
     {
-        var serviceResult = await _messages.SetTyping(ctx.CurrentAuthKeyId,
+        /*var serviceResult = await _messages.SetTyping(ctx.CurrentAuthKeyId,
             _mapper.MapToDTO<InputPeer, InputPeerDTO>(_peer),
             _mapper.MapToDTO<SendMessageAction, SendMessageActionDTO>(_action), _flags[0] ? _topMsgId : null);
         var rpcResult = factory.Resolve<RpcResult>();
@@ -128,7 +128,8 @@ public async Task<ITLObject> ExecuteAsync(TLExecutionContext ctx)
             rpcResult.Result = serviceResult.Result ? new BoolTrue() : new BoolFalse();
         }
         
-        return rpcResult;
+        return rpcResult;*/
+        throw new NotImplementedException();
     }
 
     public void Parse(ref SequenceReader buff)

diff --git a/Ferrite/ServerBuilder.cs b/Ferrite/ServerBuilder.cs
@@ -29,6 +29,7 @@
 using Ferrite.Core.Execution.Functions.BaseLayer.Auth;
 using Ferrite.Core.Execution.Functions.BaseLayer.Contacts;
 using Ferrite.Core.Execution.Functions.BaseLayer.Help;
+using Ferrite.Core.Execution.Functions.BaseLayer.Messages;
 using Ferrite.Core.Execution.Functions.BaseLayer.Users;
 using Ferrite.Core.Framing;
 using Ferrite.Core.RequestChain;
@@ -144,6 +145,15 @@ private static void RegisterApiLayers(ContainerBuilder builder)
         RegisterAccountMethods(builder);
         RegisterUsersMethods(builder);
         RegisterContactsMethods(builder);
+        RegisterMessagesMethods(builder);
+    }
+
+    private static void RegisterMessagesMethods(ContainerBuilder builder)
+    {
+        builder.RegisterType<SetTypingFunc>()
+            .Keyed<ITLFunction>(
+                new FunctionKey(DefaultLayer, Constructors.layer150_SetTyping))
+            .SingleInstance();
     }
 
     private static void RegisterContactsMethods(ContainerBuilder builder)