mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-21 07:28:30 +03:00
Merge branch 'origin/chat-style' (#1623)
* origin/chat-style: Added another round of changes Broke out functions, inlined more of the app, fewer declarations, more subject modifications rather than subject additions Added more changes. Updated to remove some of the =/ with the old style, and a few other small changes Added fixes to chat style as per Mark's comments Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin
commit
31674675e4
@ -28,13 +28,6 @@
|
|||||||
/| /css/
|
/| /css/
|
||||||
/~ ~
|
/~ ~
|
||||||
==
|
==
|
||||||
/= style
|
|
||||||
/^ octs
|
|
||||||
/; as-octs:mimes:html
|
|
||||||
/: /===/app/chat/css/index
|
|
||||||
/| /css/
|
|
||||||
/~ ~
|
|
||||||
==
|
|
||||||
/= chat-png
|
/= chat-png
|
||||||
/^ (map knot @)
|
/^ (map knot @)
|
||||||
/: /===/app/chat/img /_ /png/
|
/: /===/app/chat/img /_ /png/
|
||||||
@ -60,161 +53,84 @@
|
|||||||
==
|
==
|
||||||
--
|
--
|
||||||
::
|
::
|
||||||
|_ [bol=bowl:gall sta=state]
|
|_ [bol=bowl:gall state]
|
||||||
::
|
::
|
||||||
++ this .
|
++ this .
|
||||||
::
|
::
|
||||||
:: +prep: set up the app, migrate the state once started
|
:: +prep: set up the app, migrate the state
|
||||||
::
|
::
|
||||||
++ prep
|
++ prep
|
||||||
|= old=(unit state)
|
|= old=(unit state)
|
||||||
^- (quip move _this)
|
^- (quip move _this)
|
||||||
=/ launcha/poke
|
?^ old
|
||||||
[%launch-action [%chat /chattile '/~chat/js/tile.js']]
|
:_ this(+<+ u.old)
|
||||||
?~ old
|
[(launch-poke [/chattile '/~chat/js/tile.js'])]~
|
||||||
=/ inboxpat /circle/inbox/config/group
|
::
|
||||||
=/ circlespat /circles/[(scot %p our.bol)]
|
=/ inbox-path /circle/inbox/config/group
|
||||||
=/ inboxwir /circle/[(scot %p our.bol)]/inbox/config/group
|
::
|
||||||
=/ inboxi/poke
|
:_ this
|
||||||
:- %hall-action
|
:* [ost.bol %connect / [~ /'~chat'] %chat]
|
||||||
[%source %inbox %.y (silt [[our.bol %i] ~]~)]
|
(launch-poke [/chattile '/~chat/js/tile.js'])
|
||||||
=/ fakeannounce=poke
|
(hall-peer /circle/(scot %p our.bol)/inbox/config/group inbox-path)
|
||||||
:- %hall-action
|
(hall-peer /circles/(scot %p our.bol) /circles/(scot %p our.bol))
|
||||||
[%create %hall-internal-announcements '' %village]
|
(hall-source [our.bol %i])
|
||||||
=/ announce=poke
|
|
||||||
:- %hall-action
|
|
||||||
[%create %announcements 'Announcements from Tlon' %journal]
|
|
||||||
=/ help=poke
|
|
||||||
:- %hall-action
|
|
||||||
[%create %urbit-help 'Get help about Urbit' %channel]
|
|
||||||
=/ dev=poke
|
|
||||||
:- %hall-action
|
|
||||||
[%create %urbit-dev 'Chat about developing on Urbit' %channel]
|
|
||||||
=/ sourcefakeannounce/poke
|
|
||||||
:- %hall-action
|
|
||||||
[%source %inbox %.y (silt [[our.bol %hall-internal-announcements] ~]~)]
|
|
||||||
=/ sourceannounce/poke
|
|
||||||
:- %hall-action
|
|
||||||
[%source %inbox %.y (silt [[~marzod %announcements] ~]~)]
|
|
||||||
=/ hallactions=(list move)
|
|
||||||
?: =((clan:title our.bol) %czar)
|
?: =((clan:title our.bol) %czar)
|
||||||
~
|
~
|
||||||
?: =(our.bol ~marzod)
|
?: =(our.bol ~marzod)
|
||||||
~& %marzod-chat
|
:- (hall-create %announcements 'Announcements from Tlon' %journal)
|
||||||
:- [ost.bol %poke /announce [our.bol %hall] announce]
|
[(hall-source [~marzod %announcements])]~
|
||||||
[ost.bol %poke /announce [our.bol %hall] sourceannounce]~
|
|
||||||
?: =(our.bol ~dopzod)
|
?: =(our.bol ~dopzod)
|
||||||
~& %dopzod-chat
|
:- (hall-create %urbit-dev 'Chat about developing on Urbit' %channel)
|
||||||
:- [ost.bol %poke /announce [our.bol %hall] dev]
|
[(hall-create %urbit-help 'Help about Urbit' %channel)]~
|
||||||
[ost.bol %poke /announce [our.bol %hall] help]~
|
:~ (hall-create %hall-internal-announcements '' %village)
|
||||||
:- [ost.bol %poke /announce [our.bol %hall] fakeannounce]
|
(hall-source [our.bol %hall-internal-announcements])
|
||||||
:- [ost.bol %poke /announce [our.bol %hall] sourcefakeannounce]
|
(hall-source [~marzod %announcements])
|
||||||
[ost.bol %poke /announce [our.bol %hall] sourceannounce]~
|
==
|
||||||
=/ moves=(list move)
|
==
|
||||||
:~ [ost.bol %peer inboxwir [our.bol %hall] inboxpat]
|
|
||||||
[ost.bol %peer circlespat [our.bol %hall] circlespat]
|
|
||||||
[ost.bol %connect / [~ /'~chat'] %chat]
|
|
||||||
[ost.bol %poke /chat [our.bol %hall] inboxi]
|
|
||||||
[ost.bol %poke /chat [our.bol %launch] launcha]
|
|
||||||
==
|
|
||||||
:_ this
|
|
||||||
%+ weld moves hallactions
|
|
||||||
:- [ost.bol %poke /chat [our.bol %launch] launcha]~
|
|
||||||
this(sta u.old)
|
|
||||||
::
|
::
|
||||||
++ construct-tile-json
|
:: +peer-chattile: subscribe to data necessary for chat tile
|
||||||
|= str=streams
|
|
||||||
^- json
|
|
||||||
=/ numbers/(list [circle:hall @ud])
|
|
||||||
%+ turn ~(tap by messages.str)
|
|
||||||
|= [cir=circle:hall lis=(list envelope:hall)]
|
|
||||||
^- [circle:hall @ud]
|
|
||||||
?~ lis
|
|
||||||
[cir 0]
|
|
||||||
=/ last (snag (dec (lent lis)) `(list envelope:hall)`lis)
|
|
||||||
[cir (add num.last 1)]
|
|
||||||
=/ maptjson=(map @t json)
|
|
||||||
%- my
|
|
||||||
:~ ['config' (config-to-json str)]
|
|
||||||
['numbers' (numbers-to-json numbers)]
|
|
||||||
==
|
|
||||||
[%o maptjson]
|
|
||||||
::
|
::
|
||||||
++ peer-chattile
|
++ peer-chattile
|
||||||
|= wir=wire
|
|= wir=wire
|
||||||
^- (quip move _this)
|
^- (quip move _this)
|
||||||
:_ this
|
:_ this
|
||||||
[ost.bol %diff %json (construct-tile-json str.sta)]~
|
[ost.bol %diff %json (construct-tile-json str)]~
|
||||||
::
|
::
|
||||||
:: +peer-messages: subscribe to subset of messages and updates
|
:: +peer-messages: subscribe to subset of messages and updates
|
||||||
::
|
::
|
||||||
::
|
|
||||||
++ peer-primary
|
++ peer-primary
|
||||||
|= wir=wire
|
|= wir=wire
|
||||||
^- (quip move _this)
|
^- (quip move _this)
|
||||||
=* messages messages.str.sta
|
=* messages messages.str
|
||||||
=/ lismov/(list move)
|
|
||||||
%+ murn ~(tap by messages)
|
|
||||||
|= [cir=circle:hall lis=(list envelope:hall)]
|
|
||||||
^- (unit move)
|
|
||||||
=/ envs/(unit (list envelope:hall)) (~(get by messages) cir)
|
|
||||||
?~ envs
|
|
||||||
~
|
|
||||||
=/ length/@ (lent u.envs)
|
|
||||||
=/ start/@
|
|
||||||
?: (gte length 100)
|
|
||||||
(sub length 100)
|
|
||||||
0
|
|
||||||
=/ end/@ length
|
|
||||||
=/ offset/@ (sub end start)
|
|
||||||
:- ~
|
|
||||||
:* ost.bol
|
|
||||||
%diff
|
|
||||||
%chat-update
|
|
||||||
[%messages cir start end (swag [start offset] u.envs)]
|
|
||||||
==
|
|
||||||
:_ this
|
:_ this
|
||||||
[[ost.bol %diff %chat-config str.sta] lismov]
|
:- [ost.bol %diff %chat-config str]
|
||||||
|
%+ murn ~(tap by messages)
|
||||||
|
|= [cir=circle:hall envelopes=(list envelope:hall)]
|
||||||
|
^- (unit move)
|
||||||
|
=/ length=@ (lent envelopes)
|
||||||
|
=/ start=@
|
||||||
|
?: (gte length 100)
|
||||||
|
(sub length 100)
|
||||||
|
0
|
||||||
|
=/ end=@ length
|
||||||
|
=/ offset=@ (sub end start)
|
||||||
|
:- ~
|
||||||
|
:* ost.bol
|
||||||
|
%diff
|
||||||
|
%chat-update
|
||||||
|
[%messages cir start end (swag [start offset] envelopes)]
|
||||||
|
==
|
||||||
::
|
::
|
||||||
:: +poke-chat: send us an action
|
:: +poke-chat: send a list of actions to hall
|
||||||
::
|
::
|
||||||
++ poke-chat-action
|
++ poke-chat-action
|
||||||
|= act=action:chat
|
|= act=action:chat
|
||||||
^- (quip move _this)
|
^- (quip move _this)
|
||||||
:_ this
|
:_ this
|
||||||
%+ turn lis.act
|
%+ turn lis.act
|
||||||
|= hac=action:hall
|
|= hac=action:hall
|
||||||
^- move
|
^- move
|
||||||
:* ost.bol
|
[ost.bol %poke /p/(scot %da now.bol) [our.bol %hall] [%hall-action hac]]
|
||||||
%poke
|
|
||||||
/p/[(scot %da now.bol)]
|
|
||||||
[our.bol %hall]
|
|
||||||
[%hall-action hac]
|
|
||||||
==
|
|
||||||
::
|
|
||||||
:: +send-chat-update: utility func for sending updates to all our subscribers
|
|
||||||
::
|
|
||||||
++ send-chat-update
|
|
||||||
|= [upd=update str=streams]
|
|
||||||
^- (list move)
|
|
||||||
=/ updates/(list move)
|
|
||||||
%+ turn (prey:pubsub:userlib /primary bol)
|
|
||||||
|= [=bone *]
|
|
||||||
[bone %diff %chat-update upd]
|
|
||||||
::
|
|
||||||
=/ jon/json (construct-tile-json str)
|
|
||||||
=/ tile-updates/(list move)
|
|
||||||
%+ turn (prey:pubsub:userlib /chattile bol)
|
|
||||||
|= [=bone *]
|
|
||||||
[bone %diff %json jon]
|
|
||||||
::
|
|
||||||
%+ weld
|
|
||||||
updates
|
|
||||||
tile-updates
|
|
||||||
::
|
|
||||||
::
|
|
||||||
:: +hall arms
|
|
||||||
::
|
|
||||||
::
|
::
|
||||||
:: +diff-hall-prize: handle full state initially handed to us by hall
|
:: +diff-hall-prize: handle full state initially handed to us by hall
|
||||||
::
|
::
|
||||||
@ -225,109 +141,72 @@
|
|||||||
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
||||||
?+ i.wir
|
?+ i.wir
|
||||||
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
||||||
::
|
::
|
||||||
:: %circles wire
|
|
||||||
::
|
|
||||||
%circles
|
%circles
|
||||||
?> ?=(%circles -.piz)
|
?> ?=(%circles -.piz)
|
||||||
=/ str %= str.sta
|
=. str str(circles cis.piz)
|
||||||
circles cis.piz
|
:_ this(str str)
|
||||||
==
|
(send-chat-update [[%circles cis.piz] str])
|
||||||
:- (send-chat-update [[%circles cis.piz] str])
|
::
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
:: %circle wire
|
|
||||||
::
|
|
||||||
%circle
|
%circle
|
||||||
:: ::
|
?> ?=(%circle -.piz)
|
||||||
:: :: %circle prize
|
?. =([our.bol &3:wir] [our.bol %inbox])
|
||||||
:: ::
|
|
||||||
:: %circle
|
|
||||||
?> ?=(%circle -.piz)
|
|
||||||
=/ circle/circle:hall [our.bol &3:wir]
|
|
||||||
?: =(circle [our.bol %inbox])
|
|
||||||
::
|
|
||||||
:: fill inbox config and remote configs with prize data
|
|
||||||
::
|
|
||||||
=/ configs
|
|
||||||
%- ~(uni in configs.str.sta)
|
|
||||||
^- (map circle:hall (unit config:hall))
|
|
||||||
(~(run by rem.cos.piz) |=(a=config:hall `a))
|
|
||||||
::
|
|
||||||
=/ circles/(list circle:hall)
|
|
||||||
%+ turn ~(tap in src.loc.cos.piz)
|
|
||||||
|= src=source:hall
|
|
||||||
^- circle:hall
|
|
||||||
cir.src
|
|
||||||
::
|
|
||||||
=/ meslis/(list [circle:hall (list envelope:hall)])
|
|
||||||
%+ turn circles
|
|
||||||
|= cir=circle:hall
|
|
||||||
^- [circle:hall (list envelope:hall)]
|
|
||||||
[cir ~]
|
|
||||||
::
|
|
||||||
=/ localpeers/(set @p)
|
|
||||||
%- silt %+ turn ~(tap by loc.pes.piz)
|
|
||||||
|= [shp=@p stat=status:hall]
|
|
||||||
shp
|
|
||||||
::
|
|
||||||
=/ peers/(map circle:hall (set @p))
|
|
||||||
%- ~(rep by rem.pes.piz)
|
|
||||||
|= [[cir=circle:hall grp=group:hall] acc=(map circle:hall (set @p))]
|
|
||||||
^- (map circle:hall (set @p))
|
|
||||||
=/ newset
|
|
||||||
%- silt %+ turn ~(tap by grp)
|
|
||||||
|= [shp=@p stat=status:hall]
|
|
||||||
shp
|
|
||||||
(~(put by acc) cir newset)
|
|
||||||
::
|
|
||||||
:-
|
|
||||||
%+ turn ~(tap in (~(del in (silt circles)) [our.bol %inbox]))
|
|
||||||
|= cir=circle:hall
|
|
||||||
^- move
|
|
||||||
=/ wir/wire /circle/[(scot %p our.bol)]/[nom.cir]/config/group
|
|
||||||
=/ pat/path /circle/[nom.cir]/config/group
|
|
||||||
[ost.bol %peer wir [our.bol %hall] pat]
|
|
||||||
::
|
|
||||||
%= this
|
|
||||||
inbox.str.sta loc.cos.piz
|
|
||||||
configs.str.sta configs
|
|
||||||
messages.str.sta (molt meslis)
|
|
||||||
peers.str.sta (~(put by peers) [our.bol %inbox] localpeers)
|
|
||||||
==
|
|
||||||
::
|
::
|
||||||
:: fill remote configs with message data
|
:: fill remote configs with message data
|
||||||
::
|
::
|
||||||
=* messages messages.str.sta
|
=* messages messages.str
|
||||||
=/ circle/circle:hall [`@p`(slav %p &2:wir) &3:wir]
|
=/ circle [`@p`(slav %p &2:wir) &3:wir]
|
||||||
=/ localpeers/(set @p)
|
=/ peers=(map circle:hall (set @p))
|
||||||
%- silt %+ turn ~(tap by loc.pes.piz)
|
|
||||||
|= [shp=@p stat=status:hall]
|
|
||||||
shp
|
|
||||||
::
|
|
||||||
=/ peers/(map circle:hall (set @p))
|
|
||||||
%- ~(rep by rem.pes.piz)
|
%- ~(rep by rem.pes.piz)
|
||||||
|= [[cir=circle:hall grp=group:hall] acc=(map circle:hall (set @p))]
|
|= [[cir=circle:hall grp=group:hall] acc=(map circle:hall (set @p))]
|
||||||
^- (map circle:hall (set @p))
|
^+ acc
|
||||||
=/ newset
|
(~(put by acc) cir (silt (turn ~(tap by grp) head)))
|
||||||
%- silt %+ turn ~(tap by grp)
|
::
|
||||||
|= [shp=@p stat=status:hall]
|
=. str
|
||||||
shp
|
%= str
|
||||||
(~(put by acc) cir newset)
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
messages (~(put by messages) circle nes.piz)
|
messages (~(put by messages) circle nes.piz)
|
||||||
peers (~(uni by peers.str.sta) (~(put by peers) circle localpeers))
|
peers
|
||||||
|
%- ~(uni by peers.str)
|
||||||
|
(~(put by peers) circle ~(key by loc.pes.piz))
|
||||||
==
|
==
|
||||||
=/ messageupdate/update
|
:_ this(str str)
|
||||||
:* %messages
|
(send-chat-update [[%messages circle 0 (lent messages) nes.piz] str])
|
||||||
circle
|
::
|
||||||
0
|
:: fill inbox config and remote configs with prize data
|
||||||
(lent messages)
|
::
|
||||||
nes.piz
|
=/ circles=(list circle:hall) (turn ~(tap in src.loc.cos.piz) head)
|
||||||
==
|
::
|
||||||
:- (send-chat-update [messageupdate str])
|
=/ peers=(map circle:hall (set @p))
|
||||||
this(str.sta str)
|
%- ~(rep by rem.pes.piz)
|
||||||
|
|= [[cir=circle:hall grp=group:hall] acc=(map circle:hall (set @p))]
|
||||||
|
^+ acc
|
||||||
|
(~(put by acc) cir (silt (turn ~(tap by grp) head)))
|
||||||
|
::
|
||||||
|
:-
|
||||||
|
%+ turn
|
||||||
|
%~ tap in
|
||||||
|
%- ~(del in (silt circles))
|
||||||
|
[our.bol %inbox]
|
||||||
|
|= cir=circle:hall
|
||||||
|
%+ hall-peer
|
||||||
|
/circle/(scot %p our.bol)/[nom.cir]/config/group
|
||||||
|
/circle/[nom.cir]/config/group
|
||||||
|
%= this
|
||||||
|
inbox.str loc.cos.piz
|
||||||
|
peers.str (~(put by peers) [our.bol %inbox] ~(key by loc.pes.piz))
|
||||||
|
::
|
||||||
|
configs.str
|
||||||
|
%- ~(uni by configs.str)
|
||||||
|
^- (map circle:hall (unit config:hall))
|
||||||
|
(~(run by rem.cos.piz) some)
|
||||||
|
::
|
||||||
|
messages.str
|
||||||
|
%- molt
|
||||||
|
%+ turn circles
|
||||||
|
|= cir=circle:hall
|
||||||
|
^- [circle:hall (list envelope:hall)]
|
||||||
|
[cir ~]
|
||||||
|
==
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
:: +diff-hall-rumor: handle updates to hall state
|
:: +diff-hall-rumor: handle updates to hall state
|
||||||
@ -340,201 +219,196 @@
|
|||||||
?+ i.wir
|
?+ i.wir
|
||||||
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
||||||
::
|
::
|
||||||
:: %circles
|
|
||||||
%circles
|
%circles
|
||||||
?> ?=(%circles -.rum)
|
(handle-rumor-circles rum)
|
||||||
=/ cis
|
|
||||||
?: add.rum
|
|
||||||
(~(put in circles.str.sta) cir.rum)
|
|
||||||
(~(del in circles.str.sta) cir.rum)
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
circles cis
|
|
||||||
peers
|
|
||||||
?: add.rum
|
|
||||||
(~(put by peers.str.sta) [our.bol cir.rum] ~)
|
|
||||||
(~(del by peers.str.sta) [our.bol cir.rum])
|
|
||||||
==
|
|
||||||
:- (send-chat-update [[%circles cis] str])
|
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
::
|
|
||||||
:: %circle: fill remote configs with message data
|
|
||||||
::
|
::
|
||||||
%circle
|
%circle
|
||||||
?> ?=(%circle -.rum)
|
(handle-rumor-circle wir rum)
|
||||||
=* sto rum.rum
|
::
|
||||||
?+ -.sto
|
|
||||||
[~ this]
|
|
||||||
::
|
|
||||||
:: %gram:
|
|
||||||
::
|
|
||||||
%gram
|
|
||||||
?> ?=(%gram -.sto)
|
|
||||||
=* messages messages.str.sta
|
|
||||||
=/ circle/circle:hall [`@p`(slav %p &2:wir) &3:wir]
|
|
||||||
=/ unes/(unit (list envelope:hall)) (~(get by messages) circle)
|
|
||||||
?~ unes
|
|
||||||
[~ this]
|
|
||||||
=/ nes u.unes
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
messages (~(put by messages) circle (snoc nes nev.sto))
|
|
||||||
==
|
|
||||||
:- (send-chat-update [[%message circle nev.sto] str])
|
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
:: %status:
|
|
||||||
::
|
|
||||||
%status
|
|
||||||
?> ?=(%status -.sto)
|
|
||||||
=/ upeers/(unit (set @p)) (~(get by peers.str.sta) cir.sto)
|
|
||||||
?~ upeers
|
|
||||||
[~ this]
|
|
||||||
=/ peers/(set @p)
|
|
||||||
?: =(%remove -.dif.sto)
|
|
||||||
(~(del in u.upeers) who.sto)
|
|
||||||
(~(put in u.upeers) who.sto)
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
peers (~(put by peers.str.sta) cir.sto peers)
|
|
||||||
==
|
|
||||||
:- (send-chat-update [[%peers cir.sto peers] str])
|
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
:: %config: config has changed
|
|
||||||
::
|
|
||||||
%config
|
|
||||||
=* circ cir.sto
|
|
||||||
::
|
|
||||||
?+ -.dif.sto
|
|
||||||
[~ this]
|
|
||||||
::
|
|
||||||
:: %full: set all of config without side effects
|
|
||||||
::
|
|
||||||
%full
|
|
||||||
=* conf cof.dif.sto
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
configs (~(put by configs.str.sta) circ `conf)
|
|
||||||
==
|
|
||||||
:- (send-chat-update [[%config circ conf] str])
|
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
:: %read: the read count of one of our configs has changed
|
|
||||||
::
|
|
||||||
%read
|
|
||||||
?: =(circ [our.bol %inbox])
|
|
||||||
:: ignore when circ is inbox
|
|
||||||
[~ this]
|
|
||||||
=/ uconf/(unit config:hall) (~(got by configs.str.sta) circ)
|
|
||||||
?~ uconf
|
|
||||||
:: should we crash?
|
|
||||||
[~ this]
|
|
||||||
=/ conf/config:hall
|
|
||||||
%= u.uconf
|
|
||||||
red red.dif.sto
|
|
||||||
==
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
configs (~(put by configs.str.sta) circ `conf)
|
|
||||||
==
|
|
||||||
:- (send-chat-update [[%config circ conf] str])
|
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
:: %source: the sources of our inbox have changed
|
|
||||||
::
|
|
||||||
%source
|
|
||||||
?. =(circ [our.bol %inbox])
|
|
||||||
:: ignore when circ is not inbox
|
|
||||||
[~ this]
|
|
||||||
=* affectedcir cir.src.dif.sto
|
|
||||||
=/ newwir/wire
|
|
||||||
/circle/[(scot %p hos.affectedcir)]/[nom.affectedcir]/grams/0/config/group
|
|
||||||
=/ pat/path /circle/[nom.affectedcir]/grams/0/config/group
|
|
||||||
:: we've added a source to our inbox
|
|
||||||
::
|
|
||||||
?: add.dif.sto
|
|
||||||
=/ newinbox %= inbox.str.sta
|
|
||||||
src (~(put in src.inbox.str.sta) src.dif.sto)
|
|
||||||
==
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
inbox newinbox
|
|
||||||
::
|
|
||||||
configs
|
|
||||||
?: (~(has by configs.str.sta) affectedcir)
|
|
||||||
configs.str.sta
|
|
||||||
(~(put by configs.str.sta) affectedcir ~)
|
|
||||||
==
|
|
||||||
::
|
|
||||||
:_ this(str.sta str)
|
|
||||||
%+ weld
|
|
||||||
[ost.bol %peer newwir [hos.affectedcir %hall] pat]~
|
|
||||||
(send-chat-update [[%inbox newinbox] str])
|
|
||||||
::
|
|
||||||
=/ newinbox %= inbox.str.sta
|
|
||||||
src (~(del in src.inbox.str.sta) src.dif.sto)
|
|
||||||
==
|
|
||||||
:: we've removed a source from our inbox
|
|
||||||
::
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
inbox newinbox
|
|
||||||
::
|
|
||||||
configs (~(del by configs.str.sta) affectedcir)
|
|
||||||
messages (~(del by messages.str.sta) affectedcir)
|
|
||||||
peers (~(del by peers.str.sta) affectedcir)
|
|
||||||
==
|
|
||||||
=/ fakecir/circle:hall
|
|
||||||
:- our.bol
|
|
||||||
%- crip
|
|
||||||
%+ weld (trip 'hall-internal-') (trip nom.affectedcir)
|
|
||||||
::
|
|
||||||
?~ (~(get by configs.str) fakecir)
|
|
||||||
:: just forward the delete to our clients
|
|
||||||
::
|
|
||||||
:_ this(str.sta str)
|
|
||||||
%+ weld
|
|
||||||
[ost.bol %pull newwir [hos.affectedcir %hall] ~]~
|
|
||||||
%+ weld
|
|
||||||
(send-chat-update [[%inbox newinbox] str])
|
|
||||||
(send-chat-update [[%delete affectedcir] str])
|
|
||||||
:: if we get a delete from another ship, delete our fake circle copy
|
|
||||||
::
|
|
||||||
=/ deletefake/poke
|
|
||||||
:- %hall-action
|
|
||||||
[%delete nom.fakecir ~]
|
|
||||||
:_ this(str.sta str)
|
|
||||||
%+ weld
|
|
||||||
[ost.bol %pull newwir [hos.affectedcir %hall] ~]~
|
|
||||||
%+ weld
|
|
||||||
[ost.bol %poke /fake [our.bol %hall] deletefake]~
|
|
||||||
%+ weld
|
|
||||||
(send-chat-update [[%inbox newinbox] str])
|
|
||||||
(send-chat-update [[%delete affectedcir] str])
|
|
||||||
::
|
|
||||||
:: %remove: remove a circle
|
|
||||||
::
|
|
||||||
%remove
|
|
||||||
=/ str
|
|
||||||
%= str.sta
|
|
||||||
configs (~(del by configs.str.sta) circ)
|
|
||||||
messages (~(del by messages.str.sta) circ)
|
|
||||||
peers (~(del by peers.str.sta) circ)
|
|
||||||
==
|
|
||||||
:- (send-chat-update [[%delete circ] str])
|
|
||||||
this(str.sta str)
|
|
||||||
::
|
|
||||||
==
|
|
||||||
:: end of branching on dif.sto type
|
|
||||||
==
|
|
||||||
:: end of branching on sto type
|
|
||||||
==
|
==
|
||||||
:: end of i.wir branching
|
|
||||||
::
|
::
|
||||||
:: +lient arms
|
:: +handle-rumor-circles
|
||||||
::
|
::
|
||||||
|
++ handle-rumor-circles
|
||||||
|
|= rum=rumor:hall
|
||||||
|
^- (quip move _this)
|
||||||
|
?> ?=(%circles -.rum)
|
||||||
|
=/ cis
|
||||||
|
?: add.rum
|
||||||
|
(~(put in circles.str) cir.rum)
|
||||||
|
(~(del in circles.str) cir.rum)
|
||||||
|
=. str
|
||||||
|
%= str
|
||||||
|
circles cis
|
||||||
|
peers
|
||||||
|
?: add.rum
|
||||||
|
(~(put by peers.str) [our.bol cir.rum] ~)
|
||||||
|
(~(del by peers.str) [our.bol cir.rum])
|
||||||
|
==
|
||||||
|
:_ this(str str)
|
||||||
|
(send-chat-update [[%circles cis] str])
|
||||||
|
::
|
||||||
|
++ handle-rumor-circle
|
||||||
|
|= [wir=wire rum=rumor:hall]
|
||||||
|
^- (quip move _this)
|
||||||
|
?> ?=(%circle -.rum)
|
||||||
|
?+ -.rum.rum
|
||||||
|
[~ this]
|
||||||
|
::
|
||||||
|
:: %gram: new message
|
||||||
|
::
|
||||||
|
%gram
|
||||||
|
(handle-rumor-circle-gram wir rum.rum)
|
||||||
|
::
|
||||||
|
:: status: status update
|
||||||
|
::
|
||||||
|
%status
|
||||||
|
(handle-rumor-circle-status rum.rum)
|
||||||
|
::
|
||||||
|
:: %config: config has changed
|
||||||
|
::
|
||||||
|
%config
|
||||||
|
?+ -.dif.rum.rum
|
||||||
|
[~ this]
|
||||||
|
::
|
||||||
|
:: %full: set all of config without side effects
|
||||||
|
::
|
||||||
|
%full
|
||||||
|
=* conf cof.dif.rum.rum
|
||||||
|
=. configs.str (~(put by configs.str) cir.rum.rum `conf)
|
||||||
|
:_ this(str str)
|
||||||
|
(send-chat-update [[%config cir.rum.rum conf] str])
|
||||||
|
::
|
||||||
|
:: %read: the read count of one of our configs has changed
|
||||||
|
::
|
||||||
|
%read
|
||||||
|
(handle-rumor-circle-config-read rum.rum)
|
||||||
|
::
|
||||||
|
:: %source: the sources of our inbox have changed
|
||||||
|
::
|
||||||
|
%source
|
||||||
|
(handle-rumor-circle-config-source rum.rum)
|
||||||
|
::
|
||||||
|
:: %remove: remove a circle
|
||||||
|
::
|
||||||
|
%remove
|
||||||
|
=. str
|
||||||
|
%= str
|
||||||
|
configs (~(del by configs.str) cir.rum.rum)
|
||||||
|
messages (~(del by messages.str) cir.rum.rum)
|
||||||
|
peers (~(del by peers.str) cir.rum.rum)
|
||||||
|
==
|
||||||
|
:_ this(str str)
|
||||||
|
(send-chat-update [[%delete cir.rum.rum] str])
|
||||||
|
::
|
||||||
|
==
|
||||||
|
==
|
||||||
|
::
|
||||||
|
++ handle-rumor-circle-gram
|
||||||
|
|= [wir=wire sto=rumor-story:hall]
|
||||||
|
^- (quip move _this)
|
||||||
|
?> ?=(%gram -.sto)
|
||||||
|
=* messages messages.str
|
||||||
|
=/ circle [`@p`(slav %p &2:wir) &3:wir]
|
||||||
|
=/ nes=(unit (list envelope:hall))
|
||||||
|
(~(get by messages) circle)
|
||||||
|
?~ nes
|
||||||
|
[~ this]
|
||||||
|
=. messages.str (~(put by messages) circle (snoc u.nes nev.sto))
|
||||||
|
:_ this(str str)
|
||||||
|
(send-chat-update [[%message circle nev.sto] str])
|
||||||
|
::
|
||||||
|
++ handle-rumor-circle-status
|
||||||
|
|= sto=rumor-story:hall
|
||||||
|
^- (quip move _this)
|
||||||
|
?> ?=(%status -.sto)
|
||||||
|
=/ upeers=(unit (set @p)) (~(get by peers.str) cir.sto)
|
||||||
|
?~ upeers
|
||||||
|
[~ this]
|
||||||
|
=/ peers=(set @p)
|
||||||
|
?: =(%remove -.dif.sto)
|
||||||
|
(~(del in u.upeers) who.sto)
|
||||||
|
(~(put in u.upeers) who.sto)
|
||||||
|
=. peers.str (~(put by peers.str) cir.sto peers)
|
||||||
|
:_ this(str str)
|
||||||
|
(send-chat-update [[%peers cir.sto peers] str])
|
||||||
|
::
|
||||||
|
++ handle-rumor-circle-config-read
|
||||||
|
|= sto=rumor-story:hall
|
||||||
|
^- (quip move _this)
|
||||||
|
?> ?=(%config -.sto)
|
||||||
|
?> ?=(%read -.dif.sto)
|
||||||
|
?: =(cir.sto [our.bol %inbox])
|
||||||
|
:: ignore when cir.sto is inbox
|
||||||
|
[~ this]
|
||||||
|
=/ conf=(unit config:hall) (~(got by configs.str) cir.sto)
|
||||||
|
?~ conf
|
||||||
|
[~ this]
|
||||||
|
=. red.u.conf red.dif.sto
|
||||||
|
=. configs.str (~(put by configs.str) cir.sto conf)
|
||||||
|
:_ this(str str)
|
||||||
|
(send-chat-update [[%config cir.sto u.conf] str])
|
||||||
|
::
|
||||||
|
:: +handle-rumor-circle-config-source: on source, subscribe and add to inbox
|
||||||
|
:: on remove source, send delete and remove data from state
|
||||||
|
::
|
||||||
|
++ handle-rumor-circle-config-source
|
||||||
|
|= sto=rumor-story:hall
|
||||||
|
^- (quip move _this)
|
||||||
|
?> ?=(%config -.sto)
|
||||||
|
?> ?=(%source -.dif.sto)
|
||||||
|
?. =(cir.sto [our.bol %inbox])
|
||||||
|
:: ignore when cir.sto is not inbox
|
||||||
|
[~ this]
|
||||||
|
=* circ cir.src.dif.sto
|
||||||
|
=/ wir /circle/(scot %p hos.circ)/[nom.circ]/grams/0/config/group
|
||||||
|
:: we've added a source to our inbox
|
||||||
|
::
|
||||||
|
?: add.dif.sto
|
||||||
|
=. str
|
||||||
|
%_ str
|
||||||
|
src.inbox (~(put in src.inbox.str) src.dif.sto)
|
||||||
|
::
|
||||||
|
configs
|
||||||
|
?: (~(has by configs.str) circ)
|
||||||
|
configs.str
|
||||||
|
(~(put by configs.str) circ ~)
|
||||||
|
==
|
||||||
|
::
|
||||||
|
=/ pax /circle/[nom.circ]/grams/0/config/group
|
||||||
|
:_ this(str str)
|
||||||
|
:- [ost.bol %peer wir [hos.circ %hall] pax]
|
||||||
|
(send-chat-update [[%inbox inbox.str] str])
|
||||||
|
::
|
||||||
|
=. src.inbox.str (~(del in src.inbox.str) src.dif.sto)
|
||||||
|
:: we've removed a source from our inbox
|
||||||
|
::
|
||||||
|
=. str
|
||||||
|
%= str
|
||||||
|
inbox inbox.str
|
||||||
|
::
|
||||||
|
configs (~(del by configs.str) circ)
|
||||||
|
messages (~(del by messages.str) circ)
|
||||||
|
peers (~(del by peers.str) circ)
|
||||||
|
==
|
||||||
|
=/ fake=circle:hall
|
||||||
|
[our.bol (crip (weld (trip 'hall-internal-') (trip nom.circ)))]
|
||||||
|
::
|
||||||
|
:_ this(str str)
|
||||||
|
;: weld
|
||||||
|
^- (list move)
|
||||||
|
:: just forward the delete to our clients
|
||||||
|
::
|
||||||
|
?~ (~(get by configs.str) fake)
|
||||||
|
[ost.bol %pull wir [hos.circ %hall] ~]~
|
||||||
|
:: if we get a delete from another ship, delete our fake circle copy
|
||||||
|
::
|
||||||
|
:- [ost.bol %pull wir [hos.circ %hall] ~]
|
||||||
|
[ost.bol %poke /f [our.bol %hall] [%hall-action [%delete nom.fake ~]]]~
|
||||||
|
::
|
||||||
|
(send-chat-update [[%inbox inbox.str] str])
|
||||||
|
(send-chat-update [[%delete circ] str])
|
||||||
|
==
|
||||||
::
|
::
|
||||||
:: +bound: lient tells us we successfully bound our server to the ~chat url
|
:: +bound: lient tells us we successfully bound our server to the ~chat url
|
||||||
::
|
::
|
||||||
@ -584,27 +458,28 @@
|
|||||||
:: paginated message data
|
:: paginated message data
|
||||||
::
|
::
|
||||||
[%'~chat' %scroll @t @t @t @t ~]
|
[%'~chat' %scroll @t @t @t @t ~]
|
||||||
=/ cir/circle:hall [(slav %p &3:site.request-line) &4:site.request-line]
|
=/ cir [(slav %p &3:site.request-line) &4:site.request-line]
|
||||||
=/ start/@ud (need (rush &5:site.request-line dem))
|
=/ start=@ud (need (rush &5:site.request-line dem))
|
||||||
=/ parsedend/@ud (need (rush &6:site.request-line dem))
|
=/ parsedend=@ud (need (rush &6:site.request-line dem))
|
||||||
=* messages messages.str.sta
|
=* messages messages.str
|
||||||
=/ envs/(unit (list envelope:hall)) (~(get by messages) cir)
|
=/ envs=(unit (list envelope:hall)) (~(get by messages) cir)
|
||||||
?~ envs
|
?~ envs
|
||||||
[~ this]
|
[~ this]
|
||||||
?: (gte start (lent u.envs))
|
?: (gte start (lent u.envs))
|
||||||
[~ this]
|
[~ this]
|
||||||
=/ end/@
|
=/ end=@
|
||||||
?: (gte parsedend (lent u.envs))
|
?: (gte parsedend (lent u.envs))
|
||||||
(dec (lent u.envs))
|
(dec (lent u.envs))
|
||||||
parsedend
|
parsedend
|
||||||
=/ offset (sub end start)
|
=/ offset (sub end start)
|
||||||
=/ jon/json %- msg-to-json
|
=/ jon
|
||||||
:* %messages
|
%- msg-to-json
|
||||||
cir
|
:* %messages
|
||||||
start
|
cir
|
||||||
end
|
start
|
||||||
(swag [start offset] u.envs)
|
end
|
||||||
==
|
(swag [start offset] u.envs)
|
||||||
|
==
|
||||||
:_ this
|
:_ this
|
||||||
[ost.bol %http-response (json-response:app (json-to-octs jon))]~
|
[ost.bol %http-response (json-response:app (json-to-octs jon))]~
|
||||||
::
|
::
|
||||||
@ -633,12 +508,12 @@
|
|||||||
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
||||||
::
|
::
|
||||||
%circle
|
%circle
|
||||||
=/ shp/@p (slav %p &2:wir)
|
=/ shp=@p (slav %p &2:wir)
|
||||||
=/ pat /circle/[&3:wir]/config/group
|
=/ pat /circle/[&3:wir]/config/group
|
||||||
?: =(&3:wir 'inbox')
|
?: =(&3:wir 'inbox')
|
||||||
:_ this
|
:_ this
|
||||||
[ost.bol %peer wir [shp %hall] pat]~
|
[ost.bol %peer wir [shp %hall] pat]~
|
||||||
?: (~(has in src.inbox.str.sta) [[shp &3:wir] ~])
|
?: (~(has in src.inbox.str) [[shp &3:wir] ~])
|
||||||
:_ this
|
:_ this
|
||||||
[ost.bol %peer wir [shp %hall] pat]~
|
[ost.bol %peer wir [shp %hall] pat]~
|
||||||
[~ this]
|
[~ this]
|
||||||
@ -659,12 +534,12 @@
|
|||||||
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
(mean [leaf+"invalid wire for diff: {(spud wir)}"]~)
|
||||||
::
|
::
|
||||||
%circle
|
%circle
|
||||||
=/ shp/@p (slav %p &2:wir)
|
=/ shp=@p (slav %p &2:wir)
|
||||||
=/ pat /circle/[&3:wir]/config/group
|
=/ pat /circle/[&3:wir]/config/group
|
||||||
?: =(&3:wir 'inbox')
|
?: =(&3:wir 'inbox')
|
||||||
:_ this
|
:_ this
|
||||||
[ost.bol %peer wir [shp %hall] pat]~
|
[ost.bol %peer wir [shp %hall] pat]~
|
||||||
?: (~(has in src.inbox.str.sta) [[shp &3:wir] ~])
|
?: (~(has in src.inbox.str) [[shp &3:wir] ~])
|
||||||
:_ this
|
:_ this
|
||||||
[ost.bol %peer wir [shp %hall] pat]~
|
[ost.bol %peer wir [shp %hall] pat]~
|
||||||
[~ this]
|
[~ this]
|
||||||
@ -674,4 +549,65 @@
|
|||||||
[ost.bol %peer wir [our.bol %hall] wir]~
|
[ost.bol %peer wir [our.bol %hall] wir]~
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
|
:: +utilities
|
||||||
|
::
|
||||||
|
::
|
||||||
|
:: +send-chat-update: utility func for sending updates to all our subscribers
|
||||||
|
::
|
||||||
|
++ send-chat-update
|
||||||
|
|= [upd=update str=streams]
|
||||||
|
^- (list move)
|
||||||
|
=/ jon (construct-tile-json str)
|
||||||
|
::
|
||||||
|
%+ weld
|
||||||
|
^- (list move)
|
||||||
|
%+ turn (prey:pubsub:userlib /primary bol)
|
||||||
|
|= [=bone *]
|
||||||
|
[bone %diff %chat-update upd]
|
||||||
|
^- (list move)
|
||||||
|
%+ turn (prey:pubsub:userlib /chattile bol)
|
||||||
|
|= [=bone *]
|
||||||
|
[bone %diff %json jon]
|
||||||
|
::
|
||||||
|
++ construct-tile-json
|
||||||
|
|= str=streams
|
||||||
|
^- json
|
||||||
|
:- %o
|
||||||
|
%- my
|
||||||
|
:~ ['config' (config-to-json str)]
|
||||||
|
::
|
||||||
|
:- 'numbers'
|
||||||
|
%- numbers-to-json
|
||||||
|
^- (list [circle:hall @ud])
|
||||||
|
%+ turn ~(tap by messages.str)
|
||||||
|
|= [cir=circle:hall lis=(list envelope:hall)]
|
||||||
|
^- [circle:hall @ud]
|
||||||
|
?~ lis
|
||||||
|
[cir 0]
|
||||||
|
=/ last (snag (dec (lent lis)) `(list envelope:hall)`lis)
|
||||||
|
[cir (add num.last 1)]
|
||||||
|
==
|
||||||
|
::
|
||||||
|
++ launch-poke
|
||||||
|
|= [=path =cord]
|
||||||
|
^- move
|
||||||
|
[ost.bol %poke /chat [our.bol %launch] [%launch-action %chat path cord]]
|
||||||
|
::
|
||||||
|
++ hall-peer
|
||||||
|
|= [wir=wire pat=path]
|
||||||
|
^- move
|
||||||
|
[ost.bol %peer wir [our.bol %hall] pat]
|
||||||
|
::
|
||||||
|
++ hall-create
|
||||||
|
|= [name=@tas description=@t =security:hall]
|
||||||
|
^- move
|
||||||
|
=/ poke [%hall-action [%create name description security]]
|
||||||
|
[ost.bol %poke /chat [our.bol %hall] poke]
|
||||||
|
::
|
||||||
|
++ hall-source
|
||||||
|
|= cir=circle:hall
|
||||||
|
^- move
|
||||||
|
=/ poke [%hall-action [%source %inbox %.y (silt [cir ~]~)]]
|
||||||
|
[ost.bol %poke /chat [our.bol %hall] poke]
|
||||||
|
::
|
||||||
--
|
--
|
||||||
|
|||||||
@ -36,7 +36,7 @@ export class Root extends Component {
|
|||||||
let configs = !!state.configs ? state.configs : {};
|
let configs = !!state.configs ? state.configs : {};
|
||||||
|
|
||||||
let circles = Object.keys(configs).filter((conf) => {
|
let circles = Object.keys(configs).filter((conf) => {
|
||||||
return !!configs[conf] && conf.split('/')[1] !== 'i';
|
return configs[conf] !== undefined && conf.split('/')[1] !== 'i';
|
||||||
});
|
});
|
||||||
|
|
||||||
let messages = _.get(state, 'messages', {});
|
let messages = _.get(state, 'messages', {});
|
||||||
@ -87,7 +87,7 @@ export class Root extends Component {
|
|||||||
inviteConfig = configs[`~${window.ship}/i`];
|
inviteConfig = configs[`~${window.ship}/i`];
|
||||||
}
|
}
|
||||||
|
|
||||||
const renderChannelsSidebar = (props) => (
|
const renderChannelSidebar = (props) => (
|
||||||
<Sidebar
|
<Sidebar
|
||||||
circles={circles}
|
circles={circles}
|
||||||
messagePreviews={messagePreviews}
|
messagePreviews={messagePreviews}
|
||||||
@ -106,7 +106,7 @@ export class Root extends Component {
|
|||||||
render={ (props) => {
|
render={ (props) => {
|
||||||
return (
|
return (
|
||||||
<Skeleton
|
<Skeleton
|
||||||
sidebar={renderChannelsSidebar(props)}>
|
sidebar={renderChannelSidebar(props)}>
|
||||||
<div className="h-100 w-100 overflow-x-hidden flex flex-column">
|
<div className="h-100 w-100 overflow-x-hidden flex flex-column">
|
||||||
<div className="pl3 pr3 pt2 pb3">
|
<div className="pl3 pr3 pt2 pb3">
|
||||||
<h2>Home</h2>
|
<h2>Home</h2>
|
||||||
@ -124,7 +124,7 @@ export class Root extends Component {
|
|||||||
return (
|
return (
|
||||||
<Skeleton
|
<Skeleton
|
||||||
spinner={this.state.spinner}
|
spinner={this.state.spinner}
|
||||||
sidebar={renderChannelsSidebar(props)}>
|
sidebar={renderChannelSidebar(props)}>
|
||||||
<NewScreen
|
<NewScreen
|
||||||
setSpinner={this.setSpinner}
|
setSpinner={this.setSpinner}
|
||||||
api={api}
|
api={api}
|
||||||
@ -138,7 +138,7 @@ export class Root extends Component {
|
|||||||
render={ (props) => {
|
render={ (props) => {
|
||||||
return (
|
return (
|
||||||
<Skeleton
|
<Skeleton
|
||||||
sidebar={renderChannelsSidebar(props)}>
|
sidebar={renderChannelSidebar(props)}>
|
||||||
<LandingScreen
|
<LandingScreen
|
||||||
api={api}
|
api={api}
|
||||||
configs={configs}
|
configs={configs}
|
||||||
@ -156,7 +156,7 @@ export class Root extends Component {
|
|||||||
let messages = state.messages[station] || [];
|
let messages = state.messages[station] || [];
|
||||||
return (
|
return (
|
||||||
<Skeleton
|
<Skeleton
|
||||||
sidebar={renderChannelsSidebar(props) }>
|
sidebar={renderChannelSidebar(props) }>
|
||||||
<ChatScreen
|
<ChatScreen
|
||||||
api={api}
|
api={api}
|
||||||
configs={configs}
|
configs={configs}
|
||||||
@ -173,7 +173,7 @@ export class Root extends Component {
|
|||||||
render={ (props) => {
|
render={ (props) => {
|
||||||
return (
|
return (
|
||||||
<Skeleton
|
<Skeleton
|
||||||
sidebar={renderChannelsSidebar(props) }>
|
sidebar={renderChannelSidebar(props) }>
|
||||||
<MemberScreen
|
<MemberScreen
|
||||||
{...props}
|
{...props}
|
||||||
api={api}
|
api={api}
|
||||||
@ -187,7 +187,7 @@ export class Root extends Component {
|
|||||||
return (
|
return (
|
||||||
<Skeleton
|
<Skeleton
|
||||||
spinner={this.state.spinner}
|
spinner={this.state.spinner}
|
||||||
sidebar={renderChannelsSidebar(props) }>
|
sidebar={renderChannelSidebar(props) }>
|
||||||
<SettingsScreen
|
<SettingsScreen
|
||||||
{...props}
|
{...props}
|
||||||
setSpinner={this.setSpinner}
|
setSpinner={this.setSpinner}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user