Browse Source

retrieve sex field from facebook auth

SRV1 11 years ago
parent
commit
3edf50ac01

+ 1 - 0
apps/server/src/auth/auth_server.erl

@@ -83,6 +83,7 @@ user_info(#user{}=UserData) ->
     #'PlayerInfo'{id = wf:to_binary(UserData#user.id),
         login = UserData#user.username,
         name = UserData#user.names,
+        sex = UserData#user.sex,
         avatar_url = wf:to_binary(UserData#user.avatar),
         skill = 0,
         score = 0,

+ 3 - 3
apps/web/priv/static/app/index.htm

@@ -15,15 +15,15 @@
 
     <script src="js/n2o/bert.js"></script>
     <script src="js/n2o/bullet.js"></script>
-    <script src="js/n2o/facebook.js"></script>
+    <script src="js/n2o/facebook.js?v=1"></script>
 
     <script src="js/selector.js"></script>
     <script src="js/controller.js"></script>
     <script src="js/dragndrop.js"></script>
     <script src="js/timer.js"></script>
     <script src="js/player.js"></script>
-    <script src="js/chat.js"></script>
-    <script src="js/roster.js"></script>
+    <script src="js/chat.js?v=1"></script>
+    <script src="js/roster.js?v=1"></script>
     <script src="js/translations.js"></script>
 
     <script src="js/okey/okey_protocol.js"></script>

+ 1 - 1
apps/web/priv/static/app/js/chat.js

@@ -148,7 +148,7 @@ function addOnlineUser(name,full_name,score,insertMode) {
             'font-family="Exo 2" font-size="18" cursor="pointer" font-weight="normal" line-spacing="18"'+
             ' fill="#3B5998">' +
                 '<tspan xmlns:data="'+name+'" font-weight="normal" fill="'+color+'" x="19" y="22">'+utf8decode(full_name)+'</tspan>' + 
-                '<tspan xmlns:data="'+name+'" font-size="14" x="19" y="40">'+i18n("Score")+': '+parseUInt(score)+' </tspan></text>'+
+                '<tspan xmlns:data="'+name+'" font-size="14" x="19" y="40">'+i18n("Score")+': '+score+' </tspan></text>'+
             '<rect '+
             '  x="10" y="48" width="196" height="8"></rect></g>';
     var element = svg(html);

+ 3 - 3
apps/web/priv/static/app/js/n2o/facebook.js

@@ -11,7 +11,7 @@ utf8 = { toByteArray: utf8toByteArray };
       var inIframe= top!=self;
   //    setFbIframe(inIframe);
       if(inIframe && response.status == 'connected' && fbLogin)
-        FB.api("/me?fields=id,username,first_name,last_name,email,birthday", function(response){ fbLogin(response);});
+        FB.api("/me?fields=id,username,first_name,gender,last_name,email,birthday", function(response){ fbLogin(response);});
   //  }
   });
 };
@@ -19,9 +19,9 @@ utf8 = { toByteArray: utf8toByteArray };
 function fb_login(){
   FB.getLoginStatus(function(response){
     if(response.status == 'connected'){
-      if(fbLogin) FB.api("/me?fields=id,username,first_name,last_name,email,birthday", function(response){fbLogin(response);});
+      if(fbLogin) FB.api("/me?fields=id,username,gender,first_name,last_name,email,birthday", function(response){fbLogin(response);});
     } else FB.login(function(r){
-        if(r.authResponse && fbLogin) FB.api("/me?fields=id,username,first_name,last_name,email,birthday", function(response){fbLogin(response);});
+        if(r.authResponse && fbLogin) FB.api("/me?fields=id,gender,username,first_name,last_name,email,birthday", function(response){fbLogin(response);});
       }, {scope: 'email,user_birthday'});
   });
 }

+ 1 - 1
apps/web/priv/static/app/js/roster.js

@@ -22,7 +22,7 @@ function RosterHandlers(scope) {
         if (null != document.getElementById(id.entag())) removeOnlineUser(id);
         addOnlineUser(id,name+" "+surname,score,"insertTop");
         if ( name == document.names)
-            $("#Quota")[0].lastElementChild.textContent = i18n("Score") + ": " + score;
+            $("#Quota")[0].lastElementChild.textContent = i18n("Score") + ": " + parseUInt(score);
         if (currentChat == null) showOnlineList();
     });