API commands scopes, changes for API semantics (#1546)

status-im · Sep 26, 2017 · 9cd2f82 · 9cd2f82
1 parent e1af914
commit 9cd2f82
Show file tree

Hide file tree

Showing 42 changed files with 1,684 additions and 457 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d05403e3fce258b6985bd3b614ffe02a0e01b9f7
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.2.1
diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj
@@ -1752,7 +1752,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		49A69B853BD9751F84878340 /* [CP] Check Pods Manifest.lock */ = {
@@ -1770,7 +1770,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		967469AF8BA27D5CEC47B13C /* [CP] Copy Pods Resources */ = {

diff --git a/resources/default_contacts.json b/resources/default_contacts.json
@@ -23,6 +23,7 @@
         },
         "unremovable?": true
     },
+
     "wallet":
     {
         "name":
@@ -36,12 +37,10 @@
         "add-chat?": true,
         "dapp?": true,
         "groups": ["dapps"],
-        "has-global-command?": true,
         "dapp-url":
         {
           "en": "https://status.im/dapps/wallet/"
         },
-        "bot-url": "local://wallet-bot",
         "unremovable?": true
     },
 
@@ -53,10 +52,32 @@
             "ru": "Печкин"
         },
         "dapp?": true,
-        "has-global-command?": true,
+        "mixable?": true,
         "bot-url": "local://mailman-bot"
     },
 
+    "transactor-group":
+    {
+        "name":
+        {
+            "en": "Transactor"
+        },
+        "dapp?": true,
+        "mixable?": true,
+        "bot-url": "local://transactor-group-bot"
+    },
+
+    "transactor-personal":
+    {
+        "name":
+        {
+            "en": "Transactor"
+        },
+        "dapp?": true,
+        "mixable?": true,
+        "bot-url": "local://transactor-personal-bot"
+    },
+
     "demo-bot":
     {
         "name":

diff --git a/resources/js/bots/browse/bot.js b/resources/js/bots/browse/bot.js
@@ -34,9 +34,15 @@ function browse(params, context) {
 }
 
 status.command({
-    name: "global",
+    name: "browse",
     title: I18n.t('browse_title'),
-    registeredOnly: true,
+    scope: {
+        isGlobal: true,
+        registeredOnly: true,
+        personalChats: true,
+        groupChats: true,
+        canUseForDApps: true
+    },
     description: I18n.t('browse_description'),
     color: "#ffa500",
     fullscreen: true,

diff --git a/resources/js/bots/console/bot.js b/resources/js/bots/console/bot.js
@@ -455,7 +455,6 @@ function phoneSuggestions(params, context) {
 
 var phoneConfig = {
     name: "phone",
-    registeredOnly: true,
     icon: "phone_white",
     color: "#5bb2a2",
     title: I18n.t('phone_title'),
@@ -491,7 +490,6 @@ var phoneConfig = {
     }
 };
 status.response(phoneConfig);
-status.command(phoneConfig);
 
 var faucets = [
     /*{
@@ -540,7 +538,13 @@ status.command({
     title: I18n.t('faucet_title'),
     description: I18n.t('faucet_description'),
     color: "#7099e6",
-    registeredOnly: true,
+    scope: {
+        isGlobal: false,
+        registeredOnly: true,
+        personalChats: true,
+        groupChats: true,
+        canUseForDApps: true
+    },
     params: [{
         name: "url",
         type: status.types.TEXT,
@@ -611,7 +615,13 @@ status.command({
     title: I18n.t('debug_mode_title'),
     description: I18n.t('debug_mode_description'),
     color: "#7099e6",
-    registeredOnly: true,
+    scope: {
+        isGlobal: false,
+        registeredOnly: true,
+        personalChats: true,
+        groupChats: true,
+        canUseForDApps: true
+    },
     params: [{
         name: "mode",
         suggestions: debugSuggestions,
@@ -635,18 +645,6 @@ status.command({
     }
 });
 
-
-// status.command({
-//     name: "help",
-//     title: "Help",
-//     description: "Request help from Console",
-//     color: "#7099e6",
-//     params: [{
-//         name: "query",
-//         type: status.types.TEXT
-//     }]
-// });
-
 status.response({
     name: "confirmation-code",
     color: "#7099e6",

diff --git a/resources/js/bots/mailman/bot.js b/resources/js/bots/mailman/bot.js
@@ -32,6 +32,12 @@ function locationsSuggestions (params) {
 status.command({
     name: "location",
     title: I18n.t('location_title'),
+    scope: {
+        registeredOnly: true,
+        personalChats: true,
+        groupChats: true,
+        canUseForDApps: false
+    },
     description: I18n.t('location_description'),
     sequentialParams: true,
     hideSendButton: true,

diff --git a/resources/js/bots/wallet/bot.js → resources/js/bots/transactor_group/bot.js b/resources/js/bots/wallet/bot.js → resources/js/bots/transactor_group/bot.js
@@ -269,7 +269,11 @@ function validateSend(params, context) {
         params["bot-db"] = {};
     }
 
-    if (!params["bot-db"]["public"] || !params["bot-db"]["public"]["recipient"] || !params["bot-db"]["public"]["recipient"]["address"]) {
+    console.log(context);
+
+    if (!params["bot-db"]["public"]
+        || !params["bot-db"]["public"]["recipient"]
+        || !params["bot-db"]["public"]["recipient"]["address"]) {
         return {
             markup: status.components.validationMessage(
                 "Wrong address",
@@ -476,6 +480,12 @@ function shortPreviewSend(params, context) {
 
 var send = {
     name: "send",
+    scope: {
+        isGlobal: false,
+        personalChats: false,
+        groupChats: true,
+        canUseForDApps: false
+    },
     icon: "money_white",
     color: "#5fc48d",
     title: I18n.t('send_title'),
@@ -510,6 +520,12 @@ var paramsRequest = [
 
 status.command({
     name: "request",
+    scope: {
+        isGlobal: false,
+        personalChats: false,
+        groupChats: true,
+        canUseForDApps: false
+    },
     color: "#5fc48d",
     title: I18n.t('request_title'),
     description: I18n.t('request_description'),

diff --git a/resources/js/bots/wallet/translations.js → .../js/bots/transactor_group/translations.js b/resources/js/bots/wallet/translations.js → .../js/bots/transactor_group/translations.js