refacto chathub

src/Yavsc.Abstract/Chat/ChatHubConstants.cs

@@ -19,6 +19,6 @@ namespace Yavsc.Abstract.Chat
         public const string HopWontKickOp  = "Half operator cannot kick any operator";
         public const string LabAuthChatUser  = "Authenticated chat user";
         public const string NoKickOnCop  = "No, you won´t, you´ĺl never do kick a cop, it is the bad.";
-        public const string LabnoJoinNoSend = "LabnoJoinNoSend";
+        public const string LabNoJoinNoSend = "LabnoJoinNoSend";
     }
 }

src/Yavsc.Blogs/Controllers/FileSystemStreamController.cs

@@ -3,13 +3,13 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Attributes.Validation;
-using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.Messaging;
 using Yavsc.Services;
 using Microsoft.AspNetCore.SignalR;
 using Yavsc.Server.Helpers;
 using static Yavsc.Blogs.Constants;
+using Yavsc.Server.Hubs;
 
 namespace Yavsc.Blogs.Controllers
 {

src/Yavsc.Org/Extensions/HostingExtensions.cs

@@ -41,6 +41,7 @@ using Yavsc.Settings;
 using Yavsc.ViewModels.Auth;
 using IdentityServer8.Models;
 using IdentityServer8.EntityFramework.Mappers;
+using Yavsc.Server.Hubs;
 
 namespace Yavsc.Extensions;
 

src/Yavsc.Org/Services/ChatHubConnexionManager.cs

@@ -101,7 +101,7 @@ namespace Yavsc.Services
             return _isCop[userName];
         }
 
-        public void OnDisctonnected(string connectionId)
+        public void OnDisconnected(string connectionId)
         {
             string uname;
 
@@ -244,7 +244,7 @@ namespace Yavsc.Services
             throw new System.NotImplementedException();
         }
 
-        public bool Dehop(string roomName, string userName)
+        public bool DeHop(string roomName, string userName)
         {
             throw new System.NotImplementedException();
         }

src/Yavsc.Org/Services/YavscMessageSender.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Yavsc.Interface;
@@ -8,6 +7,7 @@ using Yavsc.Models;
 using Yavsc.Models.Google.Messaging;
 using Yavsc.Models.Haircut;
 using Yavsc.Models.Messaging;
+using Yavsc.Server.Hubs;
 
 namespace Yavsc.Services
 {
@@ -98,19 +98,19 @@ namespace Yavsc.Services
                     body + Environment.NewLine);
                         response.success++;
 
-                    var cxids = _cxManager.GetConnexionIds(user.UserName);
+                    var cxIds = _cxManager.GetConnexionIds(user.UserName);
-                    if (cxids == null)
+                    if (cxIds == null)
                     {
                         _logger.LogDebug($"no cx to {user.UserName} <{user.Email}> ");
                     }
                     else
                     {
-                        _logger.LogDebug($"Sending signal to {string.Join(" ", cxids)}  : " + JsonConvert.SerializeObject(ev));
+                        _logger.LogDebug($"Sending signal to {string.Join(" ", cxIds)}  : " + JsonConvert.SerializeObject(ev));
 
-                        foreach (var cxid in cxids)
+                        foreach (var cxId in cxIds)
                         {
                             // from usr asp.net Id : var hubClient = hubContext.Clients.User(userId);
-                            var hubClient = hubContext.Clients.Client(cxid);
+                            var hubClient = hubContext.Clients.Client(cxId);
                             var data = new Dictionary<string, object>
                             {
                                 ["event"] = JsonConvert.SerializeObject(ev)
@@ -152,22 +152,9 @@ namespace Yavsc.Services
             return await NotifyEvent<HairCutQueryEvent>(userIds, ev);
         }
 
-        public async Task<MessageWithPayloadResponse> NotifyAsync(IEnumerable<string> userIds, IEvent yaev)
+        public async Task<MessageWithPayloadResponse> NotifyAsync(IEnumerable<string> userIds, IEvent yavscEvent)
         {
-            return await NotifyEvent<IEvent>(userIds, yaev);
+            return await NotifyEvent<IEvent>(userIds, yavscEvent);
         }
-
-        /* SMS with Twilio:
-public Task SendSmsAsync(TwilioSettings twilioSettigns, string number, string message)
-{
-var Twilio = new TwilioRestClient(twilioSettigns.AccountSID, twilioSettigns.Token);
-var result = Twilio.SendMessage( twilioSettigns.SMSAccountFrom, number, message);
-// Status is one of Queued, Sending, Sent, Failed or null if the number is not valid
-Trace.TraceInformation(result.Status);
-// Twilio doesn't currently have an async API, so return success.
-
-return Task.FromResult(result.Status != "Failed");
-
-}  */
     }
 }

src/Yavsc.Server/Hubs/ChatHub.cs

@@ -19,23 +19,19 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using System;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Localization;
+#pragma warning disable CS4014 // Dans la mesure où cet appel n'est pas attendu, l'exécution de la méthode actuelle continue avant la fin de l'appel
 
-namespace Yavsc
+namespace Yavsc.Server.Hubs
 {
     using System.Diagnostics;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.EntityFrameworkCore;
-    using Models;
-    using Models.Chat;
     using Yavsc.Abstract.Chat;
-    using Yavsc.Helpers;
+    using Yavsc.Models;
+    using Yavsc.Models.Chat;
     using Yavsc.Server.Helpers;
     using Yavsc.Services;
     public partial class ChatHub : Hub, IDisposable
@@ -61,7 +57,9 @@ namespace Yavsc
                 NotifyUser(NotificationTypes.Error, context, error);
             });
             _logger = loggerFactory.CreateLogger<ChatHub>();
-            InputValidator = new HubInputValidator { NotifyUser = async (type, target, msg) => await this.NotifyUser(type, target, msg) };
+            InputValidator = new HubInputValidator(_localizer) {
+
+                NotifyUser = async (type, target, msg) => await this.NotifyUser(type, target, msg) };
         }
 
         void SetUserName(string cxId, string userName)
@@ -114,14 +112,14 @@ namespace Yavsc
                     return Context.User.Identity.Name;
                 }
             anonymousSequence++;
-            var aname = $"{ChatHubConstants.AnonymousUserNamePrefix}{queryUname}{anonymousSequence}";
+            var anonymousName = $"{ChatHubConstants.AnonymousUserNamePrefix}{queryUname}{anonymousSequence}";
-            SetUserName(Context.ConnectionId, aname);
+            SetUserName(Context.ConnectionId, anonymousName);
-            return aname;
+            return anonymousName;
         }
 
         static long anonymousSequence = 0;
 
-        public override async Task OnDisconnectedAsync(Exception ?ex)
+        public override async Task OnDisconnectedAsync(Exception ex)
         {
             string userName = Context.User?.Identity.Name;
             if (userName != null)
@@ -130,7 +128,7 @@ namespace Yavsc
                 var userId = user.Id;
                 await Clients.Group(ChatHubConstants.HubGroupFollowingPrefix + userId).SendAsync("notifyUser", NotificationTypes.DisConnected, userName, null);
 
-                _cxManager.OnDisctonnected(Context.ConnectionId);
+                _cxManager.OnDisconnected(Context.ConnectionId);
             }
               await base.OnDisconnectedAsync(ex);
         }
@@ -166,23 +164,23 @@ namespace Yavsc
             var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName;
             var user = _cxManager.GetUserName(Context.ConnectionId);
             await Groups.AddToGroupAsync(Context.ConnectionId, roomGroupName);
-            ChatRoomInfo chanInfo;
+            ChatRoomInfo channelInfo;
             if (!_cxManager.IsPresent(roomName, user))
             {
                 _logger.LogInformation($"Joining");
-                chanInfo = _cxManager.Join(roomName, Context.ConnectionId);
+                channelInfo = _cxManager.Join(roomName, Context.ConnectionId);
                 await Clients.Group(roomGroupName).SendAsync("notifyRoom", NotificationTypes.UserJoin, roomName, user);
             } else {
                 _logger.LogInformation($"already present");
                 // in case in an additional connection,
                 // one only send info on room without
                 // warning any other user.
-                _cxManager.TryGetChanInfo(roomName, out chanInfo);
+                _cxManager.TryGetChanInfo(roomName, out channelInfo);
             }
 
-            _logger.LogInformation($"returning chan info"); 
+            _logger.LogInformation($"returning channel info");
-            await Clients.Caller.SendAsync("joint", chanInfo);
+            await Clients.Caller.SendAsync("joint", channelInfo);
-            return chanInfo;
+            return channelInfo;
         }
 
         [Authorize]
@@ -192,23 +190,23 @@ namespace Yavsc
             var existent = _dbContext.ChatRoom.Any(r => r.Name == room);
             if (existent)
             {
-                NotifyUserInRoom(NotificationTypes.Error, room, "already registered.");
+               NotifyUserInRoom(NotificationTypes.Error, room, "already registered.");
                 return;
             }
             Debug.Assert(Context.User != null);
             string userName = Context.User.GetUserName();
             var user = _dbContext.Users.FirstOrDefault(u => u.UserName == userName);
 
-            var newroom = new ChatRoom { Name = room, OwnerId = Context.User.GetUserId() };
+            var newRoom = new ChatRoom { Name = room, OwnerId = Context.User.GetUserId() };
-            ChatRoomInfo chanInfo;
+            ChatRoomInfo channelInfo;
-            if (_cxManager.TryGetChanInfo(room, out chanInfo))
+            if (_cxManager.TryGetChanInfo(room, out channelInfo))
             {
-                // TODO get and require some admin status for current user on this chan
+                // TODO get and require some admin status for current user on this channel
-                newroom.Topic = chanInfo.Topic;
+                newRoom.Topic = channelInfo.Topic;
             }
-            newroom.LatestJoinPart = DateTime.Now;
+            newRoom.LatestJoinPart = DateTime.Now;
 
-            _dbContext.ChatRoom.Add(newroom);
+            _dbContext.ChatRoom.Add(newRoom);
             _dbContext.SaveChanges(user.Id);
         }
 
@@ -228,9 +226,9 @@ namespace Yavsc
             if (!InputValidator.ValidateRoomName(roomName)) return ;
             if (!InputValidator.ValidateUserName(userName)) return ;
             if (!InputValidator.ValidateReason(reason)) return;
-            ChatRoomInfo chanInfo;
+            ChatRoomInfo channelInfo;
             var roomGroupName = ChatHubConstants.HubGroupRomsPrefix + roomName;
-            if (_cxManager.TryGetChanInfo(roomName, out chanInfo))
+            if (_cxManager.TryGetChanInfo(roomName, out channelInfo))
             {
                 if (!_cxManager.IsPresent(roomName,userName))
                 {
@@ -241,9 +239,9 @@ namespace Yavsc
                 // the error handler will send an error message while handling the error.
                 if (!_cxManager.Kick(Context.ConnectionId, userName, roomName, reason)) return;
             }
-            var ukeys = _cxManager.GetConnexionIds(userName);
+            var cxIds = _cxManager.GetConnexionIds(userName);
-            if (ukeys!=null) foreach(var ukey in ukeys)
+            if (cxIds!=null) foreach(var cx in cxIds)
-                await Groups.RemoveFromGroupAsync(ukey, roomGroupName);
+                await Groups.RemoveFromGroupAsync(cx, roomGroupName);
             await Clients.Group(roomGroupName).SendAsync("notifyRoom", NotificationTypes.Kick, roomName, $"{userName}: {reason}");
         }
 
@@ -258,7 +256,7 @@ namespace Yavsc
         }
 
         [Authorize]
-        public void Gline(string userName,  string reason)
+        public void GLine(string userName,  string reason)
         {
             if (!InputValidator.ValidateUserName(userName)) return ;
             if (!InputValidator.ValidateReason(reason)) return;
@@ -299,9 +297,9 @@ namespace Yavsc
                 _logger.LogError($"Invalid message : {message}");
                 return ;
             }
-            var groupname = ChatHubConstants.HubGroupRomsPrefix + roomName;
+            var groupName = ChatHubConstants.HubGroupRomsPrefix + roomName;
-            ChatRoomInfo chanInfo ;
+            ChatRoomInfo channelInfo ;
-            if (!_cxManager.TryGetChanInfo(roomName, out chanInfo))
+            if (!_cxManager.TryGetChanInfo(roomName, out channelInfo))
             {
                 _logger.LogError($"No such room : {roomName}");
                 var noChanMsg = _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString();
@@ -312,11 +310,11 @@ namespace Yavsc
             if (!_cxManager.IsPresent(roomName, userName))
             {
                 _logger.LogError($"{userName} Not present in room : {roomName}");
-                var notSentMsg = _localizer.GetString(ChatHubConstants.LabnoJoinNoSend).ToString();
+                var notSentMsg = _localizer.GetString(ChatHubConstants.LabNoJoinNoSend).ToString();
                 NotifyUserInRoom(NotificationTypes.Error, roomName, notSentMsg);
                 return;
             }
-            var group = Clients.Group(groupname);
+            var group = Clients.Group(groupName);
             var msg = new { Name = userName, Room = roomName, Message = message};
             await group.SendAsync("ReceiveMessage", msg);
         }
@@ -399,3 +397,4 @@ namespace Yavsc
 
     }
 }
+#pragma warning restore CS4014 // Dans la mesure où cet appel n'est pas attendu, l'exécution de la méthode actuelle continue avant la fin de l'appel

src/Yavsc.Server/Hubs/HubInputValidator.cs

@@ -19,20 +19,23 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using System;
+using Microsoft.Extensions.Localization;
-using System.Linq;
-using Yavsc;
 
-namespace Yavsc
+namespace Yavsc.Server.Hubs
 {
     public class HubInputValidator {
 
+        public IStringLocalizer _locator;
+        public HubInputValidator(IStringLocalizer locator) {
+            _locator = locator;
+        }
+
         public Action<string,string,string> NotifyUser {get;set;}
         public bool ValidateRoomName (string roomName)
         {
             bool valid = ValidateStringLength(roomName,1,25);
             if (valid) valid = IsLetterOrDigit(roomName);
-            if (!valid) NotifyUser(NotificationTypes.Error, "roomName", ChatHubLabels.InvalidRoomName);
+            if (!valid) NotifyUser(NotificationTypes.Error, "roomName", _locator.GetString(ChatHubLabels.InvalidRoomName));
             return valid;
         }
         public bool ValidateUserName (string userName)
@@ -45,14 +48,18 @@ namespace Yavsc
                     if (valid) valid = ValidateStringLength(suname, 1,12);
                     if (valid) valid = IsLetterOrDigit(userName);
             }
-            if (!valid) NotifyUser(NotificationTypes.Error, "userName" , ChatHubLabels.InvalidUserName);
+            if (!valid)
+                NotifyUser(
+                    NotificationTypes.Error,
+                    "userName",
+                     _locator.GetString(ChatHubLabels.InvalidUserName));
             return valid;
         }
         public bool ValidateMessage (string message)
         {
             if (!ValidateStringLength(message, 1, 10240))
             {
-                NotifyUser(NotificationTypes.Error, "message", ChatHubLabels.InvalidMessage);
+                NotifyUser(NotificationTypes.Error, "message", _locator.GetString(ChatHubLabels.InvalidMessage));
                 return false;
             }
             return true;

src/Yavsc.Server/Interfaces/IConnexionManager.cs

@@ -11,7 +11,7 @@ namespace Yavsc.Services
         void OnConnected(string cxId, bool isCop);
         bool IsConnected(string candidate);
 
-        void OnDisctonnected (string cxId);
+        void OnDisconnected (string cxId);
         bool IsPresent(string roomName, string userName);
 
         ChatRoomInfo Join(string roomName, string cxId);
@@ -23,8 +23,8 @@ namespace Yavsc.Services
         bool Op(string roomName, string userName);
         bool Deop(string roomName, string userName);
         bool Hop(string roomName, string userName);
-        bool Dehop(string roomName, string userName);
+        bool DeHop(string roomName, string userName);
-        bool TryGetChanInfo(string room, out ChatRoomInfo chanInfo);
+        bool TryGetChanInfo(string room, out ChatRoomInfo channelInfo);
 
         IEnumerable<string> GetConnexionIds(string userName);