use encodeUrl

destinygg · Apr 20, 2024 · 0ea3282 · 0ea3282
1 parent 5a4938e
commit 0ea3282
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/assets/chat/js/encodeUrl.js b/assets/chat/js/encodeUrl.js
@@ -0,0 +1,17 @@
+// stolen from angular.js
+// https://github.com/angular/angular.js/blob/v1.3.14/src/ngSanitize/sanitize.js#L435
+function encodeUrl(value) {
+  return value
+    .replace(/&/g, '&amp;')
+    .replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, (v) => {
+      const hi = v.charCodeAt(0);
+      const low = v.charCodeAt(1);
+      return `&#${(hi - 0xd800) * 0x400 + (low - 0xdc00) + 0x10000};`;
+    })
+    .replace(/([^#-~| |!])/g, (v) => `&#${v.charCodeAt(0)};`)
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;');
+}
+
+export default encodeUrl;
diff --git a/assets/chat/js/formatters/UrlFormatter.js b/assets/chat/js/formatters/UrlFormatter.js
@@ -1,28 +1,14 @@
 import $ from 'jquery';
 import { linkregex } from '../regex';
 import { HashLinkConverter } from '../hashlinkconverter';
+import encodeUrl from '../encodeUrl';
 
 export default class UrlFormatter {
   constructor() {
     this.hashLinkConverter = new HashLinkConverter();
     this.elem = $('<div></div>');
   }
 
-  // stolen from angular.js
-  // https://github.com/angular/angular.js/blob/v1.3.14/src/ngSanitize/sanitize.js#L435
-  encodeUrl(value) {
-    return value
-      .replace(/&/g, '&amp;')
-      .replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, (v) => {
-        const hi = v.charCodeAt(0);
-        const low = v.charCodeAt(1);
-        return `&#${(hi - 0xd800) * 0x400 + (low - 0xdc00) + 0x10000};`;
-      })
-      .replace(/([^#-~| |!])/g, (v) => `&#${v.charCodeAt(0)};`)
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;');
-  }
-
   format(chat, str) {
     if (!str) return undefined;
     const self = this;
@@ -35,7 +21,7 @@ export default class UrlFormatter {
       const decodedUrl = self.elem.html(url).text();
       const m = decodedUrl.match(linkregex);
       if (m) {
-        const normalizedUrl = self.encodeUrl(this.normalizeUrl(m[0]));
+        const normalizedUrl = encodeUrl(this.normalizeUrl(m[0]));
 
         let embedHashLink = '';
         try {
@@ -53,7 +39,7 @@ export default class UrlFormatter {
           urlText = `${urlText.slice(0, 40)}...${urlText.slice(-40)}`;
         }
 
-        const extra = self.encodeUrl(decodedUrl.substring(m[0].length));
+        const extra = encodeUrl(decodedUrl.substring(m[0].length));
         const href = `${scheme ? '' : 'http://'}${normalizedUrl}`;
 
         const embedTarget = chat.isBigscreenEmbed() ? '_top' : '_blank';

diff --git a/assets/chat/js/messages/ChatUserMessage.js b/assets/chat/js/messages/ChatUserMessage.js
@@ -1,3 +1,4 @@
+import encodeUrl from '../encodeUrl';
 import ChatMessage from './ChatMessage';
 import MessageTypes from './MessageTypes';
 
@@ -61,12 +62,11 @@ export default class ChatUserMessage extends ChatMessage {
     else if (this.slashme || this.continued) ctrl = '';
 
     const colorFlair = usernameColorFlair(chat.flairs, this.user);
-    const user = `${this.buildFeatures(this.user, chat)} <a title="${this.title
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')}" class="${['user', colorFlair?.name]
-      .filter(Boolean)
-      .join(' ')}">${this.user.displayName}</a>`;
+    const user = `${this.buildFeatures(this.user, chat)} <a title="${encodeUrl(
+      this.title,
+    )}" class="${['user', colorFlair?.name].filter(Boolean).join(' ')}">${
+      this.user.displayName
+    }</a>`;
     return this.wrap(
       `${this.buildTime()} ${user}<span class="ctrl">${ctrl}</span> ${this.buildMessageTxt(
         chat,