c.id),
});
},
+ isTouchEvent(event) {
+ // This is the same way Sortable.js detects a touch event. See
+ // SortableJS/Sortable@daaefeda:/src/Sortable.js#L465
+ return (
+ (event.touches && event.touches[0]) ||
+ (event.pointerType && event.pointerType === "touch")
+ );
+ },
+ onDraggableChoose(event) {
+ const original = event.originalEvent;
+
+ if (this.isTouchEvent(original)) {
+ // onDrag is only triggered when the user actually moves the
+ // dragged object but onChoose is triggered as soon as the
+ // item is eligible for dragging. This gives us an opportunity
+ // to tell the user they've held the touch long enough.
+ event.item.classList.add("ui-sortable-dragging-touch-cue");
+
+ if (original instanceof TouchEvent && original.touches.length > 0) {
+ this.startDrag = [original.touches[0].clientX, original.touches[0].clientY];
+ } else if (original instanceof PointerEvent) {
+ this.startDrag = [original.clientX, original.clientY];
+ }
+ }
+ },
+ onDraggableUnchoose(event) {
+ event.item.classList.remove("ui-sortable-dragging-touch-cue");
+ this.startDrag = null;
+ },
+ onDraggableTouchStart() {
+ if (event.touches.length === 1) {
+ // This prevents an iOS long touch default behavior: selecting
+ // the nearest selectable text.
+ document.body.classList.add("force-no-select");
+ }
+ },
+ onDraggableTouchMove(event) {
+ if (this.startDrag && event.touches.length > 0) {
+ const touch = event.touches[0];
+ const currentPosition = [touch.clientX, touch.clientY];
+
+ if (distance(this.startDrag, currentPosition) > 10) {
+ // Context menu is shown on Android after long touch.
+ // Dismiss it now that we're sure the user is dragging.
+ eventbus.emit("contextmenu:cancel");
+ }
+ }
+ },
+ onDraggableTouchEnd(event) {
+ if (event.touches.length === 0) {
+ document.body.classList.remove("force-no-select");
+ }
+ },
toggleSearch(event) {
if (isIgnoredKeybind(event)) {
return true;
diff --git a/client/components/Sidebar.vue b/client/components/Sidebar.vue
index bb056215..6a7a23f7 100644
--- a/client/components/Sidebar.vue
+++ b/client/components/Sidebar.vue
@@ -195,6 +195,9 @@ export default {
document.body.addEventListener("touchstart", this.onTouchStart, {passive: true});
},
+ destroyed() {
+ document.body.removeEventListener("touchstart", this.onTouchStart, {passive: true});
+ },
methods: {
isPublic: () => document.body.classList.contains("public"),
},
diff --git a/client/components/Windows/Help.vue b/client/components/Windows/Help.vue
index 95067dff..b7558c02 100644
--- a/client/components/Windows/Help.vue
+++ b/client/components/Windows/Help.vue
@@ -87,6 +87,36 @@
+ Gestures
+
+
+
Single-Finger Swipe Left
+
+
+
Single-Finger Swipe Right
+
+
+
Two-Finger Swipe Left
+
+
Switch to the next window in the channel list.
+
+
+
Two-Finger Swipe Right
+
+
Switch to the previous window in the channel list.
+
+
Keyboard Shortcuts
@@ -199,6 +229,16 @@
+
+
+ Alt / ⌥ /
+
+
Switch to the help menu.
+
+
Esc
@@ -764,6 +804,7 @@ export default {
data() {
return {
isApple: navigator.platform.match(/(Mac|iPhone|iPod|iPad)/i) || false,
+ isTouch: navigator.maxTouchPoints > 0,
};
},
};
diff --git a/client/components/Windows/SearchResults.vue b/client/components/Windows/SearchResults.vue
index 08ce21ff..159b702c 100644
--- a/client/components/Windows/SearchResults.vue
+++ b/client/components/Windows/SearchResults.vue
@@ -124,7 +124,7 @@ export default {
return [];
}
- return this.search.results.slice().reverse();
+ return this.search.results;
},
chan() {
const chanId = parseInt(this.$route.params.id, 10);
diff --git a/client/components/Windows/Settings.vue b/client/components/Windows/Settings.vue
index 898e1613..ce90a66b 100644
--- a/client/components/Windows/Settings.vue
+++ b/client/components/Windows/Settings.vue
@@ -248,11 +248,18 @@
+
+
@@ -306,6 +313,7 @@
@@ -316,6 +324,14 @@
>
Warning : Notifications are not supported by your browser.
+
+ Warning : Notifications are only supported over HTTPS
+ connections.
+
@@ -370,6 +386,7 @@ expressions, it will trigger a highlight."
type="text"
name="highlights"
class="input"
+ autocomplete="off"
placeholder="Comma-separated, e.g.: word, some more words, anotherword"
/>
@@ -381,8 +398,8 @@ expressions, it will trigger a highlight."
Highlight exceptions
@@ -394,6 +411,7 @@ your nickname or expressions defined in custom highlights."
type="text"
name="highlightExceptions"
class="input"
+ autocomplete="off"
placeholder="Comma-separated, e.g.: word, some more words, anotherword"
/>
diff --git a/client/css/style.css b/client/css/style.css
index 16673295..1ce106b6 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -107,6 +107,10 @@ body {
overflow: hidden; /* iOS Safari requires overflow rather than overflow-y */
}
+body.force-no-select * {
+ user-select: none !important;
+}
+
a,
a:hover,
a:focus {
@@ -333,6 +337,7 @@ p {
.channel-list-item .not-connected-icon::before,
.channel-list-item .parted-channel-icon::before,
.jump-to-input::before,
+.password-container .reveal-password span,
#sidebar .collapse-network-icon::before {
font: normal normal normal 14px/1 FontAwesome;
font-size: inherit; /* Can't have font-size inherit on line above, so need to override */
@@ -707,14 +712,19 @@ background on hover (unless active) */
/* Remove background on hovered/active channel when sorting/drag-and-dropping */
.ui-sortable-ghost,
-.channel-list-item.ui-sortable-dragged,
-.ui-sortable-dragged .channel-list-item,
-.ui-sortable-active .channel-list-item:hover,
-.ui-sortable-active .channel-list-item.active {
+.ui-sortable-dragging .channel-list-item,
+.ui-sortable-dragging,
+.ui-sortable-dragging:hover,
+.ui-sortable-dragging.active,
+.ui-sortable-dragging-touch-cue .channel-list-item,
+.ui-sortable-dragging-touch-cue,
+.ui-sortable-dragging-touch-cue:hover,
+.ui-sortable-dragging-touch-cue.active {
background: transparent;
}
-.ui-sortable-ghost::after {
+.ui-sortable-ghost::after,
+.ui-sortable-dragging-touch-cue:not(.ui-sortable-dragging)::after {
background: var(--body-bg-color);
border: 1px dashed #99a2b4;
border-radius: 6px;
@@ -727,6 +737,10 @@ background on hover (unless active) */
right: 10px;
}
+.ui-sortable-dragging-touch-cue:not(.ui-sortable-ghost)::after {
+ background: transparent;
+}
+
#sidebar .network {
position: relative;
margin-bottom: 20px;
@@ -1038,7 +1052,10 @@ textarea.input {
.header .title {
font-size: 15px;
padding-left: 6px;
- flex-shrink: 0;
+ flex-shrink: 1;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.topic-container {
@@ -1054,6 +1071,12 @@ textarea.input {
flex-grow: 1;
overflow: hidden;
font-size: 14px;
+ flex-shrink: 99999999;
+ min-width: 25px;
+}
+
+.header .topic.empty {
+ min-width: 0;
}
.header .topic-input {
@@ -1067,6 +1090,7 @@ textarea.input {
height: 35px;
overflow: hidden;
font-size: 14px;
+ line-height: normal;
outline: none;
}
@@ -1689,6 +1713,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
#chat .userlist .search {
color: var(--body-color);
+ appearance: none;
border: 0;
background: none;
font: inherit;
@@ -1979,7 +2004,6 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
}
.password-container .reveal-password span {
- font: normal normal normal 14px/1 FontAwesome;
font-size: 16px;
color: #607992;
width: 35px;
@@ -2024,6 +2048,10 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
padding-right: 15px;
}
+#help .help-item .subject.gesture {
+ font-weight: bold;
+}
+
#help .help-item .description p {
margin-bottom: 0;
}
@@ -2234,6 +2262,14 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
background: transparent;
}
+#context-menu-container.passthrough {
+ pointer-events: none;
+}
+
+#context-menu-container.passthrough > * {
+ pointer-events: auto;
+}
+
.mentions-popup,
#context-menu,
.textcomplete-menu {
@@ -2635,6 +2671,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
right: 0;
transform: translateX(180px);
transition: transform 0.2s;
+ z-index: 1;
}
#viewport.userlist-open #chat .userlist {
diff --git a/client/js/helpers/contextMenu.js b/client/js/helpers/contextMenu.js
index feadd15c..b17c3794 100644
--- a/client/js/helpers/contextMenu.js
+++ b/client/js/helpers/contextMenu.js
@@ -252,22 +252,30 @@ export function generateUserContextMenu($root, channel, network, user) {
return items;
}
- // Names of the modes we are able to change
- const modes = {
- "~": ["owner", "q"],
- "&": ["admin", "a"],
- "@": ["operator", "o"],
- "%": ["half-op", "h"],
- "+": ["voice", "v"],
+ // Names of the standard modes we are able to change
+ const modeCharToName = {
+ "~": "owner",
+ "&": "admin",
+ "@": "operator",
+ "%": "half-op",
+ "+": "voice",
};
- // Labels for the mode changes. For example .rev(['admin', 'a']) => 'Revoke admin (-a)'
+ // Labels for the mode changes. For example .rev({mode: "a", symbol: "&"}) => 'Revoke admin (-a)'
const modeTextTemplate = {
- revoke: (m) => `Revoke ${m[0]} (-${m[1]})`,
- give: (m) => `Give ${m[0]} (+${m[1]})`,
+ revoke(m) {
+ const name = modeCharToName[m.symbol];
+ const res = name ? `Revoke ${name} (-${m.mode})` : `Mode -${m.mode}`;
+ return res;
+ },
+ give(m) {
+ const name = modeCharToName[m.symbol];
+ const res = name ? `Give ${name} (+${m.mode})` : `Mode +${m.mode}`;
+ return res;
+ },
};
- const networkModes = network.serverOptions.PREFIX;
+ const networkModeSymbols = network.serverOptions.PREFIX.symbols;
/**
* Determine whether the prefix of mode p1 has access to perform actions on p2.
@@ -284,38 +292,38 @@ export function generateUserContextMenu($root, channel, network, user) {
function compare(p1, p2) {
// The modes ~ and @ can perform actions on their own mode. The others on modes below.
return "~@".indexOf(p1) > -1
- ? networkModes.indexOf(p1) <= networkModes.indexOf(p2)
- : networkModes.indexOf(p1) < networkModes.indexOf(p2);
+ ? networkModeSymbols.indexOf(p1) <= networkModeSymbols.indexOf(p2)
+ : networkModeSymbols.indexOf(p1) < networkModeSymbols.indexOf(p2);
}
- networkModes.forEach((prefix) => {
- if (!compare(currentChannelUser.modes[0], prefix)) {
+ network.serverOptions.PREFIX.prefix.forEach((mode) => {
+ if (!compare(currentChannelUser.modes[0], mode.symbol)) {
// Our highest mode is below the current mode. Bail.
return;
}
- if (!user.modes.includes(prefix)) {
+ if (!user.modes.includes(mode.symbol)) {
// The target doesn't already have this mode, therefore we can set it.
items.push({
- label: modeTextTemplate.give(modes[prefix]),
+ label: modeTextTemplate.give(mode),
type: "item",
class: "action-set-mode",
action() {
socket.emit("input", {
target: channel.id,
- text: "/mode +" + modes[prefix][1] + " " + user.nick,
+ text: "/mode +" + mode.mode + " " + user.nick,
});
},
});
} else {
items.push({
- label: modeTextTemplate.revoke(modes[prefix]),
+ label: modeTextTemplate.revoke(mode),
type: "item",
class: "action-revoke-mode",
action() {
socket.emit("input", {
target: channel.id,
- text: "/mode -" + modes[prefix][1] + " " + user.nick,
+ text: "/mode -" + mode.mode + " " + user.nick,
});
},
});
@@ -323,9 +331,9 @@ export function generateUserContextMenu($root, channel, network, user) {
});
// Determine if we are half-op or op depending on the network modes so we can kick.
- if (!compare(networkModes.indexOf("%") > -1 ? "%" : "@", currentChannelUser.modes[0])) {
+ if (!compare(networkModeSymbols.indexOf("%") > -1 ? "%" : "@", currentChannelUser.modes[0])) {
+ // Check if the target user has no mode or a mode lower than ours.
if (user.modes.length === 0 || compare(currentChannelUser.modes[0], user.modes[0])) {
- // Check if the target user has no mode or a mode lower than ours.
items.push({
label: "Kick",
type: "item",
diff --git a/client/js/helpers/distance.js b/client/js/helpers/distance.js
new file mode 100644
index 00000000..4a9c01df
--- /dev/null
+++ b/client/js/helpers/distance.js
@@ -0,0 +1,5 @@
+function distance([x1, y1], [x2, y2]) {
+ return Math.hypot(x1 - x2, y1 - y2);
+}
+
+export default distance;
diff --git a/client/js/helpers/listenForTwoFingerSwipes.js b/client/js/helpers/listenForTwoFingerSwipes.js
new file mode 100644
index 00000000..8689f083
--- /dev/null
+++ b/client/js/helpers/listenForTwoFingerSwipes.js
@@ -0,0 +1,106 @@
+"use strict";
+
+import distance from "./distance";
+
+// onTwoFingerSwipe will be called with a cardinal direction ("n", "e", "s" or
+// "w") as its only argument.
+function listenForTwoFingerSwipes(onTwoFingerSwipe) {
+ let history = [];
+
+ document.body.addEventListener(
+ "touchmove",
+ function (event) {
+ if (event.touches.length !== 2) {
+ return;
+ }
+
+ const a = event.touches.item(0);
+ const b = event.touches.item(1);
+
+ const timestamp = window.performance.now();
+ const center = [(a.screenX + b.screenX) / 2, (a.screenY + b.screenY) / 2];
+
+ if (history.length > 0) {
+ const last = history[history.length - 1];
+ const centersAreEqual =
+ last.center[0] === center[0] && last.center[1] === center[1];
+
+ if (last.timestamp === timestamp || centersAreEqual) {
+ // Touches with the same timestamps or center don't help us
+ // see the speed of movement. Ignore them.
+ return;
+ }
+ }
+
+ history.push({timestamp, center});
+ },
+ {passive: true}
+ );
+
+ document.body.addEventListener(
+ "touchend",
+ function () {
+ if (event.touches.length >= 2) {
+ return;
+ }
+
+ try {
+ const direction = getSwipe(history);
+
+ if (direction) {
+ onTwoFingerSwipe(direction);
+ }
+ } finally {
+ history = [];
+ }
+ },
+ {passive: true}
+ );
+
+ document.body.addEventListener(
+ "touchcancel",
+ function () {
+ history = [];
+ },
+ {passive: true}
+ );
+}
+
+// Returns the cardinal direction of the swipe or null if there is no swipe.
+function getSwipe(hist) {
+ // Speed is in pixels/millisecond. Must be maintained throughout swipe.
+ const MIN_SWIPE_SPEED = 0.2;
+
+ if (hist.length < 2) {
+ return null;
+ }
+
+ for (let i = 1; i < hist.length; ++i) {
+ const previous = hist[i - 1];
+ const current = hist[i];
+
+ const speed =
+ distance(previous.center, current.center) /
+ Math.abs(previous.timestamp - current.timestamp);
+
+ if (speed < MIN_SWIPE_SPEED) {
+ return null;
+ }
+ }
+
+ return getCardinalDirection(hist[0].center, hist[hist.length - 1].center);
+}
+
+function getCardinalDirection([x1, y1], [x2, y2]) {
+ // If θ is the angle of the vector then this is tan(θ)
+ const tangent = (y2 - y1) / (x2 - x1);
+
+ // All values of |tan(-45° to 45°)| are less than 1, same for 145° to 225°
+ if (Math.abs(tangent) < 1) {
+ return x1 < x2 ? "e" : "w";
+ }
+
+ return y1 < y2 ? "s" : "n";
+}
+
+export default listenForTwoFingerSwipes;
diff --git a/client/js/helpers/parse.js b/client/js/helpers/parse.js
index 9097d96f..675dd0b0 100644
--- a/client/js/helpers/parse.js
+++ b/client/js/helpers/parse.js
@@ -79,7 +79,7 @@ function parse(createElement, text, message = undefined, network = undefined) {
// arrays of objects containing start and end markers, as well as metadata
// depending on what was found (channel or link).
const channelPrefixes = network ? network.serverOptions.CHANTYPES : ["#", "&"];
- const userModes = network ? network.serverOptions.PREFIX : ["!", "@", "%", "+"];
+ const userModes = network?.serverOptions?.PREFIX.symbols || ["!", "@", "%", "+"];
const channelParts = findChannels(cleanText, channelPrefixes, userModes);
const linkParts = findLinks(cleanText);
const emojiParts = findEmoji(cleanText);
diff --git a/client/js/helpers/simplemap.json b/client/js/helpers/simplemap.json
index 4b917733..b71c8819 100644
--- a/client/js/helpers/simplemap.json
+++ b/client/js/helpers/simplemap.json
@@ -1238,8 +1238,8 @@
"credit_card": "💳",
"receipt": "🧾",
"chart": "💹",
- "email": "✉️",
"envelope": "✉️",
+ "email": "📧",
"e_mail": "📧",
"incoming_envelope": "📨",
"envelope_with_arrow": "📩",
diff --git a/client/js/keybinds.js b/client/js/keybinds.js
index daee796f..2fbb3311 100644
--- a/client/js/keybinds.js
+++ b/client/js/keybinds.js
@@ -3,9 +3,10 @@
import Mousetrap from "mousetrap";
import store from "./store";
-import {switchToChannel} from "./router";
+import {switchToChannel, router, navigate} from "./router";
import isChannelCollapsed from "./helpers/isChannelCollapsed";
import isIgnoredKeybind from "./helpers/isIgnoredKeybind";
+import listenForTwoFingerSwipes from "./helpers/listenForTwoFingerSwipes";
// Switch to the next/previous window in the channel list.
Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
@@ -13,11 +14,22 @@ Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
return true;
}
+ navigateWindow(keys.split("+").pop() === "up" ? -1 : 1);
+
+ return false;
+});
+
+listenForTwoFingerSwipes(function (cardinalDirection) {
+ if (cardinalDirection === "e" || cardinalDirection === "w") {
+ navigateWindow(cardinalDirection === "e" ? -1 : 1);
+ }
+});
+
+function navigateWindow(direction) {
if (store.state.networks.length === 0) {
- return false;
+ return;
}
- const direction = keys.split("+").pop() === "up" ? -1 : 1;
const flatChannels = [];
let index = -1;
@@ -44,9 +56,7 @@ Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
index = (((index + direction) % length) + length) % length;
jumpToChannel(flatChannels[index]);
-
- return false;
-});
+}
// Switch to the next/previous lobby in the channel list
Mousetrap.bind(["alt+shift+up", "alt+shift+down"], function (e, keys) {
@@ -107,6 +117,17 @@ Mousetrap.bind(["alt+a"], function (e) {
return false;
});
+// Show the help menu.
+Mousetrap.bind(["alt+/"], function (e) {
+ if (isIgnoredKeybind(e)) {
+ return true;
+ }
+
+ navigate("Help");
+
+ return false;
+});
+
function jumpToChannel(targetChannel) {
switchToChannel(targetChannel);
@@ -156,6 +177,12 @@ const ignoredKeys = {
};
document.addEventListener("keydown", (e) => {
+ // Allow navigating back to the previous page when on the help screen.
+ if (e.key === "Escape" && router.currentRoute.name === "Help") {
+ router.go(-1);
+ return;
+ }
+
// Ignore any key that uses alt modifier
// Ignore keys defined above
if (e.altKey || ignoredKeys[e.which]) {
diff --git a/client/js/settings.js b/client/js/settings.js
index 403db792..3e3e5581 100644
--- a/client/js/settings.js
+++ b/client/js/settings.js
@@ -98,7 +98,7 @@ export const config = normalizeConfig({
media: {
default: true,
},
- removeImageMetadata: {
+ uploadCanvas: {
default: true,
},
userStyles: {
diff --git a/client/js/store-settings.js b/client/js/store-settings.js
index abcc3e4f..bed36968 100644
--- a/client/js/store-settings.js
+++ b/client/js/store-settings.js
@@ -86,15 +86,6 @@ function loadFromLocalStorage() {
storedSettings.highlights = storedSettings.highlights.join(", ");
}
- // Convert deprecated uploadCanvas to removeImageMetadata
- if (
- storedSettings.uploadCanvas !== undefined &&
- storedSettings.removeImageMetadata === undefined
- ) {
- storedSettings.removeImageMetadata = storedSettings.uploadCanvas;
- delete storedSettings.uploadCanvas;
- }
-
return storedSettings;
}
diff --git a/client/js/store.js b/client/js/store.js
index 4c32ce15..83ce7f86 100644
--- a/client/js/store.js
+++ b/client/js/store.js
@@ -12,6 +12,8 @@ function detectDesktopNotificationState() {
return "unsupported";
} else if (Notification.permission === "granted") {
return "granted";
+ } else if (!window.isSecureContext) {
+ return "nohttps";
}
return "blocked";
diff --git a/client/js/upload.js b/client/js/upload.js
index e5e3e6f9..fb68746d 100644
--- a/client/js/upload.js
+++ b/client/js/upload.js
@@ -142,7 +142,46 @@ class Uploader {
// This issue only happens if The Lounge is proxied through other software
// as it may buffer the upload before the upload request will be processed by The Lounge.
this.tokenKeepAlive = setInterval(() => socket.emit("upload:ping", token), 40 * 1000);
- this.performUpload(token, file);
+
+ if (
+ store.state.settings.uploadCanvas &&
+ file.type.startsWith("image/") &&
+ !file.type.includes("svg") &&
+ file.type !== "image/gif"
+ ) {
+ this.renderImage(file, (newFile) => this.performUpload(token, newFile));
+ } else {
+ this.performUpload(token, file);
+ }
+ }
+
+ renderImage(file, callback) {
+ const fileReader = new FileReader();
+
+ fileReader.onabort = () => callback(file);
+ fileReader.onerror = () => fileReader.abort();
+
+ fileReader.onload = () => {
+ const img = new Image();
+
+ img.onerror = () => callback(file);
+
+ img.onload = () => {
+ const canvas = document.createElement("canvas");
+ canvas.width = img.width;
+ canvas.height = img.height;
+ const ctx = canvas.getContext("2d");
+ ctx.drawImage(img, 0, 0);
+
+ canvas.toBlob((blob) => {
+ callback(new File([blob], file.name));
+ }, file.type);
+ };
+
+ img.src = fileReader.result;
+ };
+
+ fileReader.readAsDataURL(file);
}
performUpload(token, file) {
@@ -185,7 +224,6 @@ class Uploader {
};
const formData = new FormData();
- formData.append("removeMetadata", store.state.settings.removeImageMetadata);
formData.append("file", file);
this.xhr.open("POST", `uploads/new/${token}`);
this.xhr.send(formData);
diff --git a/defaults/config.js b/defaults/config.js
index 390f732d..691d5e65 100644
--- a/defaults/config.js
+++ b/defaults/config.js
@@ -152,8 +152,9 @@ module.exports = {
// ### prefetchMaxSearchSize
//
- // This value sets the maximum request size made to find the Open Graph tags
- // for link previews. For some sites like YouTube this can easily exceed 300
+ // This value sets the maximum response size allowed when finding the Open
+ // Graph tags for link previews. The entire response is temporarily stored
+ // in memory and for some sites like YouTube this can easily exceed 300
// kilobytes.
//
// This value is set to `50` kilobytes by default.
diff --git a/package.json b/package.json
index 78140e01..b0981b7d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "thelounge",
"description": "The self-hosted Web IRC client",
- "version": "4.3.0-pre.4",
+ "version": "4.3.0-pre.6",
"preferGlobal": true,
"bin": {
"thelounge": "index.js"
@@ -37,45 +37,44 @@
],
"license": "MIT",
"engines": {
- "node": ">=10.15.0"
+ "node": ">=12.0.0"
},
"dependencies": {
"bcryptjs": "2.4.3",
"busboy": "0.3.1",
- "chalk": "4.1.1",
+ "chalk": "4.1.2",
"cheerio": "1.0.0-rc.10",
"commander": "7.2.0",
"content-disposition": "0.5.3",
"express": "4.17.1",
"file-type": "16.2.0",
"filenamify": "4.2.0",
- "got": "11.8.1",
+ "got": "11.8.2",
"irc-framework": "4.11.0",
"is-utf8": "0.2.1",
- "ldapjs": "2.2.3",
- "linkify-it": "3.0.2",
+ "ldapjs": "2.3.1",
+ "linkify-it": "3.0.3",
"lodash": "4.17.21",
- "mime-types": "2.1.28",
+ "mime-types": "2.1.33",
"node-forge": "0.10.0",
"package-json": "6.5.0",
"read": "1.0.7",
"read-chunk": "3.2.0",
- "semver": "7.3.4",
- "sharp": "0.28.0",
+ "semver": "7.3.5",
"socket.io": "3.1.2",
"tlds": "1.216.0",
- "ua-parser-js": "0.7.24",
+ "ua-parser-js": "0.7.30",
"uuid": "8.3.2",
- "web-push": "3.4.4",
+ "web-push": "3.4.5",
"yarn": "1.22.10"
},
"optionalDependencies": {
"sqlite3": "5.0.2"
},
"devDependencies": {
- "@babel/core": "7.14.6",
- "@babel/preset-env": "7.14.7",
- "@fortawesome/fontawesome-free": "5.15.3",
+ "@babel/core": "7.15.5",
+ "@babel/preset-env": "7.15.6",
+ "@fortawesome/fontawesome-free": "5.15.4",
"@vue/server-test-utils": "1.1.3",
"@vue/test-utils": "1.1.3",
"babel-loader": "8.2.2",
@@ -84,13 +83,13 @@
"copy-webpack-plugin": "7.0.0",
"css-loader": "5.1.1",
"cssnano": "4.1.11",
- "dayjs": "1.10.5",
- "emoji-regex": "9.2.1",
+ "dayjs": "1.10.7",
+ "emoji-regex": "9.2.2",
"eslint": "7.23.0",
"eslint-config-prettier": "6.15.0",
"eslint-plugin-vue": "7.5.0",
"fuzzy": "0.1.3",
- "husky": "4.3.5",
+ "husky": "4.3.8",
"mini-css-extract-plugin": "1.3.6",
"mocha": "8.2.1",
"mousetrap": "1.6.5",
@@ -98,15 +97,15 @@
"npm-run-all": "4.1.5",
"nyc": "15.1.0",
"postcss": "8.2.10",
- "postcss-import": "14.0.0",
+ "postcss-import": "14.0.2",
"postcss-loader": "5.0.0",
"postcss-preset-env": "6.7.0",
"prettier": "2.2.1",
- "pretty-quick": "3.1.0",
+ "pretty-quick": "3.1.1",
"primer-tooltips": "2.0.0",
"sinon": "9.2.4",
- "socket.io-client": "3.1.1",
- "stylelint": "13.9.0",
+ "socket.io-client": "3.1.3",
+ "stylelint": "13.13.1",
"stylelint-config-standard": "20.0.0",
"textcomplete": "0.18.2",
"undate": "0.3.0",
@@ -120,11 +119,14 @@
"webpack": "5.21.2",
"webpack-cli": "4.5.0",
"webpack-dev-middleware": "4.1.0",
- "webpack-hot-middleware": "2.25.0"
+ "webpack-hot-middleware": "2.25.1"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged"
}
+ },
+ "resolutions": {
+ "sortablejs": "git+https://github.com/itsjohncs/Sortable.git"
}
}
diff --git a/scripts/generate-emoji.js b/scripts/generate-emoji.js
old mode 100644
new mode 100755
diff --git a/src/client.js b/src/client.js
index fe905c81..4a8aa080 100644
--- a/src/client.js
+++ b/src/client.js
@@ -104,11 +104,6 @@ function Client(manager, name, config = {}) {
delete client.config.awayMessage;
}
- if (client.config.uploadCanvas) {
- client.config.clientSettings.removeImageMetadata = client.config.uploadCanvas;
- delete client.config.uploadCanvas;
- }
-
if (client.config.clientSettings.awayMessage) {
client.awayMessage = client.config.clientSettings.awayMessage;
}
diff --git a/src/helper.js b/src/helper.js
index c12fde10..27352b53 100644
--- a/src/helper.js
+++ b/src/helper.js
@@ -43,6 +43,7 @@ const Helper = {
getDefaultNick,
parseHostmask,
compareHostmask,
+ compareWithWildcard,
password: {
hash: passwordHash,
@@ -314,8 +315,27 @@ function parseHostmask(hostmask) {
function compareHostmask(a, b) {
return (
- (a.nick.toLowerCase() === b.nick.toLowerCase() || a.nick === "*") &&
- (a.ident.toLowerCase() === b.ident.toLowerCase() || a.ident === "*") &&
- (a.hostname.toLowerCase() === b.hostname.toLowerCase() || a.hostname === "*")
+ compareWithWildcard(a.nick, b.nick) &&
+ compareWithWildcard(a.ident, b.ident) &&
+ compareWithWildcard(a.hostname, b.hostname)
);
}
+
+function compareWithWildcard(a, b) {
+ // we allow '*' and '?' wildcards in our comparison.
+ // this is mostly aligned with https://modern.ircdocs.horse/#wildcard-expressions
+ // but we do not support the escaping. The ABNF does not seem to be clear as to
+ // how to escape the escape char '\', which is valid in a nick,
+ // whereas the wildcards tend not to be (as per RFC1459).
+
+ // The "*" wildcard is ".*" in regex, "?" is "."
+ // so we tokenize and join with the proper char back together,
+ // escaping any other regex modifier
+ const wildmany_split = a.split("*").map((sub) => {
+ const wildone_split = sub.split("?").map((p) => _.escapeRegExp(p));
+ return wildone_split.join(".");
+ });
+ const user_regex = wildmany_split.join(".*");
+ const re = new RegExp(`^${user_regex}$`, "i"); // case insensitive
+ return re.test(b);
+}
diff --git a/src/models/network.js b/src/models/network.js
index 13879fb2..264642b9 100644
--- a/src/models/network.js
+++ b/src/models/network.js
@@ -5,6 +5,7 @@ const {v4: uuidv4} = require("uuid");
const IrcFramework = require("irc-framework");
const Chan = require("./chan");
const Msg = require("./msg");
+const Prefix = require("./prefix");
const Helper = require("../helper");
const STSPolicies = require("../plugins/sts");
const ClientCertificate = require("../plugins/clientCertificate");
@@ -43,7 +44,12 @@ function Network(attr) {
irc: null,
serverOptions: {
CHANTYPES: ["#", "&"],
- PREFIX: ["!", "@", "%", "+"],
+ PREFIX: new Prefix([
+ {symbol: "!", mode: "Y"},
+ {symbol: "@", mode: "o"},
+ {symbol: "%", mode: "h"},
+ {symbol: "+", mode: "v"},
+ ]),
NETWORK: "",
},
@@ -532,6 +538,7 @@ Network.prototype.export = function () {
"proxyPort",
"proxyUsername",
"proxyEnabled",
+ "proxyPassword",
]);
network.channels = this.channels
diff --git a/src/models/prefix.js b/src/models/prefix.js
new file mode 100644
index 00000000..331efdff
--- /dev/null
+++ b/src/models/prefix.js
@@ -0,0 +1,33 @@
+"use strict";
+
+class Prefix {
+ constructor(prefix) {
+ this.prefix = prefix || []; // [{symbol: "@", mode: "o"}, ... ]
+ this.modeToSymbol = {};
+ this.symbols = [];
+ this._update_internals();
+ }
+
+ _update_internals() {
+ // clean out the old cruft
+ this.modeToSymbol = {};
+ this.symbols = [];
+
+ const that = this;
+ this.prefix.forEach(function (p) {
+ that.modeToSymbol[p.mode] = p.symbol;
+ that.symbols.push(p.symbol);
+ });
+ }
+
+ update(prefix) {
+ this.prefix = prefix || [];
+ this._update_internals();
+ }
+
+ forEach(f) {
+ return this.prefix.forEach(f);
+ }
+}
+
+module.exports = Prefix;
diff --git a/src/models/user.js b/src/models/user.js
index 591ebddd..dee1e9d0 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -4,7 +4,7 @@ const _ = require("lodash");
module.exports = User;
-function User(attr, prefixLookup) {
+function User(attr, prefix) {
_.defaults(this, attr, {
modes: [],
away: "",
@@ -18,12 +18,12 @@ function User(attr, prefixLookup) {
},
});
- this.setModes(this.modes, prefixLookup);
+ this.setModes(this.modes, prefix);
}
-User.prototype.setModes = function (modes, prefixLookup) {
+User.prototype.setModes = function (modes, prefix) {
// irc-framework sets character mode, but The Lounge works with symbols
- this.modes = modes.map((mode) => prefixLookup[mode]);
+ this.modes = modes.map((mode) => prefix.modeToSymbol[mode]);
};
User.prototype.toJSON = function () {
diff --git a/src/plugins/inputs/mode.js b/src/plugins/inputs/mode.js
index 074629ef..1503b54b 100644
--- a/src/plugins/inputs/mode.js
+++ b/src/plugins/inputs/mode.js
@@ -23,7 +23,9 @@ exports.input = function ({irc, nick}, chan, cmd, args) {
return;
}
- if (args.length === 0) {
+ const target = args.filter((arg) => arg !== "");
+
+ if (target.length === 0) {
chan.pushMessage(
this,
new Msg({
@@ -44,9 +46,13 @@ exports.input = function ({irc, nick}, chan, cmd, args) {
devoice: "-v",
}[cmd];
- args.forEach(function (target) {
- irc.raw("MODE", chan.name, mode, target);
- });
+ const limit = parseInt(irc.network.supports("MODES")) || target.length;
+
+ for (let i = 0; i < target.length; i += limit) {
+ const targets = target.slice(i, i + limit);
+ const amode = `${mode[0]}${mode[1].repeat(targets.length)}`;
+ irc.raw("MODE", chan.name, amode, ...targets);
+ }
return;
}
diff --git a/src/plugins/irc-events/connection.js b/src/plugins/irc-events/connection.js
index 029eefc2..3ef3000a 100644
--- a/src/plugins/irc-events/connection.js
+++ b/src/plugins/irc-events/connection.js
@@ -63,10 +63,9 @@ module.exports = function (irc, network) {
});
irc.on("socket connected", function () {
- network.prefixLookup = {};
- irc.network.options.PREFIX.forEach(function (mode) {
- network.prefixLookup[mode.mode] = mode.symbol;
- });
+ if (irc.network.options.PREFIX) {
+ network.serverOptions.PREFIX.update(irc.network.options.PREFIX);
+ }
network.channels[0].pushMessage(
client,
@@ -197,20 +196,12 @@ module.exports = function (irc, network) {
});
irc.on("server options", function (data) {
- network.prefixLookup = {};
-
- data.options.PREFIX.forEach((mode) => {
- network.prefixLookup[mode.mode] = mode.symbol;
- });
+ network.serverOptions.PREFIX.update(data.options.PREFIX);
if (data.options.CHANTYPES) {
network.serverOptions.CHANTYPES = data.options.CHANTYPES;
}
- if (network.serverOptions.PREFIX) {
- network.serverOptions.PREFIX = data.options.PREFIX.map((p) => p.symbol);
- }
-
network.serverOptions.NETWORK = data.options.NETWORK;
client.emit("network:options", {
diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index e86fc9b7..0d67ff61 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -11,12 +11,6 @@ module.exports = function (irc, network) {
const client = this;
irc.on("notice", function (data) {
- // Some servers send notices without any nickname
- if (!data.nick) {
- data.from_server = true;
- data.nick = data.hostname || network.host;
- }
-
data.type = Msg.Type.NOTICE;
handleMessage(data);
});
@@ -44,6 +38,12 @@ module.exports = function (irc, network) {
let showInActive = false;
const self = data.nick === irc.user.nick;
+ // Some servers send messages without any nickname
+ if (!data.nick) {
+ data.from_server = true;
+ data.nick = data.hostname || network.host;
+ }
+
// Check if the sender is in our ignore list
const shouldIgnore =
!self &&
diff --git a/src/plugins/irc-events/mode.js b/src/plugins/irc-events/mode.js
index b07f0954..9c9bf6b2 100644
--- a/src/plugins/irc-events/mode.js
+++ b/src/plugins/irc-events/mode.js
@@ -107,7 +107,7 @@ module.exports = function (irc, network) {
return;
}
- const changedMode = network.prefixLookup[char];
+ const changedMode = network.serverOptions.PREFIX.modeToSymbol[char];
if (!add) {
_.pull(user.modes, changedMode);
diff --git a/src/plugins/irc-events/names.js b/src/plugins/irc-events/names.js
index 2e0a7db8..8368b281 100644
--- a/src/plugins/irc-events/names.js
+++ b/src/plugins/irc-events/names.js
@@ -14,7 +14,7 @@ module.exports = function (irc, network) {
data.users.forEach((user) => {
const newUser = chan.getUser(user.nick);
- newUser.setModes(user.modes, network.prefixLookup);
+ newUser.setModes(user.modes, network.serverOptions.PREFIX);
newUsers.set(user.nick.toLowerCase(), newUser);
});
diff --git a/src/plugins/messageStorage/sqlite.js b/src/plugins/messageStorage/sqlite.js
index cc8ccdf8..981a28b5 100644
--- a/src/plugins/messageStorage/sqlite.js
+++ b/src/plugins/messageStorage/sqlite.js
@@ -236,7 +236,7 @@ class MessageStorage {
target: query.channelName,
networkUuid: query.networkUuid,
offset: query.offset,
- results: parseSearchRowsToMessages(query.offset, rows),
+ results: parseSearchRowsToMessages(query.offset, rows).reverse(),
};
resolve(response);
}
diff --git a/src/plugins/packages/index.js b/src/plugins/packages/index.js
index ea1ed2cd..6db96280 100644
--- a/src/plugins/packages/index.js
+++ b/src/plugins/packages/index.js
@@ -46,6 +46,13 @@ const packageApis = function (packageInfo) {
},
Config: {
getConfig: () => Helper.config,
+ getPersistentStorageDir: getPersistentStorageDir.bind(this, packageInfo.packageName),
+ },
+ Logger: {
+ error: (...args) => log.error(`[${packageInfo.packageName}]`, ...args),
+ warn: (...args) => log.warn(`[${packageInfo.packageName}]`, ...args),
+ info: (...args) => log.info(`[${packageInfo.packageName}]`, ...args),
+ debug: (...args) => log.debug(`[${packageInfo.packageName}]`, ...args),
},
};
};
@@ -81,6 +88,12 @@ function getEnabledPackages(packageJson) {
return [];
}
+function getPersistentStorageDir(packageName) {
+ const dir = path.join(Helper.getPackagesPath(), packageName);
+ fs.mkdirSync(dir, {recursive: true}); // we don't care if it already exists or not
+ return dir;
+}
+
function loadPackage(packageName) {
let packageInfo;
let packageFile;
diff --git a/src/plugins/uploader.js b/src/plugins/uploader.js
index e803690f..eec8b6d6 100644
--- a/src/plugins/uploader.js
+++ b/src/plugins/uploader.js
@@ -11,7 +11,6 @@ const crypto = require("crypto");
const isUtf8 = require("is-utf8");
const log = require("../log");
const contentDisposition = require("content-disposition");
-const sharp = require("sharp");
// Map of allowed mime types to their respecive default filenames
// that will be rendered in browser without forcing them to be downloaded
@@ -134,7 +133,6 @@ class Uploader {
let destDir;
let destPath;
let streamWriter;
- let removeMetadata;
const doneCallback = () => {
// detach the stream and drain any remaining data
@@ -153,19 +151,6 @@ class Uploader {
}
};
- const successfullCompletion = () => {
- doneCallback();
-
- if (!uploadUrl) {
- return res.status(400).json({error: "Missing file"});
- }
-
- // upload was done, send the generated file url to the client
- res.status(200).json({
- url: uploadUrl,
- });
- };
-
const abortWithError = (err) => {
doneCallback();
@@ -212,11 +197,6 @@ class Uploader {
busboyInstance.on("partsLimit", () => abortWithError(Error("Parts limit reached")));
busboyInstance.on("filesLimit", () => abortWithError(Error("Files limit reached")));
busboyInstance.on("fieldsLimit", () => abortWithError(Error("Fields limit reached")));
- busboyInstance.on("field", (fieldname, val) => {
- if (fieldname === "removeMetadata") {
- removeMetadata = val === "true";
- }
- });
// generate a random output filename for the file
// we use do/while loop to prevent the rare case of generating a file name
@@ -237,7 +217,11 @@ class Uploader {
return abortWithError(err);
}
- busboyInstance.on("file", (fieldname, fileStream, filename, encoding, contentType) => {
+ // Open a file stream for writing
+ streamWriter = fs.createWriteStream(destPath);
+ streamWriter.on("error", abortWithError);
+
+ busboyInstance.on("file", (fieldname, fileStream, filename) => {
uploadUrl = `${randomName}/${encodeURIComponent(filename)}`;
if (Helper.config.fileUpload.baseUrl) {
@@ -246,55 +230,31 @@ class Uploader {
uploadUrl = `uploads/${uploadUrl}`;
}
- // Sharps prebuilt libvips does not include gif support, but that is not a problem,
- // as GIFs don't support EXIF metadata or anything alike
- const isImage = contentType.startsWith("image/") && !contentType.endsWith("gif");
-
// if the busboy data stream errors out or goes over the file size limit
// abort the processing with an error
fileStream.on("error", abortWithError);
fileStream.on("limit", () => {
- if (!isImage) {
- fileStream.unpipe(streamWriter);
- }
-
+ fileStream.unpipe(streamWriter);
fileStream.on("readable", fileStream.read.bind(fileStream));
abortWithError(Error("File size limit reached"));
});
- if (isImage) {
- let sharpInstance = sharp({
- animated: true,
- pages: -1,
- sequentialRead: true,
- });
+ // Attempt to write the stream to file
+ fileStream.pipe(streamWriter);
+ });
- if (!removeMetadata) {
- sharpInstance = sharpInstance.withMetadata();
- }
+ busboyInstance.on("finish", () => {
+ doneCallback();
- sharpInstance
- .rotate() // auto-orient based on the EXIF Orientation tag
- .toFile(destPath, (err) => {
- // Removes metadata by default https://sharp.pixelplumbing.com/api-output#tofile if no `withMetadata` is present
- if (err) {
- abortWithError(err);
- } else {
- successfullCompletion();
- }
- });
-
- fileStream.pipe(sharpInstance);
- } else {
- // Open a file stream for writing
- streamWriter = fs.createWriteStream(destPath);
- streamWriter.on("error", abortWithError);
- streamWriter.on("finish", successfullCompletion);
-
- // Attempt to write the stream to file
- fileStream.pipe(streamWriter);
+ if (!uploadUrl) {
+ return res.status(400).json({error: "Missing file"});
}
+
+ // upload was done, send the generated file url to the client
+ res.status(200).json({
+ url: uploadUrl,
+ });
});
// pipe request body to busboy for processing
diff --git a/src/server.js b/src/server.js
index f50ee078..16028b07 100644
--- a/src/server.js
+++ b/src/server.js
@@ -50,6 +50,7 @@ module.exports = function (options = {}) {
app.set("env", "production")
.disable("x-powered-by")
.use(allRequests)
+ .use(addSecurityHeaders)
.get("/", indexRequest)
.get("/service-worker.js", forceNoCacheRequest)
.get("/js/bundle.js.map", forceNoCacheRequest)
@@ -286,14 +287,7 @@ function allRequests(req, res, next) {
return next();
}
-function forceNoCacheRequest(req, res, next) {
- // Intermittent proxies must not cache the following requests,
- // browsers must fetch the latest version of these files (service worker, source maps)
- res.setHeader("Cache-Control", "no-cache, no-transform");
- return next();
-}
-
-function indexRequest(req, res) {
+function addSecurityHeaders(req, res, next) {
const policies = [
"default-src 'none'", // default to nothing
"base-uri 'none'", // disallow