Move "assets" to proper location in snappymail/v/0.0.0/static/

dev/Stores/User/Notification.js

@@ -57,7 +57,7 @@ export const NotificationUserStore = new class {
 		if (DesktopNotifications && NotificationsGranted()) {
 			const options = {
 				body: text,
-				icon: imageSrc || Links.staticLink('css/images/icon-message-notification.png'),
+				icon: imageSrc || Links.staticLink('images/icon-message-notification.png'),
 				data: messageData
 			};
 			if (messageData?.uid) {

dev/Styles/Admin/About.less

@@ -4,6 +4,7 @@
 		display: inline-block;
 		width: 250px;
 		height: 200px;
-		background: url("images/snappymail-logo.png") -30px -30px;
+		/* Yes this LESS css relative path quirk becomes ../ */
+		background: url(../../images/snappymail-logo.png) -30px -30px;
 	}
 }

gulpfile.js

@@ -2,7 +2,6 @@
 const gulp = require('gulp');
 
 const { cleanStatic } = require('./tasks/common');
-const { assets } = require('./tasks/assets');
 const { js, jsLint } = require('./tasks/js');
 const { css, cssLint } = require('./tasks/css');
 const { vendors } = require('./tasks/vendors');
@@ -12,7 +11,7 @@ const clean = gulp.series(cleanStatic);
 const lint = gulp.parallel(jsLint, cssLint);
 
 const buildState1 = gulp.parallel(js, css, vendors);
-const buildState2 = gulp.series(clean, assets, buildState1);
+const buildState2 = gulp.series(clean, buildState1);
 
 const build = gulp.parallel(lint, buildState2);
 

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php

@@ -500,11 +500,13 @@ trait Messages
 			try
 			{
 				if ('SPAM' === $sLearning) {
+//					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk');
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK);
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK, false);
 				} else if ('HAM' === $sLearning) {
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK);
 					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK, false);
+//					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk', false);
 				}
 			}
 			catch (\Throwable $oException)

tasks/assets.js

@@ -1,7 +0,0 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
-const gulp = require('gulp');
-const { config } = require('./config');
-
-const assetsCopy = () => gulp.src(config.paths.assets.src).pipe(gulp.dest(config.paths.static));
-
-exports.assets = gulp.series(assetsCopy);

tasks/common.js

@@ -14,4 +14,4 @@ exports.copy = (sFile, sNewFile, done) => {
 
 exports.getHead = () => config.head.agpl;
 
-exports.cleanStatic = () => del(config.paths.static);
+exports.cleanStatic = () => del(config.paths.staticJS) && del(config.paths.staticCSS);

tasks/config.js

@@ -14,15 +14,10 @@ const config = {
 };
 
 config.paths.globjs = 'dev/**/*.js';
-config.paths.static = 'snappymail/v/' + config.devVersion + '/static/';
 config.paths.staticJS = 'snappymail/v/' + config.devVersion + '/static/js/';
 config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min/';
 config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/';
 
-config.paths.assets = {
-	src: ['assets/**/*.*', 'assets/**/.htaccess']
-};
-
 config.paths.less = {
 	main: {
 		src: 'dev/Styles/@Main.less',