piyushxcoder
/
lupt
mirror of https://github.com/PiyushXCoder/lupt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

base64

This commit is contained in:
Piyush मिश्रः 2021-05-11 16:21:49 +05:30
parent d9e5047693
commit 4b579e84bb
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -1081,6 +1081,7 @@ dependencies = [
"actix-files",
"actix-web",
"actix-web-actors",
"base64",
"clap",
"env_logger",
"futures",

3
Cargo.toml
View File

@ -21,4 +21,5 @@ serde_json = "1.0.62"
rand = "0.8.3"
futures = "0.3.12"
sha1 = "0.6.0"
sha1 = "0.6.0"
base64 = "0.13.0"

8
src/ws_sansad/users.rs
View File

@ -19,11 +19,11 @@ impl WsSansad {
return;
}
};
// kunjika to hash
// kunjika to hash and base64
let mut m = sha1::Sha1::new();
m.update(format!("{}{}",kunjika,
std::env::var("SALT").unwrap_or("".to_owned())).as_bytes());
let kunjika = m.digest().to_string();
let kunjika = base64::encode(m.digest().bytes())[..8].to_owned();
let name = match val.get("name") {
Some(val ) => val.as_str().unwrap().to_owned(),
@ -136,11 +136,11 @@ impl WsSansad {
return;
}
};
// kunjika to hash
// kunjika to hash and base64
let mut m = sha1::Sha1::new();
m.update(format!("{}{}",kunjika,
std::env::var("SALT").unwrap_or("".to_owned())).as_bytes());
let kunjika = m.digest().to_string();
let kunjika = base64::encode(m.digest().bytes())[..8].to_owned();
let name = match val.get("name") {
Some(val ) => val.as_str().unwrap().to_owned(),

4
static/js/app.js
View File

@ -98,12 +98,12 @@ socket.onmessage = function(event) {
case 'connected':
vayakti[j.kunjika] = j.name;
if(!$('#vayakti_model').hasClass('.is-hidden')) refreshVayaktiList();
Messages.pushStatus('Vyakti '+j.name+' connected as '+j.kunjika.substr(0,8)+' at '+Messages.currentTime());
Messages.pushStatus('Vyakti '+j.name+' connected as '+j.kunjika+' at '+Messages.currentTime());
break;
case 'disconnected':
delete vayakti[j.kunjika];
if(!$('#vayakti_model').hasClass('.is-hidden')) refreshVayaktiList();
Messages.pushStatus('Vyakti '+j.name+' disconnected as '+j.kunjika.substr(0,8)+' at '+Messages.currentTime());
Messages.pushStatus('Vyakti '+j.name+' disconnected as '+j.kunjika+' at '+Messages.currentTime());
break;
case 'left':
myinfo.kunjika = '';

8
static/js/message.js
View File

@ -52,7 +52,7 @@ let Messages = class {
typing.forEach(function(val) {
var name = vayakti[val];
if(name == undefined) name = "";
text += name+'('+val.substr(0,8)+')'+ ','
text += name+'('+val+')'+ ','
})
text = text.substr(0, text.length-1);
text += ' is typing...'
@ -68,7 +68,7 @@ let Messages = class {
var elm = $('<div>', {class: 'message '+(isMe?'message-me':'message-other'), msgid: msg_id});
if(!no_name_message) {
elm.append($('<div>', {class: 'message-sub', name: 'by'})
.append($('<span>').text(vayakti[sender]+'('+sender.substr(0, 8)+')'))
.append($('<span>').text(vayakti[sender]+'('+sender+')'))
.append($('<span>', {class: 'pull-right'}).text(Messages.currentTime())));
}
if(reply != null && reply.length > 0) {
@ -93,7 +93,7 @@ let Messages = class {
var elm = $('<div>', {class: 'message '+(isMe?'message-me':'message-other'), msgid: msg_id});
if(!no_name_message) {
elm.append($('<div>', {class: 'message-sub', name: 'by'})
.append($('<span>').text(vayakti[sender]+'('+sender.substr(0, 8)+')'))
.append($('<span>').text(vayakti[sender]+'('+sender+')'))
.append($('<span>', {class: 'pull-right'}).text(Messages.currentTime())));
}
elm.append($('<img>', {src: src, width: 300}));
@ -132,7 +132,7 @@ let Messages = class {
var el = $('#reply_clip');
el.removeClass('is-hidden');
el.attr('msg', text);
$('#reply_clip > span').text(text.substr(0, 20)+ '...');
$('#reply_clip > span').text(text+ '...');
Messages.unselectAll();
}