From 4b579e84bb39d4c4ab9e4b822f15d0be16110865 Mon Sep 17 00:00:00 2001
From: Piyush Mishra <piyush.raj.kit@gmail.com>
Date: Tue, 11 May 2021 16:21:49 +0530
Subject: [PATCH] base64

---
 Cargo.lock             | 1 +
 Cargo.toml             | 3 ++-
 src/ws_sansad/users.rs | 8 ++++----
 static/js/app.js       | 4 ++--
 static/js/message.js   | 8 ++++----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 20f3936..c169b5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1081,6 +1081,7 @@ dependencies = [
  "actix-files",
  "actix-web",
  "actix-web-actors",
+ "base64",
  "clap",
  "env_logger",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index 604fe6b..10d20c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,4 +21,5 @@ serde_json = "1.0.62"
 rand = "0.8.3"
 futures = "0.3.12"
 
-sha1 = "0.6.0"
\ No newline at end of file
+sha1 = "0.6.0"
+base64 = "0.13.0"
\ No newline at end of file
diff --git a/src/ws_sansad/users.rs b/src/ws_sansad/users.rs
index 2e35d3a..7178f6c 100644
--- a/src/ws_sansad/users.rs
+++ b/src/ws_sansad/users.rs
@@ -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(),
diff --git a/static/js/app.js b/static/js/app.js
index d3141a7..08efe8b 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -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 = '';
diff --git a/static/js/message.js b/static/js/message.js
index c842f24..60ca814 100644
--- a/static/js/message.js
+++ b/static/js/message.js
@@ -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();
     }