feat: als (#9749)

* feat: als

* fix: up test timeout

* fix: don't overwrite caller if it already exists

* fix: up test timeout for psql

.github/workflows/docker.yml

@@ -1,52 +0,0 @@
-name: Run Docker
-
-# Controls when the workflow will run
-on:
-  push:
-    branches:
-      - 'master'
-      - 'v*.x'
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: nodebb/docker
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest
-
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-

install/package.json

@@ -88,7 +88,7 @@
         "nodebb-plugin-dbsearch": "5.0.2",
         "nodebb-plugin-emoji": "^3.5.0",
         "nodebb-plugin-emoji-android": "2.0.5",
-        "nodebb-plugin-markdown": "8.14.1",
+        "nodebb-plugin-markdown": "8.14.0",
         "nodebb-plugin-mentions": "2.13.11",
         "nodebb-plugin-spam-be-gone": "0.7.9",
         "nodebb-rewards-essentials": "0.1.5",

public/src/client/account/info.js

@@ -21,7 +21,7 @@ define('forum/account/info', ['forum/account/header', 'components', 'forum/accou
 				app.alertSuccess('[[user:info.moderation-note.success]]');
 				var timestamp = Date.now();
 				var data = [{
-					note: utils.escapeHTML(note),
+					note: note,
 					user: app.user,
 					timestamp: timestamp,
 					timestampISO: utils.toISOString(timestamp),

public/src/sockets.js

@@ -208,20 +208,15 @@ socket = window.socket;
 	}
 
 	function onEventBanned(data) {
-		require(['translator'], function (translator) {
-			var message = data.until ?
-				translator.compile('error:user-banned-reason-until', (new Date(data.until).toLocaleString()), data.reason) :
-				'[[error:user-banned-reason, ' + data.reason + ']]';
-			translator.translate(message, function (message) {
-				bootbox.alert({
-					title: '[[error:user-banned]]',
-					message: message,
-					closeButton: false,
-					callback: function () {
-						window.location.href = config.relative_path + '/';
-					},
-				});
-			});
+		var message = data.until ? '[[error:user-banned-reason-until, ' + utils.toISOString(data.until) + ', ' + data.reason + ']]' : '[[error:user-banned-reason, ' + data.reason + ']]';
+
+		bootbox.alert({
+			title: '[[error:user-banned]]',
+			message: message,
+			closeButton: false,
+			callback: function () {
+				window.location.href = config.relative_path + '/';
+			},
 		});
 	}
 

src/controllers/helpers.js

@@ -11,7 +11,6 @@ const privileges = require('../privileges');
 const categories = require('../categories');
 const plugins = require('../plugins');
 const meta = require('../meta');
-const middlewareHelpers = require('../middleware/helpers');
 
 const helpers = module.exports;
 
@@ -125,17 +124,7 @@ helpers.notAllowed = async function (req, res, error) {
 
 	if (req.loggedIn || req.uid === -1) {
 		if (res.locals.isAPI) {
-			if (req.originalUrl.startsWith(`${relative_path}/api/v3`)) {
-				helpers.formatApiResponse(403, res, error);
-			} else {
-				res.status(403).json({
-					path: req.path.replace(/^\/api/, ''),
-					loggedIn: req.loggedIn,
-					error: error,
-					title: '[[global:403.title]]',
-					bodyClass: middlewareHelpers.buildBodyClass(req, res),
-				});
-			}
+			helpers.formatApiResponse(403, res, error);
 		} else {
 			const middleware = require('../middleware');
 			await middleware.buildHeaderAsync(req, res);

src/flags.js

@@ -776,7 +776,7 @@ async function mergeBanHistory(history, targetUid, uids) {
 			meta: [
 				{
 					key: '[[user:banned]]',
-					value: validator.escape(String(cur.reason)),
+					value: cur.reason,
 					labelClass: 'danger',
 				},
 				{

test/emailer.js

@@ -87,7 +87,7 @@ describe('emailer', () => {
 						assert.equal(output, text);
 						done();
 					});
-				}, 2000);
+				}, 500);
 			});
 		});
 	});