Merge branch 'master' into websockets

webapp/titanembeds/blueprints/api/api.py

@@ -100,6 +100,8 @@ def get_online_discord_users(guild_id, embed):
             for role in mem_roles:
                 if role["color"] != 0:
                     member["color"] = '{0:02x}'.format(role["color"]) #int to hex
+                    while len(member["color"]) < 6:
+                        member["color"] = "0" + member["color"]
                 if role["hoist"]:
                     member["hoist-role"] = {}
                     member["hoist-role"]["name"] = role["name"]

webapp/titanembeds/static/css/embedstyle.css

@@ -289,6 +289,10 @@ body > div.navbar-fixed > nav > div {
   background-color: #546e7a;
 }
 
+.modal-overlay {
+  height: auto;
+}
+
 .betatag {
   font-variant: small-caps;
   font-size: 15px;
@@ -375,6 +379,16 @@ a {
   width: 305px;
 }
 
+#visitor_mode_message_note {
+  display: none;
+}
+
+@media only screen and (min-width: 400px) {
+  #visitor_mode_message_note {
+    display: inline;
+  }
+}
+
 #focusmodal {
   background-color: rgba(84, 110, 122, 0.58);
   text-shadow: 1px 1px 2px black, 0 0 1em #607d8b, 0 0 0.2em #b0bec5;

webapp/titanembeds/static/js/embed.js

@@ -28,6 +28,7 @@
     var unauthenticated_users_list = []; // List of all guest users
     var discord_users_list = []; // List of all discord users that are probably online
     var guild_channels_list = []; // guild channels, but as a list of them
+    var shift_pressed = false; // Track down if shift pressed on messagebox
 
     function element_in_view(element, fullyInView) {
         var pageTop = $(window).scrollTop();
@@ -227,8 +228,10 @@
         });
         
         primeEmbed();
-        
         setInterval(send_socket_heartbeat, 5000);
+        if (getParameterByName("username")) {
+            $("#custom_username_field").val(getParameterByName("username"));
+        }
     });
     
     function changeTheme(theme=null, keep_custom_css=true) {
@@ -875,12 +878,21 @@
             }
         }
     });
+    
+    $("#messagebox").keyup(function (event) {
+        if (event.keyCode == 16) {
+            shift_pressed = false;
+        }
+    });
 
-    $("#messagebox").keyup(function(event){
+    $("#messagebox").keydown(function(event){
         if ($(this).val().length == 1) {
             $(this).val($.trim($(this).val()));
         }
-        if(event.keyCode == 13 && $(this).val().length >= 1 && $(this).val().length <= 350) {
+        if (event.keyCode == 16) {
+            shift_pressed = true;
+        }
+        if(event.keyCode == 13 && !shift_pressed && $(this).val().length >= 1 && $(this).val().length <= 350) {
             $(this).val($.trim($(this).val()));
             $(this).blur();
             $("#messagebox").attr('readonly', true);

webapp/titanembeds/templates/about.html.j2

@@ -75,8 +75,8 @@ etc.</p>
             </div>
             <div class="col s10">
                 <h5 class="black-text card-title">iAmMaffie_</h5>
-                <p class="black-text flow-text">Developer</p>
+                <p class="black-text flow-text">Head Developer</p>
-                <p class="black-text">A mysterious guy, he helped out Titan with his Python coding skills, he helped primarely with the Emoji parsers and the Discord Bot commands system.</p>
+                <p class="black-text">Have you heard of JustMaffie? He has done quite some developing for Titan.</p>
             </div>
           </div>
         </div>
@@ -126,7 +126,7 @@ etc.</p>
           </div>
         </div>
     </div>
-
+    
     <div class="col s12 m6">
         <div class="card-panel indigo lighten-5 z-depth-1 no-height-padding">
           <div class="row valign-wrapper">
@@ -190,6 +190,7 @@ etc.</p>
             </div>
             <div class="col s12 l10">
                 <h5 class="black-text card-title">Everybot</h5>
+                <p class="black-text flow-text">Multipurpose Bot</p>
                 <p class="black-text">Hey, thank you for reading this, Everybot is a Discord Bot created by JustMaffie, we aim to bring fun and moderation to Discord servers using our commands.
                 We also want to provide a nice community at our Discord Server.</p>
                 <a href="https://discord.gg/7creW7n" class="waves-effect btn" target="_blank">Discord Server</a>
@@ -198,4 +199,40 @@ etc.</p>
         </div>
     </div>
 </div>
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel indigo lighten-5 z-depth-1">
+          <div class="row">
+            <div class="col s12 l2">
+              <img src="{{ url_for('static', filename='img/partners/ping_salar_emote.png') }}" alt="" class="circle responsive-img">
+            </div>
+            <div class="col s12 l10">
+                <h5 class="black-text card-title">Ping and Salar's Emote List</h5>
+                <p class="black-text flow-text">Discord Global Emojis Listing</p>
+                <p class="black-text">Do you want to use global emotes, but can't afford Nitro? Well look no further! The Discord Universe contains a few servers, which have emotes you can use EVERYWHERE! We're a community about discovering those servers, and sharing them with you! All you have to do is click the link below and go to the #links channel! From there, you can select the servers you wish to get emotes from and use them on all the servers you want! AND IT'S FREE!</p>
+                <a href="https://discord.gg/kwCUFja" class="waves-effect btn" target="_blank">Discord Server</a>
+            </div>
+          </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel indigo lighten-5 z-depth-1">
+          <div class="row">
+            <div class="col s12 l2">
+              <img src="{{ url_for('static', filename='img/partners/streamers_connected.png') }}" alt="" class="circle responsive-img">
+            </div>
+            <div class="col s12 l10">
+                <h5 class="black-text card-title">Streamers Connected</h5>
+                <p class="black-text flow-text">Community for all Content Creators, Alike</p>
+                <p class="black-text">Streamers Connected is a community for content creators across all platforms of any genre and size. We strive to provide a place for creators to network, grow, and find any resources they may need to produce the best content they can. 
+We want to see all of our members rise to their potential and find success in their passion to create and entertain. We work with large and small developers to bring our streamers games at discounted prices, and fund giveaways.</p>
+                <a href="https://www.streamersconnected.tv/" class="waves-effect btn" target="_blank">Website</a>
+                <a href="https://discord.gg/StreamersConnected" class="waves-effect btn" target="_blank">Discord Server</a>
+            </div>
+          </div>
+        </div>
+    </div>
+</div>
 {% endblock %}

webapp/titanembeds/templates/card_queryparams.html.j2

@@ -30,6 +30,11 @@
                       <hr>
                       <em>Eg: theme=DiscordDark</em>
                     </li>
+                    <li class="collection-item">
+                      <strong>username=&lt;string&gt;</strong> <br>
+                      Prefills the guest username field with the given username. <br>
+                      <em>Eg: username=Rainbow%20Dash</em>
+                    </li>
                 </ul>
             </div>
           </div>

webapp/titanembeds/templates/embed.html.j2

@@ -175,7 +175,7 @@
         </div>
         <div id="messageboxouter" class="input-field inline">
           <textarea placeholder="Enter message" id="messagebox" type="text" class="materialize-textarea" rows="1"></textarea>
-          <span id="visitor_mode_message" style="display:none;">Please login to post a message. <a id="visitor_login_btn" class="waves-effect waves-light btn">Login</a></span>
+          <span id="visitor_mode_message" style="display:none;"><span id="visitor_mode_message_note">Please login to post a message.</span> <a id="visitor_login_btn" class="waves-effect waves-light btn">Login</a></span>
         </div>
       </div>
     </footer>