pyproject.toml

@@ -39,8 +39,7 @@ dependencies = [
     "Pillow",
     "pillow-heif",
     "IP2Location",
-    "bleach",
+    "bleach"
-    "sentry-sdk"
 ]
 
 [tool.setuptools.packages.find]

src/snek/__main__.py

@@ -9,8 +9,6 @@ from snek.shell import Shell
 from snek.app import Application
 
 
-
-
 @click.group()
 def cli():
     pass
@@ -124,12 +122,6 @@ def shell(db_path):
     Shell(db_path).run()
 
 def main():
-    try:
-        import sentry_sdk
-        sentry_sdk.init("https://ab6147c2f3354c819768c7e89455557b@gt.molodetz.nl/1")
-    except ImportError:
-        print("Could not import sentry_sdk")
-
     cli()
 
 

src/snek/app.py

@@ -6,7 +6,6 @@ import uuid
 import signal
 from datetime import datetime
 from contextlib import asynccontextmanager
-import aiohttp_debugtoolbar
 
 from snek import snode
 from snek.view.threads import ThreadsView
@@ -177,8 +176,6 @@ class Application(BaseApplication):
         self.on_startup.append(self.start_ssh_server)
         self.on_startup.append(self.prepare_database)
         
-
-
     async def prepare_stats(self, app):
         app['stats'] = create_stats_structure()
         print("Stats prepared", flush=True)
@@ -290,9 +287,9 @@ class Application(BaseApplication):
         self.router.add_view("/login.json", LoginView)
         self.router.add_view("/register.html", RegisterView)
         self.router.add_view("/register.json", RegisterView)
-       # self.router.add_view("/drive/{rel_path:.*}", DriveView)
+        self.router.add_view("/drive/{rel_path:.*}", DriveView)
-       ## self.router.add_view("/drive.bin", UploadView)
+        self.router.add_view("/drive.bin", UploadView)
-       # self.router.add_view("/drive.bin/{uid}.{ext}", UploadView)
+        self.router.add_view("/drive.bin/{uid}.{ext}", UploadView)
         self.router.add_view("/search-user.html", SearchUserView)
         self.router.add_view("/search-user.json", SearchUserView)
         self.router.add_view("/avatar/{uid}.svg", AvatarView)
@@ -300,25 +297,25 @@ class Application(BaseApplication):
         self.router.add_get("/http-photo", self.handle_http_photo)
         self.router.add_get("/rpc.ws", RPCView)
         self.router.add_get("/c/{channel:.*}", ChannelView)
-        #self.router.add_view(
+        self.router.add_view(
-        #    "/channel/{channel_uid}/attachment.bin", ChannelAttachmentView
+            "/channel/{channel_uid}/attachment.bin", ChannelAttachmentView
-        #)
+        )
-        #self.router.add_view(
+        self.router.add_view(
-        #    "/channel/{channel_uid}/drive.json", ChannelDriveApiView
+            "/channel/{channel_uid}/drive.json", ChannelDriveApiView
-        #)
+        )
         self.router.add_view(
             "/channel/{channel_uid}/attachment.sock", ChannelAttachmentUploadView
         )
         self.router.add_view(
             "/channel/attachment/{relative_url:.*}", ChannelAttachmentView
-        )#
+        )
         self.router.add_view("/channel/{channel}.html", WebView)
         self.router.add_view("/threads.html", ThreadsView)
         self.router.add_view("/terminal.ws", TerminalSocketView)
         self.router.add_view("/terminal.html", TerminalView)
-        #self.router.add_view("/drive.json", DriveApiView)
+        self.router.add_view("/drive.json", DriveApiView)
-        #self.router.add_view("/drive.html", DriveView)
+        self.router.add_view("/drive.html", DriveView)
-        #self.router.add_view("/drive/{drive}.json", DriveView)
+        self.router.add_view("/drive/{drive}.json", DriveView)
         self.router.add_get("/stats.html", stats_handler)
         self.router.add_view("/stats.json", StatsView)
         self.router.add_view("/user/{user}.html", UserView)
@@ -499,7 +496,6 @@ class Application(BaseApplication):
             raise raised_exception
 
 app = Application(db_path="sqlite:///snek.db")
-#aiohttp_debugtoolbar.setup(app)
 
 
 async def main():

src/snek/model/channel.py

@@ -13,17 +13,13 @@ class ChannelModel(BaseModel):
     last_message_on = ModelField(name="last_message_on", required=False, kind=str)
     history_start = ModelField(name="history_start", required=False, kind=str)
 
-    @property
-    def is_dm(self):
-        return 'dm' in self['tag'].lower()
-
     async def get_last_message(self) -> ChannelMessageModel:
         history_start_filter = ""
         if self["history_start"]:
             history_start_filter = f" AND created_at > '{self['history_start']}' "
         try:
             async for model in self.app.services.channel_message.query(
-                "SELECT uid FROM channel_message WHERE channel_uid=:channel_uid" + history_start_filter + " ORDER BY id DESC LIMIT 1",
+                "SELECT uid FROM channel_message WHERE channel_uid=:channel_uid" + history_start_filter + " ORDER BY created_at DESC LIMIT 1",
                 {"channel_uid": self["uid"]},
             ):
 

src/snek/service/channel_message.py

@@ -1,21 +1,6 @@
 from snek.system.service import BaseService
-from snek.system.template import sanitize_html
+from snek.system.template import whitelist_attributes
 import time
-import asyncio
-from concurrent.futures import ProcessPoolExecutor
-import json
-
-from jinja2 import Environment, FileSystemLoader
-global jinja2_env
-import pathlib 
-template_path = pathlib.Path(__file__).parent.parent.joinpath("templates")
-
-
-def render(context):
-    template =jinja2_env.get_template("message.html")
-    return sanitize_html(template.render(**context))
-
-
 
 class ChannelMessageService(BaseService):
     mapper_name = "channel_message"
@@ -23,19 +8,6 @@ class ChannelMessageService(BaseService):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._configured_indexes = False
-        self._executor_pools = {}
-        global jinja2_env
-        jinja2_env = self.app.jinja2_env
-        self._max_workers = 1
-    def get_or_create_executor(self, uid):
-        if not uid in self._executor_pools:
-            self._executor_pools[uid] = ProcessPoolExecutor(max_workers=5)
-        return self._executor_pools[uid]
-    
-    def delete_executor(self, uid):
-        if uid in self._executor_pools:
-            self._executor_pools[uid].shutdown()
-            del self._executor_pools[uid]
 
     async def maintenance(self):
         args = {}
@@ -97,14 +69,10 @@ class ChannelMessageService(BaseService):
                 "color": user["color"],
             }
         )
-        loop = asyncio.get_event_loop()
         try:
-
+            template = self.app.jinja2_env.get_template("message.html")
-            context = json.loads(json.dumps(context, default=str)) 
+            model["html"] = template.render(**context)
-
+            model["html"] = whitelist_attributes(model["html"])
-
-            model["html"] = await loop.run_in_executor(self.get_or_create_executor(model["uid"]), render,context)
-            #model['html'] = await loop.run_in_executor(self.get_or_create_executor(user["uid"]), sanitize_html,model['html'])
         except Exception as ex:
             print(ex, flush=True)
 
@@ -123,8 +91,6 @@ class ChannelMessageService(BaseService):
                         ["deleted_at"], unique=False
                     )
             self._configured_indexes = True
-            if model['is_final']:
-                self.delete_executor(model['uid'])
             return model
         raise Exception(f"Failed to create channel message: {model.errors}.")
 
@@ -161,15 +127,10 @@ class ChannelMessageService(BaseService):
                 "color": user["color"],
             }
         )
-        context = json.loads(json.dumps(context, default=str)) 
+        template = self.app.jinja2_env.get_template("message.html")
-        loop = asyncio.get_event_loop()
+        model["html"] = template.render(**context)
-        model["html"] = await loop.run_in_executor(self.get_or_create_executor(model["uid"]), render, context)
+        model["html"] = whitelist_attributes(model["html"])
-        #model['html'] = await loop.run_in_executor(self.get_or_create_executor(user["uid"]), sanitize_html,model['html'])
+        return await super().save(model)
-
-        result = await super().save(model)
-        if model['is_final']:
-            self.delete_executor(model['uid'])
-        return result 
 
     async def offset(self, channel_uid, page=0, timestamp=None, page_size=30):
         channel = await self.services.channel.get(uid=channel_uid)

src/snek/service/socket.py

@@ -44,29 +44,19 @@ class SocketService(BaseService):
 
     async def user_availability_service(self):
         logger.info("User availability update service started.")
-        logger.debug("Entering the main loop.")
         while True:
             logger.info("Updating user availability...")
-            logger.debug("Initializing users_updated list.")
             users_updated = []
-            logger.debug("Iterating over sockets.")
             for s in self.sockets:
-                logger.debug(f"Checking connection status for socket: {s}.")
                 if not s.is_connected:
-                    logger.debug("Socket is not connected, continuing to next socket.")
                     continue
-                logger.debug(f"Checking if user {s.user} is already updated.")
                 if s.user not in users_updated:
-                    logger.debug(f"Updating last_ping for user: {s.user}.")
                     s.user["last_ping"] = now()
-                    logger.debug(f"Saving user {s.user} to the database.")
                     await self.app.services.user.save(s.user)
-                    logger.debug(f"Adding user {s.user} to users_updated list.")
                     users_updated.append(s.user)
             logger.info(
                 f"Updated user availability for {len(users_updated)} online users."
             )
-            logger.debug("Sleeping for 60 seconds before the next update.")
             await asyncio.sleep(60)
 
     async def add(self, ws, user_uid):
@@ -87,7 +77,7 @@ class SocketService(BaseService):
 
     async def send_to_user(self, user_uid, message):
         count = 0
-        for s in list(self.users.get(user_uid, [])):
+        for s in self.users.get(user_uid, []):
             if await s.send_json(message):
                 count += 1
         return count

src/snek/static/editor.js

@@ -7,92 +7,32 @@ class NjetEditor extends NjetComponent {
 
         const style = document.createElement('style');
         style.textContent = `
-      :host {
-        display: block;
-        position: relative;
-        height: 100%;
-        font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-      }
-      
           #editor {
             padding: 1rem;
             outline: none;
             white-space: pre-wrap;
             line-height: 1.5;
-        height: calc(100% - 30px);
+            height: 100%;
             overflow-y: auto;
             background: #1e1e1e;
             color: #d4d4d4;
-        font-size: 14px;
-        caret-color: #fff;
           }
-      
+          #command-line {
-      #editor.insert-mode {
-        caret-color: #4ec9b0;
-      }
-      
-      #editor.visual-mode {
-        caret-color: #c586c0;
-      }
-      
-      #editor::selection {
-        background: #264f78;
-      }
-      
-      #status-bar {
             position: absolute;
             bottom: 0;
             left: 0;
-        right: 0;
-        height: 30px;
-        background: #007acc;
-        color: #fff;
-        display: flex;
-        align-items: center;
-        padding: 0 1rem;
-        font-size: 12px;
-        font-weight: 500;
-      }
-      
-      #mode-indicator {
-        text-transform: uppercase;
-        margin-right: 20px;
-        font-weight: bold;
-      }
-      
-      #command-line {
-        position: absolute;
-        bottom: 30px;
-        left: 0;
             width: 100%;
-        padding: 0.3rem 1rem;
+            padding: 0.2rem 1rem;
-        background: #2d2d2d;
+            background: #333;
-        color: #d4d4d4;
+            color: #0f0;
             display: none;
-        font-family: inherit;
+            font-family: monospace;
-        border-top: 1px solid #3e3e3e;
-        font-size: 14px;
-      }
-      
-      #command-input {
-        background: transparent;
-        border: none;
-        color: inherit;
-        outline: none;
-        font-family: inherit;
-        font-size: inherit;
-        width: calc(100% - 20px);
-      }
-      
-      .visual-selection {
-        background: #264f78 !important;
           }
         `;
 
         this.editor = document.createElement('div');
         this.editor.id = 'editor';
         this.editor.contentEditable = true;
-    this.editor.spellcheck = false;
         this.editor.innerText = `Welcome to VimEditor Component
 Line 2 here
 Another line
@@ -100,90 +40,22 @@ Try i, Esc, v, :, yy, dd, 0, $, gg, G, and p`;
 
         this.cmdLine = document.createElement('div');
         this.cmdLine.id = 'command-line';
+        this.shadowRoot.append(style, this.editor, this.cmdLine);
 
-    const cmdPrompt = document.createElement('span');
+        this.mode = 'normal'; // normal | insert | visual | command
-    cmdPrompt.textContent = ':';
-    
-    this.cmdInput = document.createElement('input');
-    this.cmdInput.id = 'command-input';
-    this.cmdInput.type = 'text';
-    
-    this.cmdLine.append(cmdPrompt, this.cmdInput);
-
-    this.statusBar = document.createElement('div');
-    this.statusBar.id = 'status-bar';
-    
-    this.modeIndicator = document.createElement('span');
-    this.modeIndicator.id = 'mode-indicator';
-    this.modeIndicator.textContent = 'NORMAL';
-    
-    this.statusBar.appendChild(this.modeIndicator);
-
-    this.shadowRoot.append(style, this.editor, this.cmdLine, this.statusBar);
-
-    this.mode = 'normal';
         this.keyBuffer = '';
         this.lastDeletedLine = '';
         this.yankedLine = '';
-    this.visualStartOffset = null;
-    this.visualEndOffset = null;
 
-    // Bind event handlers
+        this.editor.addEventListener('keydown', this.handleKeydown.bind(this));
-    this.handleKeydown = this.handleKeydown.bind(this);
-    this.handleCmdKeydown = this.handleCmdKeydown.bind(this);
-    this.updateVisualSelection = this.updateVisualSelection.bind(this);
-    
-    this.editor.addEventListener('keydown', this.handleKeydown);
-    this.cmdInput.addEventListener('keydown', this.handleCmdKeydown);
-    this.editor.addEventListener('beforeinput', this.handleBeforeInput.bind(this));
       }
 
       connectedCallback() {
         this.editor.focus();
       }
 
-  setMode(mode) {
-    this.mode = mode;
-    this.modeIndicator.textContent = mode.toUpperCase();
-    
-    // Update editor classes
-    this.editor.classList.remove('insert-mode', 'visual-mode', 'normal-mode');
-    this.editor.classList.add(`${mode}-mode`);
-    
-    if (mode === 'visual') {
-      this.visualStartOffset = this.getCaretOffset();
-      this.editor.addEventListener('selectionchange', this.updateVisualSelection);
-    } else {
-      this.clearVisualSelection();
-      this.editor.removeEventListener('selectionchange', this.updateVisualSelection);
-    }
-    
-    if (mode === 'command') {
-      this.cmdLine.style.display = 'block';
-      this.cmdInput.value = '';
-      this.cmdInput.focus();
-    } else {
-      this.cmdLine.style.display = 'none';
-      if (mode !== 'insert') {
-        // Keep focus on editor for all non-insert modes
-        this.editor.focus();
-      }
-    }
-  }
-
-  updateVisualSelection() {
-    if (this.mode !== 'visual') return;
-    this.visualEndOffset = this.getCaretOffset();
-  }
-
-  clearVisualSelection() {
-    const sel = this.shadowRoot.getSelection();
-    if (sel) sel.removeAllRanges();
-    this.visualStartOffset = null;
-    this.visualEndOffset = null;
-  }
-
       getCaretOffset() {
+        let caretOffset = 0;
         const sel = this.shadowRoot.getSelection();
         if (!sel || sel.rangeCount === 0) return 0;
 
@@ -191,300 +63,160 @@ Try i, Esc, v, :, yy, dd, 0, $, gg, G, and p`;
         const preCaretRange = range.cloneRange();
         preCaretRange.selectNodeContents(this.editor);
         preCaretRange.setEnd(range.endContainer, range.endOffset);
-    return preCaretRange.toString().length;
+        caretOffset = preCaretRange.toString().length;
+        return caretOffset;
       }
 
       setCaretOffset(offset) {
-    const textContent = this.editor.innerText;
-    offset = Math.max(0, Math.min(offset, textContent.length));
-    
         const range = document.createRange();
         const sel = this.shadowRoot.getSelection();
-    const walker = document.createTreeWalker(
+        const walker = document.createTreeWalker(this.editor, NodeFilter.SHOW_TEXT, null, false);
-      this.editor, 
-      NodeFilter.SHOW_TEXT, 
-      null, 
-      false
-    );
 
         let currentOffset = 0;
         let node;
-    
         while ((node = walker.nextNode())) {
-      const nodeLength = node.textContent.length;
+          if (currentOffset + node.length >= offset) {
-      if (currentOffset + nodeLength >= offset) {
             range.setStart(node, offset - currentOffset);
             range.collapse(true);
             sel.removeAllRanges();
             sel.addRange(range);
             return;
           }
-      currentOffset += nodeLength;
+          currentOffset += node.length;
         }
-    
-    // If we couldn't find the position, set to end
-    if (this.editor.lastChild) {
-      range.selectNodeContents(this.editor.lastChild);
-      range.collapse(false);
-      sel.removeAllRanges();
-      sel.addRange(range);
-    }
-  }
-
-  handleBeforeInput(e) {
-    if (this.mode !== 'insert') {
-      e.preventDefault();
-    }
-  }
-
-  handleCmdKeydown(e) {
-    if (e.key === 'Enter') {
-      e.preventDefault();
-      this.executeCommand(this.cmdInput.value);
-      this.setMode('normal');
-    } else if (e.key === 'Escape') {
-      e.preventDefault();
-      this.setMode('normal');
-    }
-  }
-
-  executeCommand(cmd) {
-    const trimmedCmd = cmd.trim();
-    
-    // Handle basic vim commands
-    if (trimmedCmd === 'w' || trimmedCmd === 'write') {
-      console.log('Save command (not implemented)');
-    } else if (trimmedCmd === 'q' || trimmedCmd === 'quit') {
-      console.log('Quit command (not implemented)');
-    } else if (trimmedCmd === 'wq' || trimmedCmd === 'x') {
-      console.log('Save and quit command (not implemented)');
-    } else if (/^\d+$/.test(trimmedCmd)) {
-      // Go to line number
-      const lineNum = parseInt(trimmedCmd, 10) - 1;
-      this.goToLine(lineNum);
-    }
-  }
-
-  goToLine(lineNum) {
-    const lines = this.editor.innerText.split('\n');
-    if (lineNum < 0 || lineNum >= lines.length) return;
-    
-    let offset = 0;
-    for (let i = 0; i < lineNum; i++) {
-      offset += lines[i].length + 1;
-    }
-    this.setCaretOffset(offset);
-  }
-
-  getCurrentLineInfo() {
-    const text = this.editor.innerText;
-    const caretPos = this.getCaretOffset();
-    const lines = text.split('\n');
-    
-    let charCount = 0;
-    for (let i = 0; i < lines.length; i++) {
-      if (caretPos <= charCount + lines[i].length) {
-        return {
-          lineIndex: i,
-          lines: lines,
-          lineStartOffset: charCount,
-          positionInLine: caretPos - charCount
-        };
-      }
-      charCount += lines[i].length + 1;
-    }
-    
-    return {
-      lineIndex: lines.length - 1,
-      lines: lines,
-      lineStartOffset: charCount - lines[lines.length - 1].length - 1,
-      positionInLine: 0
-    };
       }
 
       handleKeydown(e) {
+        const key = e.key;
+
         if (this.mode === 'insert') {
-      if (e.key === 'Escape') {
+          if (key === 'Escape') {
             e.preventDefault();
-        this.setMode('normal');
+            this.mode = 'normal';
-        // Move cursor one position left (vim behavior)
+            this.editor.blur();
-        const offset = this.getCaretOffset();
+            this.editor.focus();
-        if (offset > 0) {
-          this.setCaretOffset(offset - 1);
-        }
           }
           return;
         }
 
         if (this.mode === 'command') {
-      return; // Command mode input is handled by cmdInput
+          if (key === 'Enter' || key === 'Escape') {
+            e.preventDefault();
+            this.cmdLine.style.display = 'none';
+            this.mode = 'normal';
+            this.keyBuffer = '';
+          }
+          return;
         }
 
         if (this.mode === 'visual') {
-      if (e.key === 'Escape') {
+          if (key === 'Escape') {
             e.preventDefault();
-        this.setMode('normal');
+            this.mode = 'normal';
+          }
           return;
         }
 
-      // Allow movement in visual mode
+        // Handle normal mode
-      if (['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(e.key)) {
+        this.keyBuffer += key;
-        return; // Let default behavior handle selection
+
+        const text = this.editor.innerText;
+        const caretPos = this.getCaretOffset();
+        const lines = text.split('\n');
+
+        let charCount = 0, lineIdx = 0;
+        for (let i = 0; i < lines.length; i++) {
+          if (caretPos <= charCount + lines[i].length) {
+            lineIdx = i;
+            break;
+          }
+          charCount += lines[i].length + 1;
         }
 
-      if (e.key === 'y') {
+        const offsetToLine = idx =>
-        e.preventDefault();
+          text.split('\n').slice(0, idx).reduce((acc, l) => acc + l.length + 1, 0);
-        // Yank selected text
-        const sel = this.shadowRoot.getSelection();
-        if (sel && sel.rangeCount > 0) {
-          this.yankedLine = sel.toString();
-        }
-        this.setMode('normal');
-        return;
-      }
 
-      if (e.key === 'd' || e.key === 'x') {
-        e.preventDefault();
-        // Delete selected text
-        const sel = this.shadowRoot.getSelection();
-        if (sel && sel.rangeCount > 0) {
-          this.lastDeletedLine = sel.toString();
-          document.execCommand('delete');
-        }
-        this.setMode('normal');
-        return;
-      }
-    }
-
-    // Normal mode handling
-    e.preventDefault();
-    
-    // Special keys that should be handled immediately
-    if (e.key === 'Escape') {
-      this.keyBuffer = '';
-      this.setMode('normal');
-      return;
-    }
-    
-    // Build key buffer for commands
-    this.keyBuffer += e.key;
-    
-    const lineInfo = this.getCurrentLineInfo();
-    const { lineIndex, lines, lineStartOffset, positionInLine } = lineInfo;
-
-    // Process commands
         switch (this.keyBuffer) {
           case 'i':
+            e.preventDefault();
+            this.mode = 'insert';
             this.keyBuffer = '';
-        this.setMode('insert');
-        break;
-
-      case 'a':
-        this.keyBuffer = '';
-        this.setCaretOffset(this.getCaretOffset() + 1);
-        this.setMode('insert');
             break;
 
           case 'v':
+            e.preventDefault();
+            this.mode = 'visual';
             this.keyBuffer = '';
-        this.setMode('visual');
             break;
 
           case ':':
+            e.preventDefault();
+            this.mode = 'command';
+            this.cmdLine.style.display = 'block';
+            this.cmdLine.textContent = ':';
             this.keyBuffer = '';
-        this.setMode('command');
             break;
 
           case 'yy':
+            e.preventDefault();
+            this.yankedLine = lines[lineIdx];
             this.keyBuffer = '';
-        this.yankedLine = lines[lineIndex];
             break;
 
           case 'dd':
-        this.keyBuffer = '';
+            e.preventDefault();
-        this.lastDeletedLine = lines[lineIndex];
+            this.lastDeletedLine = lines[lineIdx];
-        lines.splice(lineIndex, 1);
+            lines.splice(lineIdx, 1);
-        if (lines.length === 0) lines.push('');
             this.editor.innerText = lines.join('\n');
-        this.setCaretOffset(lineStartOffset);
+            this.setCaretOffset(offsetToLine(lineIdx));
+            this.keyBuffer = '';
             break;
 
           case 'p':
-        this.keyBuffer = '';
+            e.preventDefault();
             const lineToPaste = this.yankedLine || this.lastDeletedLine;
             if (lineToPaste) {
-          lines.splice(lineIndex + 1, 0, lineToPaste);
+              lines.splice(lineIdx + 1, 0, lineToPaste);
               this.editor.innerText = lines.join('\n');
-          this.setCaretOffset(lineStartOffset + lines[lineIndex].length + 1);
+              this.setCaretOffset(offsetToLine(lineIdx + 1));
             }
+            this.keyBuffer = '';
             break;
 
           case '0':
+            e.preventDefault();
+            this.setCaretOffset(offsetToLine(lineIdx));
             this.keyBuffer = '';
-        this.setCaretOffset(lineStartOffset);
             break;
 
           case '$':
+            e.preventDefault();
+            this.setCaretOffset(offsetToLine(lineIdx) + lines[lineIdx].length);
             this.keyBuffer = '';
-        this.setCaretOffset(lineStartOffset + lines[lineIndex].length);
             break;
 
           case 'gg':
-        this.keyBuffer = '';
+            e.preventDefault();
             this.setCaretOffset(0);
+            this.keyBuffer = '';
             break;
 
           case 'G':
+            e.preventDefault();
+            this.setCaretOffset(text.length);
             this.keyBuffer = '';
-        this.setCaretOffset(this.editor.innerText.length);
             break;
 
-      case 'h':
+          case 'Escape':
-      case 'ArrowLeft':
+            e.preventDefault();
+            this.mode = 'normal';
             this.keyBuffer = '';
-        const currentOffset = this.getCaretOffset();
+            this.cmdLine.style.display = 'none';
-        if (currentOffset > 0) {
-          this.setCaretOffset(currentOffset - 1);
-        }
-        break;
-
-      case 'l':
-      case 'ArrowRight':
-        this.keyBuffer = '';
-        this.setCaretOffset(this.getCaretOffset() + 1);
-        break;
-
-      case 'j':
-      case 'ArrowDown':
-        this.keyBuffer = '';
-        if (lineIndex < lines.length - 1) {
-          const nextLineStart = lineStartOffset + lines[lineIndex].length + 1;
-          const nextLineLength = lines[lineIndex + 1].length;
-          const newPosition = Math.min(positionInLine, nextLineLength);
-          this.setCaretOffset(nextLineStart + newPosition);
-        }
-        break;
-
-      case 'k':
-      case 'ArrowUp':
-        this.keyBuffer = '';
-        if (lineIndex > 0) {
-          let prevLineStart = 0;
-          for (let i = 0; i < lineIndex - 1; i++) {
-            prevLineStart += lines[i].length + 1;
-          }
-          const prevLineLength = lines[lineIndex - 1].length;
-          const newPosition = Math.min(positionInLine, prevLineLength);
-          this.setCaretOffset(prevLineStart + newPosition);
-        }
             break;
 
           default:
-        // Clear buffer if it gets too long or contains invalid sequences
+            // allow up to 2 chars for combos
-        if (this.keyBuffer.length > 2 || 
+            if (this.keyBuffer.length > 2) this.keyBuffer = '';
-            (this.keyBuffer.length === 2 && !['dd', 'yy', 'gg'].includes(this.keyBuffer))) {
-          this.keyBuffer = '';
-        }
             break;
         }
       }

src/snek/static/event-handler.js

@@ -3,15 +3,8 @@ export class EventHandler {
     this.subscribers = {};
   }
 
-  addEventListener(type, handler, { once = false } = {}) {
+  addEventListener(type, handler) {
     if (!this.subscribers[type]) this.subscribers[type] = [];
-    if (once) {
-      const originalHandler = handler;
-      handler = (...args) => {
-        originalHandler(...args);
-        this.removeEventListener(type, handler);
-      };
-    }
     this.subscribers[type].push(handler);
   }
 
@@ -19,15 +12,4 @@ export class EventHandler {
     if (this.subscribers[type])
       this.subscribers[type].forEach((handler) => handler(...data));
   }
-
-  removeEventListener(type, handler) {
-    if (!this.subscribers[type]) return;
-    this.subscribers[type] = this.subscribers[type].filter(
-      (h) => h !== handler
-    );
-
-    if (this.subscribers[type].length === 0) {
-      delete this.subscribers[type];
-    }
-  }
 }

src/snek/static/message-list.js

@@ -7,40 +7,38 @@
 // MIT License: This is free software. Permission is granted to use, copy, modify, and/or distribute this software for any purpose with or without fee. The software is provided "as is" without any warranty.
 import {app} from "./app.js";
 
-const LONG_TIME = 1000 * 60 * 20;
+const LONG_TIME = 1000 * 60 * 20
 
 export class ReplyEvent extends Event {
     constructor(messageTextTarget) {
       super('reply', { bubbles: true, composed: true });
       this.messageTextTarget = messageTextTarget;
 
-    // Clone and sanitize message node to text-only reply
       const newMessage = messageTextTarget.cloneNode(true);
-    newMessage.style.maxHeight = "0";
+      newMessage.style.maxHeight = "0"
       messageTextTarget.parentElement.insertBefore(newMessage, messageTextTarget);
 
-    // Remove all .embed-url-link
+      newMessage.querySelectorAll('.embed-url-link').forEach(link => {
-    newMessage.querySelectorAll('.embed-url-link').forEach(link => link.remove());
+        link.remove()
+      })
 
-    // Replace <picture> with their <img>
       newMessage.querySelectorAll('picture').forEach(picture => {
         const img = picture.querySelector('img');
-      if (img) picture.replaceWith(img);
+        if (img) {
-    });
+          picture.replaceWith(img);
+        }
+      })
 
-    // Replace <img> with just their src
       newMessage.querySelectorAll('img').forEach(img => {
         const src = img.src || img.currentSrc;
         img.replaceWith(document.createTextNode(src));
-    });
+      })
 
-    // Replace <iframe> with their src
       newMessage.querySelectorAll('iframe').forEach(iframe => {
         const src = iframe.src || iframe.currentSrc;
         iframe.replaceWith(document.createTextNode(src));
-    });
+      })
 
-    // Replace <a> with href or markdown
       newMessage.querySelectorAll('a').forEach(a => {
         const href = a.getAttribute('href');
         const text = a.innerText || a.textContent;
@@ -49,21 +47,33 @@ export class ReplyEvent extends Event {
         } else {
           a.replaceWith(document.createTextNode(`[${text}](${href})`));
         }
-    });
+      })
 
       this.replyText = newMessage.innerText.replaceAll("\n\n", "\n").trim();
-    newMessage.remove();
+      newMessage.remove()
     }
 }
 
 class MessageElement extends HTMLElement {
+  // static observedAttributes = ['data-uid', 'data-color', 'data-channel_uid', 'data-user_nick', 'data-created_at', 'data-user_uid'];
+
+  isVisible() {
+    if (!this) return false;
+    const rect = this.getBoundingClientRect();
+    return (
+      rect.top >= 0 &&
+      rect.left >= 0 &&
+      rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+    );
+  }
+
   updateUI() {
     if (this._originalChildren === undefined) {
       const { color,  user_nick, created_at, user_uid} = this.dataset;
       this.classList.add('message');
       this.style.maxWidth = '100%';
       this._originalChildren = Array.from(this.children);
-
       this.innerHTML = `
         <a class="avatar" style="background-color: ${color || ''}; color: black;" href="/user/${user_uid || ''}.html">
           <img class="avatar-img" width="40" height="40" src="/avatar/${user_uid || ''}.svg" alt="${user_nick || ''}" loading="lazy">
@@ -73,12 +83,12 @@ class MessageElement extends HTMLElement {
           <div class="text"></div>
           <div class="time no-select" data-created_at="${created_at || ''}">
             <span></span>
-            <a href="#reply">reply</a>
+            <a href="#reply">reply</a></div>
-          </div>
           </div>
     `;
 
       this.messageDiv = this.querySelector('.text');
+
       if (this._originalChildren && this._originalChildren.length > 0) {
           this._originalChildren.forEach(child => {
               this.messageDiv.appendChild(child);
@@ -91,12 +101,11 @@ class MessageElement extends HTMLElement {
         this.replyDiv.addEventListener('click', (e) => {
           e.preventDefault();
           this.dispatchEvent(new ReplyEvent(this.messageDiv));
-      });
+        })
     }
 
-    // Sibling logic for user switches and long time gaps
+    if (!this.siblingGenerated && this.nextElementSibling) {
-    if ((!this.siblingGenerated || this.siblingGenerated !== this.nextElementSibling) && this.nextElementSibling) {
+      this.siblingGenerated = true;
-      this.siblingGenerated = this.nextElementSibling;
       if (this.nextElementSibling?.dataset?.user_uid !== this.dataset.user_uid) {
         this.classList.add('switch-user');
       } else {
@@ -117,7 +126,7 @@ class MessageElement extends HTMLElement {
 
   updateMessage(...messages) {
     if (this._originalChildren) {
-      this.messageDiv.replaceChildren(...messages);
+      this.messageDiv.replaceChildren(...messages)
       this._originalChildren = messages;
     }
   }
@@ -126,50 +135,20 @@ class MessageElement extends HTMLElement {
     this.updateUI();
   }
 
-  disconnectedCallback() {}
+  disconnectedCallback() {
-  connectedMoveCallback() {}
+  }
+
+  connectedMoveCallback() {
+  }
 
   attributeChangedCallback(name, oldValue, newValue) {
-    this.updateUI();
+    this.updateUI()
   }
 }
 
 class MessageList extends HTMLElement {
   constructor() {
     super();
-    this.messageMap = new Map();
-    this.visibleSet = new Set();
-
-    this._observer = new IntersectionObserver((entries) => {
-      entries.forEach((entry) => {
-        if (entry.isIntersecting) {
-          this.visibleSet.add(entry.target);
-          if (entry.target instanceof MessageElement) {
-            entry.target.updateUI();
-          }
-        } else {
-          this.visibleSet.delete(entry.target);
-        }
-      });
-    }, {
-      root: this,
-      threshold: 0,
-    });
-
-    // End-of-messages marker
-    this.endOfMessages = document.createElement('div');
-    this.endOfMessages.classList.add('message-list-bottom');
-    this.prepend(this.endOfMessages);
-
-    // Observe existing children and index by uid
-    for (const c of this.children) {
-      this._observer.observe(c);
-      if (c instanceof MessageElement) {
-        this.messageMap.set(c.dataset.uid, c);
-      }
-    }
-
-    // Wire up socket events
     app.ws.addEventListener("update_message_text", (data) => {
       if (this.messageMap.has(data.uid)) {
         this.upsertMessage(data);
@@ -179,17 +158,45 @@ class MessageList extends HTMLElement {
       this.triggerGlow(data.user_uid,data.color);
     });
 
+    this.messageMap = new Map();
+    this.visibleSet = new Set();
+    this._observer = new IntersectionObserver((entries) => {
+      entries.forEach((entry) => {
+        if (entry.isIntersecting) {
+          this.visibleSet.add(entry.target);
+          const messageElement = entry.target;
+          if (messageElement instanceof MessageElement) {
+              messageElement.updateUI();
+          }
+        } else {
+          this.visibleSet.delete(entry.target);
+        }
+      });
+    }, {
+      root: this,
+      threshold: 0,
+    })
+
+    for(const c of this.children) {
+      this._observer.observe(c);
+      if (c instanceof MessageElement) {
+          this.messageMap.set(c.dataset.uid, c);
+      }
+    }
+
+    this.endOfMessages = document.createElement('div');
+    this.endOfMessages.classList.add('message-list-bottom');
+    this.prepend(this.endOfMessages);
+
     this.scrollToBottom(true);
   }
 
   connectedCallback() {
     this.addEventListener('click', (e) => {
-      if (
+      if (e.target.tagName !== 'IMG' || e.target.classList.contains('avatar-img')) return;
-        e.target.tagName !== 'IMG' ||
-        e.target.classList.contains('avatar-img')
-      ) return;
 
       const img = e.target;
+
       const overlay = document.createElement('div');
       overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.9);display:flex;justify-content:center;align-items:center;z-index:9999;cursor:pointer;';
 
@@ -210,11 +217,12 @@ class MessageList extends HTMLElement {
 
       overlay.appendChild(fullImg);
       document.body.appendChild(overlay);
-
       overlay.addEventListener('click', () => {
-        if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
+        if (overlay.parentNode) {
+          overlay.parentNode.removeChild(overlay);
+        }
       });
-      // ESC to close
+      // Optional: ESC key closes overlay
       const escListener = (evt) => {
         if (evt.key === 'Escape') {
           if (overlay.parentNode) overlay.parentNode.removeChild(overlay);
@@ -222,9 +230,8 @@ class MessageList extends HTMLElement {
         }
       };
       document.addEventListener('keydown', escListener);
-    });
+    })
   }
-
   isElementVisible(element) {
     if (!element) return false;
     const rect = element.getBoundingClientRect();
@@ -235,16 +242,14 @@ class MessageList extends HTMLElement {
       rect.right <= (window.innerWidth || document.documentElement.clientWidth)
     );
   }
-
   isScrolledToBottom() {
-    return this.visibleSet.has(this.endOfMessages);
+    return this.isElementVisible(this.endOfMessages);
   }
-
   scrollToBottom(force = false, behavior= 'instant') {
     if (force || !this.isScrolledToBottom()) {
-      this.endOfMessages.scrollIntoView({ behavior, block: 'end' });
+      this.firstElementChild.scrollIntoView({ behavior, block: 'end' });
       setTimeout(() => {
-        this.endOfMessages.scrollIntoView({ behavior, block: 'end' });
+        this.firstElementChild.scrollIntoView({ behavior, block: 'end' });
       }, 200);
     }
   }
@@ -256,9 +261,7 @@ class MessageList extends HTMLElement {
     this.querySelectorAll('.avatar').forEach((el) => {
       const anchor = el.closest('a');
       if (anchor && typeof anchor.href === 'string' && anchor.href.includes(uid)) {
-        if(!lastElement)
         lastElement = el;
-
       }
     });
     if (lastElement) {
@@ -269,48 +272,40 @@ class MessageList extends HTMLElement {
     }
   }
 
+
   updateTimes() {
     this.visibleSet.forEach((messageElement) => {
         if (messageElement instanceof MessageElement) {
             messageElement.updateUI();
         }
-    });
+    })
   }
 
   upsertMessage(data) {
     let message = this.messageMap.get(data.uid);
-    if (message && (data.is_final || !data.message)) {
+    if (message) {
-      //message.parentElement?.removeChild(message);
-      // TO force insert 
-      //message = null;
-      
-    }
-    if(message && !data.message){
         message.parentElement?.removeChild(message);
-      message = null;
     }
-    if (!data.message) return;
+
+    if (!data.message) return
 
     const wrapper = document.createElement("div");
+
     wrapper.innerHTML = data.html;
 
     if (message) {
-      // If the old element is already custom, only update its message children
       message.updateMessage(...(wrapper.firstElementChild._originalChildren || wrapper.firstElementChild.children));
     } else {
-      // If not, insert the new one and observe
       message = wrapper.firstElementChild;
       this.messageMap.set(data.uid, message);
       this._observer.observe(message);
-      this.endOfMessages.after(message);
     }
 
     const scrolledToBottom = this.isScrolledToBottom();
-
+    this.prepend(message);
     if (scrolledToBottom) this.scrollToBottom(true);
   }
 }
 
 customElements.define("chat-message", MessageElement);
 customElements.define("message-list", MessageList);
-

src/snek/static/njet.js

@@ -1,3 +1,5 @@
+
+
 class RestClient {
   constructor({ baseURL = '', headers = {} } = {}) {
     this.baseURL = baseURL;
@@ -208,52 +210,27 @@ class Njet extends HTMLElement {
         customElements.define(name, component);
     }
 
-    constructor(config) {
+    constructor() {
         super();
-        // Store the config for use in render and other methods
-        this.config = config || {};
-        
         if (!Njet._root) {
             Njet._root = this
             Njet._rest = new RestClient({ baseURL: '/' || null })
         }
         this.root._elements.push(this)
         this.classList.add('njet');
-        
-        // Initialize properties from config before rendering
-        this.initProps(this.config);
-        
-        // Call render after properties are initialized
         this.render.call(this);
-        
+        //this.initProps(config);
-        // Call construct if defined
+        //if (typeof this.config.construct === 'function')
-        if (typeof this.config.construct === 'function') {
+        //    this.config.construct.call(this)
-            this.config.construct.call(this)
-        }
     }
 
     initProps(config) {
         const props = Object.keys(config)
         props.forEach(prop => {
-            // Skip special properties that are handled separately
+            if (config[prop] !== undefined) {
-            if (['construct', 'items', 'classes'].includes(prop)) {
-                return;
-            }
-            
-            // Check if there's a setter for this property
-            const descriptor = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(this), prop);
-            if (descriptor && descriptor.set) {
-                // Use the setter
                 this[prop] = config[prop];
-            } else if (prop in this) {
-                // Property exists, set it directly
-                this[prop] = config[prop];
-            } else {
-                // Set as attribute for unknown properties
-                this.setAttribute(prop, config[prop]);
             }
         });
-        
         if (config.classes) {
             this.classList.add(...config.classes);
         }
@@ -365,7 +342,7 @@ class NjetDialog extends Component {
         const buttonContainer = document.createElement('div');
         buttonContainer.style.marginTop = '20px';
         buttonContainer.style.display = 'flex';
-        buttonContainer.style.justifyContent = 'flex-end';
+        buttonContainer.style.justifyContent = 'flenjet-end';
         buttonContainer.style.gap = '10px';
         if (secondaryButton) {
             const secondary = new NjetButton(secondaryButton);
@@ -395,9 +372,8 @@ class NjetWindow extends Component {
             header.textContent = title;
             this.appendChild(header);
         }
-        if (this.config.items) {
         this.config.items.forEach(item => this.appendChild(item)); 
-        }
+      
     }
 
     show(){
@@ -432,8 +408,7 @@ class NjetGrid extends Component {
     }
 }
 Njet.registerComponent('njet-grid', NjetGrid);
-
+/*
-/* Example usage:
 const button = new NjetButton({
     classes: ['my-button'],
     text: 'Shared',
@@ -570,12 +545,11 @@ njet.showWindow = function(args) {
     return w
 }
 njet.publish = function(event, data) {
-    if (this.root && this.root._subscriptions && this.root._subscriptions[event]) {
+    if (this.root._subscriptions[event]) {
         this.root._subscriptions[event].forEach(callback => callback(data))
     }
 }
 njet.subscribe = function(event, callback) {
-    if (!this.root) return;
     if (!this.root._subscriptions[event]) {
         this.root._subscriptions[event] = []
     }

src/snek/static/socket.js

@@ -142,9 +142,10 @@ export class Socket extends EventHandler {
       method,
       args,
     };
+    const me = this;
     return new Promise((resolve) => {
-      this.addEventListener(call.callId, (data) => resolve(data), { once: true});
+      me.addEventListener(call.callId, (data) => resolve(data));
-      this.sendJson(call);
+      me.sendJson(call);
     });
   }
 }

src/snek/system/template.py

@@ -79,38 +79,44 @@ emoji.EMOJI_DATA[
 ] = {"en": ":a1:", "status": 2, "E": 0.6, "alias": [":a1:"]}
 
 
-ALLOWED_TAGS = list(bleach.sanitizer.ALLOWED_TAGS) + ["picture"]
+ALLOWED_TAGS = list(bleach.sanitizer.ALLOWED_TAGS) + [
+    "img",
+    "video",
+    "audio",
+    "source",
+    "iframe",
+    "picture",
+    "span",
+]
+ALLOWED_ATTRIBUTES = {
+    **bleach.sanitizer.ALLOWED_ATTRIBUTES,
+    "img": ["src", "alt", "title", "width", "height"],
+    "a": ["href", "title", "target", "rel", "referrerpolicy", "class"],
+    "iframe": [
+        "src",
+        "width",
+        "height",
+        "frameborder",
+        "allow",
+        "allowfullscreen",
+        "title",
+        "referrerpolicy",
+        "style",
+    ],
+    "video": ["src", "controls", "width", "height"],
+    "audio": ["src", "controls"],
+    "source": ["src", "type"],
+    "span": ["class"],
+    "picture": [],
+}
+
 
 def sanitize_html(value):
-
-    soup = BeautifulSoup(value, 'html.parser')
-
-    for script in soup.find_all('script'):
-        script.decompose()
-
-    #for iframe in soup.find_all('iframe'):
-        #iframe.decompose()
-
-    for tag in soup.find_all(['object', 'embed']):
-        tag.decompose()
-
-    for tag in soup.find_all():
-        event_attributes = ['onclick', 'onerror', 'onload', 'onmouseover', 'onfocus']
-        for attr in event_attributes:
-            if attr in tag.attrs:
-                del tag[attr]
-
-    for img in soup.find_all('img'):
-        if 'onerror' in img.attrs:
-            img.decompose()
-
-    return soup.prettify()
-
-
-def sanitize_html2(value):
     return bleach.clean(
         value,
-        protocols=list(bleach.sanitizer.ALLOWED_PROTOCOLS) + ["data"],
+        tags=ALLOWED_TAGS,
+        attributes=ALLOWED_ATTRIBUTES,
+        protocols=bleach.sanitizer.ALLOWED_PROTOCOLS + ["data"],
         strip=True,
     )
 
@@ -126,8 +132,50 @@ def set_link_target_blank(text):
 
     return str(soup)
 
+
+SAFE_ATTRIBUTES = {
+    "href",
+    "src",
+    "alt",
+    "title",
+    "width",
+    "height",
+    "style",
+    "id",
+    "class",
+    "rel",
+    "type",
+    "name",
+    "value",
+    "placeholder",
+    "aria-hidden",
+    "aria-label",
+    "srcset",
+    "target",
+    "rel",
+    "referrerpolicy",
+    "controls",
+    "frameborder",
+    "allow",
+    "allowfullscreen",
+    "referrerpolicy",
+}
+
+
 def whitelist_attributes(html):
-    return sanitize_html(html)
+    soup = BeautifulSoup(html, "html.parser")
+
+    for tag in soup.find_all():
+        if hasattr(tag, "attrs"):
+            if tag.name in ["script", "form", "input"]:
+                tag.replace_with("")
+                continue
+            attrs = dict(tag.attrs)
+            for attr in list(attrs):
+                # Check if attribute is in the safe list or is a data-* attribute
+                if not (attr in SAFE_ATTRIBUTES or attr.startswith("data-")):
+                    del tag.attrs[attr]
+    return str(soup)
 
 
 def embed_youtube(text):

src/snek/templates/sandbox.html

@@ -12,7 +12,7 @@ function showTerm(options){
 
 
 class StarField {
-  constructor({ count = 50, container = document.body } = {}) {
+  constructor({ count = 200, container = document.body } = {}) {
     this.container = container;
     this.starCount = count;
     this.stars = [];
@@ -567,7 +567,7 @@ const count = Array.from(messages).filter(el => el.textContent.trim() === text).
 
 
 
-const starField = new StarField({starCount: 50});
+const starField = new StarField({starCount: 200});
 app.starField = starField;
 
 class DemoSequence {

src/snek/view/channel.py

@@ -29,7 +29,7 @@ class ChannelDriveApiView(DriveApiView):
 
 class ChannelAttachmentView(BaseView):
 
-    login_required=False
+    login_required=True
 
     async def get(self):
         relative_path = self.request.match_info.get("relative_url")

src/snek/view/rpc.py

@@ -11,7 +11,7 @@ import asyncio
 import json
 import logging
 import traceback
-import random
+
 from aiohttp import web
 
 from snek.system.model import now
@@ -529,8 +529,8 @@ class RPCView(BaseView):
             try:
                 await self.ws.send_str(json.dumps(obj, default=str))
             except Exception as ex:
-                print("THIS IS THE DeAL>",str(ex), flush=True)
                 await self.services.socket.delete(self.ws)
+                await self.ws.close()
         
         async def get_online_users(self, channel_uid):
             self._require_login()
@@ -638,7 +638,7 @@ class RPCView(BaseView):
                 try:
                     await rpc(msg.json())
                 except Exception as ex:
-                    print("XXXXXXXXXX Deleting socket", ex, flush=True)
+                    print("Deleting socket", ex, flush=True)
                     logger.exception(ex)
                     await self.services.socket.delete(ws)
                     break

src/snek/view/web.py

@@ -55,7 +55,7 @@ class WebView(BaseView):
             user_uid=self.session.get("uid"), channel_uid=channel["uid"]
         )
         if not channel_member:
-            if not channel["is_private"] and not channel.is_dm:
+            if not channel["is_private"]:
                 channel_member = await self.app.services.channel_member.create(
                     channel_uid=channel["uid"],
                     user_uid=self.session.get("uid"),