diff --git a/main/app/radio/core.hook b/main/app/radio/core.hook index 40b174089..f29c3082c 100644 --- a/main/app/radio/core.hook +++ b/main/app/radio/core.hook @@ -731,9 +731,9 @@ =+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/radio/backlog/jam ?. ?=([%0 %0 %0] [.^(%cy paf)]) $(u.old (some ((hard house-any) (cue ((hard ,@) .^(%cx paf)))))) - ~& %radio-prep-new + :: ~& %radio-prep-new +:ra-abet:(~(ra-apply ra 0 ~) our.hid %design %main `[~ [%| ~]]) - ~& %radio-prep-old + :: ~& %radio-prep-old |- ?- -.u.u.old %1 %_(+>.^^$ +<+ u.u.old) diff --git a/main/app/talk/core.hook b/main/app/talk/core.hook index 1abb118f0..ba361c610 100644 --- a/main/app/talk/core.hook +++ b/main/app/talk/core.hook @@ -196,7 +196,7 @@ =+ rey=(rush txt talk(lat lat.hid, our our.hid)) ?~ rey [(send /out %give %rush %tang [%leaf "invalid input"] ~) +>.$] - ~& [%rey rey] + :: ~& [%rey rey] |- ^- [(list move) _+>.^$] ?- -.u.rey %priv $(targets `(sa p.u.rey), u.rey [%def q.u.rey]) @@ -267,7 +267,7 @@ ++ pour-attach :: attach to party |= [man=span moz=(list move)] ^- (list move) - ~& [%pour-attach man] + :: ~& [%pour-attach man] :* :* 0 %pass /fm/[man] %g %show [our.hid /radio] our.hid @@ -279,7 +279,7 @@ ++ pour-detach :: detach from party |= [man=span moz=(list move)] ^- (list move) - ~& [%pour-detach man] + :: ~& [%pour-detach man] :_ moz :* 0 %pass /fm/[man] %g %nuke @@ -292,16 +292,16 @@ ?~ live ?: (~(has by parties) %main) => .(live `%main) - ~& %main-live + :: ~& %main-live [(pour-attach %main moz) +>.$] ?~ parties [moz +>] => .(live `p.n.parties) - ~& [%pour-live p.n.parties] + :: ~& [%pour-live p.n.parties] [(pour-attach p.n.parties moz) +>.$] ?: (~(has by parties) u.live) [moz +>] - ~& %pour-detach + :: ~& %pour-detach $(live ~, moz (pour-detach u.live moz)) :: ++ pour-house @@ -327,7 +327,7 @@ %+ turn nup |= man=span ^- (list move) - ~& [%new-party man] + :: ~& [%new-party man] :~ :* 0 %pass /am/[man] %g %show [our.hid /radio] our.hid @@ -344,7 +344,7 @@ %+ turn pig |= [man=span *] ^- (list move) - ~& [%old-party man] + :: ~& [%old-party man] :~ :* 0 %pass /am/[man] %g %nuke [our.hid /radio] our.hid @@ -479,7 +479,7 @@ =+ dom=`presence`?:(p.p.sih %talk %hear) ?: =(dom mode) [~ +>.$] - ~& [%cmd-ac-mode dom] + :: ~& [%cmd-ac-mode dom] =. mode dom [present +>.$] == diff --git a/main/pub/chat/src/main.js b/main/pub/chat/src/main.js index d626a8fff..6982b07e8 100644 --- a/main/pub/chat/src/main.js +++ b/main/pub/chat/src/main.js @@ -30259,7 +30259,7 @@ MessageActions = require('../actions/MessageActions.coffee'); module.exports = { listen: function(since) { return window.urb.subscribe({ - appl: "rodeo", + appl: "radio", path: "/fm/main/" + since }, function(err, res) { var _ref, _ref1; @@ -30272,7 +30272,7 @@ module.exports = { }, get: function(start, end) { return window.urb.subscribe({ - appl: "rodeo", + appl: "radio", path: "/fm/main/" + end + "/" + start }, function(err, res) { var _ref, _ref1; @@ -30281,7 +30281,7 @@ module.exports = { if ((_ref = res.data) != null ? (_ref1 = _ref.grams) != null ? _ref1.tele : void 0 : void 0) { MessageActions.loadMessages(res.data.grams); return window.urb.unsubscribe({ - appl: "rodeo", + appl: "radio", path: "/fm/main/" + start + "/" + end }, function(err, res) { console.log('done'); @@ -30292,7 +30292,7 @@ module.exports = { }, sendMessage: function(message, cb) { return window.urb.send({ - appl: "rodeo", + appl: "radio", mark: "radio-command", data: { publish: [message] @@ -30317,7 +30317,7 @@ StationActions = require('../actions/StationActions.coffee'); module.exports = { createStation: function(name, cb) { return window.urb.send({ - appl: "rodeo", + appl: "radio", mark: "radio-command", data: { design: { @@ -30336,7 +30336,7 @@ module.exports = { addSource: function(party, ship, sources) { var send; send = { - appl: "rodeo", + appl: "radio", mark: "radio-command", data: { design: { @@ -30358,7 +30358,7 @@ module.exports = { }, ping: function(_ping) { return window.urb.send({ - appl: "rodeo", + appl: "radio", mark: "radio-command", data: { ping: _ping @@ -30367,7 +30367,7 @@ module.exports = { }, members: function() { return window.urb.subscribe({ - appl: "rodeo", + appl: "radio", path: "/am/main" }, function(err, res) { var _ref, _ref1; @@ -30380,7 +30380,7 @@ module.exports = { }, config: function() { return window.urb.subscribe({ - appl: "rodeo", + appl: "radio", path: "/xm/main" }, function(err, res) { console.log('config updates'); @@ -30392,7 +30392,7 @@ module.exports = { }, rooms: function() { return window.urb.subscribe({ - appl: "rodeo", + appl: "radio", path: "/" }, function(err, res) { console.log('house updates'); @@ -30401,7 +30401,7 @@ module.exports = { }, listen: function(station) { return window.urb.subscribe({ - appl: "rodeo", + appl: "radio", path: "/am/" + station }, function(err, res) { console.log('station subscription updates'); diff --git a/main/pub/src/radio/main.js b/main/pub/src/radio/main.js index f6f784066..88d82766d 100644 --- a/main/pub/src/radio/main.js +++ b/main/pub/src/radio/main.js @@ -1,7 +1,7 @@ (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o