From 9c9b37b61ff64681d658a033ffbf338b11ea051d Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 20 May 2019 18:48:03 +0100 Subject: [PATCH] [REORG] messages types --- .../Messaging}/NotificationTypes.cs | 5 +++-- src/Yavsc.Server/ErrorMessages.cs | 6 ------ .../Contracting/CommandController.cs | 2 +- src/Yavsc/Hubs/.ChatHub.cs.swp | Bin 0 -> 16384 bytes src/Yavsc/Hubs/ChatHub.cs | 11 +++++++++++ 5 files changed, 15 insertions(+), 9 deletions(-) rename src/{Yavsc.Server => Yavsc.Abstract/Messaging}/NotificationTypes.cs (79%) delete mode 100644 src/Yavsc.Server/ErrorMessages.cs create mode 100644 src/Yavsc/Hubs/.ChatHub.cs.swp diff --git a/src/Yavsc.Server/NotificationTypes.cs b/src/Yavsc.Abstract/Messaging/NotificationTypes.cs similarity index 79% rename from src/Yavsc.Server/NotificationTypes.cs rename to src/Yavsc.Abstract/Messaging/NotificationTypes.cs index 94568868..b0c82f31 100644 --- a/src/Yavsc.Server/NotificationTypes.cs +++ b/src/Yavsc.Abstract/Messaging/NotificationTypes.cs @@ -7,9 +7,10 @@ namespace Yavsc public const string UserPart = "userpart"; public const string UserJoin = "userjoin"; public const string PrivateMessageDenied = "deniedpv"; - public const string Error = "error"; - public const string BookQuery = "bookQuery"; + public const string ContactRefused = "contact refused"; + public const string ExistingUserName ="existing user name"; + } } diff --git a/src/Yavsc.Server/ErrorMessages.cs b/src/Yavsc.Server/ErrorMessages.cs deleted file mode 100644 index f49c3069..00000000 --- a/src/Yavsc.Server/ErrorMessages.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Yavsc -{ - public static class ErrorMessages { - public const string ContactRefused = "contact refused"; - } -} diff --git a/src/Yavsc/Controllers/Contracting/CommandController.cs b/src/Yavsc/Controllers/Contracting/CommandController.cs index 6248c2bc..b4224132 100644 --- a/src/Yavsc/Controllers/Contracting/CommandController.cs +++ b/src/Yavsc/Controllers/Contracting/CommandController.cs @@ -191,7 +191,7 @@ namespace Yavsc.Controllers nrep = new MessageWithPayloadResponse { failure=1, results = new MessageWithPayloadResponse.Result[] { new MessageWithPayloadResponse.Result { - error=ErrorMessages.ContactRefused, + error=NotificationTypes.ContactRefused, registration_id= pro.PerformerId } } }; diff --git a/src/Yavsc/Hubs/.ChatHub.cs.swp b/src/Yavsc/Hubs/.ChatHub.cs.swp new file mode 100644 index 0000000000000000000000000000000000000000..81ceb92af3efff79baccfcf46b8523664491081f GIT binary patch literal 16384 zcmeHNO^hQ)6)qM+638Y|0Er8tc0h?OX4{(t0h-yF#mukC{21G_%dlBRi!{PeGz$-eB9+l z;W)-50j348^{-D_Yr=UGuaawRL5wCqg_}wmy-}qENv=!N5rwIL#h? z>!+@g)6?iQrWJtCRG%B=`PUev(|=3I+-W3I+-W z3I+-W3I+-W3I+-W3I+-W3I+-WUI7EbVeAs>y-53Qod1hN#?AW}`y23A;19qLfaihF z1J3}fzzg>>_Fdp<;FCZVxOJMb9|NBNJ_fuK_{%+v{Tz4>_zW-rTwob^2zc@JjQs}q zHSkm5C%|`rF9BZ!t^y7)56l2(fV+TOuVd^c@GS6UU={fL-HiPZ_!jU@U7E(E30m)vy^V*Y93No(_c{YU?pMtP3Uf z=);X2E!7q(U*Q)n@EPF;{>(fZZRyF}Kj~?iOSqByM-?YiC^hV;osh5(EWZ(o} z+OWa(S3S|yjB1WwPdM$=kxj8LQPuBCeH2Ah`^FKbrjnCpVcr4{Rg`yOS}46!m#B87 zA5Q5|>ryyU>B}=z=&UI9bU|5pu~VnHpBraZ1!d^T|_fo7w@Wh3TDua%}s+N*X(K!}LB+rD;&32KYK!-&N}F zC7UlSayu1`p+x*lr}>CZGMy{8!%M{Sx^Oa%beSA3c|?nlnG$vLh#;DC}W~P``vb?Q{~F zHs?(8OWeA;3K8WAbHqTnAzxEL)Yqm4bGjPS!uk9bliD4To0EkaDO) zzLh+W#9>Me3E^iJxF305o>6VyeTR;QZdx9`^Tub?b`W@}?hCvl@UF`=$Xf45ZOlhJ z*q2JVj^siQeVez0zQ(ux#7ojCjSQ9itdMjm=n}u&R)rk~YG^It6%(#;wtGJs+c@9$(BsfgcOrXR2;T3;f{o`QQ8x;(?vw)%V{Qz zOtf*qxP`>owkNbUZw5Gp&vE?D^4hYi`+*j1PsWNx8VfDH88~=9Sfo%aX*7ABJ;`XX zX1=H8<||spk^-)+0v&WhYvmx6zQ$axY2nj_(D~byS(bh2V+h&9nt#=-F8s;z%OVuk ziWz2UW^<@Rxrd3@^Ws`iI`HjCDU85;q5MBQZR_kzfCcn_;8Eck5c?ql*69DQ!cgAQ7dd~Iuo zZ%C~%qZl)U$LsNc--rc5n2~pEL5}q*-wTxFjtqs1E@A3zt~8d`t6Qz=`)V7t)-Fe( z)mm$7rP<`G+YMgj^=hM4TiV&EHh6ufQQvN^z}hCPgnC9oI|})wT5ElKr^TyVyZlnM z(SX3+dBanHT)8iOV~x9qwG(U{2&J(0Co7GJ7Oi^|E@>U?xHMBjFv_}d)gA^SWMFlT z_tC)hJl>Wxk#-_)7BY;O5^{$@qrFA!lm~iL=d$dOT{~Op#pT<6%_W$YmJMHt! zz}>(QOA)aB6hk>O{f@aT%w&kVkV<)&LU=r zq)h*$Oln3JSGyeVJlzk=D_P=He(D!<@z*SfOX~h78Opa#6woz2m2#8}BZUYUJs))) z`bQx4r7Q%Ju$M34XwvN@M@_9^Uuvta+w# f5a9IYz#552lJDa)oCtmO!3QZj8GX_zm)XAoC1kLJ literal 0 HcmV?d00001 diff --git a/src/Yavsc/Hubs/ChatHub.cs b/src/Yavsc/Hubs/ChatHub.cs index 2bf31021..4eb2b229 100644 --- a/src/Yavsc/Hubs/ChatHub.cs +++ b/src/Yavsc/Hubs/ChatHub.cs @@ -189,6 +189,17 @@ namespace Yavsc public string Topic; } + public void Nick(string nickName) + { + var candidate = "?"+nickName; + if (ChatUserNames.Any(u=> u.Value == candidate )) + { + Clients.Caller.notify(NotificationTypes.ExistingUserName, "name already used:"+nickName); + return ; + } + ChatUserNames[ Context.ConnectionId ] = "?"+nickName; + } + public void JoinAsync(string roomName) { var info = Join(roomName);