From 2647021bf7a191b68545d8cadc65b28bb2985a7a Mon Sep 17 00:00:00 2001
From: Jeremy Zhang <jkzhang@uw.edu>
Date: Tue, 4 Apr 2017 19:16:21 +0000
Subject: [PATCH] Update user chip during fetch routine

---
 titanembeds/blueprints/api/api.py   |  5 +++++
 titanembeds/static/js/embed.js      | 14 +++++++++++++-
 titanembeds/templates/embed.html.j2 |  6 +++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/titanembeds/blueprints/api/api.py b/titanembeds/blueprints/api/api.py
index 531a2a1..de3c3b1 100644
--- a/titanembeds/blueprints/api/api.py
+++ b/titanembeds/blueprints/api/api.py
@@ -53,10 +53,13 @@ def update_user_status(guild_id, username, user_key=None):
     if user_unauthenticated():
         ip_address = get_client_ipaddr()
         status = {
+            'authenticated': False,
+            'avatar': None,
             'ip_address': ip_address,
             'username': username,
             'user_key': user_key,
             'guild_id': guild_id,
+            'user_id': session['user_id'],
             'banned': checkUserBanned(guild_id, ip_address),
             'revoked': checkUserRevoke(guild_id, user_key),
         }
@@ -70,6 +73,8 @@ def update_user_status(guild_id, username, user_key=None):
             db.session.commit()
     else:
         status = {
+            'authenticated': True,
+            'avatar': session["avatar"],
             'username': username,
             'guild_id': guild_id,
             'user_id': session['user_id'],
diff --git a/titanembeds/static/js/embed.js b/titanembeds/static/js/embed.js
index b3a2664..af05e24 100644
--- a/titanembeds/static/js/embed.js
+++ b/titanembeds/static/js/embed.js
@@ -183,7 +183,8 @@ function run_fetch_routine() {
     var fet = fetch(channel_id);
     fet.done(function(data) {
         console.log(data);
-        
+        var status = data.status;
+        update_embed_userchip(status.authenticated, status.avatar, status.username, status.user_id);
         var guild = query_guild();
         guild.done(function(guildobj) {
             fill_channels(guildobj.channels);
@@ -206,6 +207,17 @@ function run_fetch_routine() {
     });
 }
 
+function update_embed_userchip(authenticated, avatar, username, userid) {
+    if (authenticated) {
+        $("#currentuserimage").show();
+        $("#currentuserimage").attr("src", avatar);
+        $("#currentusername").text(username);
+    } else {
+        $("#currentuserimage").hide();
+        $("#currentusername").text(username + "#" + userid);
+    }
+}
+
 $("#discordlogin_btn").click(function() {
     lock_login_fields();
     wait_for_discord_login();
diff --git a/titanembeds/templates/embed.html.j2 b/titanembeds/templates/embed.html.j2
index 6b9c2d4..df09bd7 100644
--- a/titanembeds/templates/embed.html.j2
+++ b/titanembeds/templates/embed.html.j2
@@ -79,7 +79,7 @@
           </div>
           <div class="row">
             <div class="col s1 m4">
-              <a id="discordlogin_btn" href="{{ url_for("embed.login_discord", _external=True) }}" class="waves-effect waves-light btn-large" target="_blank">Login with Discord</a>
+              <a id="discordlogin_btn" href="{{ url_for("embed.login_discord", _external=True) }}" class="waves-effect waves-light btn-large" target="_blank">Discord Login</a>
             </div>
             {% if unauth_enabled %}
             <div class="col s1 m8">
@@ -95,8 +95,8 @@
     <footer class="footer">
       <div class="footercontainer">
         <div class="currentuserchip left" id="nameplate">
-          <div class="left"><img src="https://cdn.discordapp.com/icons/213459805048668160/14aa7c0ad94e3c80d2eeef3a83cae1c1.jpg" class="circle left currentuserimage"></div>
-          <div class="currentusername left">EndenDragon#4151</div>
+          <div class="left"><img id="currentuserimage" src="https://cdn.discordapp.com/icons/213459805048668160/14aa7c0ad94e3c80d2eeef3a83cae1c1.jpg" class="circle left currentuserimage" style="display: none;"></div>
+          <div id="currentusername" class="currentusername left">Titan#0001</div>
         </div>
         <div id="messageboxouter" class="input-field inline"><textarea placeholder="Enter message" id="messagebox" type="text" class="materialize-textarea"></textarea></div>
       </div>