diff --git a/src/Yavsc/Hubs/ChatHub.cs b/src/Yavsc/Hubs/ChatHub.cs
index 6d795fe4..b033b071 100644
--- a/src/Yavsc/Hubs/ChatHub.cs
+++ b/src/Yavsc/Hubs/ChatHub.cs
@@ -210,11 +210,6 @@ namespace Yavsc
_cxManager.SetUserName( Context.ConnectionId, candidate);
}
- public void JoinAsync(string roomName)
- {
- var info = Join(roomName);
- Clients.Caller.joint(info);
- }
bool IsPresent(string roomName, string userName)
{
return _cxManager.IsPresent(roomName, userName);
@@ -237,9 +232,6 @@ namespace Yavsc
_cxManager.TryGetChanInfo(roomName, out chanInfo);
}
- // FIXME useless : Mobiles should also reveive the returned value
- Clients.Caller.joint(chanInfo);
-
return chanInfo;
}
@@ -332,14 +324,14 @@ namespace Yavsc
ChatRoomInfo 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);
return;
}
var userName = _cxManager.GetUserName(Context.ConnectionId);
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);
return;
}
diff --git a/src/Yavsc/Resources/Yavsc.ChatHub.en.resx b/src/Yavsc/Resources/Yavsc.ChatHub.en.resx
index e5cd70f1..8317c447 100644
--- a/src/Yavsc/Resources/Yavsc.ChatHub.en.resx
+++ b/src/Yavsc/Resources/Yavsc.ChatHub.en.resx
@@ -62,5 +62,5 @@
route name for the api controller used to tag the 'BlogPost' entity
-->
Authenticated chat user
- could not send to channel (not joint)
-
\ No newline at end of file
+ could not send to channel (not joint)
+
diff --git a/src/Yavsc/Services/ChatHubConnexionManager.cs b/src/Yavsc/Services/ChatHubConnexionManager.cs
index c9dd9d59..c2b88bf7 100644
--- a/src/Yavsc/Services/ChatHubConnexionManager.cs
+++ b/src/Yavsc/Services/ChatHubConnexionManager.cs
@@ -280,13 +280,13 @@ namespace Yavsc.Services
ChatRoomInfo chanInfo;
if (!Channels.ContainsKey(roomName))
{
- _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan));
+ _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString());
return false;
}
if (!Channels.TryGetValue(roomName, out chanInfo))
{
- _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan));
+ _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchChan).ToString());
return false;
}
@@ -294,24 +294,24 @@ namespace Yavsc.Services
if (!chanInfo.Ops.Contains(kickerName))
if (!chanInfo.Hops.Contains(kickerName))
{
- _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp));
+ _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabYouNotOp).ToString());
return false;
}
if (!IsPresent(roomName, userName))
{
- _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser));
+ _errorHandler(roomName, _localizer.GetString(ChatHubConstants.LabNoSuchUser).ToString());
return false;
}
if (chanInfo.Hops.Contains(kickerName))
if (chanInfo.Ops.Contains(userName))
{
- _errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp));
+ _errorHandler(roomName, _localizer.GetString(ChatHubConstants.HopWontKickOp).ToString());
return false;
}
if (isCop(userName))
{
- _errorHandler(roomName, _localizer.GetString(ChatHubConstants.NoKickOnCop));
+ _errorHandler(roomName, _localizer.GetString(ChatHubConstants.NoKickOnCop).ToString());
return false;
}