From 50712937503118f62dd3adc85cc90ade3f34336b Mon Sep 17 00:00:00 2001 From: Steve Ayerhart Date: Wed, 30 Jun 2021 10:41:00 -0400 Subject: [PATCH] getting ready for test deploy --- bonerbonerboner/bonerbonerboner.factor | 17 +++++++++++++++-- bonerbonerboner/deploy.factor | 16 ++++++++++++++++ bonerbonerboner/resources.txt | 1 + .../services/mississippis/mississippis.factor | 3 ++- .../services/platzisms/platzisms.factor | 3 --- bonerbonerboner/services/services.factor | 1 - bonerbonerboner/services/slack/slack.factor | 2 ++ 7 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 bonerbonerboner/deploy.factor create mode 100644 bonerbonerboner/resources.txt diff --git a/bonerbonerboner/bonerbonerboner.factor b/bonerbonerboner/bonerbonerboner.factor index 52342e0..c1e1fcd 100644 --- a/bonerbonerboner/bonerbonerboner.factor +++ b/bonerbonerboner/bonerbonerboner.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel http.server http.server.responses http.server.dispatchers furnace.actions html.forms accessors namespaces io.servers io.sockets.secure.debug sequences validators ; -USING: bonerbonerboner.services ; +USING: bonerbonerboner.services bonerbonerboner.services.slack bonerbonerboner.services.mississippis bonerbonerboner.services.platzisms bonerbonerboner.services.link-logger ; USING: prettyprint ; IN: bonerbonerboner @@ -10,7 +10,7 @@ IN: bonerbonerboner TUPLE: bbb < dispatcher ; : bbb-themes ( -- themes ) - { "bbb" "rocket" "hockey" } ; + { "bbb" "bones" "float" "hockey" "rocket" "trump" "wakeywakey" } ; : v-valid-theme ( str -- theme ) dup bbb-themes member? [ "not a valid theme" throw ] unless ; @@ -47,3 +47,16 @@ SYMBOL: current-bbb-server : restart-bbb-server ( -- ) current-bbb-server get stop-server run-bbb-server ; + +: add-default-slack-listeners ( -- ) + { + [ check-mississippi-request ] + [ check-platz ] + [ check-links ] + } slack-callbacks set-global ; + +: start-bonerbonerboner ( -- ) + add-default-slack-listeners + run-bbb-server ; + +MAIN: start-bonerbonerboner diff --git a/bonerbonerboner/deploy.factor b/bonerbonerboner/deploy.factor new file mode 100644 index 0000000..24f5f37 --- /dev/null +++ b/bonerbonerboner/deploy.factor @@ -0,0 +1,16 @@ +USING: tools.deploy.config ; +H{ + { deploy-console? t } + { deploy-io 3 } + { deploy-reflection 1 } + { deploy-ui? f } + { deploy-word-defs? f } + { deploy-threads? t } + { "stop-after-last-window?" t } + { deploy-math? t } + { deploy-word-props? f } + { deploy-c-types? f } + { deploy-help? f } + { deploy-name "bonerbonerboner-api" } + { deploy-unicode? f } +} diff --git a/bonerbonerboner/resources.txt b/bonerbonerboner/resources.txt new file mode 100644 index 0000000..73b7650 --- /dev/null +++ b/bonerbonerboner/resources.txt @@ -0,0 +1 @@ +templates/themes.xml diff --git a/bonerbonerboner/services/mississippis/mississippis.factor b/bonerbonerboner/services/mississippis/mississippis.factor index c93cbf9..48b9c35 100644 --- a/bonerbonerboner/services/mississippis/mississippis.factor +++ b/bonerbonerboner/services/mississippis/mississippis.factor @@ -2,7 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel math math.ranges math.order math.parser math.functions arrays sequences sequences.extras threads calendar io timers accessors random formatting combinators combinators.random http.server.responses regexp unicode peg peg.parsers assocs db.types db.tuples ; -USING: bonerbonerboner.services bonerbonerboner.services.slack ; +USING: bonerbonerboner.services ; +FROM: bonerbonerboner.services.slack => slack-lookup-user say-slack ; IN: bonerbonerboner.services.mississippis diff --git a/bonerbonerboner/services/platzisms/platzisms.factor b/bonerbonerboner/services/platzisms/platzisms.factor index aa9d890..06f6002 100644 --- a/bonerbonerboner/services/platzisms/platzisms.factor +++ b/bonerbonerboner/services/platzisms/platzisms.factor @@ -58,6 +58,3 @@ platzism "platzisms" "text" of [ is-platz? [ share-platzism ] when ] [ dup is-platzism? [ log/confirm-platzism ] [ drop ] if ] bi ; - -! [ check-platz ] add-slack-handler - diff --git a/bonerbonerboner/services/services.factor b/bonerbonerboner/services/services.factor index 59cb4d5..ed72f13 100644 --- a/bonerbonerboner/services/services.factor +++ b/bonerbonerboner/services/services.factor @@ -2,7 +2,6 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel fry db db.sqlite environment math.parser io.pathnames ; -USING: bonerbonerboner.services.slack ; IN: bonerbonerboner.services diff --git a/bonerbonerboner/services/slack/slack.factor b/bonerbonerboner/services/slack/slack.factor index b4d539d..f9c932c 100644 --- a/bonerbonerboner/services/slack/slack.factor +++ b/bonerbonerboner/services/slack/slack.factor @@ -8,6 +8,8 @@ IN: bonerbonerboner.services.slack SYMBOLS: slack-callbacks current-slack-webhook-url current-slack-authorization-token ; +{ } slack-callbacks set-global + TUPLE: slack < dispatcher ; : ( -- response )