some small fixes: grey-out send button if not ready
This commit is contained in:
		@@ -7,7 +7,11 @@ module.exports = function(sql) {
 | 
			
		||||
        console.log("new client");
 | 
			
		||||
 | 
			
		||||
        function emit(signal, data) {
 | 
			
		||||
            console.log("<- signal: "+signal);
 | 
			
		||||
            if (typeof data == 'string') {
 | 
			
		||||
                console.log("<- signal: "+signal+"("+data+")");
 | 
			
		||||
            } else {
 | 
			
		||||
                console.log("<- signal: "+signal);
 | 
			
		||||
            }
 | 
			
		||||
            socket.emit(signal, data);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -51,11 +55,11 @@ module.exports = function(sql) {
 | 
			
		||||
            if (user.name=="safechat") return emit("fail", "user name safechat is reserved");
 | 
			
		||||
            sql.query("select name, pubkey from user where name = ?", [user.name],
 | 
			
		||||
                      function(err, res, flds) {
 | 
			
		||||
                          if (err) return emit('fail', "login failed");
 | 
			
		||||
                          if (err) return emit('fail', "login failed (db access) - "+err);
 | 
			
		||||
                          if (!res || res.length==0) {
 | 
			
		||||
                              sql.query("insert into user (name, pubkey) values (?,?)",
 | 
			
		||||
                                        [user.name, user.pubkey], function(err, res, flds) {
 | 
			
		||||
                                            if (err) return emit('fail', "login failed");
 | 
			
		||||
                                            if (err) return emit('fail', "create user failed - "+err);
 | 
			
		||||
                                            broadcast("user", {
 | 
			
		||||
                                                name: user.name, exists: false, pubkey: user.pubkey
 | 
			
		||||
                                            });
 | 
			
		||||
@@ -63,7 +67,7 @@ module.exports = function(sql) {
 | 
			
		||||
                                        });
 | 
			
		||||
                          } else {
 | 
			
		||||
                              if (res[0].pubkey==user.pubkey) return emit('login');
 | 
			
		||||
                              emit('fail', "login failed");
 | 
			
		||||
                              emit('fail', "login failed - wrong credentials");
 | 
			
		||||
                          }
 | 
			
		||||
                      });
 | 
			
		||||
        });
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user