Merge remote-tracking branch 'origin/master'

vvye · Nov 21, 2018 · 7a751de · 7a751de
2 parents e0bae90 + 253074f
commit 7a751de
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 8 deletions.
diff --git a/css/dark/chat.css b/css/dark/chat.css
@@ -229,3 +229,28 @@ button#send {
 .chat-bar .chat-message .chat-message-content iframe {
     display: none;
 }
+
+.chat-message.tiny {
+    height: 1.7rem;
+    overflow-y: hidden;
+    line-height: 1rem;
+}
+
+.chat-message.tiny .avatar {
+    height: 1rem;
+    margin-top: 0;
+}
+
+.chat-message.tiny .chat-topbar {
+    float: left;
+}
+
+.chat-message.tiny .username {
+    font-size: 0.8rem !important;
+}
+
+.chat-message.tiny .chat-message-content {
+    float: left;
+    padding-left: 0.5rem;
+    font-size: 0.8rem;
+}
diff --git a/css/default/chat.css b/css/default/chat.css
@@ -231,3 +231,28 @@ button#send {
     display: none;
 }
 
+.chat-message.tiny {
+    height: 1.7rem;
+    overflow-y: hidden;
+    line-height: 1rem;
+}
+
+.chat-message.tiny .avatar {
+    height: 1rem;
+    margin-top: 0;
+}
+
+.chat-message.tiny .chat-topbar {
+    float: left;
+}
+
+.chat-message.tiny .username {
+    font-size: 0.8rem !important;
+}
+
+.chat-message.tiny .chat-message-content {
+    float: left;
+    padding-left: 0.5rem;
+    font-size: 0.8rem;
+}
+
diff --git a/inc/config/files.php b/inc/config/files.php
@@ -6,5 +6,6 @@
 		'jpeg',
 		'gif',
 		'bmp',
-		'txt'
+		'txt',
+		'pdf'
 	]);
diff --git a/inc/lang/de/tmpl/chat.php b/inc/lang/de/tmpl/chat.php
@@ -20,7 +20,8 @@
 
 		<?php foreach ($messages as $message): ?>
 
-			<div class="chat-message" id="message-<?= $message['id'] ?>" data-id="<?= $message['id'] ?>">
+			<div class="chat-message<?= startsWith($message['content'], '@Bot') ? ' tiny' : '' ?>"
+			     id="message-<?= $message['id'] ?>" data-id="<?= $message['id'] ?>">
 				<div class="chat-sidebar">
 					<img class="avatar" src="<?= $message['avatar_url'] ?>" />
 				</div>

diff --git a/js/chat.js.php b/js/chat.js.php
@@ -72,8 +72,9 @@ function removeFirstMessage() {
     function addMessage(message) {
 
         var largeAvatar = isYelling(message.content);
+        var tinyMessage = message.content.substr(0, 4) === '@Bot';
 
-        var messageTemplate = '<div class="chat-message" id="message-{id}" data-id="{id}">'
+        var messageTemplate = '<div class="chat-message' + (tinyMessage ? ' tiny' : '') + '" id="message-{id}" data-id="{id}">'
             + '<div class="chat-sidebar">'
             + '<img class="avatar' + (largeAvatar ? ' large' : '') + '" src="{avatar_url}" />'
             + '</div>'
@@ -243,8 +244,8 @@ function deleteMessage(id) {
         if (doDelete) {
             nanoajax.ajax({
                 url: 'inc/ajax/chat.php?action=delete'
-                + '&id=' + id
-                + '&token=' + '<?= getCsrfToken() ?>'
+                    + '&id=' + id
+                    + '&token=' + '<?= getCsrfToken() ?>'
             }, function (status) {
 
                 if (status === 403) {
@@ -276,7 +277,7 @@ function deleteMessage(id) {
 
         nanoajax.ajax({
             url: 'inc/ajax/chat.php?action=update_messages'
-            + '&last_id=' + getLastMessageId()
+                + '&last_id=' + getLastMessageId()
         }, function (status, response) {
 
             showCheckmark();
@@ -364,8 +365,8 @@ function postMessage() {
             url: 'inc/ajax/chat.php?action=post_message',
             method: 'POST',
             body: 'content=' + encodeURIComponent(messageContent.value)
-            + '&last_id=' + getLastMessageId()
-            + '&token=' + '<?= getCsrfToken() ?>'
+                + '&last_id=' + getLastMessageId()
+                + '&token=' + '<?= getCsrfToken() ?>'
         }, function (status, response) {
 
             if (status === 429) {