paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes messages

Browse Source
This commit is contained in:
Paul Schneider
2019-06-15 17:00:00 +01:00
parent c70358d5ab
commit aa770ab96c
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Yavsc/Hubs/ChatHub.cs
View File

@ -210,11 +210,6 @@ namespace Yavsc
_cxManager.SetUserName( Context.ConnectionId, candidate); _cxManager.SetUserName( Context.ConnectionId, candidate);
} }
public void JoinAsync(string roomName)
{
var info = Join(roomName);
Clients.Caller.joint(info);
}
bool IsPresent(string roomName, string userName) bool IsPresent(string roomName, string userName)
{ {
return _cxManager.IsPresent(roomName, userName); return _cxManager.IsPresent(roomName, userName);
@ -237,9 +232,6 @@ namespace Yavsc
_cxManager.TryGetChanInfo(roomName, out chanInfo); _cxManager.TryGetChanInfo(roomName, out chanInfo);
} }
// FIXME useless : Mobiles should also reveive the returned value
Clients.Caller.joint(chanInfo);
return chanInfo; return chanInfo;
} }
@ -332,14 +324,14 @@ namespace Yavsc
ChatRoomInfo chanInfo ; ChatRoomInfo chanInfo ;
if (!_cxManager.TryGetChanInfo(roomName, out chanInfo)) if (!_cxManager.TryGetChanInfo(roomName, out chanInfo))
{ {
var noChanMsg = _localizer.GetString(ChatHubConstants.LabNoSuchChan); var noChanMsg = _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString();
Clients.Caller.notifyUser(NotificationTypes.Error, roomName, noChanMsg); Clients.Caller.notifyUser(NotificationTypes.Error, roomName, noChanMsg);
return; return;
} }
var userName = _cxManager.GetUserName(Context.ConnectionId); var userName = _cxManager.GetUserName(Context.ConnectionId);
if (!_cxManager.IsPresent(roomName, userName)) if (!_cxManager.IsPresent(roomName, userName))
{ {
var notSentMsg = _localizer.GetString(ChatHubConstants.LabnoJoinNoSend); var notSentMsg = _localizer.GetString(ChatHubConstants.LabnoJoinNoSend).ToString();
Clients.Caller.notifyUser(NotificationTypes.Error, roomName, notSentMsg); Clients.Caller.notifyUser(NotificationTypes.Error, roomName, notSentMsg);
return; return;
} }

4
src/Yavsc/Resources/Yavsc.ChatHub.en.resx
View File

@ -62,5 +62,5 @@
route name for the api controller used to tag the 'BlogPost' entity route name for the api controller used to tag the 'BlogPost' entity
--> -->
<data name="Authenticated chat user"><value>Authenticated chat user</value></data> <data name="Authenticated chat user"><value>Authenticated chat user</value></data>
<data name="LabnoJoinNoSend">could not send to channel (not joint)</data> <data name="LabnoJoinNoSend"><value>could not send to channel (not joint)</value></data>
</root> </root>

12
src/Yavsc/Services/ChatHubConnexionManager.cs
View File

@ -280,13 +280,13 @@ namespace Yavsc.Services
ChatRoomInfo chanInfo; ChatRoomInfo chanInfo;
if (!Channels.ContainsKey(roomName)) if (!Channels.ContainsKey(roomName))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan)); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString());
return false; return false;
} }
if (!Channels.TryGetValue(roomName, out chanInfo)) if (!Channels.TryGetValue(roomName, out chanInfo))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan)); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString());
return false; return false;
} }
@ -294,24 +294,24 @@ namespace Yavsc.Services
if (!chanInfo.Ops.Contains(kickerName)) if (!chanInfo.Ops.Contains(kickerName))
if (!chanInfo.Hops.Contains(kickerName)) if (!chanInfo.Hops.Contains(kickerName))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp)); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp).ToString());
return false; return false;
} }
if (!IsPresent(roomName, userName)) if (!IsPresent(roomName, userName))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser)); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser).ToString());
return false; return false;
} }
if (chanInfo.Hops.Contains(kickerName)) if (chanInfo.Hops.Contains(kickerName))
if (chanInfo.Ops.Contains(userName)) if (chanInfo.Ops.Contains(userName))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp)); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp).ToString());
return false; return false;
} }
if (isCop(userName)) if (isCop(userName))
{ {
_errorHandler(roomName, _localizer.GetString(ChatHubConstants.NoKickOnCop)); _errorHandler(roomName, _localizer.GetString(ChatHubConstants.NoKickOnCop).ToString());
return false; return false;
} }