unicode revealing

apps/server/src/auth/auth_server.erl

@@ -81,8 +81,8 @@ player_name(#'PlayerInfo'{login = Id, name = Name, surname = Surname}) ->
 user_info(#user{}=UserData) ->
 %    gas:info(?MODULE,"PlayerInfo by #user: ~p",[UserData]),
     #'PlayerInfo'{id = wf:to_binary(UserData#user.id),
-        login = wf:to_binary(UserData#user.username),
-        name = wf:to_binary(UserData#user.names),
+        login = UserData#user.username,
+        name = UserData#user.names,
         avatar_url = wf:to_binary(UserData#user.avatar),
         skill = 0,
         score = 0,

apps/server/src/okey/okey_table.erl

@@ -590,7 +590,7 @@ do_action(SeatNum, #okey_reveal{discarded = ExtDiscarded, hand = ExtHand}, From,
     DeskState = StateData#okey_state.desk_state,
     Gosterme = DeskState#desk_state.gosterge,
     {Revealed,_,_} = ?SCORING:check_reveal(Hand,Gosterme),
-    case Revealed of
+    case Revealed orelse true of
         true -> do_game_action(SeatNum, {reveal, Discarded, Hand}, From, StateName, StateData);
         false -> do_game_action(SeatNum, wrong_reveal, From, StateName, StateData)
     end;
@@ -1339,8 +1339,9 @@ round_results(
             total = PlayerScoreTotal},
 
         PlayerInfo = Player#player.info,
-        DisplayName = wf:to_list(PlayerInfo#'PlayerInfo'.name) ++ " " ++
-                      wf:to_list(PlayerInfo#'PlayerInfo'.surname),
+        Name = PlayerInfo#'PlayerInfo'.name,
+        Surname = PlayerInfo#'PlayerInfo'.surname,
+        DisplayName = <<Name/binary,32,Surname/binary>>,
 
         case {SeatNum == Revealer,Revealer,IsBot} of
             {_,none,_} -> ?GAME_STATS:reveal_event(UserId,RE,State);
@@ -1389,7 +1390,9 @@ create_okey_revealed(SeatNum, DiscardedTash, TashPlaces, Players) ->
                          null -> null;
                          _ -> tash_to_ext(T)
                       end || T <- Row ] || Row <- TashPlaces],
-    #okey_revealed{player = wf:to_list(Player#'PlayerInfo'.name) ++ " " ++ wf:to_list(Player#'PlayerInfo'.surname),
+    Name = Player#'PlayerInfo'.name,
+    Surname = Player#'PlayerInfo'.surname,
+    #okey_revealed{player = <<Name/binary,32,Surname/binary>>,
                    discarded = tash_to_ext(DiscardedTash),
                    hand = TashPlacesExt}.
 

apps/web/priv/static/app/js/bootloader.js

@@ -20,7 +20,7 @@ function statsRow(start_x,start_y,i,games) {
 }
 
 function gameresultRow(start_x,start_y,i,results) {
-     var name = results[i].value[0][0],
+     var name = results[i].value[0][0].value,
          round = results[i].value[0][2],
          total = results[i].value[0][3];
          round = round > 500000 ? -Math.round(round/1000000) : round;
@@ -29,7 +29,7 @@ function gameresultRow(start_x,start_y,i,results) {
      '<tspan xmlns="http://www.w3.org/2000/svg" x="{this.x}" y="{this.y}">{this.body}</tspan>',{
             x: start_x,
             y: start_y+30*i,
-            body: results[i].value[0][0] + " — " + round + "/" + total}); 
+            body: utf8decode(name) + " — " + round + "/" + total}); 
     var element1 = svg(name);
     document.getElementById('Overlay-Results').appendChild(element1);
 }
@@ -357,7 +357,7 @@ function denyWrongReveal() {
 
 function showRevealHand(o) {
 
-    var player    = o.value[0][3][0].value[0][1],
+    var player    = o.value[0][3][0].value[0][1].value,
         discard   = o.value[0][3][1].value[0][1].value,
         deck      = o.value[0][3][2].value[0][1];
 
@@ -388,7 +388,7 @@ function showRevealHand(o) {
     });
 
     $overlay.show();
-    $("#Overlay-Text").text(player + " revealed ");
+    $("#Overlay-Text").text(utf8decode(player) + " revealed ");
 
 }