mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-09-20 15:08:34 +03:00
Merge remote-tracking branch 'origin/release/next-userspace' into lf/chat-graph
This commit is contained in:
commit
f8452af94e
@ -64,6 +64,9 @@
|
||||
=| cards=(list card)
|
||||
|-
|
||||
?: ?=(%2 -.old-state)
|
||||
=. cards
|
||||
:_ cards
|
||||
(act [%watch %group-store /groups %group-on-leave])
|
||||
[cards this(state old-state)]
|
||||
?: ?=(%1 -.old-state)
|
||||
=. cards
|
||||
@ -134,9 +137,9 @@
|
||||
^- (quip card _this)
|
||||
|^
|
||||
?+ wire (on-agent:def wire sign)
|
||||
[%observer @ ~] on-observer
|
||||
[%thread-result @ ~] on-thread-result
|
||||
[%thread-start @ @ ~] on-thread-start
|
||||
[%observer @ ~] on-observer
|
||||
[%thread-result @ @ ~] on-thread-result
|
||||
[%thread-start @ @ ~] on-thread-start
|
||||
==
|
||||
::
|
||||
++ on-observer
|
||||
@ -167,7 +170,7 @@
|
||||
=/ tid (scot %uv (sham eny.bowl))
|
||||
:_ this
|
||||
:~ :* %pass
|
||||
[%thread-result i.t.wire ~]
|
||||
[%thread-result i.t.wire tid ~]
|
||||
%agent
|
||||
[our.bowl %spider]
|
||||
%watch
|
||||
@ -184,7 +187,7 @@
|
||||
==
|
||||
::
|
||||
++ on-thread-result
|
||||
?> ?=([%thread-result @ ~] wire)
|
||||
?> ?=([%thread-result @ @ ~] wire)
|
||||
?+ -.sign (on-agent:def wire sign)
|
||||
%kick [~ this]
|
||||
%watch-ack [~ this]
|
||||
|
@ -486,7 +486,7 @@
|
||||
++ thread-fail
|
||||
|= [=yarn =term =tang]
|
||||
^- (quip card ^state)
|
||||
:: %- (slog leaf+"strand {<yarn>} failed" leaf+<term> tang)
|
||||
::%- (slog leaf+"strand {<yarn>} failed" leaf+<term> tang)
|
||||
=/ =tid (yarn-to-tid yarn)
|
||||
=/ fail-cards (thread-say-fail tid term tang)
|
||||
=^ cards state (thread-clean yarn)
|
||||
|
@ -80,15 +80,18 @@
|
||||
[%remove g.i.entries m.i.entries]
|
||||
:: archive graph associated with group
|
||||
::
|
||||
=/ app-resource (de-path-soft:res app-path.m.i.entries)
|
||||
?~ app-resource
|
||||
loop(entries t.entries)
|
||||
;< ~ bind:m
|
||||
%+ raw-poke
|
||||
[our.bowl %graph-store]
|
||||
:- %graph-update
|
||||
!> ^- update:gra
|
||||
[%0 now.bowl [%archive-graph (de-path:res app-path.m.i.entries)]]
|
||||
[%0 now.bowl [%archive-graph u.app-resource]]
|
||||
;< ~ bind:m
|
||||
%+ raw-poke
|
||||
[our.bowl %graph-pull-hook]
|
||||
:- %pull-hook-action
|
||||
!>([%remove (de-path:res app-path.m.i.entries)])
|
||||
!>([%remove u.app-resource])
|
||||
loop(entries t.entries)
|
||||
|
@ -11,7 +11,7 @@ import { RouteComponentProps } from "react-router-dom";
|
||||
import { LinkItem } from "./components/LinkItem";
|
||||
import LinkSubmit from "./components/LinkSubmit";
|
||||
import { LinkPreview } from "./components/link-preview";
|
||||
import { Comments } from "~/views/components/comments";
|
||||
import { Comments } from "~/views/components/Comments";
|
||||
|
||||
import "./css/custom.css";
|
||||
|
||||
|
@ -101,7 +101,7 @@ const GraphNodeContent = ({ group, post, contacts, mod, description, index, remo
|
||||
<Box mb="2" fontWeight="500">
|
||||
<Text>{header}</Text>
|
||||
</Box>
|
||||
<Box overflow="hidden" maxHeight="400px">
|
||||
<Box overflow="hidden" maxHeight="400px" position="relative">
|
||||
<Text lineHeight="tall">{snippet}</Text>
|
||||
<FilterBox
|
||||
width="100%"
|
||||
|
@ -76,7 +76,7 @@ export function ShipSearch(props: InviteSearchProps) {
|
||||
if(ob.isValidPatp(ship)) {
|
||||
checkInput(true, ship);
|
||||
} else {
|
||||
checkInput(ship.length !== 1, undefined)
|
||||
checkInput(ship.length !== 1, undefined)
|
||||
}
|
||||
},
|
||||
[checkInput]
|
||||
@ -90,7 +90,7 @@ export function ShipSearch(props: InviteSearchProps) {
|
||||
(s: string) => {
|
||||
setTouched(true);
|
||||
checkInput(true, undefined);
|
||||
s = `~${deSig(s)}`;
|
||||
s = `${deSig(s)}`;
|
||||
setSelected(v => _.uniq([...v, s]))
|
||||
},
|
||||
[setTouched, checkInput, setSelected]
|
||||
|
Loading…
Reference in New Issue
Block a user