2 files changed, 10 insertions, 6 deletions
diff --git a/src/main.css b/src/main.css
index fc7d02b..98c2511 100644
--- a/src/main.css
+++ b/src/main.css
@@ -27,6 +27,7 @@
 .messagetext {
     white-space: pre-wrap;
     flex-grow: 1;
+    word-break: break-all;
 }
 .messagedate {
     font-size: 12px;
@@ -106,6 +107,7 @@ body {
 .username {
     margin-left: 0.3em;
     margin-right: 0.7em;
+    word-break: keep-all;
 }
 
 .deleted {
diff --git a/src/main.ts b/src/main.ts
index 889b291..e0f768d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,6 +2,10 @@ interface User {
     id: number,
     username: string,
     deleted: boolean,
+    desc: string,
+    statustext: string,
+    status: number,
+    displayname: string,
 }
 interface Message {
     id: number,
@@ -48,8 +52,7 @@ async function format_message(m: Message): Promise<string> {
 
     let s = `<span id="${m.id}" class="message ${sclass}">
     <p class="messagedate">${format_date(m.date)}</p>
-    <p class="username">${sender}</p>
-    <p class="messagetext">${m.message}</p>
+    <p class="messagetext"><span class="username">${sender}</span>${m.message}</p>
     <span class="message_buttons_anchor">
         <span class="message_buttons">
             <button title="information" onclick="message_info(${m.id})"><i class="fa fa-info" aria-hidden="true"></i></button>
@@ -72,8 +75,7 @@ async function format_reply(m: Message): Promise<string> {
 
     let s = `<span class="reply ${sclass}" onclick="chatwindow(${m.id}, true)">
     <span class="reply_icon"><i class="fa fa-level-down fa-rotate-270" aria-hidden="true"></i></span>
-    <p class="username">${sender}</p>
-    <p class="messagetext">${m.message}</p>
+    <p class="messagetext"><span class="username">${sender}</span>${m.message}</p>
     </span>`
 
     return s
@@ -317,7 +319,7 @@ async function create_user(username) {
 async function get_user_name(id) {
     let cached = users.get(id)
     if (cached != undefined) {
-        return cached.username
+        return cached.displayname
     }
 
 
@@ -326,7 +328,7 @@ async function get_user_name(id) {
 
     users.set(user.id, user)
 
-    return user.username
+    return user.displayname
 }
 
 // Pretty hacky if I do say so myself