clean up

Author: Jeff

.gitignore

@@ -12,3 +12,6 @@ node_modules
 
 # This file is for local config which we never want committed:
 /sogs.ini
+
+
+/.vscode/

.vscode/settings.json

@@ -1,4 +1,3 @@
-
 const makebuffer = (raw) => {
     let b = Uint8Array.from(window.atob(raw), (v) => v.charCodeAt(0));
     // This data is padded with a 0x80 delimiter followed by any number of 0x00 bytes, but these are
@@ -50,12 +49,12 @@ const setup = async () => {
 
             if(msgs.length === 0)
             {
-                elem.appendChild(document.createTextNode(`the ${window.view_room} room is empty`));
+                elem.appendChild(document.createTextNode(`the ${window.view_room_token} room is empty`));
             }
 
             for(let msg of msgs.reverse())
             {
-                let e = document.createElement("li")
+                let e = document.createElement("li");
                 try
                 {
                     const data = makebuffer(msg.data);
@@ -64,41 +63,42 @@ const setup = async () => {
                     {
                         throw Error(err);
                     }
-                    
+
                     const plain = Message.decode(data).dataMessage;
 
                     // reply
-                    if (plain.quote){
-                        originalMsg = document.createElement('p');
+                    if (plain.quote)
+                    {
+                        let originalMsg = document.createElement('p');
                         originalMsg.classList.add('text-sm', 'italic', 'border-l-2', 'border-accent', 'pl-2');
 
-                        authorId = plain.quote.author
+                        let authorId = plain.quote.author;
                         authorId = authorId.substr(authorId.length - 8);
                         originalMsg.appendChild(document.createTextNode("..." + authorId +": "+plain.quote.text));
                         e.appendChild(originalMsg);
                     }
-                    
+
                     // message body
                     e.appendChild(document.createTextNode(plain.profile.displayName +": "+plain.body));
                     e.classList.add('bg-gray-300','dark:bg-lightGray', 'w-fit', 'rounded-lg', 'p-2', 'my-2')
                     elem.appendChild(e);
-                    
-                    // attachments
-                    if (plain.attachments.length > 0){
-                        plain.attachments.forEach(attachment => {
-                            console.log(attachment);
-                            attachmentElement = document.createElement('p');
-                            attachmentElement.appendChild(document.createTextNode("📎\xa0\xa0\xa0"));
-                            
-                                                        attachmentLink = document.createElement('a');
-                                                        attachmentLink.appendChild(document.createTextNode((attachment.fileName || attachment.contentType) + ` (${formatBytes(attachment.size)})` ));
-                                                        attachmentLink.href = attachment.url;
-                                                        attachmentLink.download = (attachment.fileName || "");
-                            
-                            attachmentElement.appendChild(attachmentLink);
-                            attachmentElement.classList.add('text-sm', 'italic', 'pl-1');
-                            e.appendChild(attachmentElement);
-                        });
+
+                    // show attachments
+                    for(let attachment of plain.attachments)
+                    {
+
+                        let attachmentElement = document.createElement('p');
+                        attachmentElement.appendChild(document.createTextNode("📎\xa0\xa0\xa0"));
+
+                        let attachmentLink = document.createElement('a');
+                        attachmentLink.appendChild(document.createTextNode((attachment.fileName || attachment.contentType) + ` (${formatBytes(attachment.size)})` ));
+                        attachmentLink.href = attachment.url;
+                        attachmentLink.download = (attachment.fileName || "");
+
+                        attachmentElement.appendChild(attachmentLink);
+                        attachmentElement.classList.add('text-sm', 'italic', 'pl-1');
+                        e.appendChild(attachmentElement);
+
                     }
 
                 }

sogs/static/view_room.js

@@ -11,7 +11,7 @@
     {% for room in rooms %}
     <a class="px-5 flex flex-col justify-center items-center transition duration-250 text-center w-full h-24 
     border-2 border-accent bg-gray-300 hover:bg-black hover:text-white md:h-28
-    dark:border-accent rounded-full dark:bg-darkGray dark:hover:bg-accent dark:hover:text-black " href="/r/{{room.token}}">
+    dark:border-accent rounded-full dark:bg-darkGray dark:hover:bg-accent dark:hover:text-black " href="{{room.url}}">
       <p class=" text-2xl xs:text-3xl sm:text-4xl">{{room.token }}</p>
       <p class="text-sm xs:text-lg sm:text-xl">{{room.active_users }} Active User{{'s' if room.active_users > 1}}</p>
     </a>

sogs/templates/index.html

@@ -43,7 +43,8 @@
       </ul>
     </div>
     <script>
-      window.view_room = "{{room.token}}";
+      window.view_room_token = "{{room.token}}";
+      window.view_room_url = "{{room.url}}";
       window.poll_room_url = "/room/{{room.token}}/messages/recent";
     </script>
     <script src="/static/protobuf.min.js"></script>