bug #1893

src/client/ui/templates/inventory/inventory.js

@@ -328,17 +328,17 @@ define([
 					ctxConfig.push(menuItems.divider);
 			}
 
-			if ((!item.eq) && (!item.active)) {
-				if (!item.quest) {
-					if ((window.player.stash.active) && (!item.noStash))
-						ctxConfig.push(menuItems.stash);
+			if (!item.eq && !item.active && !item.quest) {
+				const isAtStash = window.player.serverActions.hasAction('openStash');
 
-					if (!item.noDrop)
-						ctxConfig.push(menuItems.drop);
+				if (isAtStash && !item.noStash)
+					ctxConfig.push(menuItems.stash);
 
-					if ((!item.material) && (!item.noSalvage))
-						ctxConfig.push(menuItems.salvage);
-				}
+				if (!item.noDrop)
+					ctxConfig.push(menuItems.drop);
+
+				if (!item.material && !item.noSalvage)
+					ctxConfig.push(menuItems.salvage);
 			}
 
 			if (item.quantity > 1 && !item.quest)

src/server/clientComponents/serverActions.js

@@ -14,6 +14,10 @@ define([
 			this.hookEvent('onKeyUp', this.onKeyUp.bind(this));
 		},
 
+		hasAction: function (actionId) {
+			return this.actions.some(a => a.id === actionId);
+		},
+
 		onKeyUp: function (key) {
 			this.actions.forEach(function (a) {
 				if (a.key !== key)

src/server/components/stash.js

@@ -71,7 +71,10 @@ module.exports = {
 		items.push(item);
 	},
 
-	deposit: function (item) {
+	deposit: async function (item) {
+		if (!this.items)
+			await this.getItemsFromDb();
+
 		const { active, items, maxItems, obj } = this;
 
 		if (!active)
@@ -126,10 +129,10 @@ module.exports = {
 		const { obj } = this;
 
 		this.active = active;
-		obj.syncer.set(true, 'stash', 'active', this.active);
 
 		const actionType = active ? 'addActions' : 'removeActions';
 		obj.syncer.setArray(true, 'serverActions', actionType, {
+			id: 'openStash',
 			key: 'u',
 			action: {
 				targetId: obj.id,
@@ -138,6 +141,9 @@ module.exports = {
 			}
 		});
 
+		if (!this.active)
+			return;
+
 		let msg = 'Press U to access your Shared Stash';
 		obj.instance.syncer.queue('onGetAnnouncement', {
 			src: obj.id,

src/server/config/serverConfig.js

@@ -8,7 +8,7 @@ module.exports = {
 	// sqlite
 	// rethink
 	//eslint-disable-next-line no-process-env
-	db: process.env.IWD_DB || 'sqlite',
+	db: process.env.IWD_DB || 'rethink',
 	//eslint-disable-next-line no-process-env
 	dbHost: process.env.IWD_DB_HOST || 'localhost',
 	//eslint-disable-next-line no-process-env