cleanning / code format

vnext
Paul Schneider 5 years ago
parent c2f0db5daa
commit 2375915952
2 changed files with 7 additions and 12 deletions

Binary file not shown.

@ -168,9 +168,6 @@ namespace Yavsc
return _cxManager.IsPresent(roomName, userName); return _cxManager.IsPresent(roomName, userName);
} }
public ChatRoomInfo Join(string roomName) public ChatRoomInfo Join(string roomName)
{ {
_logger.LogInformation($"Join:{roomName}"); _logger.LogInformation($"Join:{roomName}");
@ -189,7 +186,7 @@ namespace Yavsc
_logger.LogInformation($"Joining"); _logger.LogInformation($"Joining");
chanInfo = _cxManager.Join(roomName, Context.ConnectionId); chanInfo = _cxManager.Join(roomName, Context.ConnectionId);
Clients.Group(roomGroupName).notifyRoom(NotificationTypes.UserJoin, roomName, user); Clients.Group(roomGroupName).notifyRoom(NotificationTypes.UserJoin, roomName, user);
} else{ } else {
_logger.LogInformation($"already present"); _logger.LogInformation($"already present");
// in case in an additional connection, // in case in an additional connection,
// one only send info on room without // one only send info on room without
@ -348,13 +345,13 @@ namespace Yavsc
public void SendPV(string userName, string message) public void SendPV(string userName, string message)
{ {
_logger.LogInformation($"Sending pv to {userName}"); _logger.LogInformation($"Sending pv to {userName}");
if (!InputValidator.ValidateUserName(userName)) if (!InputValidator.ValidateUserName(userName))
{ {
_logger.LogError($"Invalid username : {userName}"); _logger.LogError($"Invalid username : {userName}");
return ; return ;
} }
if (!InputValidator.ValidateMessage(message)) if (!InputValidator.ValidateMessage(message))
{ {
_logger.LogError($"Invalid message : {message}"); _logger.LogError($"Invalid message : {message}");
return ; return ;
@ -365,10 +362,10 @@ namespace Yavsc
if (!Context.User.IsInRole(Constants.AdminGroupName)) if (!Context.User.IsInRole(Constants.AdminGroupName))
{ {
var bl = _dbContext.BlackListed var bl = _dbContext.BlackListed
.Include(r => r.User) .Include(r => r.User)
.Include(r => r.Owner) .Include(r => r.Owner)
.Where(r => r.User.UserName == Context.User.Identity.Name && r.Owner.UserName == userName) .Where(r => r.User.UserName == Context.User.Identity.Name && r.Owner.UserName == userName)
.Select(r => r.OwnerId); .Select(r => r.OwnerId);
if (bl.Count() > 0) if (bl.Count() > 0)
{ {
@ -391,11 +388,9 @@ namespace Yavsc
cli.addPV(Context.User.Identity.Name, message); cli.addPV(Context.User.Identity.Name, message);
_logger.LogInformation($"Sent pv to cx {connectionId}"); _logger.LogInformation($"Sent pv to cx {connectionId}");
} }
} }
[Authorize] [Authorize]
public void SendStream(string connectionId, long streamId, string message) public void SendStream(string connectionId, long streamId, string message)
{ {
if (!InputValidator.ValidateMessage(message)) return; if (!InputValidator.ValidateMessage(message)) return;

Loading…