From 5cfc0e941310c776f24ef6954369025821ac959e Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Thu, 22 Sep 2022 11:06:18 +0200
Subject: [PATCH] add transactionsEnabled : enable the circuit to the
 transactions

---
 src/server/models/circuit.js       |  5 +++++
 src/server/telegram/telegrambot.js | 17 ++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/server/models/circuit.js b/src/server/models/circuit.js
index e2b0d12..7040ec9 100755
--- a/src/server/models/circuit.js
+++ b/src/server/models/circuit.js
@@ -175,6 +175,9 @@ const CircuitSchema = new Schema({
     type: Boolean,
     default: false,
   },
+  transactionsEnabled: {
+    type: Boolean,
+  },
 });
 
 CircuitSchema.pre('save', async function(next) {
@@ -230,6 +233,8 @@ CircuitSchema.statics.getWhatToShow = function(idapp, username) {
     date_updated: 1,
     nome_valuta: 1,
     fido_scoperto_default: 1,
+    deperimento: 1,
+    transactionsEnabled: 1,
     qta_max_default: 1,
     valuta_per_euro: 1,
     symbol: 1,
diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js
index 3968f98..4b184df 100755
--- a/src/server/telegram/telegrambot.js
+++ b/src/server/telegram/telegrambot.js
@@ -3984,19 +3984,14 @@ if (true) {
 
                     if (userDest) {
                       cmd = shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS;
-                      const foundIfAlreadyFriend = await User.isMyFriend(user.idapp, data.username, data.userDest);
-
-                      if (foundIfAlreadyFriend) {
-                        // Aggiungilo nelle Amicizie
-                        const ris = await User.setFriendsCmd(req, user.idapp, data.username, data.userDest, cmd);
-                        if (ris) {
-                          const msgDest = printf(getstr(user.lang, 'MSG_FRIENDS_NOT_ACCEPTED_CONFIRMED'), data.username);
-
-                          await local_sendMsgTelegram(user.idapp, data.userDest, msgDest);
-                        }
+                      // Rimuovilo nelle Amicizie
+                      const req = tools.getReqByPar(user.idapp, username_action);
+                      const ris = await User.setFriendsCmd(req, user.idapp, data.username, data.userDest, cmd);
+                      if (ris) {
+                        const msgDest = printf(getstr(user.lang, 'MSG_FRIENDS_NOT_ACCEPTED_CONFIRMED'), data.username);
 
+                        await local_sendMsgTelegram(user.idapp, data.userDest, msgDest);
                       }
-
                     }
                   }
                 }