fixed conflict

src/server/components/social.js

@@ -172,6 +172,7 @@ module.exports = {
 					class: 'color-yellowB',
 					message: '(you to ' + playerName + '): ' + messageString,
 					type: 'chat',
+					subType: 'privateOut',
 					source: this.obj.name
 				}]
 			}
@@ -184,6 +185,7 @@ module.exports = {
 					class: 'color-yellowB',
 					message: '(' + this.obj.name + ' to you): ' + messageString,
 					type: 'chat',
+					subType: 'privateIn',
 					source: this.obj.name
 				}]
 			}
@@ -399,7 +401,7 @@ module.exports = {
 
 	//Sends a notification to yourself
 	// arg1 = { message, className, type }
-	notifySelf: function ({ message, className = 'color-redA', type = 'info' }) {
+	notifySelf: function ({ message, className = 'color-redA', type = 'info', subType }) {
 		const { obj: { id, serverId, instance: { syncer } } } = this;
 
 		syncer.queue('onGetMessages', {
@@ -407,7 +409,8 @@ module.exports = {
 			messages: [{
 				class: className,
 				message,
-				type
+				type,
+				subType
 			}]
 		}, [serverId]);
 	},
@@ -418,9 +421,10 @@ module.exports = {
 		const { obj: { id, serverId, instance: { syncer } } } = this;
 
 		messages.forEach(m => {
-			const { className = 'color-redA', type = 'info' } = m;
+			const { className = 'color-redA', type = 'info', subType } = m;
 			m.className = className;
 			m.type = type;
+			m.subType = subType;
 		});
 
 		syncer.queue('onGetMessages', {

src/server/mail/mailRethinkDb.js

@@ -130,6 +130,12 @@ module.exports = {
 
 					sentMessages.push(r.msg);
 					delete r.msg;
+				} else {
+					player.social.notifySelf({
+						message: 'You have received a mail',
+						className: 'color-greenB',
+						subType: 'mail'
+					});
 				}
 
 				delete r.pos;

src/server/mail/mailSqlite.js

@@ -84,6 +84,12 @@ module.exports = {
 
 					sentMessages.push(r.msg);
 					delete r.msg;
+				} else {
+					player.social.notifySelf({
+						message: 'You have received a mail',
+						className: 'color-greenB',
+						subType: 'mail'
+					});
 				}
 				inventory.getItem(r, false, false, false, true);
 			}