From 9e1c1f993f472b9fecbe79f3d53cf1f43660a71c Mon Sep 17 00:00:00 2001
From: Troplo <troplo@troplo.com>
Date: Thu, 3 Nov 2022 18:30:37 +1100
Subject: [PATCH] 1.0.34

---
 backend/lib/errors.js                                    | 9 +++++++++
 backend/routes/associations.js                           | 4 ++--
 backend/routes/communications.js                         | 8 ++++----
 frontend/package.json                                    | 4 ++--
 frontend/src/App.vue                                     | 5 ++++-
 frontend/src/components/CommsInput.vue                   | 2 +-
 frontend/src/components/DevOverlay.vue                   | 2 +-
 frontend/src/components/Header.vue                       | 9 ++-------
 frontend/src/components/Message.vue                      | 2 +-
 frontend/src/components/NicknameDialog.vue               | 2 +-
 frontend/src/components/Poll.vue                         | 2 +-
 frontend/src/components/UserDialog.vue                   | 2 +-
 frontend/src/main.js                                     | 2 +-
 frontend/src/store/index.js                              | 2 +-
 frontend/src/views/Admin/Admin.vue                       | 2 +-
 frontend/src/views/Admin/AdminLogs.vue                   | 2 +-
 frontend/src/views/Admin/AdminState.vue                  | 2 +-
 frontend/src/views/Admin/AdminThemes.vue                 | 2 +-
 frontend/src/views/Admin/AdminUsers.vue                  | 2 +-
 .../src/views/Communications/CommunicationsFriends.vue   | 2 +-
 frontend/src/views/Email/EmailConfirm.vue                | 2 +-
 frontend/src/views/Email/EmailVerify.vue                 | 2 +-
 frontend/src/views/Login.vue                             | 2 +-
 frontend/src/views/Register.vue                          | 2 +-
 frontend/src/views/Settings/SettingsAppearance.vue       | 2 +-
 frontend/src/views/Settings/SettingsSecurity.vue         | 3 ++-
 frontend/src/views/Settings/SettingsSessions.vue         | 2 +-
 frontend/src/views/Settings/SettingsSite.vue             | 2 +-
 28 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/backend/lib/errors.js b/backend/lib/errors.js
index 5f472ba..27b60e1 100644
--- a/backend/lib/errors.js
+++ b/backend/lib/errors.js
@@ -89,6 +89,15 @@ ProcessedErrors.invalidParameter = function (param, message) {
   }
 }
 
+ProcessedErrors.customMessage = function (param) {
+  return {
+    name: "customMessage",
+    message: `${param}`,
+    status: 400,
+    parameter: param
+  }
+}
+
 ProcessedErrors.sequelizeValidation = (sequelize, obj) => {
   return new sequelize.ValidationError(obj.error, [
     new sequelize.ValidationErrorItem(
diff --git a/backend/routes/associations.js b/backend/routes/associations.js
index bacaaf1..c1a7f66 100644
--- a/backend/routes/associations.js
+++ b/backend/routes/associations.js
@@ -62,8 +62,8 @@ router.delete("/:id/:associationId", auth, async (req, res, next) => {
     if (!chat) {
       throw Errors.chatNotFoundOrNotAdmin
     }
-    if (!association) {
-      throw Errors.chatNotFoundOrNotAdmin
+    if (association?.rank === "admin" || !association) {
+      throw Errors.customMessage("User is admin and cannot be removed.")
     }
     await association.destroy()
     res.sendStatus(204)
diff --git a/backend/routes/communications.js b/backend/routes/communications.js
index e40b8c0..91b27f5 100644
--- a/backend/routes/communications.js
+++ b/backend/routes/communications.js
@@ -1038,8 +1038,8 @@ router.post(
   async (req, res, next) => {
     try {
       const io = req.app.get("io")
-      if (req.body.message.length > 999) {
-        throw Errors.invalidParameter("message", "Maximum length is 1000")
+      if (req.body.message.length > 1999 && !req.user.admin) {
+        throw Errors.invalidParameter("message", "Maximum length is 2000")
       }
       const chat = await ChatAssociation.findOne({
         where: {
@@ -1309,8 +1309,8 @@ router.post("/:id/message", auth, limiter, async (req, res, next) => {
     if (!req.body.message.length) {
       throw Errors.invalidParameter("message")
     }
-    if (req.body.message.length > 999) {
-      throw Errors.invalidParameter("message", "Maximum length is 1000")
+    if (req.body.message.length > 1999 && !req.user.admin) {
+      throw Errors.invalidParameter("message", "Maximum length is 2000")
     }
     const chat = await ChatAssociation.findOne({
       where: {
diff --git a/frontend/package.json b/frontend/package.json
index f6dd600..21f2b82 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "colubrina",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "Simple instant communication.",
   "private": true,
   "author": "Troplo <troplo@troplo.com>",
@@ -13,7 +13,7 @@
     "postinstall": "patch-package && electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps"
   },
-  "main": "./dist_electron/bundled/background.js",
+  "main": "background.js",
   "repository": "https://github.com/Troplo/Colubrina",
   "dependencies": {
     "@babel/preset-env": "^7.17.10",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index c838a06..d0e2ffb 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -5,6 +5,9 @@
       $vuetify.theme.themes[$vuetify.theme.dark ? 'dark' : 'light'].bg
     "
   >
+    <v-overlay :value="!$store.state.wsConnected" absolute style="z-index: 69">
+      <v-progress-circular indeterminate size="64"></v-progress-circular>
+    </v-overlay>
     <DevOverlay v-if="$store.state.site.release === 'dev'"></DevOverlay>
     <v-overlay :value="$store.state.site.loading">
       <v-progress-circular indeterminate size="64"></v-progress-circular>
@@ -452,7 +455,7 @@
 </template>
 <style></style>
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 import { VueFinalModal } from "vue-final-modal"
 import Header from "@/components/Header"
 import DevOverlay from "@/components/DevOverlay"
diff --git a/frontend/src/components/CommsInput.vue b/frontend/src/components/CommsInput.vue
index e816627..7ce90a6 100644
--- a/frontend/src/components/CommsInput.vue
+++ b/frontend/src/components/CommsInput.vue
@@ -248,7 +248,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 import twemoji from "twemoji"
 const emojis = require("../lib/emojis.json")
 
diff --git a/frontend/src/components/DevOverlay.vue b/frontend/src/components/DevOverlay.vue
index 080dd2a..21a8ef9 100644
--- a/frontend/src/components/DevOverlay.vue
+++ b/frontend/src/components/DevOverlay.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 export default {
   name: "DevOverlay",
   data() {
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
index 0c09331..60acea7 100644
--- a/frontend/src/components/Header.vue
+++ b/frontend/src/components/Header.vue
@@ -1,8 +1,5 @@
 <template>
   <div v-if="$store.state.user.username">
-    <v-overlay :value="!$store.state.wsConnected" absolute>
-      <v-progress-circular indeterminate size="64"></v-progress-circular>
-    </v-overlay>
     <NicknameDialog :nickname="nickname" />
     <v-menu
       v-model="context.user.value"
@@ -687,6 +684,7 @@
               style="margin-bottom: -18px"
               elevation="2"
               v-model="search"
+              autocomplete="none"
             ></v-text-field>
             <v-toolbar color="sheet" class="rounded-xl mb-3" elevation="2">
               <v-toolbar-title class="subtitle-1">
@@ -777,9 +775,6 @@
       <template v-slot:append>
         <v-card tile color="bg" elevation="0">
           <v-divider></v-divider>
-          <v-overlay :value="!$store.state.wsConnected" absolute>
-            <v-progress-circular indeterminate size="48"></v-progress-circular>
-          </v-overlay>
           <v-list-item>
             <v-menu top offset-y>
               <template v-slot:activator="{ on, attrs }">
@@ -876,7 +871,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 import NicknameDialog from "@/components/NicknameDialog"
 import Vue from "vue"
 
diff --git a/frontend/src/components/Message.vue b/frontend/src/components/Message.vue
index 9efb89b..e38f579 100644
--- a/frontend/src/components/Message.vue
+++ b/frontend/src/components/Message.vue
@@ -383,7 +383,7 @@
 <script>
 import Embed from "./Embed.vue"
 import CommsInput from "./CommsInput.vue"
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 import Poll from "@/components/Poll"
 
 export default {
diff --git a/frontend/src/components/NicknameDialog.vue b/frontend/src/components/NicknameDialog.vue
index a173cbc..be8d80f 100644
--- a/frontend/src/components/NicknameDialog.vue
+++ b/frontend/src/components/NicknameDialog.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "NicknameDialog",
diff --git a/frontend/src/components/Poll.vue b/frontend/src/components/Poll.vue
index 35db110..405f1c9 100644
--- a/frontend/src/components/Poll.vue
+++ b/frontend/src/components/Poll.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "Poll",
diff --git a/frontend/src/components/UserDialog.vue b/frontend/src/components/UserDialog.vue
index a345213..5210ded 100644
--- a/frontend/src/components/UserDialog.vue
+++ b/frontend/src/components/UserDialog.vue
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "UserDialog",
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 3c34f12..ebabe93 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -28,7 +28,7 @@ const md = require("markdown-it")({
   highlight: function (/*str, lang*/) {
     return ""
   }
-}).disable(["image", "autolink"])
+}).disable(["image", "autolink", "list"])
 const emoji = require("markdown-it-emoji")
 const defaultRender =
   md.renderer.rules.link_open ||
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index ea488ff..0338160 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -1,7 +1,7 @@
 import Vue from "vue"
 import Vuex from "vuex"
 import Vuetify from "../plugins/vuetify"
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 Vue.use(Vuex)
 function getDirectRecipient(context, item) {
diff --git a/frontend/src/views/Admin/Admin.vue b/frontend/src/views/Admin/Admin.vue
index 0da2922..2bc33f5 100644
--- a/frontend/src/views/Admin/Admin.vue
+++ b/frontend/src/views/Admin/Admin.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "Admin",
diff --git a/frontend/src/views/Admin/AdminLogs.vue b/frontend/src/views/Admin/AdminLogs.vue
index cc10a57..21766db 100644
--- a/frontend/src/views/Admin/AdminLogs.vue
+++ b/frontend/src/views/Admin/AdminLogs.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "AdminLogs",
diff --git a/frontend/src/views/Admin/AdminState.vue b/frontend/src/views/Admin/AdminState.vue
index c8f667e..9778596 100644
--- a/frontend/src/views/Admin/AdminState.vue
+++ b/frontend/src/views/Admin/AdminState.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 export default {
   name: "AdminState",
   data() {
diff --git a/frontend/src/views/Admin/AdminThemes.vue b/frontend/src/views/Admin/AdminThemes.vue
index e54f922..0601c36 100644
--- a/frontend/src/views/Admin/AdminThemes.vue
+++ b/frontend/src/views/Admin/AdminThemes.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "AdminThemes",
diff --git a/frontend/src/views/Admin/AdminUsers.vue b/frontend/src/views/Admin/AdminUsers.vue
index 6b751b7..ce078e6 100644
--- a/frontend/src/views/Admin/AdminUsers.vue
+++ b/frontend/src/views/Admin/AdminUsers.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "AdminUsers",
diff --git a/frontend/src/views/Communications/CommunicationsFriends.vue b/frontend/src/views/Communications/CommunicationsFriends.vue
index 6fae98c..a26af0b 100644
--- a/frontend/src/views/Communications/CommunicationsFriends.vue
+++ b/frontend/src/views/Communications/CommunicationsFriends.vue
@@ -267,7 +267,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "CommunicationsFriends",
diff --git a/frontend/src/views/Email/EmailConfirm.vue b/frontend/src/views/Email/EmailConfirm.vue
index f64ba93..5dd4633 100644
--- a/frontend/src/views/Email/EmailConfirm.vue
+++ b/frontend/src/views/Email/EmailConfirm.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "EmailConfirm",
diff --git a/frontend/src/views/Email/EmailVerify.vue b/frontend/src/views/Email/EmailVerify.vue
index 87551bc..28d4957 100644
--- a/frontend/src/views/Email/EmailVerify.vue
+++ b/frontend/src/views/Email/EmailVerify.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "EmailVerify",
diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index b3ac651..184af21 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -109,7 +109,7 @@
 
 <script>
 import Vue from "vue"
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "Login",
diff --git a/frontend/src/views/Register.vue b/frontend/src/views/Register.vue
index 05de818..78a6849 100644
--- a/frontend/src/views/Register.vue
+++ b/frontend/src/views/Register.vue
@@ -129,7 +129,7 @@
 
 <script>
 import Vue from "vue"
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "Login",
diff --git a/frontend/src/views/Settings/SettingsAppearance.vue b/frontend/src/views/Settings/SettingsAppearance.vue
index 87dc3dd..edd431e 100644
--- a/frontend/src/views/Settings/SettingsAppearance.vue
+++ b/frontend/src/views/Settings/SettingsAppearance.vue
@@ -139,7 +139,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "SettingsAppearance",
diff --git a/frontend/src/views/Settings/SettingsSecurity.vue b/frontend/src/views/Settings/SettingsSecurity.vue
index 7ba6bbc..8e3328c 100644
--- a/frontend/src/views/Settings/SettingsSecurity.vue
+++ b/frontend/src/views/Settings/SettingsSecurity.vue
@@ -18,6 +18,7 @@
             v-model="totp.password"
             color="white"
             @keydown.enter="totpEnable"
+            autocomplete="false"
           >
           </v-text-field>
           <v-btn @click="totpEnable" text>Proceed</v-btn>
@@ -96,7 +97,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "SettingsSecurity",
diff --git a/frontend/src/views/Settings/SettingsSessions.vue b/frontend/src/views/Settings/SettingsSessions.vue
index 5a9e160..ca81391 100644
--- a/frontend/src/views/Settings/SettingsSessions.vue
+++ b/frontend/src/views/Settings/SettingsSessions.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "SettingsSessions",
diff --git a/frontend/src/views/Settings/SettingsSite.vue b/frontend/src/views/Settings/SettingsSite.vue
index b84d592..c0fae32 100644
--- a/frontend/src/views/Settings/SettingsSite.vue
+++ b/frontend/src/views/Settings/SettingsSite.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import AjaxErrorHandler from "@/lib/errorHandler"
+import AjaxErrorHandler from "@/lib/errorHandler.js"
 
 export default {
   name: "SettingsSite",