From 3a6d7942a66d5e2dfaaee641445f8118d168876d Mon Sep 17 00:00:00 2001 From: Troplo Date: Sun, 7 Aug 2022 23:17:49 +1000 Subject: [PATCH] 1.0.21 --- backend/index.js | 14 +++++ backend/lib/socket.js | 1 + frontend/electron-builder.json5 | 2 +- frontend/package.json | 2 +- frontend/src/assets/styles.css | 9 ++- frontend/src/components/Message.vue | 5 +- .../Communications/CommunicationsChat.vue | 59 ++++++++++--------- 7 files changed, 60 insertions(+), 32 deletions(-) diff --git a/backend/index.js b/backend/index.js index f065c81..17fa9d6 100644 --- a/backend/index.js +++ b/backend/index.js @@ -7,6 +7,8 @@ let os = require("os") app.set("trust proxy", true) app.locals.config = require("./config/config.json") const socket = require("./lib/socket") +const { User } = require("./models") +const { Op } = require("sequelize") const server = require("http").createServer(app) app.use(bodyParser.json({ limit: "15mb" })) @@ -47,6 +49,18 @@ console.log(os.hostname()) app.use(require("./lib/errorHandler")) server.listen(23998, () => { + User.update( + { + status: "offline" + }, + { + where: { + status: { + [Op.ne]: "offline" + } + } + } + ) console.log("Initialized") console.log("Listening on port 0.0.0.0:" + 23998) diff --git a/backend/lib/socket.js b/backend/lib/socket.js index ed68647..4ece4ef 100644 --- a/backend/lib/socket.js +++ b/backend/lib/socket.js @@ -1,5 +1,6 @@ const auth = require("../lib/authorize_socket.js") const { User, Friend, Session, Theme } = require("../models") +const { Op } = require("sequelize") module.exports = { init(app, server) { const io = require("socket.io")(server, { diff --git a/frontend/electron-builder.json5 b/frontend/electron-builder.json5 index 0d8ec40..10de307 100644 --- a/frontend/electron-builder.json5 +++ b/frontend/electron-builder.json5 @@ -5,7 +5,7 @@ publish: ["github"] }, linux: { - target: ["AppImage", "deb", "tar.gz", "snap", "pacman"], + target: ["AppImage", "deb", "tar.gz", "snap"], publish: ["github"], category: "Network", synopsis: "Instant Messaging", diff --git a/frontend/package.json b/frontend/package.json index 1d1a206..3a6e0a1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "colubrina", - "version": "1.0.20", + "version": "1.0.21", "description": "Simple instant communication.", "private": true, "author": "Troplo ", diff --git a/frontend/src/assets/styles.css b/frontend/src/assets/styles.css index ddd6c85..d5cc112 100644 --- a/frontend/src/assets/styles.css +++ b/frontend/src/assets/styles.css @@ -1,14 +1,19 @@ +>>>.max-v-list-height { + max-height: 10px; + overflow-y: auto; +} + .mentioned-message { box-shadow: -2px 0 0 0 var(--v-primary-base); } .offset-message { - padding-left: 53px; + margin-left: 53px; } .message-action-card { position: absolute; top: 0; right: 0; - margin-top: 5px; + margin-top: -15px; margin-right: 5px; } /* large codeblock */ diff --git a/frontend/src/components/Message.vue b/frontend/src/components/Message.vue index 06a6523..6a58ed8 100644 --- a/frontend/src/components/Message.vue +++ b/frontend/src/components/Message.vue @@ -36,12 +36,14 @@ {{ message.reply.content.substring(0, 100) }} diff --git a/frontend/src/views/Communications/CommunicationsChat.vue b/frontend/src/views/Communications/CommunicationsChat.vue index a5a93b5..1cc05dd 100644 --- a/frontend/src/views/Communications/CommunicationsChat.vue +++ b/frontend/src/views/Communications/CommunicationsChat.vue @@ -51,6 +51,9 @@ class="rounded-l" > + + Copy Message Content + Reply to Message @@ -126,6 +129,7 @@ v-if="!loading && $vuetify.breakpoint.mobile" app right + style="z-index: 100" > @@ -275,33 +279,31 @@ {{ $store.state.user.username }} has read up to this point. @@ -723,6 +725,9 @@ export default { } }, methods: { + copy(content) { + navigator.clipboard.writeText(content) + }, removePin(id) { this.axios .post(`/api/v1/communications/${this.chat.id}/pins`, {