From ae52804a086667e8ab0aed18ac00b0d3567284de Mon Sep 17 00:00:00 2001
From: Jeremy Zhang <jkzhang@uw.edu>
Date: Sun, 4 Jun 2017 05:48:38 +0000
Subject: [PATCH] Add discordio support in embed endpoint

---
 webapp/titanembeds/blueprints/embed/embed.py | 3 ++-
 webapp/titanembeds/templates/embed.html.j2   | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/webapp/titanembeds/blueprints/embed/embed.py b/webapp/titanembeds/blueprints/embed/embed.py
index 9b68511..8d3f2dd 100644
--- a/webapp/titanembeds/blueprints/embed/embed.py
+++ b/webapp/titanembeds/blueprints/embed/embed.py
@@ -34,7 +34,8 @@ def guild_embed(guild_id):
             "id": guild.guild_id,
             "name": guild.name,
             "unauth_users": guild.unauth_users,
-            "icon": guild.icon
+            "icon": guild.icon,
+            "discordio": guild.discordio,
         }
         return render_template("embed.html.j2",
             login_greeting=get_logingreeting(),
diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2
index 8b5f01d..535e2e0 100644
--- a/webapp/titanembeds/templates/embed.html.j2
+++ b/webapp/titanembeds/templates/embed.html.j2
@@ -42,7 +42,7 @@
             {% if guild['icon'] %}
             <img class="circle" src="{{ generate_guild_icon( guild['id'], guild['icon']  ) }}">
             {% endif %}
-            <span class="name">{{ guild['name'] }}</span>
+            <span class="name">{{ guild['name']|e }}</span>
           </div>
         </li>
 
@@ -82,8 +82,12 @@
               {% if guild['icon'] %}
               <img id="modal_guildiconcircle" class="circle" src="{{ generate_guild_icon( guild['id'], guild['icon']  ) }}">
               {% endif %}
-              <p id="modal_guildname"><strong>{{ guild['name'] }}</strong></p>
+              <p id="modal_guildname"><strong>{{ guild['name']|e }}</strong></p>
+              {% if guild["discordio"] %}
+              <a id="modal_invite_btn_discordio" class="waves-effect waves-light btn" target="_blank" href="http://discord.io/{{ guild["discordio"]|e }}">discord.io/{{ guild["discordio"]|e }}</a>
+              {% else %}
               <a id="modal_invite_btn" class="waves-effect waves-light btn" target="_blank">discord.gg</a>
+              {% endif %}
             </div>
             <div class="col m9 s12">
               <p class="flow-text">Please choose one of the following methods to authenticate!</p>