Skip to content

Commit e50d56a

Browse files
janherichjanherich
committed
Refactored jail loading + commands/responses
1 parent 91a0d40 commit e50d56a

65 files changed

Lines changed: 1417 additions & 2356 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎env/dev/env/ios/main.cljs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
(def root-el (r/as-element [reloader]))
1313

1414
(figwheel/watch-and-reload
15-
:websocket-url "ws://10.0.1.15:3449/figwheel-ws"
15+
:websocket-url "ws://localhost:3449/figwheel-ws"
1616
:heads-up-display false
1717
:jsload-callback #(swap! cnt inc))
1818

19-
(rr/enable-re-frisk-remote! {:host "localhost:4567" :on-init core/init :pre-send (fn [db] (update db :chats #(into {} %)))})
19+
(rr/enable-re-frisk-remote! {:host "localhost:4567" :on-init core/init :pre-send (fn [db] (update db :chats #(into {} %)))})

‎resources/default_contacts.json‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,8 @@
66
"en": "Browse"
77
},
88
"dapp?": true,
9-
"bot-url": "local://browse-bot",
10-
"global-command": {
11-
"description":"Launch the browser",
12-
"color": "#ffa500",
13-
"name": "global",
14-
"params": [{
15-
"name": "url",
16-
"placeholder":"URL",
17-
"type":"text"
18-
}],
19-
"title":"Browser",
20-
"registered-only":true,
21-
"has-handler": false,
22-
"fullscreen":true
23-
},
9+
"hide-contact?": true,
10+
"bot-url": "local://browse-bot",
2411
"unremovable?": true
2512
},
2613

@@ -32,30 +19,19 @@
3219
"ru": "Печкин"
3320
},
3421
"dapp?": true,
35-
"mixable?": true,
22+
"hide-contact?": true,
3623
"bot-url": "local://mailman-bot"
3724
},
3825

39-
"transactor-group":
40-
{
41-
"name":
42-
{
43-
"en": "Transactor"
44-
},
45-
"dapp?": true,
46-
"mixable?": true,
47-
"bot-url": "local://transactor-group-bot"
48-
},
49-
50-
"transactor-personal":
26+
"transactor":
5127
{
5228
"name":
5329
{
5430
"en": "Transactor"
5531
},
5632
"dapp?": true,
57-
"mixable?": true,
58-
"bot-url": "local://transactor-personal-bot"
33+
"hide-contact?": true,
34+
"bot-url": "local://transactor-bot"
5935
},
6036

6137
"demo-bot":

‎resources/js/bots/browse/bot.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function browse(params, context) {
3636
status.command({
3737
name: "browse",
3838
title: I18n.t('browse_title'),
39-
scope: ["global", "registered-only", "group-chats", "personal-chats", "can-use-for-dapps"],
39+
scope: ["global", "personal-chats", "group-chats", "public-chats", "registered", "dapps", "humans"],
4040
description: I18n.t('browse_description'),
4141
color: "#ffa500",
4242
fullscreen: true,

‎resources/js/bots/console/bot.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ var phoneConfig = {
458458
icon: "phone_white",
459459
color: "#5bb2a2",
460460
title: I18n.t('phone_title'),
461+
scope: ["personal-chats", "registered", "dapps"],
461462
description: I18n.t('phone_description'),
462463
sequentialParams: true,
463464
validator: function (params) {
@@ -489,6 +490,7 @@ var phoneConfig = {
489490
};
490491
}
491492
};
493+
status.command(phoneConfig);
492494
status.response(phoneConfig);
493495

494496
var ropstenNetworkId = 3;
@@ -556,7 +558,7 @@ var faucetCommandConfig ={
556558
title: I18n.t('faucet_title'),
557559
description: I18n.t('faucet_description'),
558560
color: "#7099e6",
559-
scope: ["registered-only", "group-chats", "personal-chats", "can-use-for-dapps"],
561+
scope: ["personal-chats", "registered", "dapps"],
560562
params: [{
561563
name: "url",
562564
type: status.types.TEXT,
@@ -632,7 +634,7 @@ status.command({
632634
title: I18n.t('debug_mode_title'),
633635
description: I18n.t('debug_mode_description'),
634636
color: "#7099e6",
635-
scope: ["registered-only", "group-chats", "personal-chats", "can-use-for-dapps"],
637+
scope: ["personal-chats", "registered", "dapps"],
636638
params: [{
637639
name: "mode",
638640
suggestions: debugSuggestions,
@@ -659,6 +661,7 @@ status.command({
659661
status.response({
660662
name: "confirmation-code",
661663
color: "#7099e6",
664+
scope: ["personal-chats", "registered", "dapps"],
662665
description: I18n.t('confirm_description'),
663666
sequentialParams: true,
664667
params: [{
@@ -696,6 +699,7 @@ status.response({
696699
status.response({
697700
name: "password",
698701
color: "#7099e6",
702+
scope: ["personal-chats", "anonymous", "dapps"],
699703
description: I18n.t('password_description'),
700704
icon: "lock_white",
701705
sequentialParams: true,
@@ -754,6 +758,7 @@ status.response({
754758

755759
status.response({
756760
name: "grant-permissions",
761+
scope: ["personal-chats", "anonymous", "registered", "dapps"],
757762
color: "#7099e6",
758763
description: "Grant permissions",
759764
icon: "lock_white",

‎resources/js/bots/mailman/bot.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function locationsSuggestions (params) {
3232
status.command({
3333
name: "location",
3434
title: I18n.t('location_title'),
35-
scope: ["registered-only", "group-chats", "personal-chats"],
35+
scope: ["global", "personal-chats", "group-chats", "public-chats", "registered", "humans"],
3636
description: I18n.t('location_description'),
3737
sequentialParams: true,
3838
hideSendButton: true,
@@ -96,4 +96,4 @@ status.command({
9696
)
9797
};
9898
}
99-
});
99+
});

0 commit comments

Comments
 (0)