master..5e4bbd8 · sphinx

git.iko.soy/sphinx

on 5e4bbd8 help sign in

.gitignoredeleted−2

since splitsnapshots

unifiedsplit

@@ -1,2 +0,0 @@

1−/result

2−/result-*

README.md+25−105

@@ -1,125 +1,45 @@

1# sphinx

3−A search engine powered by you and your pals for finding answers to your

3+## Desk

4−riddles.

6−sphinx keeps a directory of listings: apps, groups, notebook posts and links.

5+The desk currently has the minimum amount of files necessary to distribute an application and should be distributable immediately. Any further Hoon development should happen here.

7−The listings you publish go to your mutual pals and on to their mutual pals,

8−theirs come to you, and you search everything you've received.

10−## Install

7+TODO: Add further documentation on beginning Hoon development

12−sphinx runs on the kernels listed in `desk/sys.kelvin`, currently

9+## UI

13−`[%zuse 408]`. Check your ship first: in the dojo, `+vats %base` must show

14−`/sys/kelvin: [%zuse 408]`. If it shows an older kernel, let your ship finish

15−its update first. If the update is blocked, Landscape lists the apps that

16−block it, and `|bump` suspends them.

18−Then, in your ship's dojo:

11+sphinx is built primarily using [React], [Typescript], and [Tailwind CSS]. [Vite] ensures that all code and assets are loaded appropriately, bundles the application for distribution and provides a functional dev environment.

20−```

13+### Getting Started

21−|install ~donmec-sallud %sphinx

22−```

23−

24−For a new install, you can also search for ~donmec-sallud in Landscape and

25−install sphinx from there.

26−

27−sphinx shares listings through %pals. Install it with

28−`|install ~paldev %pals` and add your friends as pals. Without %pals you only

29−see your own listings.

30−

31−### Moving from ~nocsyx-lassul

32−

33−sphinx used to be distributed from ~nocsyx-lassul. Its last release there

34−only supports `[%zuse 412]`, so it can't run on a current ship. On a

35−`[%zuse 412]` ship it blocks the kernel update until you `|bump`. After the

36−kernel check above, switch it to ~donmec-sallud in the dojo:

37−

38−```

39−|install ~donmec-sallud %sphinx

40−```

41−

42−Your listings are kept. Use the dojo for this: Landscape's Get App can't

43−switch an existing install. It asks ~nocsyx-lassul again, and docket refuses

44−because sphinx is already installed.

45−

46−If you ran `|install` before your ship reached `[%zuse 408]`, sphinx stays

47−suspended after the update, and another `|install` only prints

48−`already syncing`. Run `|uninstall %sphinx`, then

49−`|install ~donmec-sallud %sphinx` again. Your listings are kept.

50−

51−## Development

52−

53−The repo has two parts:

54−

55−- `desk/`: the Hoon agent, its marks and libraries, and the docket file.

56−- `ui/`: the web interface, built with [React], [TypeScript],

57− [Tailwind CSS] and [Vite].

59−### Build

15+To get started using sphinx first you need to run `npm install` inside the `ui` directory.

61−With Nix:

17+To develop you'll need a running ship to point to. To do so you first need to add a `.env.local` file to the `ui` directory. This file will not be committed. Adding `VITE_SHIP_URL={URL}` where **{URL}** is the URL of the ship you would like to point to, will allow you to run `npm run dev`. This will proxy all requests to the ship except for those powering the interface, allowing you to see live data.

63−```sh

19+Regardless of what you run to develop, Vite will hot-reload code changes as you work so you don't have to constantly refresh.

64−nix build .#desk -o result-desk # the desk; Nix makes its files read-only

65−nix build .#glob -o result-glob # the UI, built for /apps/sphinx/

66−```

67−

68−To put the desk on a test ship, copy it writable and with `--delete`, as in

69−RELEASING.md step 2. vere aborts at `|unmount` if the mount is read-only.

70−

71−```sh

72−chmod -R u+w result-desk-rw 2>/dev/null; rm -rf result-desk-rw &&

73−cp -RL result-desk result-desk-rw && chmod -R u+w result-desk-rw &&

74−rsync -rpc --delete result-desk-rw/ <pier>/sphinx/

75−```

76−

77−The desk output adds what `desk/` needs from urbit's `base-dev` and

78−landscape's `desk-dev`. Both are pinned in `flake.nix` for the kelvin in

79−`desk/sys.kelvin`. When you port sphinx to a new kernel, update those two

80−inputs together with `desk/sys.kelvin`.

81−

82−Without Nix, run `npm install` and `npm run build` in `ui/` to build the UI

83−into `ui/dist/`. Use the Node version in `ui/.nvmrc`.

84−

85−To publish a release from ~donmec-sallud, follow [RELEASING.md](RELEASING.md).

87−### Working on the UI

21+### Deploying

89−You need a running ship with sphinx installed. In `ui/`:

23+To deploy, run `npm run build` in the `ui` directory which will bundle all the code and assets into the `dist/` folder. This can then be made into a glob by doing the following:

90−

91−1. Run `npm install`.

92−2. Create `ui/.env.local` with `VITE_SHIP_URL=<URL>`, where `<URL>` is your

93− ship's web address, for example `http://localhost:8080`. Git ignores this

94− file.

95−3. Run `npm run dev` and open the address it prints.

96−

97−The dev server sends every request except those for the interface itself to

98−the ship, so you see live data. Vite reloads the page as you change the code.

99−

100−### The tile image

101−

102−The tile is inlined in `desk/desk.docket-0` as a `data:` URI, so Landscape

103−doesn't load it from another server.

104−

105−To get the SVG out:

106−

107−```sh

108−sed -n "s|^ image+'data:image/svg+xml;base64,$.*$'\$|\1|p" desk/desk.docket-0 | base64 -d > tile.svg

109−```

110

111−To put a new one in, print a new `image+` line and replace the old line in

25+1. Create or launch an urbit using the -F flag

112−`desk/desk.docket-0` with it:

26+2. On that urbit, if you don't already have a desk to run from, run `|merge %work our %base` to create a new desk and mount it with `|mount %work`.

27+3. Now the `%work` desk is accessible through the host OS's filesystem as a directory of that urbit's pier ie `~/zod/work`.

28+4. From the `ui` directory you can run `rsync -avL --delete dist/ ~/zod/work/sphinx` where `~/zod` is your fake urbit's pier.

29+5. Once completed you can then run `|commit %work` on your urbit and you should see your files logged back out from the dojo.

30+6. Now run `=dir /=garden` to switch to the garden desk directory

31+7. You can now run `-make-glob %work /sphinx` which will take the folder where you just added files and create a glob which can be thought of as a sort of bundle. It will be output to `~/zod/.urb/put`.

32+8. If you navigate to `~/zod/.urb/put` you should see a file that looks like this `glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob`. The characters between `glob-` and `.glob` are a hash of the glob's contents.

33+9. Now that we have the glob it can be uploaded to any publicly available HTTP endpoint that can serve files. This allows the glob to distributed over HTTP.

34+10. Once you've uploaded the glob, you should then update the corresponding entry in the docket file at `desk/desk.docket-0`. Both the full URL and the hash should be updated to match the glob we just created, on the line that looks like this:

113

114−```sh

36+```hoon

115−printf " image+'data:image/svg+xml;base64,%s'\n" "$(base64 < tile.svg | tr -d '\n')"

37+ glob-http+['https://bootstrap.urbit.org/glob-0v5.fdf99.nph65.qecq3.ncpjn.q13mb.glob' 0v5.fdf99.nph65.qecq3.ncpjn.q13mb]

116```

38```

117

118−Keep the rest of the file as it is. Docket rewrites the file when a glob is

40+11. This can now be safely committed and deployed.

119−uploaded, and the hash copy-back in RELEASING.md should only change the hash.

120−A new tile doesn't need a new glob.

121

122−[react]: https://react.dev/

42+[react]: https://reactjs.org/

123[typescript]: https://www.typescriptlang.org/

43[typescript]: https://www.typescriptlang.org/

124[tailwind css]: https://tailwindcss.com/

44[tailwind css]: https://tailwindcss.com/

125[vite]: https://vitejs.dev/

45[vite]: https://vitejs.dev/

RELEASING.mddeleted−166

@@ -1,166 +0,0 @@

1−# Releasing sphinx

2−

3−sphinx is published from ~donmec-sallud. Ships install it with

4−`|install ~donmec-sallud %sphinx` and then follow it: the desk syncs from

5−~donmec-sallud's `%sphinx` desk, and docket fetches the UI (the glob) over ames

6−from ~donmec-sallud.

7−

8−A release has three parts:

9−

10−1. **Desk**: copy `nix build .#desk` into ~donmec-sallud's mounted `%sphinx`

11− desk and commit it.

12−2. **Glob**: if the UI changed, upload `nix build .#glob` at `/docket/upload`.

13− Docket hashes it and writes the hash into the desk's `desk.docket-0`.

14−3. **Hash copy-back**: copy that `desk.docket-0` back into the repo and commit

15− it.

16−

17−Never skip the copy-back. On every commit of the desk, docket compares the hash

18−in `desk.docket-0` with the glob it serves, and when they differ it drops the

19−glob and waits for a new upload. So a stale hash in the repo takes the UI down

20−at the next release, on ~donmec-sallud and on every ship that installed

21−sphinx, until the glob is uploaded again.

22−

23−## Before you start

24−

25−- [ ] ~donmec-sallud runs a kernel listed in `desk/sys.kelvin`. In its dojo,

26− `+vats %base` prints it on the `/sys/kelvin:` line. If it isn't listed,

27− port the desk to that kernel first.

28−- [ ] Optional: bump `version` in `desk/desk.docket-0`. Landscape and the

29− sphinx footer show it.

30−- [ ] Everything is committed and pushed. The release is whatever the repo

31− builds.

32−

33−The commands below use these shell variables:

34−

35−```sh

36−server=user@host # ssh login of the user that runs ~donmec-sallud's vere and owns the pier

37−pier=/path/to/donmec-sallud # the pier directory on that machine

38−```

39−

40−## 1. Build

41−

42−From the repo root:

43−

44−```sh

45−nix build .#desk -o result-desk

46−nix build .#glob -o result-glob

47−```

48−

49−## 2. Desk

50−

51−First release only, in ~donmec-sallud's dojo:

52−

53−```

54−|new-desk %sphinx

55−|mount %sphinx

56−```

57−

58−Leave the desk mounted. The copy-back in step 4 reads the mounted file.

59−

60−Every release, copy the desk into the mount from a writable copy of the

61−build:

62−

63−```sh

64−chmod -R u+w result-desk-rw 2>/dev/null; rm -rf result-desk-rw &&

65−cp -RL result-desk result-desk-rw && chmod -R u+w result-desk-rw &&

66−rsync -rpc --delete result-desk-rw/ "$server:$pier/sphinx/"

67−ssh "$server" find "$pier/sphinx" '!' -perm -u+w # must print nothing

68−```

69−

70−- The `&&`s stop the copy when an earlier step fails, so a leftover

71− `result-desk-rw` from an interrupted run is never sent.

72−- Send a writable copy. Nix store files and directories are read-only, and

73− `-p` copies their modes into the mount. Don't rely on `rsync --chmod=u+w`:

74− macOS's `rsync` (openrsync) accepts it and ignores it. In a read-only

75− mount, vere aborts when it has to delete a file, for example at

76− `|unmount %sphinx` in step 3, and clay's writes to read-only files fail.

77−- `-c` compares contents. Don't use `rsync -a`: Nix store files all have

78− mtime 1, so with `-a` rsync can skip an edited file of the same size.

79−

80−Then in the dojo:

81−

82−```

83−|commit %sphinx

84−```

85−

86−The dojo lists the changed files, for example

87−`: /~donmec-sallud/sphinx/4/desk/docket-0`. A commit that changes nothing

88−prints nothing. A mark or build error rejects the whole commit, so fix the

89−desk and repeat this step.

90−

91−First release only:

92−

93−```

94−|install our %sphinx

95−|public %sphinx

96−:treaty|publish %sphinx

97−```

98−

99−- `|install our %sphinx` starts the app on ~donmec-sallud. Docket then prints

100− `docket: awaiting manual glob for %sphinx desk` until step 3.

101−- `|public %sphinx` lets other ships read the desk. Without it, clay doesn't

102− answer their requests, so `|install ~donmec-sallud %sphinx` waits without

103− an error. A waiting install continues by itself once the desk is public.

104−- `:treaty|publish %sphinx` lists sphinx under ~donmec-sallud in Landscape's

105− app search. It also makes the desk public.

106−

107−## 3. Glob

108−

109−Upload on the first release and whenever `ui/` changed since the last one. If

110−you're unsure, upload anyway: the same files give the same hash.

111−

112−1. Log in to ~donmec-sallud's web interface in Chrome or Firefox. Safari can't

113− upload folders. `+code` in the dojo prints the password.

114−2. Open `/docket/upload` on that host, pick the desk `sphinx`, choose the

115− `result-glob` folder and press **glob!**. If the folder picker won't follow

116− the `result-glob` symlink, press ⇧⌘G and paste the path that

117− `readlink result-glob` prints.

118−3. The page answers `successfully globbed`.

119−4. Refresh the mount in the dojo:

120−

121− ```

122− |unmount %sphinx

123− |mount %sphinx

124− ```

125−

126− Docket wrote the new hash into clay. vere rewrites a mounted file only

127− while it still holds exactly what clay last wrote there. If the

128− `desk.docket-0` you committed differs in any byte from what docket prints

129− (another layout, or a final newline an editor added), the mounted file

130− keeps the old hash, and any later `|commit %sphinx`, even one with no

131− edits, puts the old hash back and takes the UI down. The remount rewrites

132− the mount from clay. It's harmless when the file is already current, so

133− always do it.

134−

135−## 4. Hash copy-back

136−

137−After every upload and remount:

138−

139−```sh

140−scp "$server:$pier/sphinx/desk.docket-0" desk/desk.docket-0

141−```

142−

143−Only the hash on the `glob-ames` line should change. Commit

144−`desk/desk.docket-0` and push it.

145−

146−## 5. Check

147−

148−- [ ] `/apps/sphinx/` on ~donmec-sallud loads.

149−- [ ] The dojo has not printed `docket: awaiting manual glob for %sphinx desk`

150− since the last commit or upload.

151−- [ ] `+vats %sphinx` shows `app status: running`.

152−- [ ] First release only: another ship can `|install ~donmec-sallud %sphinx`.

153− Its log shows `kiln: merge into %sphinx succeeded` and

154− `docket: fetching %ames glob for %sphinx desk`.

155−- [ ] A ship that installed sphinx shows the release at `/apps/sphinx/`.

156− After a glob upload, it answers 404 until it has downloaded the new

157− glob from ~donmec-sallud.

158−

159−## If the UI is down

160−

161−`docket: awaiting manual glob for %sphinx desk` after a commit means the hash

162−in the desk's `desk.docket-0` doesn't match the glob docket serves, usually

163−because a copy-back or a remount was skipped. Build the glob from the released

164−commit, upload it and remount (step 3), then do the copy-back (step 4). Other

165−ships pick up the corrected `desk.docket-0` and fetch the glob again on their

166−own.

desk/app/sphinx.hoon+43−179

@@ -15,84 +15,13 @@

15 state-1:s

16 state:s

17 ==

18− :: +guard-verb: refuse /verb watches from other ships

19− ::

20− :: lib/verb (here and inside lib/gossip) answers /verb/events and

21− :: /verb/events-plus for anyone, and those carry every poke, card

22− :: and wire of the agent, the mutuals in gossip's wires included

23− ::

24− ++ guard-verb

25− |= inner=agent:gall

26− ^- agent:gall

27− |_ =bowl:gall

28− +* this .

29− ag ~(. inner bowl)

30− ++ on-init

31− ^- (quip card _this)

32− =^ cards inner on-init:ag

33− [cards this]

34− ::

35− ++ on-save on-save:ag

36− ++ on-load

37− |= old=vase

38− ^- (quip card _this)

39− =^ cards inner (on-load:ag old)

40− :: and end the /verb watches other ships made before this guard

41− ::

42− :_ this

43− %+ weld cards

44− %+ murn ~(val by sup.bowl)

45− |= [=ship =path]

46− ^- (unit card)

47− ?. &(?=([%verb *] path) !=(our.bowl ship)) ~

48− `[%give %kick ~[path] `ship]

49− ::

50− ++ on-poke

51− |= [=mark =vase]

52− ^- (quip card _this)

53− =^ cards inner (on-poke:ag mark vase)

54− [cards this]

55− ::

56− ++ on-watch

57− |= =path

58− ^- (quip card _this)

59− ?< &(?=([%verb *] path) !=(our.bowl src.bowl))

60− =^ cards inner (on-watch:ag path)

61− [cards this]

62− ::

63− ++ on-leave

64− |= =path

65− ^- (quip card _this)

66− =^ cards inner (on-leave:ag path)

67− [cards this]

68− ::

69− ++ on-peek on-peek:ag

70− ++ on-agent

71− |= [=wire =sign:agent:gall]

72− ^- (quip card _this)

73− =^ cards inner (on-agent:ag wire sign)

74− [cards this]

75− ::

76− ++ on-arvo

77− |= [=wire =sign-arvo]

78− ^- (quip card _this)

79− =^ cards inner (on-arvo:ag wire sign-arvo)

80− [cards this]

81− ::

82− ++ on-fail

83− |= [=term =tang]

84− ^- (quip card _this)

85− =^ cards inner (on-fail:ag term tang)

86− [cards this]

87− --

88 --

18 --

89=| state:s

19=| state:s

90=* state -

20=* state -

91=<

21=<

92− %- guard-verb

93− %+ verb |

22+ %+ verb &

94 %- %+ agent:gossip

23 %- %+ agent:gossip

95− [2 %mutuals %mutuals |]

24+ [2 %mutuals %mutuals]

96 %- malt

25 %- malt

97 ^- (list [mark $-(* vase)])

26 ^- (list [mark $-(* vase)])

98 :~ [%directory-listing |=(n=* !>((grab-listing n)))]

27 :~ [%directory-listing |=(n=* !>((grab-listing n)))]

@@ -130,11 +59,10 @@

130 ::

59 ::

131 ++ get-state-2

60 ++ get-state-2

132 |= =directory:s

61 |= =directory:s

133− =/ purged (purge-invalid directory)

134 :* %2

62 :* %2

135− (reindex purged)

63+ (reindex directory)

136− purged

64+ directory

137− (purge-foreign purged)

65+ (purge directory)

138 ==

66 ==

139 ++ reindex

67 ++ reindex

140 |= =directory:s

68 |= =directory:s

@@ -142,20 +70,7 @@

142 ~(tap by directory)

70 ~(tap by directory)

143 |= [[=hash:s l=listing:s] i=index:s]

71 |= [[=hash:s l=listing:s] i=index:s]

144 (~(catalog delver i) hash l)

72 (~(catalog delver i) hash l)

145− ++ purge-invalid

73+ ++ purge

146− |= =directory:s

147− ^- directory:s

148− %- malt

149− %+ skim

150− ~(tap by directory)

151− |= [=hash:s =listing:s]

152− :: the old %directory handler kept peers' entries under any key

153− ::

154− ?& =(hash hash.listing)

155− =(hash (digest post.listing))

156− (listing-valid listing)

157− ==

158− ++ purge-foreign

159 |= =directory:s

74 |= =directory:s

160 ^- directory:s

75 ^- directory:s

161 %- malt

76 %- malt

@@ -218,16 +133,13 @@

218 cor

133 cor

219 ::

134 ::

220 %remove

135 %remove

221− ?> from-self

222 =+ !<(=hash:s vase)

136 =+ !<(=hash:s vase)

223 di-abet:di-remove:(di-abed:di-core hash)

137 di-abet:di-remove:(di-abed:di-core hash)

224 ==

138 ==

225 ++ publish

139 ++ publish

226 |= [=declare:s core=_cor]

140 |= [=declare:s core=_cor]

227 ^+ cor

141 ^+ cor

228− :: .core accumulates a %declarations batch: a skipped listing must

142+ ::

229− :: return it, not the pre-batch .cor, or the batch so far is lost

230− ::

231 ?> from-self

143 ?> from-self

232 =/ listing

144 =/ listing

233 :* post=q.declare

145 :* post=q.declare

@@ -236,10 +148,9 @@

236 source=our.bowl

148 source=our.bowl

237 time=now.bowl

149 time=now.bowl

238 ==

150 ==

239− ?: (~(has by directory.core) hash.listing)

151+ ?: (~(has by directory) hash.listing)

240 ~& 'Listing already exists.'

152 ~& 'Listing already exists.'

241− core

153+ cor

242− ?. (listing-valid listing) core

243 di-abet:(di-publish:(di-abed:di-core:core hash.listing) listing)

154 di-abet:(di-publish:(di-abed:di-core:core hash.listing) listing)

244 --

155 --

245::

156::

@@ -248,7 +159,7 @@

248 ^+ cor

159 ^+ cor

249 ?+ path ~|(bad-watch-path/path !!)

160 ?+ path ~|(bad-watch-path/path !!)

250 [%~.~ %gossip %source ~]

161 [%~.~ %gossip %source ~]

251− (give %fact ~ directory+!>(directory))

162+ (give %fact ~ directory+!>(published))

252 ==

163 ==

253++ agent

164++ agent

254 |= [=wire =sign:agent:gall]

165 |= [=wire =sign:agent:gall]

@@ -266,28 +177,16 @@

266 =+ !<(=listing:s vase)

177 =+ !<(=listing:s vase)

267 ?> =(hash.listing (digest post.listing))

178 ?> =(hash.listing (digest post.listing))

268 ?: (~(has by directory) hash.listing)

179 ?: (~(has by directory) hash.listing)

269− ~& 'Listing already exists.'

180+ ~& 'Listing already exists.'

270− cor

181+ cor

271− ?. (listing-valid listing) cor

272− di-abet:(di-receive:(di-abed:di-core hash.listing) listing)

182+ di-abet:(di-publish:(di-abed:di-core hash.listing) listing)

273 ::

183 ::

274 %directory

184 %directory

275 =+ !<(d=directory:s vase)

185 =+ !<(d=directory:s vase)

276− :: take only listings we don't have yet that pass the checks a

186+ =. directory (~(uni by directory) d)

277− :: %directory-listing gets: a peer's map must not replace our

278− :: listings, and each listing may be indexed only once

279− ::

280− =/ new=(list [=hash:s =listing:s])

281− %+ skim ~(tap by d)

282− |= [=hash:s l=listing:s]

283− ?& =(hash hash.l)

284− =(hash (digest post.l))

285− !(~(has by directory) hash)

286− (listing-valid l)

287− ==

288− =. directory (~(gas by directory) new)

289 =. index

187 =. index

290− %+ roll new

188+ %+ roll

189+ ~(tap by d)

291 |= [[=hash:s l=listing:s] i=_index]

190 |= [[=hash:s l=listing:s] i=_index]

292 (~(catalog delver i) hash l)

191 (~(catalog delver i) hash l)

293 cor

192 cor

@@ -308,34 +207,6 @@

308 ::

207 ::

309 [%x %state ~]

208 [%x %state ~]

310 ``noun+!>(state)

209 ``noun+!>(state)

311− [%x %tags ~]

312− =- ``tags+!>(-)

313− %+ roll

314− ~(tap by directory)

315− |= [[=hash:s =listing:s] tags=(map @t @ud)]

316− %-

317− %- ~(uno by tags)

318− %- malt

319− %+ turn

320− tags.post.listing

321− |=(tag=@t [tag 1])

322− |= [key=@t a=@ud b=@ud]

323− (add a b)

324− ::

325− [%x %lookup %tag @ @ @ ~]

326− =- ``search+!>(-)

327− ^- search:s

328− =/ start (slav %ud i.t.t.t.path)

329− =/ limit (slav %ud i.t.t.t.t.path)

330− =/ tag (slav %t i.t.t.t.t.t.path)

331− %^ page start limit

332− %+ sort

333− %+ skim

334− ~(val by directory)

335− |= =listing:s

336− !=(~ (find ~[tag] tags.post.listing))

337− |= [a=listing:s b=listing:s]

338− (lth time.b time.a)

339 ::

210 ::

340 [%x %lookup @ @ @ $@(~ [@ ~])]

211 [%x %lookup @ @ @ $@(~ [@ ~])]

341 =- ``search+!>(-)

212 =- ``search+!>(-)

@@ -350,38 +221,36 @@

350 `@t`(slav %t i.t.t.t.t.t.path)

221 `@t`(slav %t i.t.t.t.t.t.path)

351 ~

222 ~

352 :: expects encoded @t values)

223 :: expects encoded @t values)

353− %^ page start limit

224+ =/ all

354− ?~ term

225+ ?~ term

226+ %+ skim

227+ ~(val by directory)

228+ |= =listing:s

229+ |(=(filter %all) =(filter type.post.listing))

230+ =/ entries (~(get-entries delver index) term)

231+ :: ~& %+ turn

232+ :: entries

233+ :: |= [=hash:s =rank:s]

234+ :: [(~(got by directory) hash) rank]

355 %+ skim

235 %+ skim

356− ~(val by directory)

236+ %- get-listings

237+ %- get-hashes

238+ %- sort-entries

239+ entries

357 |= =listing:s

240 |= =listing:s

358 |(=(filter %all) =(filter type.post.listing))

241 |(=(filter %all) =(filter type.post.listing))

359− =/ entries (~(get-entries delver index) term)

360− :: ~& %+ turn

361− :: entries

362− :: |= [=hash:s =rank:s]

363− :: [(~(got by directory) hash) rank]

364− %+ skim

365− %- get-listings

366− %- get-hashes

367− %- sort-entries

368− entries

369− |= =listing:s

370− |(=(filter %all) =(filter type.post.listing))

371− ==

372−++ page

373− |= [start=@ud limit=@ud all=(list listing:s)]

374− =/ listings (swag [start limit] all)

242+ =/ listings (swag [start limit] all)

375− :* listings

243+ :* listings

376− start

244+ start

377− limit

245+ limit

378− (lent listings)

246+ (lent listings)

379− (lent all)

247+ (lent all)

248+ ==

380 ==

249 ==

381++ get-listings

250++ get-listings

382 |= l=(list hash)

251 |= l=(list hash)

383− %+ murn l

252+ %+ turn l

384− |=(=hash:s (~(get by directory) hash))

253+ |=(=hash:s (~(got by directory) hash))

385++ from-self =(our src):bowl

254++ from-self =(our src):bowl

386++ di-core

255++ di-core

387 |_ [=listing:s =hash:s gone=_|]

256 |_ [=listing:s =hash:s gone=_|]

@@ -396,7 +265,7 @@

396 di-core(hash h, listing (~(gut by directory) h *listing:s))

265 di-core(hash h, listing (~(gut by directory) h *listing:s))

397 ++ di-remove

266 ++ di-remove

398 =. gone &

267 =. gone &

399− =/ keys (~(gut by trail.index) hash ~)

268+ =/ keys (~(got by trail.index) hash)

400 =. trail.index (~(del by trail.index) hash)

269 =. trail.index (~(del by trail.index) hash)

401 =. lookup.index

270 =. lookup.index

402 ^- lookup:s

271 ^- lookup:s

@@ -418,14 +287,9 @@

418 =. listing l

287 =. listing l

419 =. index (~(catalog delver index) hash l)

288 =. index (~(catalog delver index) hash l)

420 =. published

289 =. published

421− ?. =(source.listing our:bowl) published

290+ ?. =(src our):bowl published

422− (~(put by published) hash.listing listing)

291+ (~(put by directory) hash.listing listing)

423 =. cor (emit (invent:gossip %directory-listing !>(listing)))

292 =. cor (emit (invent:gossip %directory-listing !>(listing)))

424 di-core

293 di-core

425− ++ di-receive

426− |= l=listing:s

427− =. listing l

428− =. index (~(catalog delver index) hash l)

429− di-core

430 --

294 --

431--

295--

desk/desk.docket-0+10−11

@@ -1,11 +1,10 @@

1−:~

2− title+'sphinx'

1+:~ title+'sphinx'

3− info+'A search engine powered by you and your pals for finding answers to your riddles'

2+ info+'An app for answering all your riddles'

4− color+0xb2.5068

3+ color+0xb2.5068

5− version+[0 7 0]

4+ image+'https://nyc3.digitaloceanspaces.com/hmillerdev/nocsyx-lassul/2022.7.16..04.35.22-sphinx-web-shifted.svg'

5+ glob-http+['https://nyc3.digitaloceanspaces.com/hmillerdev/sphinx/glob-0v4.mkqik.qlhbj.1hm8n.opr21.tjb70.glob' 0v4.mkqik.qlhbj.1hm8n.opr21.tjb70]

6+ base+'sphinx'

7+ version+[0 2 0]

6− website+'https://github.com/iko-soy/sphinx'

8+ website+'https://github.com'

7− license+'MIT'

9+ license+'MIT'

8− image+'data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-30 15 600 600" fill="none"><style>.st1{fill:#e7ab79}</style><path class="st1" d="M294.69 562.96c-3.34 0-6.68-.09-10.02.02-7.59.25-15.1-.2-22.55-1.85-9.54-2.12-17.85-6.57-24.62-13.53-4.15-4.27-7.97-8.94-11.4-13.81-10.42-14.82-20.49-29.89-30.86-44.75-11.88-17.02-24.04-33.85-35.88-50.9-8.43-12.14-16.56-24.48-24.72-36.8-2.01-3.04-4.57-5.16-7.76-6.88-21.33-11.51-38.84-27.18-51.46-48.03-3.64-6.02-7.27-12.06-10.5-18.3-4.56-8.81-6.98-18.39-9.04-28.04-4.67-21.86-2.49-43.12 6.68-63.45 5.78-12.82 11.93-25.5 18.66-37.84 14.67-26.92 31.19-52.67 50.37-76.65 8.48-10.6 17.53-20.65 28.09-29.26 20.2-16.47 42.97-27.94 67.99-35.05 8.47-2.41 17.05-4.18 25.81-5.26 6.97-.86 13.82-2.61 20.78-3.6 8.18-1.15 16.4-2.04 24.63-2.78 9.45-.85 18.93-1.58 28.41-2.04 14.99-.73 29.85.72 44.64 3.25 23.6 4.03 46.85 9.56 69.98 15.68 3.05.81 6.01 1.98 9.05 2.85 3.19.91 4.46 3.04 4.57 6.23.28 8.79.74 17.57.99 26.36.15 5.45.08 10.91.03 16.36-.04 3.57.65 6.97 1.78 10.34 3.47 10.34 6.93 20.68 10.3 31.04 3.1 9.53 6.05 19.11 9.17 28.63 1.2 3.67 2.48 7.35 4.14 10.82 8.32 17.47 16.72 34.9 25.19 52.29 5.78 11.86 11.72 23.63 17.6 35.45.63 1.26 1.19 2.55 1.89 3.77 4.7 8.28 3.84 16.59-.09 24.77-2.59 5.39-5.52 10.61-8.39 15.86-5.4 9.88-10.76 19.78-16.32 29.57-3.3 5.81-4.66 12.01-5.13 18.61-1.3 18.41-3.07 36.78-5.91 55.04-1.79 11.46-2.91 23.02-4.47 34.52-1.54 11.32-3.2 22.63-4.91 33.92-2 13.21-4.17 26.4-6.11 39.62-.38 2.6-1.13 4.74-3.3 6.28-.43.3-.8.68-1.21 1.02-7.97 6.77-7.97 6.81-18.5 7.01-6.68.12-13.37.12-20.05.14-1.23 0-2.46-.1-3.69-.19-2.31-.16-3.86-1.17-4.71-3.5-2.27-6.28-4.73-12.48-7.08-18.73-1.11-2.96-2.2-5.93-3.21-8.92-.53-1.59-1.67-2.35-3.17-2.27-3.5.19-7.03.38-10.46 1.01-1.1.2-2.24 1.64-2.83 2.79-1.31 2.53-3.26 3.38-5.99 3.42-15.65.24-31.3.56-46.95.91-2.33.05-4.13-.57-5.24-2.72-.63-1.21-1.66-1.67-3.05-1.63-5.45.14-10.91.17-16.36.33-2.59.08-3.26.99-2.23 3.33 3.34 7.56 6.83 15.05 10.28 22.56.95 2.08 2.06 4.09 2.9 6.21 1.15 2.93.51 4.41-2.62 4.92-5.2.85-10.45 1.54-15.7 1.81-5.79.31-11.6.07-17.41.07-.03.01-.03-.01-.03-.03zm77.94-401.47c-4.95.14-10.93.18-16.9.5-7.9.42-15.79 1.08-23.51 3-15.45 3.85-30.08 9.79-44.02 17.45-2.45 1.35-4.82 2.96-6.9 4.82-1.79 1.6-3.59 3.52-4.57 5.66-3.06 6.71-6.08 13.48-8.49 20.44-3.52 10.18-4.2 20.73-1.57 31.21 4.51 18.01 12.51 34.33 24.89 48.32 8.33 9.42 18.03 17.29 28.54 24.11 3.51 2.28 7.36 4.17 11.28 5.68 5.41 2.08 11.03 3.6 16.53 5.44 2.24.75 4.35.75 6.68.18 11.44-2.82 22.9-5.54 34.39-8.14 7.2-1.63 14.5-2.83 21.68-4.53 5.65-1.34 9.6.53 12.44 5.37.62 1.06 1.28 2.11 2 3.11 1.13 1.57 2.24 1.6 3.21-.15 4.87-8.76 9.81-17.49 13.09-27.03 4.93-14.31 4.8-29.06 3.67-43.85-.78-10.16-1.97-20.29-2.94-30.44-.32-3.36-1.03-4.08-4.34-3.44-5.79 1.11-11.54.87-17.32-.01-2.61-.4-5.21-.79-7.83-1.12-1.62-.2-2.47.79-1.76 2.2 1.26 2.5 2.64 4.97 4.15 7.33 3.13 4.89 6.34 9.73 9.61 14.52 2.39 3.51 2.89 7.21 1.07 11-2.41 5.02-4.26 10.52-9.72 13.36-1.44.75-1.98 2.12-1.6 3.57.39 1.48 1.1 2.9 1.85 4.25 1.11 1.98 2.49 3.81 3.55 5.81.93 1.76 1.18 3.8.31 5.62-1.17 2.47-1.46 4.92-1.26 7.64.25 3.46-1.52 5.79-4.91 6.5-2.72.57-5.58.75-8.37.65-10.02-.35-20.03-.64-30.04.32-1.74.17-3.52.19-5.27.1-1.99-.11-3.17-1.02-3.02-2.23.23-1.88 1.79-1.94 3.19-2.03 5.26-.35 10.53-.85 15.8-.89 6.5-.05 12.99.36 19.49.43 2.25.02 4.54-.23 6.76-.63 1.28-.23 2.13-1.3 2.04-2.71-.1-1.53-.84-2.74-2.45-3.01-1.2-.21-2.45-.21-3.68-.24-4.4-.09-8.8-.03-13.19-.25-6.44-.31-12.59.85-18.58 3.13-2.46.93-4.96 1.88-7.53 2.36-1.83.34-3.91.27-5.67-.28-3.08-.96-3.91-4.41-1.73-6.8 1.03-1.13 2.46-1.98 3.85-2.69 4.23-2.15 8.56-4.12 12.8-6.25 7.98-4.01 16.42-6.19 25.34-6.53 1.4-.05 2.82-.14 4.18-.46.52-.12 1.31-1.04 1.22-1.4-.19-.71-.78-1.52-1.43-1.84-.74-.36-1.72-.32-2.59-.29-4.39.19-8.77.5-13.17.63-3.15.09-6.31.13-9.45-.11-2.02-.16-3.03-1.29-2.81-2.48.32-1.74 1.73-2.03 3.17-2.23.35-.05.7-.04 1.05-.06 5.8-.17 11.61-.23 17.4-.56 3.67-.21 7.34-.72 10.97-1.32 2.08-.35 4.12-1.13 5.24-3.17.21-.39.2-.98.1-1.43-.04-.18-.6-.36-.91-.35-10.71.52-21.42 1.08-32.13 1.6-2.58.13-4.82 1.09-6.67 2.81-1.79 1.67-3.41 3.53-5.08 5.34-.71.77-1.23 1.75-2.03 2.39-.43.35-1.39.43-1.91.19s-1-.99-1.11-1.59c-.11-.63.06-1.46.41-2 4.13-6.41 8.94-11.74 17.41-11.96 8.09-.21 16.17-.65 24.24-1.08 2.81-.15 5.61-.51 8.39-.9 3.56-.5 4.78-2.75 3.23-6-.68-1.42-1.64-2.7-2.51-4.02-3.59-5.43-7.31-10.77-10.76-16.29-2.91-4.65-5.4-9.63-5.4-15.24 0-6.85.51-13.69.81-20.54.02-.35.16-.68.22-1.03 1.04-6.34 4.73-10.43 10.72-12.55 8.44-2.98 16.83-3.53 25.11.57.63.31 1.27.62 1.92.88 2.16.85 2.78.58 3.33-1.74 1.55-6.51.9-6.16-4.35-7.8-9.78-3.06-19.82-4.64-29.99-5.71-12.25-1.26-24.49-2.33-37.86-1.09zm-157.08 6.29c-1.34-10.1-2.5-20.23-4.06-30.3-2.47-15.97-5.21-31.91-7.84-47.85-.09-.52-.14-1.05-.27-1.55-.27-1.01-1.22-1.23-2-.45-.49.5-.94 1.04-1.38 1.59-17.03 21.28-33.91 42.67-49.99 64.68-8.72 11.93-17.02 24.14-24.52 36.88-6.89 11.7-12.68 23.91-16.76 36.89-2.71 8.63-4.01 17.41-3.11 26.5 1.05 10.66 1.76 21.36 2.68 32.04.71 8.23 1.39 16.46 2.32 24.66.76 6.73 1.24 6.96 7.93 6.46 14.02-1.05 28.04-2.03 42.05-3.13 5.25-.41 10.48-1.16 15.73-1.63 9.27-.83 18.42-2.85 27.79-2.63 1.22.03 2.46-.17 3.67-.39 2.17-.4 2.54-1.13 1.82-3.35-.16-.5-.38-.98-.59-1.47-3.97-9.6-7.18-19.44-9.89-29.47-.53-1.95-1.77-3.78-2.95-5.47-2.72-3.88-5.89-7.47-8.39-11.49-8.89-14.3-13.75-29.54-10.55-46.66 1.92-10.29 6.18-19.35 12.96-27.28 4.4-5.15 9.87-8.37 16.57-9.46 1.21-.2 2.41-.48 3.63-.67 5.47-.85 5.47-.84 5.15-6.45zm45.01 64.1c-.41-7.41 1.06-14.64 3.61-21.62 1.93-5.27 4.42-10.34 6.55-15.55 3.31-8.08 9.3-13.58 16.92-17.37 7.4-3.68 14.83-7.33 22.48-10.44 10.12-4.11 20.55-7.52 31.47-8.56 11.37-1.09 22.8-1.6 34.21-2.1 13.38-.59 26.72.19 40 1.98 7.67 1.03 15.33 2.09 22.75 4.43 2.18.69 4.39 1.29 6.61 1.79 1.59.36 2.3-.18 2.54-1.81.18-1.21.21-2.45.25-3.68.28-7.56.5-15.12.83-22.68.13-2.98.59-5.96.67-8.94.09-3.15-.7-4.02-3.89-4.5-11.65-1.73-23.31-3.45-34.98-5.07-2.42-.34-4.91-.29-7.37-.26-1.62.02-2.59 1.02-2.78 2.63-.12 1.04-.11 2.1-.15 3.16-.23 5.8-.4 11.6-.69 17.39-.21 4.01-1.47 5.17-5.67 5.15-2.63-.01-5.26-.42-7.9-.45-4.21-.05-8.49-.38-12.61.26-3.75.58-6.1-.63-7.99-3.53-1.25-1.91-2.55-3.8-3.68-5.79-3.03-5.36-6.15-10.68-8.89-16.18-1.39-2.8-3.12-3.9-6.19-3.59-8.4.85-16.85 1.2-25.2 2.35-25.11 3.43-49.86 8.81-74.49 14.7-8.71 2.08-17.28 4.79-25.87 7.37-3.42 1.03-3.73 1.53-3.36 4.89.86 7.86 1.91 15.71 2.81 23.56.35 3.02 1.54 5.02 4.64 6.25 6.89 2.73 11.49 8.02 14.27 14.78 1.47 3.56 2.63 7.28 3.59 11.02 2.68 10.38 4.98 20.86 7.8 31.2 3.88 14.25 7.9 28.46 12.22 42.58 4.82 15.74 14.12 28.67 26.59 39.23 7.24 6.13 14.98 11.67 22.47 17.51 7.54 5.88 15.72 10.7 24.59 14.22 4.54 1.8 7.63 4.85 9.8 9.07 2.49 4.85 5.21 9.59 7.49 14.54 11.39 24.77 22.68 49.59 34 74.39.58 1.28 1.12 2.59 1.74 3.84 1.01 2.02 1.81 2.1 3.52.43 4.53-4.43 4.81-5.71 2.1-11.54-6.6-14.19-13.22-28.38-19.9-42.54-3.3-6.99-7.15-13.75-10-20.92-5.02-12.6-10.66-24.89-16.63-37.06-1.2-2.45-2.84-3.82-5.36-4.55-3.38-.98-6.68-2.21-10.04-3.23-6.8-2.07-13.08-5.18-18.81-9.35-4.26-3.11-8.47-6.29-12.59-9.59-19.76-15.84-32.29-36.4-39.31-60.53-1.61-5.61-2.49-11.33-2.17-17.29zm76.24 120.04c-1.82-.92-2.86-1.44-3.89-1.97-4.38-2.24-8.99-4.13-13.09-6.8-12.08-7.89-23.76-16.36-34.55-25.96-12.32-10.95-21.56-24.05-26.71-39.84-1.04-3.17-2.18-6.32-3.12-9.52-6.41-21.76-11.82-43.78-16.97-65.86-1.21-5.2-3.05-10.1-6.16-14.45-3.08-4.3-7.06-7.72-12.34-8.36-10.22-1.25-19.73.5-26.63 9.14-11.81 14.82-15.31 31.46-9.69 49.58 5.38 17.34 16.28 30.98 30.23 42.3 4.17 3.38 9 5.51 14.34 6.24 1.52.21 3.18.18 4.67-.18 8.22-1.99 12.42-10.33 9.07-18.12-1.18-2.73-2.86-5.24-4.23-7.9-.55-1.07-1.02-2.23-1.22-3.41-.09-.52.43-1.41.93-1.7.49-.29 1.42-.26 1.94.02.74.4 1.46 1.05 1.87 1.78 2.07 3.67 4.23 7.31 5.98 11.13 1.35 2.93 1.31 6.11.45 9.3-1.2 4.41-3.35 8.17-7.13 10.75-2.52 1.72-2.92 3.73-1.75 6.34.36.8.59 1.65.9 2.48 5.8 15.59 15.24 28.86 26.44 40.94 4.96 5.34 11.01 9.27 17.67 12.23 3.37 1.5 6.79 2.91 10.07 4.6 6.31 3.24 13.06 4.07 19.97 3.81 2.59-.1 5.32-.61 7.67-1.64 4.67-2.04 9.38-3.81 15.28-4.93zm118.43-219.96c-.3.07-.6.14-.91.21-.19 1.2-.5 2.4-.55 3.61-.24 5.27-.38 10.54-.6 15.81-.35 8.25-.36 16.53-2.45 24.6-2.22 8.53-3.43 17.22-3.69 26.01-.47 16.54.57 32.99 2.73 49.42 1.61 12.23 1.55 24.55-.99 36.73-.18.86-.44 1.71-.53 2.58-.2 2.06.41 3.03 2.41 3.36 2.6.43 5.22.79 7.84.94 8.77.51 17.55.84 26.32 1.39 6.66.42 13.31 1.05 19.96 1.62 5.25.45 10.5 1.02 15.75 1.39 4.55.32 5.39-.73 3.93-5.15-.88-2.65-2.16-5.19-3.42-7.69-5.13-10.21-10.44-20.33-15.45-30.6-9.49-19.43-18.85-38.91-28.17-58.42-1.58-3.32-2.84-6.81-3.99-10.31-5.45-16.7-10.8-33.44-16.21-50.16-.57-1.81-1.31-3.57-1.98-5.34zm-145.39 264.4c.23.81.42 2.03.92 3.11.96 2.07 2.1 4.06 3.17 6.08 5.91 11.2 12.01 22.3 17.67 33.63 5.97 11.96 11.5 24.14 17.23 36.21 1.51 3.18 3.02 6.36 4.65 9.47 1.11 2.11 1.87 2.11 3.55.37 4.99-5.19 9.96-10.42 15.02-15.54 3.09-3.13 6.43-6 9.5-9.15 6.36-6.53 6.4-4.31 2.4-13.36-7.39-16.73-15.07-33.34-22.65-49.99-4.74-10.4-9.49-20.8-14.31-31.17-1.18-2.55-2.63-4.98-3.95-7.46-.75-1.41-1.89-1.86-3.5-1.73-4.43.34-8.67 1.29-12.75 3.08-4.26 1.87-7.34 4.73-8.72 9.28-2.5 8.24-5.05 16.47-7.57 24.71-.2.66-.36 1.35-.66 2.46zm-31.62 26.67c3.37.03 4.13-.61 4.62-2.99.11-.52.11-1.05.21-1.57 2.73-14.87 5.45-29.73 8.19-44.6.61-3.28 1.35-6.54 1.91-9.84.54-3.22.19-3.9-2.75-5.49-1.7-.92-3.46-1.74-5.25-2.46-11.9-4.76-21.5-12.45-29.38-22.51-9.06-11.57-16.84-23.85-21.4-37.93-.86-2.67-2.23-4.01-5.19-4.21-7.24-.5-13.53-3.53-19.18-8-.96-.76-1.93-1.52-2.97-2.17-.14-.09-.99.48-.96.63.29 1.37.66 2.73 1.08 4.06 3.29 10.42 7.79 20.35 12.19 30.33 5.67 12.87 11.28 25.77 16.77 38.71 6.04 14.24 11.94 28.55 17.84 42.85 2.1 5.08 5.03 9.67 8.11 14.16 2.73 3.97 6.38 7.05 10.74 9.13 2.03.98 4.27 1.51 5.42 1.9zm122.21 64.48c5.62 0 11.25-.13 16.86.05 3.07.1 5.3-.96 7.41-3.14 5.61-5.81 11.4-11.45 17.12-17.16 6.1-6.08 12.28-12.07 18.26-18.27 2.42-2.51 4.54-5.35 6.48-8.25 1.4-2.09.5-3.84-2.03-4.06-2.78-.25-5.62-.21-8.41.03-5.6.48-11.2 1-16.75 1.82-10.94 1.62-21.85 3.48-32.77 5.2-2.36.37-4.3 1.3-5.86 3.17-8.9 10.69-19 20.22-29 29.85-2.78 2.68-5.51 5.43-8.11 8.28-.98 1.07-2.89 2.23-1.82 3.86.45.68 2.58.45 3.92.33 11.54-1.03 23.08-2.1 34.7-1.71zm-131.31-62.04c.32 1.18.4 1.86.68 2.45 5.28 11.3 10.32 22.73 15.94 33.86 8.96 17.73 18.41 35.2 26.21 53.49.28.65.61 1.26.93 1.89.69 1.38 1.82 2.21 3.34 2.21 5.62 0 11.24-.05 16.86-.18 1.27-.03 1.76-1.02 1.28-2.29-.43-1.15-1-2.25-1.53-3.35-3.58-7.44-7.14-14.9-10.77-22.32-7.74-15.79-15.12-31.73-21.62-48.07-.84-2.12-1.62-4.32-2.81-6.24-3.49-5.67-8-9.8-15.35-9.03-3.21.34-6.3-.18-9.33-1.25-1.11-.39-2.24-.69-3.83-1.17zm-140.05-88.84c4.97-.37 8.65-.78 12.33-.9 18.8-.61 37.57-1.71 56.3-3.49 6.3-.6 12.57-1.42 18.85-2.19 2.46-.3 3-1.23 2.02-3.58-1.23-2.91-2.65-5.75-3.91-8.65-.87-2.01-2.3-3-4.5-2.94-5.27.15-10.61-.24-15.79.48-23.18 3.19-46.49 4.79-69.83 6.05-1.75.09-3.51.25-5.25.51-3.35.51-3.76 1.29-2.1 4.03 1.18 1.95 2.69 3.72 3.76 5.73 2.04 3.88 4.87 5.93 8.12 4.95zM384.63 140.3c0 .08.01.16.01.24 2.1.18 4.2.46 6.31.5 2.99.05 3.77-.66 3.91-3.68.18-3.69.3-7.39.2-11.07-.19-7.02-.07-14.02-1.01-21.04-.86-6.45-3.94-11.19-8.84-14.96-2.21-1.7-4.72-3.02-7.18-4.37-3.2-1.75-3.46-2.14-2.82-5.83.12-.69.43-1.37.43-2.06-.02-3.5.39-7.1-.29-10.48-1.33-6.52-5.93-10.68-11.77-13.28-3.34-1.49-7.02-2.22-10.55-3.27-7.2-2.15-13.92-.51-20.36 2.79-6.09 3.11-7.64 5.9-6.93 12.7.46 4.44 1.66 8.8 5.14 11.81 4.68 4.04 9.8 7.34 16.22 8.23 4.79.66 5.97 2.36 5.39 7.23-.74 6.27.19 12.31 2.26 18.15 3.36 9.51 8.78 17.98 14.07 26.49 1.39 2.24 3.27 2.78 5.84 2.47 3.29-.42 6.64-.41 9.97-.57zm-218.5 236.51v-.1c10.35-.43 20.7-.86 31.04-1.29.53-.02 1.05-.11 1.57-.14 11.39-.64 22.78-1.27 34.16-1.9.88-.05 1.76.01 2.63-.06 1.67-.13 2.17-.83 1.55-2.46-1.23-3.29-2.56-6.54-3.89-9.79-1.79-4.4-2.85-5.05-7.52-4.72-8.05.56-16.1 1.28-24.16 1.62-14.21.6-28.43.92-42.64 1.44-4.73.18-9.46.58-14.18.97-1.92.16-2.4 1.23-1.3 2.88 2.52 3.8 5.17 7.53 7.71 11.32 1.09 1.63 2.58 2.25 4.47 2.24 3.54-.03 7.05-.01 10.56-.01zm56.4 64.6c0 .04 0 .09.01.13 13.32-.49 26.65-.98 39.97-1.48 1.4-.05 2.82-.08 4.2-.28 1.79-.26 2.48-1.33 1.76-2.98-1.76-4.02-3.66-7.97-5.53-11.93-.75-1.6-2.09-2.28-3.82-2.32-1.05-.02-2.1-.11-3.16-.1-11.93.09-23.87.08-35.8.34-8.06.17-16.12.72-24.18 1.1-4.03.19-8.06.34-12.09.62-1.95.14-2.61 1.2-1.71 2.83 2.39 4.29 4.9 8.52 7.39 12.74.76 1.3 1.94 1.98 3.49 1.96 1.4-.01 2.81.05 4.21.01 8.43-.2 16.85-.43 25.26-.64zm-4.29-106.57c-2.37.2-3.96.25-5.52.47-22.84 3.19-45.83 4.42-68.86 5.09-4.39.13-8.77.5-13.15.87-1.64.14-2.23 1.26-1.33 2.56 2.61 3.75 5.33 7.42 8.04 11.1.96 1.3 2.3 1.24 3.8 1.16 14.74-.86 29.48-1.68 44.22-2.44 10.53-.54 21.07-.95 31.61-1.47 2.81-.14 5.61-.45 8.41-.73 3.13-.31 3.56-.99 2.35-4.13-1.07-2.79-2.45-5.46-3.47-8.27-1.21-3.36-3.37-4.81-6.1-4.21zm-12.44 66.71h-31.87c-1.4 0-2.81-.04-4.21.06-1.27.09-1.82 1.09-1.17 2.25 1.55 2.75 3.23 5.43 4.82 8.16 4.81 8.24 4.81 8.23 14.39 7.68 9.81-.57 19.62-1.35 29.44-1.63 12.27-.36 24.55-1.47 36.84-.46.87.07 1.76.04 2.63-.01 1.77-.11 2.19-.87 1.3-2.38-2.13-3.63-4.37-7.2-6.38-10.89-1.03-1.9-2.39-2.93-4.53-3.03-4.55-.21-9.1-.68-13.64-.62-8.94.12-17.88.54-27.62.87zm-.47-4.77v-.47c12.47-.17 24.94-.33 37.41-.5.18 0 .35 0 .53-.01 3.24-.2 3.86-.99 2.71-3.89-1.29-3.26-2.89-6.41-4.15-9.69-1.11-2.9-3.15-4.07-6.1-4-5.62.13-11.25.11-16.86.4-15.61.81-31.21 1.78-46.82 2.6-4.56.24-9.14.16-13.7.32-1.62.06-2.25 1.1-1.5 2.5 1.58 2.94 3.46 5.72 4.92 8.71 1.53 3.1 3.79 4.12 7.19 4.07 12.12-.14 24.25-.04 36.37-.04zm60.74 108.32c0 .08.01.16.01.23 5.97-.25 11.93-.54 17.9-.72 4.74-.14 9.49-.12 14.23-.23 2.67-.06 3.09-.72 1.9-3.25-1.78-3.82-3.83-7.52-5.52-11.38-1.32-2.99-3.39-4.3-6.6-3.99-1.05.1-2.11.01-3.16.06-7.9.33-15.79.87-23.69.97-12.99.15-25.98 1.41-38.98.37-.35-.03-.7-.02-1.05 0-2.29.11-2.84 1.02-1.57 3.03 2.53 4.01 5.37 7.83 7.76 11.93 2.06 3.53 4.82 4.51 8.76 4.26 9.99-.61 20-.87 30.01-1.28zm-48.92-41.75c7.92-.35 15.29-.7 22.65-1 11.22-.46 22.45-.89 33.67-1.35 1.04-.04 2.1-.15 3.11-.41 1.4-.36 1.98-1.43 1.37-2.84-1.6-3.7-3.32-7.36-5.04-11-.66-1.4-1.89-2.03-3.42-2.03-1.23 0-2.46.01-3.68.07-5.26.28-10.51.72-15.77.85-17.02.42-34.04.72-51.06 1.07-.7.01-1.41 0-2.1.06-2.25.21-2.68 1.04-1.47 3.14 2.02 3.49 4.22 6.89 6.17 10.41 1.27 2.29 3.08 3.12 5.61 3.05 3.49-.1 7-.02 9.96-.02zm22.27 19.05v.18c14.74-.51 29.49-1.02 44.23-1.53.88-.03 1.76-.03 2.62-.18 2.12-.36 2.77-1.4 1.96-3.3-.76-1.77-1.68-3.48-2.59-5.18-3.85-7.27-3.08-6.85-11.28-6.53-18.43.7-36.85 1.4-55.28 2.07-3.33.12-6.68.06-10.01.18-1.63.06-2.21 1.05-1.4 2.49 1.63 2.91 3.44 5.72 5.09 8.62 1.25 2.2 3.04 3.23 5.58 3.21 7.03-.06 14.06-.03 21.08-.03zm25.63 27.96c-3.69 0-10.56-.07-17.41.03-3.69.06-7.38.36-11.06.66-1.69.14-2.17 1.13-1.16 2.54 2.98 4.14 6.06 8.2 9.13 12.28 1.32 1.75 3.22 1.97 5.22 1.85 4.91-.3 9.82-.7 14.74-.89 13.18-.52 26.36-.95 39.54-1.43 1.23-.04 2.47-.06 3.67-.29 1.76-.33 2.3-1.29 1.64-3.1-.77-2.15-1.98-4.16-2.56-6.35-1.34-5.07-5-6.36-9.59-6.38-1.06-.01-2.11-.02-3.17.02-8.59.3-17.2.62-28.99 1.06zm240.66-193.58c.01-.05.01-.1.02-.14 3.17 0 6.33.04 9.5-.03 1.03-.02 2.36.01 3.02-.59 2.67-2.42 3.99-5.7 4.95-9.09.12-.42-.55-1.29-1.07-1.6-.72-.44-1.62-.68-2.48-.79-3.14-.4-6.28-.82-9.44-1.05-19.63-1.46-39.27-2.88-58.9-4.3-.88-.06-1.76-.07-2.64-.09-1.56-.03-2.76.62-3.42 2.02-1.5 3.18-2.99 6.37-4.38 9.6-.63 1.46-.03 2.34 1.64 2.44 3.51.22 7.03.28 10.54.48 17.56 1.03 35.11 2.09 52.66 3.14zm-9.6 17.73c0-.04.01-.08.01-.12 1.4 0 2.81.01 4.21 0 9.91-.06 7.81 1.14 12.8-7.66 2.6-4.58 2.16-5.17-3.17-5.35-12.1-.42-24.19-.79-36.28-1.38-6.65-.32-13.28-1.14-19.92-1.57-4.55-.3-9.11-.34-13.67-.45-1.43-.03-2.91.16-3.71 1.53-1.86 3.17-3.67 6.38-5.38 9.63-.47.89.02 1.77 1.05 1.99 1.02.22 2.08.27 3.13.33 7.7.42 15.41.84 23.12 1.23 12.59.61 25.2 1.21 37.81 1.82zm-60.08 1.78c0-.06 0-.12.01-.17-.7 0-1.4-.01-2.11 0-2.7.05-3.34.75-2.46 3.08 1.3 3.45 2.79 6.82 4.2 10.22.84 2.02 2.36 2.91 4.56 2.84 2.46-.08 4.91-.04 7.37-.08 14.74-.28 29.48-.6 44.21-.86 8.86-.16 7.26 1.36 11.88-7.32 2.18-4.1 1.81-4.59-3-4.76-11.05-.38-22.1-.64-33.14-1.14-10.51-.47-21.01-1.19-31.52-1.81zM229.63 79.72c.1 1.26.12 1.79.19 2.31 1.39 10.42 2.72 20.85 4.21 31.25.7 4.85 1.62 9.68 2.62 14.48.53 2.54 1.4 3.08 3.65 2.55 4.09-.97 8.17-2.02 12.21-3.17 2.28-.65 2.58-1.37 2.11-3.96-.16-.86-.39-1.71-.56-2.57-1.72-8.76-3.52-17.51-5.11-26.3-.9-5-1.43-10.06-2.13-15.09-.65-4.68-1.78-5.65-6.14-4.72-2.91.62-5.74 1.57-8.6 2.4-1.75.52-2.58 1.71-2.45 2.82zm-6.79-.95c-4.68 1.19-9.1 2.26-13.49 3.46-1.35.37-1.84 1.55-1.71 2.92.08.87.27 1.73.41 2.6 1.62 9.51 3.23 19.02 4.86 28.53 1.01 5.88 1.99 11.76 3.06 17.63.49 2.67 1.42 3.23 4.05 2.49 3.04-.86 6.06-1.78 9.04-2.82 2.7-.94 3.06-1.63 2.74-4.27-.06-.52-.22-1.03-.31-1.55-2.49-14.17-4.52-28.41-5.86-42.74-.13-1.39-.32-2.83-.81-4.12-.29-.79-1.22-1.35-1.98-2.13zm226.58 418.26c8.79 0 15.48.01 22.17-.01 1.05 0 2.2.16 3.13-.2.87-.33 2.02-1.15 2.18-1.93.91-4.47 1.63-8.98 2.25-13.51.22-1.61-.78-2.64-2.45-2.83-.7-.08-1.4-.15-2.1-.14-11.78.28-23.56.58-35.34.86-1.82.04-3.47.49-4.79 1.83-2.59 2.63-5.32 5.15-7.73 7.94-1.18 1.37-2.94 2.85-2.2 5.05.88 2.62 3.36 2.24 5.38 2.33 7.19.32 14.4.47 19.5.61zM300.17 362.3c-1.46-.06-1.7.1-2.39 2.37-.2.67-.36 1.36-.49 2.05-2.43 12.94-4.88 25.88-7.25 38.83-.82 4.49-1.41 9.02-2.15 13.52-.38 2.32.1 4.03 2.46 5.16 2.04.98 3.86 2.41 5.8 3.62 1.56.97 2.29.72 2.58-1.02.58-3.46.95-6.96 1.6-10.41 2.97-15.72 6.97-31.18 12.17-46.31.46-1.33.94-2.65 1.28-4.01.4-1.6-.11-2.44-1.65-2.62-3.65-.42-7.32-.73-11.96-1.18zM261.19 69.87c-1.55.42-4.46 1.06-7.26 2.03-2.99 1.03-3.37 1.66-2.89 4.65 1.83 11.26 3.68 22.51 5.68 33.74.74 4.14 1.83 8.22 2.93 12.29.58 2.13 1.28 2.51 3.49 2.13 3.11-.53 6.22-1.14 9.28-1.89 2.22-.54 2.57-1.2 2.22-3.39-.19-1.21-.55-2.39-.81-3.59-.91-4.29-2-8.55-2.67-12.88-1.5-9.71-2.77-19.46-4.15-29.19-.45-3.21-1.26-3.91-5.82-3.9zm18.48-3.18c-.41.05-2.01.08-3.54.43-3.67.85-4.51 2.05-4.41 5.95.03 1.05.06 2.12.22 3.15 1.45 9.55 2.81 19.12 4.44 28.63.77 4.49 2 8.91 3.17 13.32.59 2.21 1.32 2.66 3.41 2.33 2.95-.47 5.89-1.03 8.78-1.74 2.23-.55 2.8-1.64 2.42-3.91-.12-.69-.37-1.36-.54-2.04-2.5-10.07-4.55-20.22-5.85-30.51-.53-4.18-1.12-8.36-1.74-12.52-.48-3.17-.74-3.33-4.14-3.22-.35.01-.7.04-2.22.13zm6.43 464.11c0 .22.01.44.01.66-5.98 0-11.96-.11-17.94.03-5.09.12-10.18.51-15.27.85-.61.04-1.19.52-1.78.79.29.61.45 1.33.89 1.8 2.02 2.21 4.19 4.28 6.15 6.52 2.89 3.31 6.36 4.52 10.78 4.13 14.71-1.28 29.44-2.28 44.16-3.47 4.03-.32 4.4-1.12 2.83-5.08-.32-.82-.78-1.59-1.01-2.43-1.04-3.72-3.56-4.72-7.2-4.53-7.2.4-14.41.51-21.62.73zm182.3-159.43c0-.06.01-.13.01-.19 6.48.29 12.97.59 19.45.88 3.26.14 3.56-.08 4.33-3.17.67-2.71 1.09-5.42 2.57-7.95 2.55-4.34 2.05-5.05-2.94-4.97-15.44.25-30.87.56-46.31.85-.88.02-1.76.06-2.63.17-2.62.33-3.15 1.05-2.3 3.4.78 2.14 1.79 4.19 2.6 6.33.93 2.47 2.68 3.43 5.26 3.55 6.66.29 13.31.72 19.96 1.1zM296.78 64.67c-5.21-.2-6.32.92-5.92 5.97.03.35.05.7.1 1.05 1.84 13.4 4.03 26.73 7.38 39.85.3 1.19.52 2.47 1.15 3.48.49.78 1.61 1.78 2.35 1.7 3.64-.39 7.27-1.03 10.87-1.76 1.42-.29 1.82-1.55 1.57-2.91-.16-.86-.41-1.7-.65-2.55-3.79-13.52-7.57-27.05-11.38-40.56-1.11-3.87-1.5-4.11-5.47-4.27zM451.4 501.91v-.23c-1.05 0-2.11.03-3.16 0-6.14-.18-12.27-.4-18.41-.55-2-.05-2.63.69-2.06 2.57.96 3.19 2.17 6.3 3.1 9.5.8 2.75 2.4 3.96 5.33 3.99 11.58.11 23.16.36 34.73.57 1.62.03 2.73-.61 3-2.28.58-3.64 1.17-7.27 1.65-10.92.19-1.44-.65-2.36-2.08-2.52-1.22-.14-2.45-.12-3.68-.13-6.14-.01-12.28 0-18.42 0zM314.97 63.97c-1.53 0-2.41.01-3.29 0-4.88-.07-5.57.79-4.44 5.53.24 1.02.49 2.05.78 3.06 3.23 11.12 6.46 22.23 9.69 33.34.54 1.85 1.08 3.7 1.64 5.55.47 1.56 1.57 2.33 3.15 2.22 1.92-.13 3.83-.41 5.74-.61 3.19-.33 3.76-.71 2.98-4.53-.42-2.06-1.05-4.07-1.56-6.12-2.72-10.89-5.54-21.75-8.1-32.67-1.38-5.96-1.18-6.01-6.59-5.77zm158.6 327.33c4.39 0 8.78.08 13.17-.03 3.02-.08 3.71-.79 4.07-3.67.29-2.26.52-4.54.69-6.81.19-2.63-.52-3.49-3.19-3.69-4.73-.34-9.46-.58-14.19-.85-5.43-.31-10.87-.62-16.3-.89-2.63-.13-5.26-.26-7.9-.25-1.71 0-2.47.88-1.91 2.28 1.5 3.75 3.04 7.48 4.84 11.09.46.92 1.81 1.65 2.9 1.95 1.84.51 3.8.78 5.71.83 4.02.13 8.07.05 12.11.04zm-20.29 130.85v-.24c-5.27 0-10.54-.07-15.81.03-2.49.04-3.14.98-2.4 3.38 1.03 3.36 2.28 6.65 3.34 9.99.68 2.15 2.12 3.09 4.3 3.17 4.39.16 8.78.52 13.16.51 3.86-.02 7.71-.45 11.57-.67 2.08-.12 3.2-1.18 3.5-3.22.42-2.78.95-5.54 1.31-8.32.41-3.13-.11-3.83-3.19-3.99-5.25-.29-10.51-.44-15.78-.64zm-83.48 1.12v-.92c5.96 0 11.92.04 17.88-.03 1.37-.01 3.27.12 4.02-.67 2.61-2.77 4.85-5.9 7.13-8.97.13-.17-.51-1.26-.98-1.44-.78-.3-1.71-.27-2.59-.3-7.01-.21-14.02-.39-21.02-.58-3.51-.1-7.01-.16-10.52-.29-2-.08-3.86.21-5.34 1.7-2.97 2.98-5.94 5.96-8.84 9-.39.42-.69 1.41-.46 1.81.25.43 1.17.66 1.79.67 6.31.04 12.62.02 18.93.02zm64.74 17.28c-.54-1.92-.87-3.29-1.31-4.63-4.11-12.53-8.23-25.06-12.37-37.58-.33-1-.74-1.98-1.19-2.93-.56-1.18-1.43-2.02-2.82-2.06-1.4-.04-2.82-.13-4.21 0-1.96.19-2.66 1.29-2.18 3.34.32 1.37.79 2.7 1.25 4.03 4.7 13.82 9.49 27.61 14.08 41.47 2.09 6.31 2.98 4.99 6.7 1.38.93-.91 1.51-2.2 2.05-3.02zm26.77-66.89c4.22 0 9.49.06 14.75-.02 3.77-.06 4.56-.8 5.06-4.54.32-2.43.5-4.89.65-7.34.15-2.53-.4-3.33-2.86-3.33-6.14 0-12.28.17-18.42.35-2.37.07-4.36 1.06-6.05 2.79-3.44 3.51-7 6.9-10.44 10.41-.52.53-.65 1.44-.97 2.18.66.14 1.33.43 1.99.4 5.08-.25 10.16-.56 16.29-.9zm-41.35-377.8h.15c0-3.51-.04-7.03.01-10.54.12-8.34.87-7.68-7.98-9.87-5.02-1.24-5.65-.75-5.46 4.3.34 8.95.85 17.89 1.3 26.83.31 6.13.9 6.71 7.13 7.11.35.02.7.05 1.05.05 3.01.03 3.76-.65 3.79-3.65.03-4.76.01-9.5.01-14.23zm-39.21 409.58v.4c4.38 0 8.76.03 13.14-.02 1.39-.01 2.81-.12 4.17-.39 1.19-.24 1.81-1.17 1.36-2.37-.87-2.29-1.87-4.53-2.84-6.78-.94-2.17-2.56-3.1-4.97-3.11-9.28-.01-18.54-.58-27.81.82-4.83.73-5.41.64-3.93 5.85.14.51.36.99.46 1.51.57 2.83 2.25 4.15 5.18 4.11 5.09-.07 10.17-.02 15.24-.02zm44.18-409.12h-.25c0 3.34-.01 6.68 0 10.02.01 1.58-.03 3.17.09 4.74.22 3 .71 3.65 3.61 4.33 1.7.4 3.47.57 5.21.69 2.62.18 3.09-.26 3.23-2.86.09-1.75 0-3.52.07-5.27.29-7.02.57-14.05.92-21.06.23-4.69-.14-5.25-4.9-6.41-1.53-.37-3.07-.78-4.63-1.01-2.64-.4-3.28.05-3.33 2.61-.09 4.73-.02 9.47-.02 14.22zm50.33 313.33v.64c3.34 0 6.68.09 10.02-.03 2.45-.09 3.1-.69 3.52-3.06.43-2.42.77-4.87.87-7.32.11-2.71-.64-3.52-3.34-3.6-9.48-.29-18.97-.48-28.46-.68-1.16-.02-1.58.84-1.18 1.77 1.31 3.07 2.78 6.07 4.12 9.12.97 2.21 2.64 3.17 4.98 3.16 3.15-.01 6.31 0 9.47 0zm-72.44-302.37c-.3-9.27-.58-18.54-.9-27.81-.04-1.22-.26-2.44-.41-3.65-.23-1.94-1.23-3.2-3.19-3.68-2.89-.71-5.75-1.52-8.65-2.21-1.76-.42-2.29.03-2.11 1.83.48 4.88.95 9.76 1.66 14.61.19 1.28.98 2.66 1.89 3.62 4.75 5.05 7.13 11.13 8.28 17.84.27 1.58-.37 3.79 2.07 4.26 1.31.24 1.76-1.12 1.36-4.81zm24.36 81.83v.28c-1.92 0-3.85-.09-5.77.02-3.38.2-6.41 1.44-9.34 3.17-3.72 2.2-4.67 5.41-4.15 9.37.18 1.36 1 1.74 2.24 1.33.5-.16.97-.4 1.46-.59 5.8-2.27 11.79-3.18 18.01-2.5 3.13.34 6.27.69 9.41.8.88.03 2.15-.5 2.63-1.2 1.33-1.94.65-5.67-1.11-7.21-2.03-1.78-4.42-2.85-7.1-3.12-2.08-.21-4.18-.24-6.28-.35zm48.3 226.01v-.25c-2.61-.17-5.22-.4-7.84-.47-1.6-.05-2.13.94-1.46 2.43.07.16.13.33.23.47 3.44 4.46 6.28 9.15 6.8 14.97.14 1.6 1.5 2.35 3.07 2.2 2.26-.21 4.5-.55 6.75-.87 1.35-.19 2.29-.98 2.51-2.31.72-4.3 1.5-8.6 1.98-12.92.25-2.23-.68-3.08-3.14-3.21-2.96-.16-5.93-.04-8.9-.04zM330.24 85.3c.39 1.67.74 3.35 1.18 5 1.31 4.9 2.65 9.79 3.98 14.69 1.82 6.71.75 7.26 9.67 6.78.52-.03 1.05-.09 1.57-.14 1.52-.15 2.09-1.02 1.96-2.5-.43-4.87-.86-9.74-1.23-14.61-.13-1.78-.83-3.01-2.66-3.39-5.03-1.05-9.55-3.25-14.47-5.83zm98.61 130.26c3.19-.57 6.85-.97 10.35-1.93 2.61-.72 3.44-2.94 2.72-5.42-.6-2.06-2.33-2.63-4.09-2.7-5.59-.24-11.19-.49-16.78-.36-3.72.09-7.15 1.62-10.37 3.47-.6.34-1.19.75-1.66 1.26-.72.79-.62 1.73.29 2.21 1.06.56 2.24 1.02 3.42 1.21 5.19.78 10.39 1.46 16.12 2.26zm-29.53 69.33c3.45 0 7.12.02 10.8-.01 1.04-.01 2.12-.04 3.12-.3 1.67-.44 2.38-2.24 1.57-3.78-1.24-2.38-3.29-3.61-5.92-3.74-2.8-.13-5.6-.16-8.4-.1-6.04.13-11.77 1.6-17.19 4.24-3.93 1.92-7.82 3.93-11.69 5.96-1.66.87-3.22 1.91-4.83 2.87 2.13 1.31 3.82-.4 5.7-.83.34-.08.67-.21.99-.34 8.2-3.54 16.68-5.24 25.85-3.97zm50.45-183.79h.22V87.46c0-3.42-2.32-4.28-5.31-4.33-.54-.01-1.32.58-1.59 1.1-.38.74-.51 1.68-.54 2.54-.28 8.91-.6 17.83-.72 26.74-.05 3.34 1.64 4.59 5.01 4.38 1.42-.09 2.35-.78 2.61-2.12.24-1.19.3-2.43.31-3.65.03-3.67.01-7.34.01-11.02zM273.82 550.17c-.04.29-.07.58-.11.87.98.3 1.93.71 2.93.88 2.42.41 4.85.88 7.29 1.03 6.31.39 12.64.72 18.96.87 5.27.13 10.55.08 15.82-.08 2.5-.08 3.73-1.06 3.64-2.25-.15-1.8-1.77-3.91-3.42-4.24-1.02-.21-2.1-.24-3.15-.22-3.16.06-6.33.09-9.48.32-9.29.66-18.57 1.4-27.85 2.15-1.55.12-3.09.44-4.63.67zm198.65-96.58v-.07c2.46 0 4.91.05 7.37-.02 1.58-.04 2.73-.94 3.01-2.47.58-3.28 1.08-6.57 1.41-9.88.17-1.69-.78-2.58-2.59-2.53-1.92.05-3.83.44-5.75.56-2.13.14-3.44 1.19-4.55 3.02-1.72 2.84-3.79 5.46-5.72 8.17-.41.57-1.07 1.05-1.23 1.67-.11.43.42 1.47.7 1.48 2.44.12 4.9.07 7.35.07zm-29.13-267.72c-.73-.81-1.37-1.86-2.3-2.48-8.73-5.8-17.84-5.75-27.03-1.31-1.62.78-2.79 2.54-4.07 3.93-.28.3-.16.97-.22 1.47.49.04 1.05.27 1.45.11 9.99-4.27 20.06-4.52 30.24-.71.31.12.73.16 1.02.04.26-.12.43-.49.91-1.05zm10.46 357.89c-4.2-.26-7.37-.4-10.52-.68-3.44-.3-5.58 1.7-7.46 4.12-.19.25.21 1.33.6 1.57.54.33 1.35.32 2.05.31 6.68-.15 13.36-.35 20.04-.49 2.5-.05 4.28-1.44 5.92-3.07.28-.28.33-.9.3-1.35-.01-.16-.59-.39-.91-.39-3.68-.03-7.37-.02-10.02-.02zm-47.07-27.89v-.04c.35 0 .7.02 1.05 0 2.93-.18 3.5-.9 2.67-3.57-1.66-5.35-3.37-10.69-5.1-16.02-.26-.81-.6-1.77-1.22-2.23-.58-.43-1.63-.46-2.38-.28-.31.08-.65 1.24-.5 1.78.36 1.34 1.02 2.6 1.52 3.91.81 2.12 1.59 4.26 2.37 6.4 1.02 2.76 1.36 5.35-.9 7.85-1.09 1.21-.38 2.12 1.45 2.2.34.01.69 0 1.04 0zM383.69 81.41c-.28-3.24-.36-5.53-.72-7.77-.24-1.5-.89-2.93-1.36-4.39-2.18 1.15-.72 3.08-.94 4.63-.32 2.25-.45 4.52-.59 6.79-.08 1.36 1.16 2.62 2.25 2.17.61-.25.93-1.22 1.35-1.89.07-.12.01-.34.01.46z"/><path class="st1" d="M317.38 207.58c.87.4 1.46.82 2.1.96 6.37 1.3 12.72 2.66 19.12 3.79 8.72 1.54 17.15.22 25.32-3.04 1.31-.52 2.57-1.16 3.88-1.66 1.94-.74 3.24-.51 3.65.68.61 1.74-.68 2.54-1.86 3.32-.58.38-1.22.7-1.86.99-8.81 4.04-18.04 5.94-27.71 4.79-5.4-.64-10.75-1.73-16.08-2.8-4.13-.83-8.21-1.93-12.29-2.99-1.17-.3-2.35-.75-3.37-1.39-1.26-.79-1.46-2.65-.36-3.67 1-.94 2.22-1.7 3.46-2.31 9.53-4.73 19.55-7.85 30.15-9.03 7.16-.8 14.3-2 21.51-.54 1.38.28 2.47-.09 2.96-1.49.58-1.69 0-3.4-1.33-4.14-.31-.17-.63-.32-.96-.42-11.5-3.39-22.93-4.98-34.6-.31-9.64 3.86-19.29 7.65-28.22 13.01-2.08 1.25-4.13 2.77-5.71 4.59-3.05 3.51-3.13 7.03.08 10.41 3.37 3.55 7.15 6.76 10.99 9.82 3.29 2.62 6.87 4.9 10.4 7.2 4.66 3.03 7.64 7.19 8.88 12.59.75 3.25 1.55 6.5 2.1 9.79 1.3 7.66 3.46 15.06 6.07 22.35 1.84 5.12 3.46 10.33 5.05 15.54.4 1.31.51 2.78.36 4.14-.07.64-.98 1.41-1.68 1.69-.45.17-1.44-.29-1.78-.76-.6-.82-.95-1.85-1.28-2.83-2.18-6.5-4.47-12.96-6.43-19.52-1.85-6.22-3.36-12.55-4.96-18.84-.47-1.87-.84-3.78-1.09-5.7-.95-7.27-4.42-12.62-10.87-16.47-4.95-2.95-9.36-6.82-13.91-10.41-1.79-1.41-3.38-3.08-4.93-4.75-6.49-7-4.26-13.82 1.11-19.03 1.74-1.69 3.91-3 6.01-4.25 9.71-5.76 19.99-10.33 30.67-13.94 8.86-3 17.87-3.6 26.98-.97 2.19.63 4.45 1.03 6.67 1.56 5.12 1.23 10.33 2.15 15.06 4.67 1.64.87 2.52.09 2.61-1.84.11-2.37-.96-4.07-2.85-5.29-6.12-3.96-12.62-7.01-20-7.59-8.86-.69-17.54.06-25.93 3.31-6.72 2.6-13.56 4.89-20.25 7.57-3.41 1.37-6.6 3.28-9.88 4.97-1.4.73-2.74 1.6-4.17 2.26-1.83.84-3.19.59-3.68-.59-.69-1.65.23-2.79 1.51-3.51 4.6-2.57 9.08-5.44 13.92-7.45 7.95-3.3 16.1-6.12 24.23-8.96 8.81-3.08 17.96-3.42 27.09-2.18 7.43 1.01 14.12 4.28 20.21 8.59 4.85 3.43 6.07 10.44 3 15.55-1.03 1.72-2.56 2.33-4.51 1.49-1.93-.83-3.7-2.04-5.61-2.9-2.25-1.01-3.16-.38-3.5 2.13-.98 7.39-.97 7.35-8.48 5.92-2.06-.39-4.19-.81-6.26-.72-11.62.53-23.14 1.71-34.09 6.02-1.56.58-3.33.9-4.66 2.59zM231.73 205.14c-.69 7.15-3.25 14.92-10.18 19.94-4.73 3.43-5.54 6.94-3.95 12.07 1.35 4.34 2.16 8.86 3.17 13.3.34 1.5 1.03 3.17-.78 4.22-1.26.73-2.52-.39-3.51-3-.31-.82-.61-1.66-.79-2.51-1.26-6.19-2.45-12.39-3.76-18.57-.5-2.36.08-4.1 2.17-5.39 1.19-.74 2.25-1.68 3.38-2.51 5.08-3.74 7.78-8.98 9.15-14.95 2.64-11.53-8.01-19.02-17.59-15.42-4.37 1.64-8.15 4.1-11.2 7.62-3.01 3.48-4.25 7.59-4.26 12.15 0 1.41-.22 2.89-1.95 3.32-1.26.31-2.37-1.12-2.41-3.41-.09-4.87 1.18-9.42 4.04-13.38 4.39-6.09 10.33-10.01 17.68-11.52 10.62-2.22 20.78 6.1 20.79 18.04zM217.39 270.13c.01-3.38 2.95-6.04 6.68-6.04 3.71 0 6.6 2.73 6.52 6.16-.08 3.44-2.96 6.37-6.38 6.5-3.54.14-6.83-3.05-6.82-6.62zm8.62.38c-.7-.76-1.15-1.61-1.53-1.59-.7.05-1.37.63-2.05.98.4.64.72 1.71 1.22 1.81.58.12 1.33-.63 2.36-1.2zM392.08 121.29c-.37 3.64-.64 6.97-1.05 10.28-.34 2.72-1.88 4.47-4.63 5.05-.69.14-1.36.36-2.05.51-6.74 1.48-8.23.89-11.05-5.48-3.69-8.35-7.2-16.79-10.61-25.26-1.04-2.59-1.61-5.38-2.22-8.12-.3-1.35-.36-2.8-.24-4.19.52-6.03 4.99-9.1 10.74-7.29 5.18 1.63 9.37 4.75 12.58 9.14 3.91 5.35 6.26 11.37 7.52 17.82.49 2.59.7 5.22 1.01 7.54zm-4.76 1.42c-.21-8.52-2.29-15.7-6.31-22.29-2.14-3.51-5.03-6.32-8.8-8.09-.95-.44-1.94-.87-2.96-1.07-2.46-.49-4.13.75-4.36 3.28-.11 1.2-.06 2.49.25 3.65.81 3.05 1.67 6.1 2.76 9.06 1.63 4.45 3.42 8.85 5.24 13.22 1.41 3.4 2.97 6.75 4.48 10.11.97 2.17 2.8 2.42 4.86 2.12 2.55-.38 3.52-1.1 3.96-3.47.45-2.4.66-4.86.88-6.52zM352.02 84.34c-1.82-.39-4.91-.99-7.97-1.73-1.01-.24-1.97-.76-2.88-1.27-9.32-5.28-9.71-16.95-.77-22.86 2.55-1.69 5.39-2.59 8.43-2.65 6.19-.11 11.78 1.58 16.5 5.74 5.14 4.53 5.92 10.3 2.11 16.02-3.36 5.05-8.39 6.6-15.42 6.75zm-1.65-24.15c-1.72.28-3.52.32-5.14.9-3.73 1.33-6.21 3.97-6.75 8-.43 3.24 2 7.05 5.87 8.52 2.9 1.11 6.08 1.95 9.16 2.04 4.13.12 7.99-1.2 10.32-5.13 2.01-3.39 1.73-6.32-1.14-9.02-3.43-3.22-7.39-5.33-12.32-5.31z"/></svg>'

9− base+'sphinx'

10− glob-ames+[~donmec-sallud 0v0]

11−==

10+==

desk/gen/publish-all.hoon+13−13

@@ -2,28 +2,28 @@

2/+ *sphinx

3:- %say

4|= $: [now=@da eny=@uv =beak]

5− [~ ~]

5+ [ ~]

6 ==

7:- %declarations

8^- (list declare:s)

9−:~ :- %friends

9+:* :- %friends

10− ['networked subject' %group 'web+urbitgraph://group/~matwet/networked-subject' 'https://subject.network | networked subject' ~['hosting' 'networking' 'urbit' 'ops'] 'https://urbits3.ams3.digitaloceanspaces.com/sitful-hatred/2022.7.07..17.15.52-ns.png' '']

10+ ['networked subject' %group 'web+urbitgraph://group/~matwet/networked-subject' 'https://subject.network | networked subject' 'https://urbits3.ams3.digitaloceanspaces.com/sitful-hatred/2022.7.07..17.15.52-ns.png' ~['hosting' 'networking' 'urbit' 'ops']]

11 :- %friends

12− ['Hooniverse' %group 'web+urbitgraph://group/~hiddev-dannut/new-hooniverse' 'Community based Hoon learning for all levels. For discussion of Hoon specific to Uqbar, join ~hiddev-dannut/uhoon' ~['hoon' 'dev' 'urbit' 'programming' 'education'] 'https://i.imgur.com/ghThlz7.png' '']

12+ ['Hooniverse' %group 'web+urbitgraph://group/~hiddev-dannut/new-hooniverse' 'Community based Hoon learning for all levels. For discussion of Hoon specific to Uqbar, join ~hiddev-dannut/uhoon' 'https://i.imgur.com/ghThlz7.png' ~['hoon' 'dev' 'urbit' 'programming' 'education']]

13 :- %friends

14− ['Hollow Mars Theory' %group 'web+urbitgraph://group/~rabsef-bicrym/hollow-mars-theory' 'Definitely NOT a Conspiracy Chat' ~['conspiracies' 'ufos' 'steel beams'] '' '']

14+ ['Hollow Mars Theory' %group 'web+urbitgraph://group/~rabsef-bicrym/hollow-mars-theory' 'Definitely NOT a Conspiracy Chat' '' ~['conspiracies' 'ufos' 'steel beams']]

15 :- %friends

16− ['celestial systems' %group 'web+urbitgraph://group/~nocsyx-lassul/celestial-systems' 'A place for pilots who are building hosting providers' ~['hosting' 'ops' 'urbit'] '' '']

16+ ['celestial systems' %group 'web+urbitgraph://group/~nocsyx-lassul/celestial-systems' 'A place for pilots who are building hosting providers' '' ~['hosting' 'ops' 'urbit']]

17 :- %friends

18− ['Structure' %group 'web+urbitgraph://group/~fabled-faster/structure' 'Urbit Structural Design and Engineering Group. Always Thinking About Mechanics.' ~['design' 'ux' 'hci' 'urbit'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2022.1.27..17.59.43-image.png' '']

18+ ['Structure' %group 'web+urbitgraph://group/~fabled-faster/structure' 'Urbit Structural Design and Engineering Group. Always Thinking About Mechanics.' 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2022.1.27..17.59.43-image.png' ~['design' 'ux' 'hci' 'urbit']]

19 :- %friends

20− ['The Marketplace' %group 'web+urbitgraph://group/~tirrel/the-marketplace' 'Welcome to The Marketplace, featuring The Pit, Urbit\'s first open-outcry market!' ~['urbit' 'market' 'sell' 'buy'] 'https://snipboard.io/U0IYyi.jpg' '']

20+ ['The Marketplace' %group 'web+urbitgraph://group/~tirrel/the-marketplace' 'Welcome to The Marketplace, featuring The Pit, Urbit\'s first open-outcry market!' 'https://snipboard.io/U0IYyi.jpg' ~['urbit' 'market' 'sell' 'buy']]

21 :- %friends

22− ['The Forge' %group 'web+urbitgraph://group/~middev/the-forge' 'pale fire computing' ~['dev' 'programming' 'hoon' 'urbit'] 'https://nyc3.digitaloceanspaces.com/archiv/littel-wolfur/2021.5.06..21.01.58-the%20forge.png' '']

22+ ['The Forge' %group 'web+urbitgraph://group/~middev/the-forge' 'pale fire computing' 'https://nyc3.digitaloceanspaces.com/archiv/littel-wolfur/2021.5.06..21.01.58-the%20forge.png' ~['dev' 'programming' 'hoon' 'urbit']]

23 :- %friends

24− ['UFORIA' %group 'web+urbitgraph://group/~tiplec-lacnyx/ufora' 'UFO Research, Investigations, and Analysis' ~['UFO' 'conspiracies' 'research'] 'https://tiplec-lacnyx.nyc3.digitaloceanspaces.com/tiplec-lacnyx/2021.12.27..06.09.47-change1.jpg' '']

24+ ['UFORIA' %group 'web+urbitgraph://group/~tiplec-lacnyx/ufora' 'UFO Research, Investigations, and Analysis' 'https://tiplec-lacnyx.nyc3.digitaloceanspaces.com/tiplec-lacnyx/2021.12.27..06.09.47-change1.jpg' ~['UFO' 'conspiracies' 'research']]

25 :- %friends

26− ['Urbit Community' %group 'web+urbitgraph://group/~bitbet-bolbel/urbit-community' 'World hub, help desk, meet and greet, etc.' ~['general' 'urbit' 'community' 'help'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2021.4.02..21.52.41-UC.png' '']

26+ ['Urbit Community' %group 'web+urbitgraph://group/~bitbet-bolbel/urbit-community' 'World hub, help desk, meet and greet, etc.' 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2021.4.02..21.52.41-UC.png' ~['general' 'urbit' 'community' 'help']]

27 :- %friends

28− ['Urbytes' %group 'web+urbitgraph://group/~nartes-fasrum/urbytes' 'We feed and water Mars.' ~['cooking' 'food' 'beverages' 'peanut butter eggs'] '' '']

28+ ['Urbytes' %group 'web+urbitgraph://group/~nartes-fasrum/urbytes' 'We feed and water Mars.' '' ~['cooking' 'food' 'beverages' 'peanut butter eggs']]

29−==

29+==

desk/gen/state.hoondeleted−8

@@ -1,8 +0,0 @@

1−/- s=sphinx

2−:- %say

3−|= $: [now=@da eny=@uv =beak]

4− [~ ~]

5− ==

6−=/ our (scot %p p.beak)

7−=/ wen (scot %da now)

8−noun+.^(state:s /gx/[our]/sphinx/[wen]/state/noun)

desk/lib/gossip.hoon+58−283

@@ -1,10 +1,14 @@

1−:: gossip: data sharing with pals (and pals of pals, etc)

1+:: gossip: data sharing with pals

2−::

3−:: v1.1.1: sneaky whisper

4::

2::

5:: automates using /app/pals for peer & content discovery,

3:: automates using /app/pals for peer & content discovery,

6:: letting the underlying agent focus on handling the data.

4:: letting the underlying agent focus on handling the data.

7::

5::

6+:: at the time of writing, this library has not seen much real-world

7+:: use yet. it may be subject to behavioral or interface changes.

8+:: it tries its best to not generate obscene amounts of network load,

9+:: but has not yet proven itself in the real world.

10+:: for the time being, please tread carefully.

11+::

8:: usage

12:: usage

9::

13::

10:: to use this library, call its +agent arm with an initial

14:: to use this library, call its +agent arm with an initial

@@ -40,10 +44,6 @@

40:: setting hops to 1 distributes the data to direct pals only.

44:: setting hops to 1 distributes the data to direct pals only.

41:: setting hops to 0 prevents emission of any gossip data at all,

45:: setting hops to 0 prevents emission of any gossip data at all,

42:: even during initial subscription setup.

46:: even during initial subscription setup.

43−:: setting pass to true causes 50% of locally-originating data to be

44−:: proxied through a random "tell" peer. note that the proxy will have

45−:: a 50% chance of proxying in turn. for low amounts of hops, data could

46−:: escape the local social graph entirely.

47::

48:: (we introduce the /~/etc path prefix convention to indicate paths

49:: that are for library-specific use only.

@@ -75,12 +75,6 @@

75:: we may want to use pokes exclusively, instead of watches/facts,

76:: making it easier to exclude the src.bowl, include metadata, etc.

77::

78−:: we currently only emit every rumor as a fact once at most. but we might

79−:: receive it again later, with a higher hop count. if we want to try for

80−:: maximum reach within the given hops, we should re-send if we receive a

81−:: known rumor with higher hop counter. but this may not be worth the added

82−:: complexity...

83−::

84:: what if this was a userspace-infrastructure app instead of a wrapper?

78:: what if this was a userspace-infrastructure app instead of a wrapper?

85:: how would ensuring installation of this app-dependency work?

79:: how would ensuring installation of this app-dependency work?

86:: it gains us... a higher chance of peers having this installed.

80:: it gains us... a higher chance of peers having this installed.

@@ -99,7 +93,6 @@

99:: - if pals ever watch-nacks (it shouldn't), we try rewatching after ~m1.

93:: - if pals ever watch-nacks (it shouldn't), we try rewatching after ~m1.

100::

94::

101:: - for facts produced on /~/gossip/source, we

95:: - for facts produced on /~/gossip/source, we

102−:: - 50% chance to redirect into the "pass flow" (see below)

103:: - wrap them as %gossip-rumor to send them out on /~/gossip/gossip

96:: - wrap them as %gossip-rumor to send them out on /~/gossip/gossip

104:: - for new pals matching the hear mode, we watch their /~/gossip/gossip

97:: - for new pals matching the hear mode, we watch their /~/gossip/gossip

105:: - for gone pals, we leave that watch

98:: - for gone pals, we leave that watch

@@ -109,16 +102,6 @@

109:: - re-emit them as facts on /~/gossip/gossip if there are hops left

102:: - re-emit them as facts on /~/gossip/gossip if there are hops left

110:: - for nacks on those watches, we retry after ~m30

103:: - for nacks on those watches, we retry after ~m30

111::

104::

112−:: - other gossip instances may poke us with rumors directly

113−:: - the inner agent learns the rumor normally, as if it came from a fact

114−:: - based on randomness (50/50), we do one of two things:

115−:: - publish the rumor as a fact to our subscribers, like the above

116−:: - poke a randomly selected peer (in the "tell" set) with the rumor

117−:: - when poking, store the rumor until we receive a poke-ack

118−:: - upon receiving a positive poke-ack, delete the local datum

119−:: - upon receiving a negative poke-ack, do the 50/50 again

120−:: - if we do not receive a poke-ack within some time, do the 50/50 again

121−::

122/- pals

105/- pals

123/+ lp=pals, dbug, verb

106/+ lp=pals, dbug, verb

124::

107::

@@ -129,8 +112,6 @@

129 ==

112 ==

130+$ meta-0 hops=_0

113+$ meta-0 hops=_0

131::

114::

132−+$ hash @uv

133−::

134+$ whos

115+$ whos

135 $? %anybody :: any ship discoverable through pals

116 $? %anybody :: any ship discoverable through pals

136 %targets :: any ship we've added as a pal

117 %targets :: any ship we've added as a pal

@@ -142,11 +123,7 @@

142 :: (1 hop is pals only, 0 stops exposing data at all)

123 :: (1 hop is pals only, 0 stops exposing data at all)

143 hear=whos :: who to subscribe to

124 hear=whos :: who to subscribe to

144 tell=whos :: who to allow subscriptions from

125 tell=whos :: who to allow subscriptions from

145− pass=? :: whether to (50/50) emit data through proxy

146 ==

126 ==

147−::

148−++ pass-timeout ~s30

149−::

150++ invent

127++ invent

151 |= =cage

128 |= =cage

152 ^- card:agent:gall

129 ^- card:agent:gall

@@ -169,27 +146,23 @@

169 ^- $-(agent:gall agent:gall)

146 ^- $-(agent:gall agent:gall)

170 |^ agent

147 |^ agent

171 ::

148 ::

172− +$ state-3

149+ +$ state-0

173− $: %3

150+ $: %0

174− manner=config :: latest config

151+ manner=config :: latest config

175− memory=(set hash) :: datums seen (by inner agent)

152+ memory=(set @uv) :: datums seen

176− shared=(set hash) :: datums shared (as fact)

177− passed=(map hash [rumor @da]) :: pending relays & timeouts

178− misses=(set ship) :: ships that won't relay

179− future=(list rumor) :: rumors of unknown kinds

153+ future=(list rumor) :: rumors of unknown kinds

180 ==

154 ==

181 ::

155 ::

182 +$ card card:agent:gall

156 +$ card card:agent:gall

183 ::

157 ::

184 ++ helper

158 ++ helper

185− |_ [=bowl:gall state-3]

159+ |_ [=bowl:gall state-0]

186 +* state +<+

160 +* state +<+

187 pals ~(. lp bowl)

161 pals ~(. lp bowl)

188 ++ en-cage

162 ++ en-cage

189 |= =(cask *)

163 |= =(cask *)

190 ^- cage

164 ^- cage

191 ?^ to=(~(get by grab) p.cask)

165 ?^ to=(~(get by grab) p.cask)

192− ::TODO +soft or otherwise virtualize? don't want to risk crashes, right?

193 [p.cask (u.to q.cask)]

166 [p.cask (u.to q.cask)]

194 ~& [gossip+dap.bowl %no-mark p.cask]

167 ~& [gossip+dap.bowl %no-mark p.cask]

195 [%gossip-unknown !>(cask)]

168 [%gossip-unknown !>(cask)]

@@ -204,10 +177,6 @@

204 ~| [%en-rumor initial-hops=hops.manner]

177 ~| [%en-rumor initial-hops=hops.manner]

205 [%0 `meta-0`(dec hops.manner)]

178 [%0 `meta-0`(dec hops.manner)]

206 ::

179 ::

207− ++ en-hash

208− |= rumor

209− (sham data)

210− ::

211 ++ play-card :: en-rumor relevant facts, handle config changes

180 ++ play-card :: en-rumor relevant facts, handle config changes

212 |= =card

181 |= =card

213 ^- (quip ^card _state)

182 ^- (quip ^card _state)

@@ -242,68 +211,11 @@

242 ?> =(/~/gossip/source path)

211 ?> =(/~/gossip/source path)

243 :: if hops is configured at 0, we don't broadcast at all.

212 :: if hops is configured at 0, we don't broadcast at all.

244 ::

213 ::

214+ =. memory (~(put in memory) (sham (de-cage cage.p.card)))

215+ ?: =(0 hops.manner) [caz state]

216+ =- [[- caz] state]

245 =/ =rumor (en-rumor cage.p.card)

217 =/ =rumor (en-rumor cage.p.card)

246− =. memory (~(put in memory) (en-hash rumor))

247− ?: =(0 hops.manner)

248− [caz state]

249− =^ cas state (emit-rumor rumor)

250− [(weld cas caz) state]

251− ::

252− ++ emit-rumor :: gossip a rumor as-is

253− |= =rumor

254− ^- (quip card _state)

255− =/ =hash (en-hash rumor)

256− =* fact

257− :- [%give %fact [/~/gossip/gossip]~ %gossip-rumor !>(rumor)]~

218+ card(paths.p [/~/gossip/gossip]~, cage.p [%gossip-rumor !>(rumor)])

258− %_ state

259− passed (~(del by passed) hash)

260− shared (~(put in shared) hash)

261− ==

262− :: if we don't want to proxy, always send as fact

263− ::

264− ?. pass.manner

265− fact

266− :: if we want to proxy, do so 50% of the time

267− ::

268− ?. =(0 (~(rad og eny.bowl) 2))

269− fact

270− :: if we're proxying, but there's no reasonable targets, send as fact

271− ::

272− =/ aides=(set ship)

273− :: reasonable targets do not include ourselves, whoever

274− :: caused us to want to (re)send this rumor, or ships that failed

275− :: to proxy for us before.

276− :: that last one is important because we need to avoid the mistake of

277− :: occasionally sending them pokes that just linger in our outbound

278− :: ames flows and keep retrying. (ideally we'd do those all pokes for

279− :: a target on the same flow, but we really like storing information

280− :: in the wire and don't want to do per-relay queues in state. we also

281− :: don't particularly care about ordering guarantees for gossip.)

282− :: we don't just get the set of ships with active incoming or outgoing

283− :: subscriptions, because that constrains the set unnecessarily. for

284− :: some configs, ships in .tell (that aren't in .hear) might be

285− :: running the agent without actively listening to us.

286− ::

287− =- (~(dif in (~(del in (~(del in -) our.bowl)) src.bowl)) misses)

288− ?- tell.manner

289− %anybody (~(uni in (targets:pals ~.)) leeches:pals)

290− %targets (targets:pals ~.)

291− %mutuals (mutuals:pals ~.)

292− ==

293− =/ count=@ud ~(wyt in aides)

294− ?: =(0 count)

295− fact

296− :: poke a randomly chosen proxy with the rumor

297− ::

298− =/ proxy=ship (snag (~(rad og +(eny.bowl)) count) ~(tap in aides))

299− =/ =time (add now.bowl pass-timeout)

300− =. passed (~(put by passed) hash [rumor time])

301− :_ state

302− =/ =wire /~/gossip/passed/(scot %p proxy)/(scot %uv hash)

303− =/ =cage gossip-rumor+!>(rumor)

304− :~ [%pass wire %agent [proxy dap.bowl] %poke cage]

305− [%pass wire %arvo %b %wait time]

306− ==

307 ::

219 ::

308 ++ play-cards

220 ++ play-cards

309 |= cards=(list card)

221 |= cards=(list card)

@@ -330,18 +242,15 @@

330 [%gossip-rumor !>((en-rumor cage.p.i.cards))]

242 [%gossip-rumor !>((en-rumor cage.p.i.cards))]

331 $(out (snoc out i.cards), cards t.cards)

243 $(out (snoc out i.cards), cards t.cards)

332 ::

244 ::

333− ++ jump-rumor :: relay a rumor if we haven't yet

245+ ++ resend-rumor

334 |= =rumor

246 |= =rumor

335− ^- (quip card _state)

247+ ^- (unit card)

336− =/ =hash (en-hash rumor)

337− ?: (~(has in shared) hash) [~ state]

338 ?> =(%0 kind.rumor) ::NOTE should have been checked for already

248 ?> =(%0 kind.rumor) ::NOTE should have been checked for already

339− ?~ meta=((soft ,hops=@ud) meta.rumor) [~ state]

249+ ?~ meta=((soft ,hops=@ud) meta.rumor) ~

340 =* hops hops.u.meta

250 =* hops hops.u.meta

341− ?: =(0 hops) [~ state]

251+ ?: =(0 hops) ~

342 =. meta.rumor (dec hops)

252 =. meta.rumor (dec hops)

343− :- [%give %fact [/~/gossip/gossip]~ %gossip-rumor !>(rumor)]~

253+ `[%give %fact [/~/gossip/gossip]~ %gossip-rumor !>(rumor)]

344− state(shared (~(put in shared) (en-hash rumor)))

345 ::

254 ::

346 ++ may-watch

255 ++ may-watch

347 |= who=ship

256 |= who=ship

@@ -455,7 +364,7 @@

455 ::

364 ::

456 ++ agent

365 ++ agent

457 |= inner=agent:gall

366 |= inner=agent:gall

458− =| state-3

367+ =| state-0

459 =* state -

368 =* state -

460 %+ verb |

369 %+ verb |

461 %- agent:dbug

370 %- agent:dbug

@@ -473,70 +382,22 @@

473 =^ cards state (play-cards:up cards)

382 =^ cards state (play-cards:up cards)

474 [(weld watch-pals:up cards) this]

383 [(weld watch-pals:up cards) this]

475 ::

384 ::

476− ++ on-save (slop !>([%gossip state]) on-save:og)

385+ ++ on-save !>([[%gossip state] on-save:og])

477 ++ on-load

386 ++ on-load

478 |= ole=vase

387 |= ole=vase

479 ^- (quip card _this)

388 ^- (quip card _this)

480 ?. ?=([[%gossip *] *] q.ole)

389 ?. ?=([[%gossip *] *] q.ole)

481 =. manner init

390 =. manner init

482− =^ cards inner (on-load:og ole)

391+ =^ cards inner (on-load:og ole)

483 =^ cards state (play-cards:up cards)

392 =^ cards state (play-cards:up cards)

484 [(weld watch-pals:up cards) this]

393 [(weld watch-pals:up cards) this]

485 ::

394 ::

486− |^ =+ !<([%gossip old=state-any] (slot 2 ole))

395+ =+ !<([[%gossip old=state-0] ile=vase] ole)

487− =/ ile=vase (slot 3 ole)

488− =? old ?=(%0 -.old) (state-0-to-1 old)

489− =? old ?=(%1 -.old) (state-1-to-2 old)

490− :: before version 3, we stored the inner +on-save vase inside

491− :: our own +on-save vase. undoing this double-vasing coincided

492− :: with the h135 type-of-type upgrade.

493− ::

494− =? ile ?=(%2 -.old) (next-vase:h136 !<(vase:h136 ile))

495− =? old ?=(%2 -.old) (state-2-to-3 old)

496− ?> ?=(%3 -.old)

497− =. state old

396+ =. state old

498− =^ cards inner (on-load:og ile)

397+ =^ cards inner (on-load:og ile)

499− =^ cards state (play-cards:up cards)

398+ =^ cards state (play-cards:up cards)

500− ::TODO for later versions, add :future retry logic as needed

399+ ::TODO for later versions, add :future retry logic as needed

501− [cards this]

400+ [cards this]

502− ::

503− +$ state-any $%(state-0 state-1 state-2 state-3)

504− ::

505− +$ state-2

506− $: %2

507− manner=config

508− memory=(set hash)

509− shared=(set hash)

510− passed=(map hash [rumor @da])

511− misses=(set ship)

512− future=(list rumor)

513− ==

514− ++ state-2-to-3

515− |=(s=state-2 s(- %3))

516− ::

517− +$ state-1

518− $: %1

519− manner=config

520− memory=(set hash)

521− shared=(set hash)

522− passed=(map hash [rumor @da])

523− future=(list rumor)

524− ==

525− ++ state-1-to-2

526− |= state-1

527− [%2 manner memory shared passed ~ future]

528− ::

529− +$ state-0 [%0 manner=config-0 memory=(set hash) future=(list rumor)]

530− +$ config-0 [hops=_1 hear=whos tell=whos]

531− ++ state-0-to-1

532− |= state-0

533− ^- state-1

534− [%1 (config-0-to-1 manner) memory memory ~ future]

535− ++ config-0-to-1

536− |= config-0

537− ^- config

538− [hops hear tell pass.init]

539− --

540 ::

401 ::

541 ++ on-watch

402 ++ on-watch

542 |= =path

403 |= =path

@@ -553,43 +414,13 @@

553 =^ cards state (play-first-cards:up cards)

414 =^ cards state (play-first-cards:up cards)

554 [cards this]

415 [cards this]

555 ::

416 ::

556− ++ on-poke

557− |= [=mark =vase]

558− ^- (quip card _this)

559− ::TODO gossip config pokes

560− ?. =(%gossip-rumor mark)

561− =^ cards inner (on-poke:og +<)

562− =^ cards state (play-cards:up cards)

563− [cards this]

564− ?. (want-target:up src.bowl)

565− ~|(%gossip-rejected !!)

566− :: we're getting pokes from them, so we should try relaying through

567− :: them again if we stopped doing so

568− ::NOTE this only ever cleans out .misses for ships producing content

569− ::

570− =. misses (~(del in misses) src.bowl)

571− ::TODO dedupe with +on-agent %fact

572− =+ !<(=rumor vase)

573− =/ =hash (en-hash:up rumor)

574− ?: (~(has in memory) hash)

575− [~ this]

576− ?. =(%0 kind.rumor)

577− ~& [gossip+dap.bowl %delaying-unknown-rumor-kind kind.rumor]

578− [~ this(future [rumor future])]

579− =. memory (~(put in memory) hash)

580− =/ mage=cage (en-cage:up data.rumor)

581− =^ cards inner (on-agent:og /~/gossip/gossip %fact mage)

582− =^ caz1 state (play-cards:up cards)

583− =^ caz2 state (emit-rumor:up rumor)

584− [(weld caz1 caz2) this]

585− ::

586 ++ on-agent

417 ++ on-agent

587 |= [=wire =sign:agent:gall]

418 |= [=wire =sign:agent:gall]

588 ^- (quip card _this)

419 ^- (quip card _this)

589 ?. ?=([%~.~ %gossip *] wire)

420 ?. ?=([%~.~ %gossip *] wire)

590 =^ cards inner (on-agent:og wire sign)

421 =^ cards inner (on-agent:og wire sign)

591 =^ cards state (play-cards:up cards)

422 =^ cards state (play-cards:up cards)

592− [cards this]

423+ [cards this]

593 ::

424 ::

594 ?+ t.t.wire ~|([%gossip %unexpected-wire wire] !!)

425 ?+ t.t.wire ~|([%gossip %unexpected-wire wire] !!)

595 [%gossip @ ~]

426 [%gossip @ ~]

@@ -602,26 +433,18 @@

602 ?. =(%gossip-rumor mark)

433 ?. =(%gossip-rumor mark)

603 ~& [gossip+dap.bowl %ignoring-unexpected-fact mark=mark]

434 ~& [gossip+dap.bowl %ignoring-unexpected-fact mark=mark]

604 [~ this]

435 [~ this]

605− :: we're getting facts from them, so we should try relaying through

606− :: them again if we stopped doing so

607− ::NOTE this only ever cleans out .misses for ships in .hear

608− ::

609− =. misses (~(del in misses) src.bowl)

610− ::TODO de-dupe with +on-poke

611 =+ !<(=rumor vase)

436 =+ !<(=rumor vase)

612− =/ =hash (en-hash:up rumor)

437+ =/ hash (sham data.rumor)

613 ?: (~(has in memory) hash)

438 ?: (~(has in memory) hash)

614− =^ cards state (jump-rumor:up rumor)

615− [cards this]

439+ [~ this]

616 ?. =(%0 kind.rumor)

440 ?. =(%0 kind.rumor)

617 ~& [gossip+dap.bowl %delaying-unknown-rumor-kind kind.rumor]

441 ~& [gossip+dap.bowl %delaying-unknown-rumor-kind kind.rumor]

618 [~ this(future [rumor future])]

442 [~ this(future [rumor future])]

619− =. memory (~(put in memory) hash)

620 =/ mage=cage (en-cage:up data.rumor)

443 =/ mage=cage (en-cage:up data.rumor)

621 =^ cards inner (on-agent:og /~/gossip/gossip sign(cage mage))

444 =^ cards inner (on-agent:og /~/gossip/gossip sign(cage mage))

622− =^ caz1 state (play-cards:up cards)

445+ =^ cards state (play-cards:up cards)

623− =^ caz2 state (jump-rumor:up rumor)

446+ :_ this(memory (~(put in memory) hash))

624− [(weld caz1 caz2) this]

447+ (weld (drop (resend-rumor:up rumor)) cards)

625 ::

448 ::

626 %watch-ack

449 %watch-ack

627 :_ this

450 :_ this

@@ -648,32 +471,6 @@

648 ~& [gossip+dap.bowl %unexpected-poke-ack wire]

471 ~& [gossip+dap.bowl %unexpected-poke-ack wire]

649 [~ this]

472 [~ this]

650 ==

473 ==

651− ::

652− [%passed ?([@ ~] [@ @ ~])]

653− ?. ?=(%poke-ack -.sign)

654− ~& [gossip+dap.bowl %unexpected-sign wire -.sign]

655− [~ this]

656− ~| t.t.wire

657− :: regardless of anything else: if they acked the poke, they are

658− :: accepting of relay requests, if they nacked they're unaccepting

659− ::

660− =. misses

661− ?: ?=(~ p.sign)

662− (~(del in misses) src.bowl)

663− (~(put in misses) src.bowl)

664− =/ =hash

665− ?: ?=([@ ~] t.t.t.wire)

666− (slav %uv i.t.t.t.wire)

667− (slav %uv i.t.t.t.t.wire)

668− ?~ rum=(~(get by passed) hash)

669− [~ this]

670− ::NOTE emitting rest is cute, but doesn't actually work reliably,

671− :: due to userspace duct shenanigans. %wake logic will have to

672− :: be defensive...

673− =/ rest=card [%pass wire %arvo %b %rest +.u.rum]

674− ?~ p.sign [[rest]~ this(passed (~(del by passed) hash))]

675− =^ caz state (emit-rumor:up -.u.rum)

676− [[rest caz] this]

677 ::

474 ::

678 [%pals @ ~]

475 [%pals @ ~]

679 ?- -.sign

476 ?- -.sign

@@ -745,14 +542,6 @@

745 ++ on-peek

542 ++ on-peek

746 |= =path

543 |= =path

747 ^- (unit (unit cage))

544 ^- (unit (unit cage))

748− ?: =(/x/whey path)

749− :+ ~ ~

750− :- %mass

751− !> ^- (list mass)

752− :- %gossip^&+state

753− =/ dat (on-peek:og path)

754− ?: ?=(?(~ [~ ~]) dat) ~

755− (fall ((soft (list mass)) q.q.u.u.dat) ~)

756 ?: =(/x/dbug/state path)

545 ?: =(/x/dbug/state path)

757 ``noun+(slop on-save:og !>(gossip=state))

546 ``noun+(slop on-save:og !>(gossip=state))

758 ?. ?=([@ %~.~ %gossip *] path)

547 ?. ?=([@ %~.~ %gossip *] path)

@@ -771,6 +560,14 @@

771 =^ cards state (play-cards:up cards)

560 =^ cards state (play-cards:up cards)

772 [cards this]

561 [cards this]

773 ::

562 ::

563+ ++ on-poke

564+ |= cage

565+ ^- (quip card _this)

566+ ::TODO gossip config pokes?

567+ =^ cards inner (on-poke:og +<)

568+ =^ cards state (play-cards:up cards)

569+ [cards this]

570+ ::

774 ++ on-arvo

571 ++ on-arvo

775 |= [=wire sign=sign-arvo:agent:gall]

572 |= [=wire sign=sign-arvo:agent:gall]

776 ^- (quip card _this)

573 ^- (quip card _this)

@@ -778,41 +575,19 @@

778 =^ cards inner (on-arvo:og wire sign)

575 =^ cards inner (on-arvo:og wire sign)

779 =^ cards state (play-cards:up cards)

576 =^ cards state (play-cards:up cards)

780 [cards this]

577 [cards this]

578+ ?> ?=([%retry *] t.t.wire)

579+ ?> ?=(%wake +<.sign)

781− ?+ t.t.wire ~|(wire !!)

580+ ?+ t.t.t.wire ~|(wire !!)

782− [%passed ?([@ ~] [@ @ ~])]

581+ [%pals *]

783− =/ =hash

582+ ::NOTE this might result in subscription wire re-use,

784− ?: ?=([@ ~] t.t.t.wire)

583+ :: but if we hit this path we should be loud anyway.

785− (slav %uv i.t.t.t.wire)

584+ [watch-pals:up this]

786− (slav %uv i.t.t.t.t.wire)

787− ?~ rum=(~(get by passed) hash) [~ this]

788− :: since timer cancellation isn't fully reliable, this timer fire

789− :: might be from a relay that nacked our poke. if the timer fired

790− :: earlier than expected, assume that to be the case and no-op.

791− ::

792− ?: (gth +.u.rum now.bowl) [~ this]

793− :: they failed to respond to our relay request in time, mark them as

794− :: unaccepting (if we know who they are from a the new-style wire)

795− :: and try sending the rumor again

796− ::

797− =? misses ?=([@ @ ~] t.t.t.wire)

798− (~(put in misses) (slav %p i.t.t.t.wire))

799− =^ cards state (emit-rumor:up -.u.rum)

800− [cards this]

801 ::

585 ::

802− [%retry *]

803− ?> ?=(%wake +<.sign)

804− ?+ t.t.t.wire ~|(wire !!)

805− [%pals *]

806− ::NOTE this might result in subscription wire re-use,

807− :: but if we hit this path we should be loud anyway.

808− [watch-pals:up this]

809− ::

810− [%watch @ ~]

586+ [%watch @ ~]

811− :_ this

587+ :_ this

812− =/ target=ship (slav %p i.t.t.t.t.wire)

588+ =/ target=ship (slav %p i.t.t.t.t.wire)

813− ?. (want-target:up target) ~

589+ ?. (want-target:up target) ~

814− (watch-target:up target)

590+ (watch-target:up target)

815− ==

816 ==

591 ==

817 ::

592 ::

818 ++ on-fail

593 ++ on-fail

@@ -823,4 +598,4 @@

823 [cards this]

598 [cards this]

824 --

599 --

825 --

600 --

826−--

601+--

desk/lib/metaphone.hoon−1

@@ -155,7 +155,6 @@

155 ?: forward

156 ?: (gth (add index offset) (dec (lent text))) ''

157 (snag (add index offset) text)

158− ?: (lth index offset) ''

159 ?: (lth (sub index offset) 0) ''

158 ?: (lth (sub index offset) 0) ''

160 (snag (sub index offset) text)

159 (snag (sub index offset) text)

161 --

160 --

desk/lib/pals.hoon+2−8

@@ -1,9 +1,6 @@

1:: pals: manual peer discovery

2::

3−/- *pals

4−::

5|_ bowl:gall

3|_ bowl:gall

6−++ records (s ^records /)

7++ leeches (s (set ship) /leeches)

4++ leeches (s (set ship) /leeches)

8++ targets |= list=@ta (s (set ship) %targets ?~(list / /[list]))

5++ targets |= list=@ta (s (set ship) %targets ?~(list / /[list]))

9++ mutuals |= list=@ta (s (set ship) %mutuals ?~(list / /[list]))

6++ mutuals |= list=@ta (s (set ship) %mutuals ?~(list / /[list]))

@@ -11,11 +8,8 @@

11++ target |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

8++ target |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

12++ mutual |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

9++ mutual |= [list=@ta =ship] (s _| /mutuals/[list]/(scot %p ship))

13::

10::

14−++ labels ?. running `(set @ta)`~

15− ~(key by dir:.^(arch %gy (snoc base %targets)))

16−::

17−++ base ~+ `path`/(scot %p our)/pals/(scot %da now)

11+++ base ~+ /(scot %p our)/pals/(scot %da now)

18−++ running ~+ .^(? %gu (snoc base %$))

12+++ running ~+ .^(? %gu base)

19::

13::

20++ s

14++ s

21 |* [=mold =path] ~+

15 |* [=mold =path] ~+

desk/lib/sift.hoon+23−39

@@ -3,63 +3,47 @@

3 |= corpus=@t

4 ^- (list @t)

5 ?: =(corpus '') ~

6− =/ parts (split corpus)

7− ?~ parts ~

8 %+ skip

6 %+ skip

9− (need parts)

7+ (split corpus)

10 |= word=@t

8 |= word=@t

11 (~(has in words) word)

9 (~(has in words) word)

12++ norm

10++ norm

13 |= corpus=@t

11 |= corpus=@t

14− ^- @t

15 ?: =(corpus '') ''

12 ?: =(corpus '') ''

16− =/ cleaned (trimall (weave (expunge (weave (trimall `corpus)))))

13+ (crip (cass (trimall (crip (expunge corpus)))))

17− ?~ cleaned ''

18− (crip (cass (need cleaned)))

19−++ weave

20− |= corpus=(unit tape)

21− ^- (unit @t)

22− ?~ corpus ~

23− (some (crip (need corpus)))

24++ split

14++ split

25 |= corpus=@t

15 |= corpus=@t

26− ^- (unit (list @t))

16+ ^- (list @t)

27 ?: =(corpus '') ~

17 ?: =(corpus '') ~

28− =/ test (norm corpus)

18+ %+ rash (norm corpus)

29− %+ rush test

30− (more (plus ws) (cook crip (plus ;~(pose aln hep))))

19+ (more ace (cook crip (plus ;~(pose aln hep))))

31++ allowed ;~(pose aln hep ace)

20++ allowed ;~(pose aln hep ace)

32−++ banned ;~(less allowed next)

21+++ banned ;~(less allowed prn)

33−++ ws (mask " \0a\0d\09")

34++ expunge

22++ expunge

35− |= corpus=(unit @t)

23+ |= corpus=@t

36− ^- (unit tape)

24+ ^- (list @t)

37− ?~ corpus ~

25+ ?: =(corpus '') ~

38− =/ text (need corpus)

26+ %- zing

39− ?: =(text '') ~

27+ %+ rash corpus

40− =/ parsed

41− %+ rush text

42− %- plus

28+ %- plus

43− ;~ pose

29+ ;~ pose

44− ;~(pfix (plus banned) (star allowed))

30+ ;~(pfix (plus banned) (star allowed))

45− ;~(sfix (star allowed) (plus banned))

31+ ;~(sfix (star allowed) (plus banned))

46− (plus allowed)

32+ (plus allowed)

47− ==

33+ ==

48− ?~ parsed ~

49− `(zing (need parsed))

50++ trimall

34++ trimall

51− |= corpus=(unit @t)

35+ |= corpus=@t

52− ^- (unit tape)

36+ |^ ^- tape

53− ?~ corpus ~

37+ ?: =(corpus '') ~

54− =/ text (need corpus)

38+ %+ rash corpus

55− ?: =(text '') ~

56− %+ rush text

57 %+ ifix [(star ws) (star ws)]

39 %+ ifix [(star ws) (star ws)]

58 %- star

40 %- star

59 ;~ less

41 ;~ less

60 ;~(plug (plus ws) ;~(less next (easy ~)))

42 ;~(plug (plus ws) ;~(less next (easy ~)))

61 ;~(pose (cold ' ' (plus ws)) next)

43 ;~(pose (cold ' ' (plus ws)) next)

62 ==

44 ==

45+ ++ ws (mask " \0a\0d\09")

46+ --

63++ words

47++ words

64 %- silt

48 %- silt

65 :~ 'a'

49 :~ 'a'

desk/lib/sphinx-json.hoon+4−12

@@ -26,12 +26,10 @@

26 |= =search:s

27 %- pairs

28 :~ listings/a/(turn listings.search listing)

29− :: numb, not (scot %ud): 1.234 would be read as a fraction

30− ::

31− start/(numb start.search)

29+ start/n/(scot %ud start.search)

32− limit/(numb limit.search)

30+ limit/n/(scot %ud limit.search)

33− size/(numb size.search)

31+ size/n/(scot %ud size.search)

34− total/(numb total.search)

32+ total/n/(scot %ud total.search)

35 ==

33 ==

36 ++ directory

34 ++ directory

37 |= d=directory:s

35 |= d=directory:s

@@ -39,12 +37,6 @@

39 %+ turn ~(tap by d)

37 %+ turn ~(tap by d)

40 |= [=hash:s l=listing:s]

38 |= [=hash:s l=listing:s]

41 [(scot %uv hash) (listing l)]

39 [(scot %uv hash) (listing l)]

42− ++ tags

43− |= tags=(map @t @ud)

44− %- pairs

45− %+ turn ~(tap by tags)

46− |= [tag=@t count=@ud]

47− [tag (numb count)]

48 --

40 --

49++ dejs

41++ dejs

50 =, dejs:format

42 =, dejs:format

desk/lib/sphinx.hoon+24−44

@@ -47,38 +47,6 @@

47 %+ turn

48 entries

49 |=(=entry hash.entry)

50−:: +lengths-valid: bounds on what a peer can send, checked before

51−:: anything is indexed

52−::

53−:: source and time aren't in the digest, so a peer picks them too:

54−:: +time:enjs crashes before 1970, and rendering a huge atom is

55−:: quadratic

56−::

57−++ lengths-valid

58− |= l=listing

59− ?& (lte (met 3 title.post.l) 77)

60− (lte (met 3 description.post.l) 256)

61− (lte (lent tags.post.l) 8)

62− (levy tags.post.l |=(tag=@t (lte (met 3 tag) 1.024)))

63− (lte (met 3 link.post.l) 1.024)

64− (lte (met 3 image.post.l) 1.024)

65− (lte (met 3 color.post.l) 1.024)

66− (lte (met 3 source.l) 16)

67− (gte time.l ~1970.1.1)

68− (lth time.l ~275000.1.1)

69− ==

70−++ urls-valid

71− |= l=listing

72− =/ image

73− ?: =(image.post.l '') 'X'

74− (validate image.post.l)

75− =/ link (validate link.post.l)

76− &(!=(image ~) !=(link ~))

77−++ listing-valid

78− |= l=listing

79− :: lengths first: don't parse urls of oversized listings

80− ::

81− &((lengths-valid l) (urls-valid l))

82++ delver

50++ delver

83 |_ [=lookup =trigrams =phonetics =trail]

51 |_ [=lookup =trigrams =phonetics =trail]

84 ++ get

52 ++ get

@@ -86,7 +54,20 @@

86 [lookup trigrams phonetics trail]

54 [lookup trigrams phonetics trail]

87 ++ catalog

55 ++ catalog

88 |= [=hash l=listing]

56 |= [=hash l=listing]

89− ?. (listing-valid l) get

57+ ?.

58+ ?& (lte (lent (trip title.post.l)) 77)

59+ (lte (lent (trip description.post.l)) 256)

60+ (lte (lent tags.post.l) 8)

61+ (lte (lent (trip link.post.l)) 1.024)

62+ (lte (lent (trip image.post.l)) 1.024)

63+ ==

64+ get

65+ =/ image

66+ ?: =(image.post.l '') 'X'

67+ (validate image.post.l)

68+ =/ link (validate link.post.l)

69+ ?: |(=(image ~) =(link ~))

70+ get

90 =/ entries=^lookup

71 =/ entries=^lookup

91 %- malt

72 %- malt

92 ^- (list [@t (list entry)])

73 ^- (list [@t (list entry)])

@@ -96,11 +77,8 @@

96 (sift:sift description.post.l)

77 (sift:sift description.post.l)

97 |= word=@t

78 |= word=@t

98 [word ~[[hash rank=8]]]

79 [word ~[[hash rank=8]]]

99− :: +iching is quadratic in the length of a key, so long

100− :: tags aren't indexed

101− ::

102 %+ turn

80 %+ turn

103− (skim tags.post.l |=(tag=@t (lte (met 3 tag) 64)))

81+ tags.post.l

104 |= tag=@t

82 |= tag=@t

105 [(norm:sift tag) ~[[hash rank=12]]]

83 [(norm:sift tag) ~[[hash rank=12]]]

106 %+ turn

84 %+ turn

@@ -111,13 +89,12 @@

111 ==

89 ==

112 =/ keys ~(tap in ~(key by entries))

90 =/ keys ~(tap in ~(key by entries))

113 =. trail (~(put by trail) hash keys)

91 =. trail (~(put by trail) hash keys)

114− :: only touch the new keys: rebuilding the whole map for every

115− :: listing made cataloging a directory quadratic

116− ::

117− =. lookup

92+ =. lookup

118− %+ roll ~(tap by entries)

93+ %- ~(uni by entries)

94+ %- ~(rut by lookup)

119− |= [[=key value=(list entry)] lok=_lookup]

95+ |= [=key value=(list entry)]

96+ ?. (~(has by entries) key) value

120− (~(put by lok) key (weld value (~(gut by lok) key ~)))

97+ (weld value (~(got by entries) key))

121 =. trigrams

98 =. trigrams

122 %+ roll

99 %+ roll

123 %+ snoc

100 %+ snoc

@@ -175,6 +152,9 @@

175 =/ exact (turn (get-exact title) (uprank 8))

152 =/ exact (turn (get-exact title) (uprank 8))

176 =/ trigrams (turn (get-trigrams title) (uprank 4))

153 =/ trigrams (turn (get-trigrams title) (uprank 4))

177 =/ phonetics (get-phonetics title)

154 =/ phonetics (get-phonetics title)

155+ ~& [%exact exact]

156+ ~& [%trigrams trigrams]

157+ ~& [%phonetics phonetics]

178 ;: weld

158 ;: weld

179 phonetics

159 phonetics

180 trigrams

160 trigrams

desk/mar/search.hoon+1−1

@@ -9,6 +9,6 @@

9 --

10++ grab

11 |%

12− ++ noun search:s

12+ ++ noun search

13 --

14--

desk/mar/tags.hoondeleted−14

@@ -1,14 +0,0 @@

1−/- s=sphinx

2−/+ j=sphinx-json

3−|_ tags=(map @t @ud)

4−++ grad %noun

5−++ grow

6− |%

7− ++ noun tags

8− ++ json (tags:enjs:j tags)

9− --

10−++ grab

11− |%

12− ++ noun (map @t @ud)

13− --

14−--

desk/sys.kelvin+1−1

@@ -1 +1 @@

1−[%zuse 408]

1+[%zuse 418]

desk/ted/publish-all.hoon+10−10

@@ -5,25 +5,25 @@

5=/ posts

6 ^- (list declare:s)

7 :~ :- %friends

8− ['networked subject' %group 'web+urbitgraph://group/~matwet/networked-subject' 'https://subject.network | networked subject' ~['hosting' 'networking' 'urbit' 'ops'] 'https://urbits3.ams3.digitaloceanspaces.com/sitful-hatred/2022.7.07..17.15.52-ns.png' '']

8+ ['networked subject' %group 'web+urbitgraph://group/~matwet/networked-subject' 'https://subject.network | networked subject' ~['hosting' 'networking' 'urbit' 'ops'] 'https://urbits3.ams3.digitaloceanspaces.com/sitful-hatred/2022.7.07..17.15.52-ns.png']

9 :- %friends

10− ['Hooniverse' %group 'web+urbitgraph://group/~hiddev-dannut/new-hooniverse' 'Community based Hoon learning for all levels. For discussion of Hoon specific to Uqbar, join ~hiddev-dannut/uhoon' ~['hoon' 'dev' 'urbit' 'programming' 'education'] 'https://i.imgur.com/ghThlz7.png' '']

10+ ['Hooniverse' %group 'web+urbitgraph://group/~hiddev-dannut/new-hooniverse' 'Community based Hoon learning for all levels. For discussion of Hoon specific to Uqbar, join ~hiddev-dannut/uhoon' ~['hoon' 'dev' 'urbit' 'programming' 'education'] 'https://i.imgur.com/ghThlz7.png']

11 :- %friends

12− ['Hollow Mars Theory' %group 'web+urbitgraph://group/~rabsef-bicrym/hollow-mars-theory' 'Definitely NOT a Conspiracy Chat' ~['conspiracies' 'ufos' 'steel beams'] '' '']

12+ ['Hollow Mars Theory' %group 'web+urbitgraph://group/~rabsef-bicrym/hollow-mars-theory' 'Definitely NOT a Conspiracy Chat' ~['conspiracies' 'ufos' 'steel beams'] '']

13 :- %friends

14− ['celestial systems' %group 'web+urbitgraph://group/~nocsyx-lassul/celestial-systems' 'A place for pilots who are building hosting providers' ~['hosting' 'ops' 'urbit'] '' '']

14+ ['celestial systems' %group 'web+urbitgraph://group/~nocsyx-lassul/celestial-systems' 'A place for pilots who are building hosting providers' ~['hosting' 'ops' 'urbit'] '']

15 :- %friends

16− ['Structure' %group 'web+urbitgraph://group/~fabled-faster/structure' 'Urbit Structural Design and Engineering Group. Always Thinking About Mechanics.' ~['design' 'ux' 'hci' 'urbit'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2022.1.27..17.59.43-image.png' '']

16+ ['Structure' %group 'web+urbitgraph://group/~fabled-faster/structure' 'Urbit Structural Design and Engineering Group. Always Thinking About Mechanics.' ~['design' 'ux' 'hci' 'urbit'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2022.1.27..17.59.43-image.png']

17 :- %friends

18− ['The Marketplace' %group 'web+urbitgraph://group/~tirrel/the-marketplace' 'Welcome to The Marketplace, featuring The Pit, Urbit\'s first open-outcry market!' ~['urbit' 'market' 'sell' 'buy'] 'https://snipboard.io/U0IYyi.jpg' '']

18+ ['The Marketplace' %group 'web+urbitgraph://group/~tirrel/the-marketplace' 'Welcome to The Marketplace, featuring The Pit, Urbit\'s first open-outcry market!' ~['urbit' 'market' 'sell' 'buy'] 'https://snipboard.io/U0IYyi.jpg']

19 :- %friends

20− ['The Forge' %group 'web+urbitgraph://group/~middev/the-forge' 'pale fire computing' ~['dev' 'programming' 'hoon' 'urbit'] 'https://nyc3.digitaloceanspaces.com/archiv/littel-wolfur/2021.5.06..21.01.58-the%20forge.png' '']

20+ ['The Forge' %group 'web+urbitgraph://group/~middev/the-forge' 'pale fire computing' ~['dev' 'programming' 'hoon' 'urbit'] 'https://nyc3.digitaloceanspaces.com/archiv/littel-wolfur/2021.5.06..21.01.58-the%20forge.png']

21 :- %friends

22− ['UFORIA' %group 'web+urbitgraph://group/~tiplec-lacnyx/ufora' 'UFO Research, Investigations, and Analysis' ~['UFO' 'conspiracies' 'research'] 'https://tiplec-lacnyx.nyc3.digitaloceanspaces.com/tiplec-lacnyx/2021.12.27..06.09.47-change1.jpg' '']

22+ ['UFORIA' %group 'web+urbitgraph://group/~tiplec-lacnyx/ufora' 'UFO Research, Investigations, and Analysis' ~['UFO' 'conspiracies' 'research'] 'https://tiplec-lacnyx.nyc3.digitaloceanspaces.com/tiplec-lacnyx/2021.12.27..06.09.47-change1.jpg']

23 :- %friends

24− ['Urbit Community' %group 'web+urbitgraph://group/~bitbet-bolbel/urbit-community' 'World hub, help desk, meet and greet, etc.' ~['general' 'urbit' 'community' 'help'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2021.4.02..21.52.41-UC.png' '']

24+ ['Urbit Community' %group 'web+urbitgraph://group/~bitbet-bolbel/urbit-community' 'World hub, help desk, meet and greet, etc.' ~['general' 'urbit' 'community' 'help'] 'https://fabled-faster.nyc3.digitaloceanspaces.com/fabled-faster/2021.4.02..21.52.41-UC.png']

25 :- %friends

26− ['Urbytes' %group 'web+urbitgraph://group/~nartes-fasrum/urbytes' 'We feed and water Mars.' ~['cooking' 'food' 'beverages' 'peanut butter eggs'] '' '']

26+ ['Urbytes' %group 'web+urbitgraph://group/~nartes-fasrum/urbytes' 'We feed and water Mars.' ~['cooking' 'food' 'beverages' 'peanut butter eggs'] '']

27 ==

28^- thread:spider

29|= arg=vase

flake.lockdeleted−63

@@ -1,63 +0,0 @@

1−{

2− "nodes": {

3− "landscape": {

4− "flake": false,

5− "locked": {

6− "lastModified": 1781809440,

7− "narHash": "sha256-woNZKzK8xlBxnMMrQOzInA7+gGxs7BgjGbmTi7OGi6g=",

8− "owner": "tloncorp",

9− "repo": "landscape",

10− "rev": "3ea2679f2003ed3ca1a6b322cd7857a774eac305",

11− "type": "github"

12− },

13− "original": {

14− "owner": "tloncorp",

15− "repo": "landscape",

16− "rev": "3ea2679f2003ed3ca1a6b322cd7857a774eac305",

17− "type": "github"

18− }

19− },

20− "nixpkgs": {

21− "locked": {

22− "lastModified": 1792210252,

23− "narHash": "sha256-Mh0PUaIv4nFY+8wAGonaEh8iBzwsmdNlwjVHmFg1Biw=",

24− "owner": "NixOS",

25− "repo": "nixpkgs",

26− "rev": "09063bd1f2b36fd9fd793c36dfade7bd40a93dfc",

27− "type": "github"

28− },

29− "original": {

30− "owner": "NixOS",

31− "ref": "nixos-unstable",

32− "repo": "nixpkgs",

33− "type": "github"

34− }

35− },

36− "root": {

37− "inputs": {

38− "landscape": "landscape",

39− "nixpkgs": "nixpkgs",

40− "urbit": "urbit"

41− }

42− },

43− "urbit": {

44− "flake": false,

45− "locked": {

46− "lastModified": 1785851358,

47− "narHash": "sha256-eHoGwqirk7zMpOn/y8dKqozz5IiQ7nqek/ypxIOaRiU=",

48− "owner": "urbit",

49− "repo": "urbit",

50− "rev": "5a187fededc4582a34fcd6055c67bb63e0917b94",

51− "type": "github"

52− },

53− "original": {

54− "owner": "urbit",

55− "ref": "408k-2",

56− "repo": "urbit",

57− "type": "github"

58− }

59− }

60− },

61− "root": "root",

62− "version": 7

63−}

flake.nixdeleted−98

@@ -1,98 +0,0 @@

1−{

2− description = "sphinx desk";

3−

4− inputs = {

5− nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

6−

7− # Dependency desks. Keep them on releases for the kelvin in

8− # desk/sys.kelvin ([%zuse 408]) and bump them together with it.

9− urbit = {

10− # release tag for [%zuse 408]

11− url = "github:urbit/urbit/408k-2";

12− flake = false;

13− };

14− landscape = {

15− # No 408 tag: the staging head Tlon promoted on 2026-06-18, whose

16− # desk/sys.kelvin lists [%zuse 410] [%zuse 409] [%zuse 408].

17− url = "github:tloncorp/landscape/3ea2679f2003ed3ca1a6b322cd7857a774eac305";

18− flake = false;

19− };

20− };

21−

22− outputs =

23− {

24− self,

25− nixpkgs,

26− urbit,

27− landscape,

28− }:

29− let

30− forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;

31−

32− # Only what ./desk needs from the dependency desks: its imports,

33− # transitively, and the marks for its file types plus json and mime.

34− # 408 clay builds every mark on the desk at each commit and OTA, and one

35− # that fails to build rejects the whole event, so extra marks are a

36− # liability.

37− basePicks = [

38− "lib/dbug.hoon"

39− "lib/default-agent.hoon"

40− "lib/skeleton.hoon"

41− "lib/strand.hoon"

42− "lib/strandio.hoon"

43− "lib/verb.hoon"

44− "sur/spider.hoon"

45− "sur/verb.hoon"

46− "mar/bill.hoon"

47− "mar/hoon.hoon"

48− "mar/json.hoon"

49− "mar/kelvin.hoon"

50− "mar/mime.hoon"

51− "mar/noun.hoon"

52− "mar/txt.hoon"

53− ];

54− # desk.docket-0 needs mar/docket-0, which imports lib/docket and

55− # sur/docket.

56− docketPicks = [

57− "lib/docket.hoon"

58− "mar/docket-0.hoon"

59− "sur/docket.hoon"

60− ];

61− in

62− {

63− packages = forAllSystems (

64− system:

65− let

66− pkgs = nixpkgs.legacyPackages.${system};

67− in

68− {

69− # The picks, then ./desk on top. -L copies symlink targets, so the

70− # desk is plain files.

71− desk = pkgs.runCommandLocal "sphinx-desk" { } ''

72− mkdir $out

73− for f in ${toString basePicks}; do

74− install -Dm644 ${urbit}/pkg/base-dev/$f $out/$f

75− done

76− for f in ${toString docketPicks}; do

77− install -Dm644 ${landscape}/desk-dev/$f $out/$f

78− done

79− cp -RL ${./desk}/. $out

80− '';

81− # The UI files, served under /apps/sphinx/. Upload this directory at

82− # /docket/upload on the ship in desk/desk.docket-0's glob-ames.

83− glob = pkgs.buildNpmPackage {

84− name = "sphinx-glob";

85− src = ./ui;

86− nodejs = pkgs.nodejs_22;

87− npmDepsHash = "sha256-uOUDkt0spCWdlOfto5Y3o5R9PP6oeYmGMcwUjEdzC/M=";

88− installPhase = ''

89− runHook preInstall

90− cp -R dist $out

91− runHook postInstall

92− '';

93− };

94− default = self.packages.${system}.desk;

95− }

96− );

97− };

98−}

ui/.nvmrcdeleted−1

@@ -1 +0,0 @@

1−22

ui/index.html+1−1

@@ -8,7 +8,7 @@

8 <link rel="icon" href="/src/assets/favicon.svg" sizes="any" type="image/svg+xml" />

9 <link rel="mask-icon" href="/src/assets/safari-pinned-tab.svg" color="#000000" />

10 <link rel="apple-touch-icon" sizes="180x180" href="/src/assets/apple-touch-icon.png" />

11− <link rel="manifest" href="/manifest.json" />

11+ <link rel="manifest" href="/src/assets/manifest.json" />

12 </head>

13 <body class="font-sans text-mauve bg-linen antialiased">

14 <div id="app"></div>

ui/package-lock.json+359−174

@@ -12,21 +12,17 @@

12 "@radix-ui/react-dropdown-menu": "^0.1.6",

13 "@radix-ui/react-select": "^0.1.1",

14 "@radix-ui/react-toggle-group": "^0.1.5",

15− "@tanstack/react-query": "^4.29.5",

16− "@urbit/api": "2.2",

15+ "@urbit/api": "^2.0.0",

17 "@urbit/http-api": "^2.0.0",

16 "@urbit/http-api": "^2.0.0",

18 "big-integer": "^1.6.51",

17 "big-integer": "^1.6.51",

19 "classnames": "^2.3.1",

18 "classnames": "^2.3.1",

20− "color2k": "^2.0.2",

21 "lodash.debounce": "^4.0.8",

19 "lodash.debounce": "^4.0.8",

22− "query-string": "^7.1.1",

23 "react": "^17.0.2",

20 "react": "^17.0.2",

24 "react-dom": "^17.0.2",

21 "react-dom": "^17.0.2",

25 "react-hook-form": "^7.33.1",

22 "react-hook-form": "^7.33.1",

23+ "react-query": "^3.39.1",

26 "react-router-dom": "^6.3.0",

24 "react-router-dom": "^6.3.0",

27 "react-select": "^5.4.0",

25 "react-select": "^5.4.0",

28− "remove-markdown-and-html": "^0.1.0",

29− "urbit-ob": "^5.0.1",

30 "zustand": "^4.0.0-rc.1"

26 "zustand": "^4.0.0-rc.1"

31 },

27 },

32 "devDependencies": {

28 "devDependencies": {

@@ -37,7 +33,6 @@

37 "@vitejs/plugin-react-refresh": "^1.3.1",

33 "@vitejs/plugin-react-refresh": "^1.3.1",

38 "autoprefixer": "^10.4.7",

34 "autoprefixer": "^10.4.7",

39 "postcss": "^8.4.14",

35 "postcss": "^8.4.14",

40− "postcss-import": "^14.1.0",

41 "tailwindcss": "^3.1.4",

36 "tailwindcss": "^3.1.4",

42 "tailwindcss-labeled-groups": "^0.0.2",

37 "tailwindcss-labeled-groups": "^0.0.2",

43 "typescript": "^4.3.2",

38 "typescript": "^4.3.2",

@@ -1070,49 +1065,6 @@

1070 "node": ">= 8.0.0"

1065 "node": ">= 8.0.0"

1071 }

1066 }

1072 },

1067 },

1073− "node_modules/@tanstack/query-core": {

1074− "version": "4.29.5",

1075− "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.29.5.tgz",

1076− "integrity": "sha512-xXIiyQ/4r9KfaJ3k6kejqcaqFXXBTzN2aOJ5H1J6aTJE9hl/nbgAdfF6oiIu0CD5xowejJEJ6bBg8TO7BN4NuQ==",

1077− "funding": {

1078− "type": "github",

1079− "url": "https://github.com/sponsors/tannerlinsley"

1080− }

1081− },

1082− "node_modules/@tanstack/react-query": {

1083− "version": "4.29.5",

1084− "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.29.5.tgz",

1085− "integrity": "sha512-F87cibC3s3eG0Q90g2O+hqntpCrudKFnR8P24qkH9uccEhXErnJxBC/AAI4cJRV2bfMO8IeGZQYf3WyYgmSg0w==",

1086− "dependencies": {

1087− "@tanstack/query-core": "4.29.5",

1088− "use-sync-external-store": "^1.2.0"

1089− },

1090− "funding": {

1091− "type": "github",

1092− "url": "https://github.com/sponsors/tannerlinsley"

1093− },

1094− "peerDependencies": {

1095− "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

1096− "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",

1097− "react-native": "*"

1098− },

1099− "peerDependenciesMeta": {

1100− "react-dom": {

1101− "optional": true

1102− },

1103− "react-native": {

1104− "optional": true

1105− }

1106− }

1107− },

1108− "node_modules/@tanstack/react-query/node_modules/use-sync-external-store": {

1109− "version": "1.2.0",

1110− "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",

1111− "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",

1112− "peerDependencies": {

1113− "react": "^16.8.0 || ^17.0.0 || ^18.0.0"

1114− }

1115− },

1116 "node_modules/@types/lodash": {

1068 "node_modules/@types/lodash": {

1117 "version": "4.14.182",

1069 "version": "4.14.182",

1118 "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",

1070 "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",

@@ -1171,9 +1123,9 @@

1171 "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="

1123 "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="

1172 },

1124 },

1173 "node_modules/@urbit/api": {

1125 "node_modules/@urbit/api": {

1174− "version": "2.2.0",

1126+ "version": "2.1.1",

1175− "resolved": "https://registry.npmjs.org/@urbit/api/-/api-2.2.0.tgz",

1127+ "resolved": "https://registry.npmjs.org/@urbit/api/-/api-2.1.1.tgz",

1176− "integrity": "sha512-W8kP9OT6yOK62n+4yCPO3i9QqU5xriLvZQ9WYW4SAV7ktbSrGuf2kmYbnoqfA/NybIs9Q/MbFkPewrz4XJ96Ag==",

1128+ "integrity": "sha512-QRlqhtJ73q+pgMdSwuOO62HlxA7/2c5ylCcOUT01LXkJ2LTVCl5u+QnejdDvUmqjOuN2PyZk7df30xJVg6rC2A==",

1177 "dependencies": {

1129 "dependencies": {

1178 "@babel/runtime": "^7.16.0",

1130 "@babel/runtime": "^7.16.0",

1179 "big-integer": "^1.6.48",

1131 "big-integer": "^1.6.48",

@@ -1336,6 +1288,11 @@

1336 "resolve": "^1.12.0"

1288 "resolve": "^1.12.0"

1337 }

1289 }

1338 },

1290 },

1291+ "node_modules/balanced-match": {

1292+ "version": "1.0.2",

1293+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",

1294+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="

1295+ },

1339 "node_modules/big-integer": {

1296 "node_modules/big-integer": {

1340 "version": "1.6.51",

1297 "version": "1.6.51",

1341 "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",

1298 "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",

@@ -1358,6 +1315,15 @@

1358 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",

1315 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",

1359 "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="

1316 "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="

1360 },

1317 },

1318+ "node_modules/brace-expansion": {

1319+ "version": "1.1.11",

1320+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

1321+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",

1322+ "dependencies": {

1323+ "balanced-match": "^1.0.0",

1324+ "concat-map": "0.0.1"

1325+ }

1326+ },

1361 "node_modules/braces": {

1327 "node_modules/braces": {

1362 "version": "3.0.2",

1328 "version": "3.0.2",

1363 "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",

1329 "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",

@@ -1370,6 +1336,21 @@

1370 "node": ">=8"

1336 "node": ">=8"

1371 }

1337 }

1372 },

1338 },

1339+ "node_modules/broadcast-channel": {

1340+ "version": "3.7.0",

1341+ "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",

1342+ "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",

1343+ "dependencies": {

1344+ "@babel/runtime": "^7.7.2",

1345+ "detect-node": "^2.1.0",

1346+ "js-sha3": "0.8.0",

1347+ "microseconds": "0.2.0",

1348+ "nano-time": "1.0.0",

1349+ "oblivious-set": "1.0.0",

1350+ "rimraf": "3.0.2",

1351+ "unload": "2.2.0"

1352+ }

1353+ },

1373 "node_modules/browser-or-node": {

1354 "node_modules/browser-or-node": {

1374 "version": "1.3.0",

1355 "version": "1.3.0",

1375 "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz",

1356 "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz",

@@ -1504,10 +1485,10 @@

1504 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",

1485 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",

1505 "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="

1486 "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="

1506 },

1487 },

1507− "node_modules/color2k": {

1488+ "node_modules/concat-map": {

1508− "version": "2.0.2",

1489+ "version": "0.0.1",

1509− "resolved": "https://registry.npmjs.org/color2k/-/color2k-2.0.2.tgz",

1490+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",

1510− "integrity": "sha512-kJhwH5nAwb34tmyuqq/lgjEKzlFXn1U99NlnB6Ws4qVaERcRUYeYP1cBw6BJ4vxaWStAUEef4WMr7WjOCnBt8w=="

1491+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="

1511 },

1492 },

1512 "node_modules/connect-history-api-fallback": {

1493 "node_modules/connect-history-api-fallback": {

1513 "version": "1.6.0",

1494 "version": "1.6.0",

@@ -1584,20 +1565,17 @@

1584 }

1565 }

1585 }

1566 }

1586 },

1567 },

1587− "node_modules/decode-uri-component": {

1588− "version": "0.2.0",

1589− "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",

1590− "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",

1591− "engines": {

1592− "node": ">=0.10"

1593− }

1594− },

1595 "node_modules/defined": {

1568 "node_modules/defined": {

1596 "version": "1.0.0",

1569 "version": "1.0.0",

1597 "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",

1570 "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",

1598 "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==",

1571 "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==",

1599 "dev": true

1572 "dev": true

1600 },

1573 },

1574+ "node_modules/detect-node": {

1575+ "version": "2.1.0",

1576+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",

1577+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="

1578+ },

1601 "node_modules/detect-node-es": {

1579 "node_modules/detect-node-es": {

1602 "version": "1.1.0",

1580 "version": "1.1.0",

1603 "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",

1581 "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",

@@ -2080,14 +2058,6 @@

2080 "node": ">=8"

2058 "node": ">=8"

2081 }

2059 }

2082 },

2060 },

2083− "node_modules/filter-obj": {

2084− "version": "1.1.0",

2085− "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",

2086− "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",

2087− "engines": {

2088− "node": ">=0.10.0"

2089− }

2090− },

2091 "node_modules/find-root": {

2061 "node_modules/find-root": {

2092 "version": "1.1.0",

2062 "version": "1.1.0",

2093 "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",

2063 "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",

@@ -2106,6 +2076,11 @@

2106 "url": "https://www.patreon.com/infusion"

2076 "url": "https://www.patreon.com/infusion"

2107 }

2077 }

2108 },

2078 },

2079+ "node_modules/fs.realpath": {

2080+ "version": "1.0.0",

2081+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",

2082+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="

2083+ },

2109 "node_modules/fsevents": {

2084 "node_modules/fsevents": {

2110 "version": "2.3.2",

2085 "version": "2.3.2",

2111 "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",

2086 "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",

@@ -2141,6 +2116,25 @@

2141 "node": ">=6"

2116 "node": ">=6"

2142 }

2117 }

2143 },

2118 },

2119+ "node_modules/glob": {

2120+ "version": "7.2.3",

2121+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",

2122+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",

2123+ "dependencies": {

2124+ "fs.realpath": "^1.0.0",

2125+ "inflight": "^1.0.4",

2126+ "inherits": "2",

2127+ "minimatch": "^3.1.1",

2128+ "once": "^1.3.0",

2129+ "path-is-absolute": "^1.0.0"

2130+ },

2131+ "engines": {

2132+ "node": "*"

2133+ },

2134+ "funding": {

2135+ "url": "https://github.com/sponsors/isaacs"

2136+ }

2137+ },

2144 "node_modules/glob-parent": {

2138 "node_modules/glob-parent": {

2145 "version": "6.0.2",

2139 "version": "6.0.2",

2146 "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",

2140 "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",

@@ -2220,6 +2214,20 @@

2220 "url": "https://github.com/sponsors/sindresorhus"

2214 "url": "https://github.com/sponsors/sindresorhus"

2221 }

2215 }

2222 },

2216 },

2217+ "node_modules/inflight": {

2218+ "version": "1.0.6",

2219+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",

2220+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",

2221+ "dependencies": {

2222+ "once": "^1.3.0",

2223+ "wrappy": "1"

2224+ }

2225+ },

2226+ "node_modules/inherits": {

2227+ "version": "2.0.4",

2228+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

2229+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="

2230+ },

2223 "node_modules/invariant": {

2231 "node_modules/invariant": {

2224 "version": "2.2.4",

2232 "version": "2.2.4",

2225 "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",

2233 "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",

@@ -2286,6 +2294,11 @@

2286 "node": ">=0.12.0"

2294 "node": ">=0.12.0"

2287 }

2295 }

2288 },

2296 },

2297+ "node_modules/js-sha3": {

2298+ "version": "0.8.0",

2299+ "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",

2300+ "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="

2301+ },

2289 "node_modules/js-tokens": {

2302 "node_modules/js-tokens": {

2290 "version": "4.0.0",

2303 "version": "4.0.0",

2291 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

2304 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

@@ -2358,6 +2371,15 @@

2358 "loose-envify": "cli.js"

2371 "loose-envify": "cli.js"

2359 }

2372 }

2360 },

2373 },

2374+ "node_modules/match-sorter": {

2375+ "version": "6.3.1",

2376+ "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",

2377+ "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",

2378+ "dependencies": {

2379+ "@babel/runtime": "^7.12.5",

2380+ "remove-accents": "0.4.2"

2381+ }

2382+ },

2361 "node_modules/memoize-one": {

2383 "node_modules/memoize-one": {

2362 "version": "5.2.1",

2384 "version": "5.2.1",

2363 "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",

2385 "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",

@@ -2385,6 +2407,22 @@

2385 "node": ">=8.6"

2407 "node": ">=8.6"

2386 }

2408 }

2387 },

2409 },

2410+ "node_modules/microseconds": {

2411+ "version": "0.2.0",

2412+ "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",

2413+ "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="

2414+ },

2415+ "node_modules/minimatch": {

2416+ "version": "3.1.2",

2417+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",

2418+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",

2419+ "dependencies": {

2420+ "brace-expansion": "^1.1.7"

2421+ },

2422+ "engines": {

2423+ "node": "*"

2424+ }

2425+ },

2388 "node_modules/minimist": {

2426 "node_modules/minimist": {

2389 "version": "1.2.6",

2427 "version": "1.2.6",

2390 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",

2428 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",

@@ -2396,6 +2434,14 @@

2396 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

2434 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

2397 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="

2435 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="

2398 },

2436 },

2437+ "node_modules/nano-time": {

2438+ "version": "1.0.0",

2439+ "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",

2440+ "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",

2441+ "dependencies": {

2442+ "big-integer": "^1.6.16"

2443+ }

2444+ },

2399 "node_modules/nanoid": {

2445 "node_modules/nanoid": {

2400 "version": "3.3.4",

2446 "version": "3.3.4",

2401 "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",

2447 "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",

@@ -2448,6 +2494,19 @@

2448 "node": ">= 6"

2494 "node": ">= 6"

2449 }

2495 }

2450 },

2496 },

2497+ "node_modules/oblivious-set": {

2498+ "version": "1.0.0",

2499+ "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",

2500+ "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="

2501+ },

2502+ "node_modules/once": {

2503+ "version": "1.4.0",

2504+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",

2505+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",

2506+ "dependencies": {

2507+ "wrappy": "1"

2508+ }

2509+ },

2451 "node_modules/parent-module": {

2510 "node_modules/parent-module": {

2452 "version": "1.0.1",

2511 "version": "1.0.1",

2453 "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",

2512 "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",

@@ -2476,6 +2535,14 @@

2476 "url": "https://github.com/sponsors/sindresorhus"

2535 "url": "https://github.com/sponsors/sindresorhus"

2477 }

2536 }

2478 },

2537 },

2538+ "node_modules/path-is-absolute": {

2539+ "version": "1.0.1",

2540+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",

2541+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",

2542+ "engines": {

2543+ "node": ">=0.10.0"

2544+ }

2545+ },

2479 "node_modules/path-parse": {

2546 "node_modules/path-parse": {

2480 "version": "1.0.7",

2547 "version": "1.0.7",

2481 "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",

2548 "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",

@@ -2652,23 +2719,6 @@

2652 "react-is": "^16.13.1"

2719 "react-is": "^16.13.1"

2653 }

2720 }

2654 },

2721 },

2655− "node_modules/query-string": {

2656− "version": "7.1.1",

2657− "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz",

2658− "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==",

2659− "dependencies": {

2660− "decode-uri-component": "^0.2.0",

2661− "filter-obj": "^1.1.0",

2662− "split-on-first": "^1.0.0",

2663− "strict-uri-encode": "^2.0.0"

2664− },

2665− "engines": {

2666− "node": ">=6"

2667− },

2668− "funding": {

2669− "url": "https://github.com/sponsors/sindresorhus"

2670− }

2671− },

2672 "node_modules/queue-microtask": {

2722 "node_modules/queue-microtask": {

2673 "version": "1.2.3",

2723 "version": "1.2.3",

2674 "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",

2724 "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",

@@ -2746,6 +2796,31 @@

2746 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",

2796 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",

2747 "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="

2797 "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="

2748 },

2798 },

2799+ "node_modules/react-query": {

2800+ "version": "3.39.1",

2801+ "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",

2802+ "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",

2803+ "dependencies": {

2804+ "@babel/runtime": "^7.5.5",

2805+ "broadcast-channel": "^3.4.1",

2806+ "match-sorter": "^6.0.2"

2807+ },

2808+ "funding": {

2809+ "type": "github",

2810+ "url": "https://github.com/sponsors/tannerlinsley"

2811+ },

2812+ "peerDependencies": {

2813+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0"

2814+ },

2815+ "peerDependenciesMeta": {

2816+ "react-dom": {

2817+ "optional": true

2818+ },

2819+ "react-native": {

2820+ "optional": true

2821+ }

2822+ }

2823+ },

2749 "node_modules/react-refresh": {

2824 "node_modules/react-refresh": {

2750 "version": "0.10.0",

2825 "version": "0.10.0",

2751 "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",

2826 "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",

@@ -2920,10 +2995,10 @@

2920 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",

2995 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",

2921 "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="

2996 "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="

2922 },

2997 },

2923− "node_modules/remove-markdown-and-html": {

2998+ "node_modules/remove-accents": {

2924− "version": "0.1.0",

2999+ "version": "0.4.2",

2925− "resolved": "https://registry.npmjs.org/remove-markdown-and-html/-/remove-markdown-and-html-0.1.0.tgz",

3000+ "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",

2926− "integrity": "sha512-Sy03RJ/R/FBbK6wutBKKIyEVMQS+TzSpGc8pBxwrh0LiqyVIaD/LkitUABIJJ59iryhvrPTmS8dzd3DoLdopHg=="

3001+ "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="

2927 },

3002 },

2928 "node_modules/resolve": {

3003 "node_modules/resolve": {

2929 "version": "1.22.1",

3004 "version": "1.22.1",

@@ -2959,6 +3034,20 @@

2959 "node": ">=0.10.0"

3034 "node": ">=0.10.0"

2960 }

3035 }

2961 },

3036 },

3037+ "node_modules/rimraf": {

3038+ "version": "3.0.2",

3039+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",

3040+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",

3041+ "dependencies": {

3042+ "glob": "^7.1.3"

3043+ },

3044+ "bin": {

3045+ "rimraf": "bin.js"

3046+ },

3047+ "funding": {

3048+ "url": "https://github.com/sponsors/isaacs"

3049+ }

3050+ },

2962 "node_modules/rollup": {

3051 "node_modules/rollup": {

2963 "version": "2.75.7",

3052 "version": "2.75.7",

2964 "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",

3053 "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",

@@ -3036,22 +3125,6 @@

3036 "node": ">=0.10.0"

3125 "node": ">=0.10.0"

3037 }

3126 }

3038 },

3127 },

3039− "node_modules/split-on-first": {

3040− "version": "1.1.0",

3041− "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",

3042− "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",

3043− "engines": {

3044− "node": ">=6"

3045− }

3046− },

3047− "node_modules/strict-uri-encode": {

3048− "version": "2.0.0",

3049− "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",

3050− "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",

3051− "engines": {

3052− "node": ">=4"

3053− }

3054− },

3055 "node_modules/stylis": {

3128 "node_modules/stylis": {

3056 "version": "4.0.13",

3129 "version": "4.0.13",

3057 "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",

3130 "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",

@@ -3172,6 +3245,15 @@

3172 "node": ">=4.2.0"

3245 "node": ">=4.2.0"

3173 }

3246 }

3174 },

3247 },

3248+ "node_modules/unload": {

3249+ "version": "2.2.0",

3250+ "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",

3251+ "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",

3252+ "dependencies": {

3253+ "@babel/runtime": "^7.6.2",

3254+ "detect-node": "^2.0.4"

3255+ }

3256+ },

3175 "node_modules/update-browserslist-db": {

3257 "node_modules/update-browserslist-db": {

3176 "version": "1.0.4",

3258 "version": "1.0.4",

3177 "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",

3259 "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",

@@ -3336,6 +3418,11 @@

3336 "vite": "^2.0.2"

3418 "vite": "^2.0.2"

3337 }

3419 }

3338 },

3420 },

3421+ "node_modules/wrappy": {

3422+ "version": "1.0.2",

3423+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

3424+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="

3425+ },

3339 "node_modules/xtend": {

3426 "node_modules/xtend": {

3340 "version": "4.0.2",

3427 "version": "4.0.2",

3341 "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

3428 "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

@@ -4170,28 +4257,6 @@

4170 "picomatch": "^2.2.2"

4257 "picomatch": "^2.2.2"

4171 }

4258 }

4172 },

4259 },

4173− "@tanstack/query-core": {

4174− "version": "4.29.5",

4175− "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.29.5.tgz",

4176− "integrity": "sha512-xXIiyQ/4r9KfaJ3k6kejqcaqFXXBTzN2aOJ5H1J6aTJE9hl/nbgAdfF6oiIu0CD5xowejJEJ6bBg8TO7BN4NuQ=="

4177− },

4178− "@tanstack/react-query": {

4179− "version": "4.29.5",

4180− "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.29.5.tgz",

4181− "integrity": "sha512-F87cibC3s3eG0Q90g2O+hqntpCrudKFnR8P24qkH9uccEhXErnJxBC/AAI4cJRV2bfMO8IeGZQYf3WyYgmSg0w==",

4182− "requires": {

4183− "@tanstack/query-core": "4.29.5",

4184− "use-sync-external-store": "^1.2.0"

4185− },

4186− "dependencies": {

4187− "use-sync-external-store": {

4188− "version": "1.2.0",

4189− "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",

4190− "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",

4191− "requires": {}

4192− }

4193− }

4194− },

4195 "@types/lodash": {

4260 "@types/lodash": {

4196 "version": "4.14.182",

4261 "version": "4.14.182",

4197 "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",

4262 "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",

@@ -4250,9 +4315,9 @@

4250 "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="

4315 "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="

4251 },

4316 },

4252 "@urbit/api": {

4317 "@urbit/api": {

4253− "version": "2.2.0",

4318+ "version": "2.1.1",

4254− "resolved": "https://registry.npmjs.org/@urbit/api/-/api-2.2.0.tgz",

4319+ "resolved": "https://registry.npmjs.org/@urbit/api/-/api-2.1.1.tgz",

4255− "integrity": "sha512-W8kP9OT6yOK62n+4yCPO3i9QqU5xriLvZQ9WYW4SAV7ktbSrGuf2kmYbnoqfA/NybIs9Q/MbFkPewrz4XJ96Ag==",

4320+ "integrity": "sha512-QRlqhtJ73q+pgMdSwuOO62HlxA7/2c5ylCcOUT01LXkJ2LTVCl5u+QnejdDvUmqjOuN2PyZk7df30xJVg6rC2A==",

4256 "requires": {

4321 "requires": {

4257 "@babel/runtime": "^7.16.0",

4322 "@babel/runtime": "^7.16.0",

4258 "big-integer": "^1.6.48",

4323 "big-integer": "^1.6.48",

@@ -4374,6 +4439,11 @@

4374 "resolve": "^1.12.0"

4439 "resolve": "^1.12.0"

4375 }

4440 }

4376 },

4441 },

4442+ "balanced-match": {

4443+ "version": "1.0.2",

4444+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",

4445+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="

4446+ },

4377 "big-integer": {

4447 "big-integer": {

4378 "version": "1.6.51",

4448 "version": "1.6.51",

4379 "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",

4449 "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",

@@ -4390,6 +4460,15 @@

4390 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",

4460 "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",

4391 "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="

4461 "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="

4392 },

4462 },

4463+ "brace-expansion": {

4464+ "version": "1.1.11",

4465+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

4466+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",

4467+ "requires": {

4468+ "balanced-match": "^1.0.0",

4469+ "concat-map": "0.0.1"

4470+ }

4471+ },

4393 "braces": {

4472 "braces": {

4394 "version": "3.0.2",

4473 "version": "3.0.2",

4395 "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",

4474 "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",

@@ -4399,6 +4478,21 @@

4399 "fill-range": "^7.0.1"

4478 "fill-range": "^7.0.1"

4400 }

4479 }

4401 },

4480 },

4481+ "broadcast-channel": {

4482+ "version": "3.7.0",

4483+ "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",

4484+ "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",

4485+ "requires": {

4486+ "@babel/runtime": "^7.7.2",

4487+ "detect-node": "^2.1.0",

4488+ "js-sha3": "0.8.0",

4489+ "microseconds": "0.2.0",

4490+ "nano-time": "1.0.0",

4491+ "oblivious-set": "1.0.0",

4492+ "rimraf": "3.0.2",

4493+ "unload": "2.2.0"

4494+ }

4495+ },

4402 "browser-or-node": {

4496 "browser-or-node": {

4403 "version": "1.3.0",

4497 "version": "1.3.0",

4404 "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz",

4498 "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz",

@@ -4486,10 +4580,10 @@

4486 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",

4580 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",

4487 "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="

4581 "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="

4488 },

4582 },

4489− "color2k": {

4583+ "concat-map": {

4490− "version": "2.0.2",

4584+ "version": "0.0.1",

4491− "resolved": "https://registry.npmjs.org/color2k/-/color2k-2.0.2.tgz",

4585+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",

4492− "integrity": "sha512-kJhwH5nAwb34tmyuqq/lgjEKzlFXn1U99NlnB6Ws4qVaERcRUYeYP1cBw6BJ4vxaWStAUEef4WMr7WjOCnBt8w=="

4586+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="

4493 },

4587 },

4494 "connect-history-api-fallback": {

4588 "connect-history-api-fallback": {

4495 "version": "1.6.0",

4589 "version": "1.6.0",

@@ -4541,17 +4635,17 @@

4541 "ms": "2.1.2"

4635 "ms": "2.1.2"

4542 }

4636 }

4543 },

4637 },

4544− "decode-uri-component": {

4545− "version": "0.2.0",

4546− "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",

4547− "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="

4548− },

4549 "defined": {

4638 "defined": {

4550 "version": "1.0.0",

4639 "version": "1.0.0",

4551 "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",

4640 "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",

4552 "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==",

4641 "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==",

4553 "dev": true

4642 "dev": true

4554 },

4643 },

4644+ "detect-node": {

4645+ "version": "2.1.0",

4646+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",

4647+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="

4648+ },

4555 "detect-node-es": {

4649 "detect-node-es": {

4556 "version": "1.1.0",

4650 "version": "1.1.0",

4557 "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",

4651 "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",

@@ -4828,11 +4922,6 @@

4828 "to-regex-range": "^5.0.1"

4922 "to-regex-range": "^5.0.1"

4829 }

4923 }

4830 },

4924 },

4831− "filter-obj": {

4832− "version": "1.1.0",

4833− "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",

4834− "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="

4835− },

4836 "find-root": {

4925 "find-root": {

4837 "version": "1.1.0",

4926 "version": "1.1.0",

4838 "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",

4927 "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",

@@ -4844,6 +4933,11 @@

4844 "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",

4933 "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",

4845 "dev": true

4934 "dev": true

4846 },

4935 },

4936+ "fs.realpath": {

4937+ "version": "1.0.0",

4938+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",

4939+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="

4940+ },

4847 "fsevents": {

4941 "fsevents": {

4848 "version": "2.3.2",

4942 "version": "2.3.2",

4849 "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",

4943 "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",

@@ -4866,6 +4960,19 @@

4866 "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",

4960 "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",

4867 "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="

4961 "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="

4868 },

4962 },

4963+ "glob": {

4964+ "version": "7.2.3",

4965+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",

4966+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",

4967+ "requires": {

4968+ "fs.realpath": "^1.0.0",

4969+ "inflight": "^1.0.4",

4970+ "inherits": "2",

4971+ "minimatch": "^3.1.1",

4972+ "once": "^1.3.0",

4973+ "path-is-absolute": "^1.0.0"

4974+ }

4975+ },

4869 "glob-parent": {

4976 "glob-parent": {

4870 "version": "6.0.2",

4977 "version": "6.0.2",

4871 "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",

4978 "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",

@@ -4923,6 +5030,20 @@

4923 "resolve-from": "^4.0.0"

5030 "resolve-from": "^4.0.0"

4924 }

5031 }

4925 },

5032 },

5033+ "inflight": {

5034+ "version": "1.0.6",

5035+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",

5036+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",

5037+ "requires": {

5038+ "once": "^1.3.0",

5039+ "wrappy": "1"

5040+ }

5041+ },

5042+ "inherits": {

5043+ "version": "2.0.4",

5044+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

5045+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="

5046+ },

4926 "invariant": {

5047 "invariant": {

4927 "version": "2.2.4",

5048 "version": "2.2.4",

4928 "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",

5049 "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",

@@ -4974,6 +5095,11 @@

4974 "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",

5095 "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",

4975 "dev": true

5096 "dev": true

4976 },

5097 },

5098+ "js-sha3": {

5099+ "version": "0.8.0",

5100+ "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",

5101+ "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="

5102+ },

4977 "js-tokens": {

5103 "js-tokens": {

4978 "version": "4.0.0",

5104 "version": "4.0.0",

4979 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

5105 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

@@ -5028,6 +5154,15 @@

5028 "js-tokens": "^3.0.0 || ^4.0.0"

5154 "js-tokens": "^3.0.0 || ^4.0.0"

5029 }

5155 }

5030 },

5156 },

5157+ "match-sorter": {

5158+ "version": "6.3.1",

5159+ "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",

5160+ "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",

5161+ "requires": {

5162+ "@babel/runtime": "^7.12.5",

5163+ "remove-accents": "0.4.2"

5164+ }

5165+ },

5031 "memoize-one": {

5166 "memoize-one": {

5032 "version": "5.2.1",

5167 "version": "5.2.1",

5033 "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",

5168 "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",

@@ -5049,6 +5184,19 @@

5049 "picomatch": "^2.3.1"

5184 "picomatch": "^2.3.1"

5050 }

5185 }

5051 },

5186 },

5187+ "microseconds": {

5188+ "version": "0.2.0",

5189+ "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",

5190+ "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="

5191+ },

5192+ "minimatch": {

5193+ "version": "3.1.2",

5194+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",

5195+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",

5196+ "requires": {

5197+ "brace-expansion": "^1.1.7"

5198+ }

5199+ },

5052 "minimist": {

5200 "minimist": {

5053 "version": "1.2.6",

5201 "version": "1.2.6",

5054 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",

5202 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",

@@ -5060,6 +5208,14 @@

5060 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

5208 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

5061 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="

5209 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="

5062 },

5210 },

5211+ "nano-time": {

5212+ "version": "1.0.0",

5213+ "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",

5214+ "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",

5215+ "requires": {

5216+ "big-integer": "^1.6.16"

5217+ }

5218+ },

5063 "nanoid": {

5219 "nanoid": {

5064 "version": "3.3.4",

5220 "version": "3.3.4",

5065 "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",

5221 "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",

@@ -5094,6 +5250,19 @@

5094 "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",

5250 "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",

5095 "dev": true

5251 "dev": true

5096 },

5252 },

5253+ "oblivious-set": {

5254+ "version": "1.0.0",

5255+ "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",

5256+ "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="

5257+ },

5258+ "once": {

5259+ "version": "1.4.0",

5260+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",

5261+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",

5262+ "requires": {

5263+ "wrappy": "1"

5264+ }

5265+ },

5097 "parent-module": {

5266 "parent-module": {

5098 "version": "1.0.1",

5267 "version": "1.0.1",

5099 "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",

5268 "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",

@@ -5113,6 +5282,11 @@

5113 "lines-and-columns": "^1.1.6"

5282 "lines-and-columns": "^1.1.6"

5114 }

5283 }

5115 },

5284 },

5285+ "path-is-absolute": {

5286+ "version": "1.0.1",

5287+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",

5288+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="

5289+ },

5116 "path-parse": {

5290 "path-parse": {

5117 "version": "1.0.7",

5291 "version": "1.0.7",

5118 "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",

5292 "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",

@@ -5216,17 +5390,6 @@

5216 "react-is": "^16.13.1"

5390 "react-is": "^16.13.1"

5217 }

5391 }

5218 },

5392 },

5219− "query-string": {

5220− "version": "7.1.1",

5221− "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz",

5222− "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==",

5223− "requires": {

5224− "decode-uri-component": "^0.2.0",

5225− "filter-obj": "^1.1.0",

5226− "split-on-first": "^1.0.0",

5227− "strict-uri-encode": "^2.0.0"

5228− }

5229− },

5230 "queue-microtask": {

5393 "queue-microtask": {

5231 "version": "1.2.3",

5394 "version": "1.2.3",

5232 "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",

5395 "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",

@@ -5269,6 +5432,16 @@

5269 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",

5432 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",

5270 "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="

5433 "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="

5271 },

5434 },

5435+ "react-query": {

5436+ "version": "3.39.1",

5437+ "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",

5438+ "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",

5439+ "requires": {

5440+ "@babel/runtime": "^7.5.5",

5441+ "broadcast-channel": "^3.4.1",

5442+ "match-sorter": "^6.0.2"

5443+ }

5444+ },

5272 "react-refresh": {

5445 "react-refresh": {

5273 "version": "0.10.0",

5446 "version": "0.10.0",

5274 "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",

5447 "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",

@@ -5392,10 +5565,10 @@

5392 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",

5565 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",

5393 "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="

5566 "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="

5394 },

5567 },

5395− "remove-markdown-and-html": {

5568+ "remove-accents": {

5396− "version": "0.1.0",

5569+ "version": "0.4.2",

5397− "resolved": "https://registry.npmjs.org/remove-markdown-and-html/-/remove-markdown-and-html-0.1.0.tgz",

5570+ "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",

5398− "integrity": "sha512-Sy03RJ/R/FBbK6wutBKKIyEVMQS+TzSpGc8pBxwrh0LiqyVIaD/LkitUABIJJ59iryhvrPTmS8dzd3DoLdopHg=="

5571+ "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="

5399 },

5572 },

5400 "resolve": {

5573 "resolve": {

5401 "version": "1.22.1",

5574 "version": "1.22.1",

@@ -5418,6 +5591,14 @@

5418 "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",

5591 "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",

5419 "dev": true

5592 "dev": true

5420 },

5593 },

5594+ "rimraf": {

5595+ "version": "3.0.2",

5596+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",

5597+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",

5598+ "requires": {

5599+ "glob": "^7.1.3"

5600+ }

5601+ },

5421 "rollup": {

5602 "rollup": {

5422 "version": "2.75.7",

5603 "version": "2.75.7",

5423 "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",

5604 "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",

@@ -5466,16 +5647,6 @@

5466 "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",

5647 "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",

5467 "dev": true

5648 "dev": true

5468 },

5649 },

5469− "split-on-first": {

5470− "version": "1.1.0",

5471− "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",

5472− "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="

5473− },

5474− "strict-uri-encode": {

5475− "version": "2.0.0",

5476− "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",

5477− "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="

5478− },

5479 "stylis": {

5650 "stylis": {

5480 "version": "4.0.13",

5651 "version": "4.0.13",

5481 "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",

5652 "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",

@@ -5564,6 +5735,15 @@

5564 "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",

5735 "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",

5565 "dev": true

5736 "dev": true

5566 },

5737 },

5738+ "unload": {

5739+ "version": "2.2.0",

5740+ "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",

5741+ "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",

5742+ "requires": {

5743+ "@babel/runtime": "^7.6.2",

5744+ "detect-node": "^2.0.4"

5745+ }

5746+ },

5567 "update-browserslist-db": {

5747 "update-browserslist-db": {

5568 "version": "1.0.4",

5748 "version": "1.0.4",

5569 "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",

5749 "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",

@@ -5655,6 +5835,11 @@

5655 "connect-history-api-fallback": "^1.6.0"

5835 "connect-history-api-fallback": "^1.6.0"

5656 }

5836 }

5657 },

5837 },

5838+ "wrappy": {

5839+ "version": "1.0.2",

5840+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

5841+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="

5842+ },

5658 "xtend": {

5843 "xtend": {

5659 "version": "4.0.2",

5844 "version": "4.0.2",

5660 "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

5845 "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

ui/package.json+2−7

@@ -14,21 +14,17 @@

14 "@radix-ui/react-dropdown-menu": "^0.1.6",

15 "@radix-ui/react-select": "^0.1.1",

16 "@radix-ui/react-toggle-group": "^0.1.5",

17− "@tanstack/react-query": "^4.29.5",

18− "@urbit/api": "2.2",

17+ "@urbit/api": "^2.0.0",

19 "@urbit/http-api": "^2.0.0",

18 "@urbit/http-api": "^2.0.0",

20 "big-integer": "^1.6.51",

19 "big-integer": "^1.6.51",

21 "classnames": "^2.3.1",

20 "classnames": "^2.3.1",

22− "color2k": "^2.0.2",

23 "lodash.debounce": "^4.0.8",

21 "lodash.debounce": "^4.0.8",

24− "query-string": "^7.1.1",

25 "react": "^17.0.2",

22 "react": "^17.0.2",

26 "react-dom": "^17.0.2",

23 "react-dom": "^17.0.2",

27 "react-hook-form": "^7.33.1",

24 "react-hook-form": "^7.33.1",

25+ "react-query": "^3.39.1",

28 "react-router-dom": "^6.3.0",

26 "react-router-dom": "^6.3.0",

29 "react-select": "^5.4.0",

27 "react-select": "^5.4.0",

30− "remove-markdown-and-html": "^0.1.0",

31− "urbit-ob": "^5.0.1",

32 "zustand": "^4.0.0-rc.1"

28 "zustand": "^4.0.0-rc.1"

33 },

29 },

34 "devDependencies": {

30 "devDependencies": {

@@ -39,7 +35,6 @@

39 "@vitejs/plugin-react-refresh": "^1.3.1",

35 "@vitejs/plugin-react-refresh": "^1.3.1",

40 "autoprefixer": "^10.4.7",

36 "autoprefixer": "^10.4.7",

41 "postcss": "^8.4.14",

37 "postcss": "^8.4.14",

42− "postcss-import": "^14.1.0",

43 "tailwindcss": "^3.1.4",

38 "tailwindcss": "^3.1.4",

44 "tailwindcss-labeled-groups": "^0.0.2",

39 "tailwindcss-labeled-groups": "^0.0.2",

45 "typescript": "^4.3.2",

40 "typescript": "^4.3.2",

ui/postcss.config.js−2

@@ -1,7 +1,5 @@

1module.exports = {

2 plugins: [

3− require('postcss-import'),

4− require('tailwindcss/nesting'),

5 require('tailwindcss'),

3 require('tailwindcss'),

6 require('autoprefixer'),

4 require('autoprefixer'),

7 ]

5 ]

ui/src/api.ts−6

@@ -3,10 +3,4 @@ import Urbit from "@urbit/http-api";

3const api = new Urbit('', '', window.desk);

4api.ship = window.ship;

6−// @urbit/http-api 2.x adds `window.addEventListener('beforeunload', this.delete)`

7−// unbound, so its beacon is sent to `${location dir}/undefined` (404) and the

8−// channel is left open until eyre's 12h timeout. Replace it with a bound one.

9−window.removeEventListener('beforeunload', api.delete);

10−window.addEventListener('beforeunload', () => api.delete());

11−

12export default api;

6export default api;

ui/src/app.tsx+9−24

@@ -1,16 +1,12 @@

1import React from 'react';

2−import { QueryClient, QueryClientProvider } from '@tanstack/react-query';

2+import { QueryClient, QueryClientProvider } from 'react-query';

3import { BrowserRouter, Route, Routes } from 'react-router-dom';

4−import { CenterColumn } from './components/CenterColumn';

5import { Layout } from './components/Layout';

4import { Layout } from './components/Layout';

6−import { AllListings } from './manage-listings/AllListings';

7import { Apps } from './manage-listings/Apps';

5import { Apps } from './manage-listings/Apps';

8import { Groups } from './manage-listings/Groups';

6import { Groups } from './manage-listings/Groups';

9import { MyListings } from './manage-listings/MyListings';

7import { MyListings } from './manage-listings/MyListings';

10−import { Notebooks } from './manage-listings/Notebooks';

11import { Post } from './manage-listings/Post';

8import { Post } from './manage-listings/Post';

12import { Search } from './pages/Search';

9import { Search } from './pages/Search';

13−import { Tag } from './pages/Tag';

15const queryClient = new QueryClient();

11const queryClient = new QueryClient();

@@ -18,26 +14,15 @@ function Main() {

18 return (

14 return (

19 <Routes>

15 <Routes>

20 <Route element={<Layout />}>

16 <Route element={<Layout />}>

21− <Route element={<CenterColumn />}>

22− <Route path="/" element={<Search />} />

17+ <Route path="/" element={<Search />} />

23− <Route path="/search" element={<Search />} />

18+ <Route path="/search" element={<Search />} />

24− <Route path="/search/:lookup" element={<Search />} />

19+ <Route path="/search/:lookup" element={<Search />} />

25− <Route path="/search/:lookup/:limit/:page" element={<Search />} />

20+ <Route path="/search/:lookup/:limit/:page" element={<Search />} />

26− <Route path="/tags" element={<Tag />} />

27− <Route path="/tags/:tag" element={<Tag />} />

28− <Route path="/tags/:tag/:limit/:page" element={<Tag />} />

29− </Route>

30 <Route path="/manage-listings">

21 <Route path="/manage-listings">

31− <Route element={<CenterColumn />}>

32− <Route index element={<MyListings />} />

22+ <Route index element={<MyListings />} />

33− <Route path="all" element={<AllListings />} />

34− <Route path="all/:limit/:page" element={<AllListings />} />

35− <Route path="post" element={<Post />} />

23+ <Route path="post" element={<Post />} />

36− <Route path="apps" element={<Apps />} />

24+ <Route path="apps" element={<Apps />} />

37− <Route path="groups" element={<Groups />} />

25+ <Route path="groups" element={<Groups />} />

38− </Route>

39− <Route path="posts" element={<Notebooks />} />

40− <Route path="posts/:ship/:name" element={<Notebooks />} />

41 </Route>

26 </Route>

42 </Route>

27 </Route>

43 </Routes>

28 </Routes>

ui/public/android-chrome-512x512.png → ui/src/assets/android-chrome-512x512.pngrenamed

Binary file not shown.

ui/public/manifest.json → ui/src/assets/manifest.jsonrenamed+1−1

@@ -3,7 +3,7 @@

3 "short_name": "sphinx",

4 "icons": [

5 {

6− "src": "/apps/sphinx/android-chrome-512x512.png",

6+ "src": "/apps/grid/android-chrome-512x512.png",

7 "sizes": "512x512",

8 "type": "image/png"

9 }

ui/src/components/CenterColumn.tsxdeleted−6

@@ -1,6 +0,0 @@

1−import React from 'react';

2−import { Outlet } from 'react-router-dom';

3−

4−export const CenterColumn = () => (

5− <div className="flex-1 flex flex-col max-w-2xl h-full w-full p-4 sm:py-12 sm:px-8 space-y-6">{<Outlet />}</div>

6−)

ui/src/components/ErrorMessage.tsx+3−3

@@ -1,16 +1,16 @@

1import cn from 'classnames';

2import React from 'react';

3−import { FieldValues, LiteralUnion, RegisterOptions, useFormContext } from 'react-hook-form';

3+import { LiteralUnion, RegisterOptions, useFormContext } from 'react-hook-form';

5type Validation = LiteralUnion<keyof RegisterOptions, string>;

7−interface ErrorMessageProps<T extends FieldValues> {

7+interface ErrorMessageProps<T> {

8 field: keyof T;

9 messages: Partial<Record<Validation, string>>;

10 className?: string;

11}

13−export function ErrorMessage<T extends FieldValues>({ field, messages, className }: ErrorMessageProps<T>) {

13+export function ErrorMessage<T>({ field, messages, className }: ErrorMessageProps<T>) {

14 const { formState } = useFormContext<T>();

15 const error = formState.errors[field];

ui/src/components/Layout.tsx+25−62

@@ -1,73 +1,36 @@

1−import { MenuIcon } from '@heroicons/react/solid';

2−import * as DropdownMenu from '@radix-ui/react-dropdown-menu';

3import cn from 'classnames';

1import cn from 'classnames';

4import React from 'react';

2import React from 'react';

5−import { NavLink, NavLinkProps, Outlet } from 'react-router-dom';

3+import { NavLink, Outlet, useParams } from 'react-router-dom';

6−import useMedia from '../logic/useMedia';

7−import { BrowsingRoutes, PostingRoutes } from '../routes';

8import { Meta } from './Meta';

4import { Meta } from './Meta';

10−const DesktopNavLink = ({ to, children, ...props }: NavLinkProps) => (

11− <li>

12− <NavLink to={to} className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')} {...props}>

13− { children }

14− </NavLink>

15− </li>

16−)

17−

18−interface WrappedNavLinkProps extends NavLinkProps {

19− navClassName: (props: { isActive: boolean }) => string;

20−}

21−

22−const WrappedNavLink = React.forwardRef<HTMLAnchorElement, WrappedNavLinkProps>(({ className, navClassName, ...props }, forwardedRef) => {

23− return (

24− <NavLink

25− {...props}

26− className={(props) => `${className} ${navClassName(props)}`}

27− ref={forwardedRef}

28− />

29− );

30−});

31−

32−const MobileNavLink = ({ to, children }: NavLinkProps) => (

33− <DropdownMenu.Item asChild>

34− <WrappedNavLink to={to} navClassName={({ isActive }) => cn('block hover:text-rosy transition-colors', isActive && 'underline')}>

35− { children }

36− </WrappedNavLink>

37− </DropdownMenu.Item>

38−)

39−

40export const Layout = () => {

6export const Layout = () => {

41− const isMobile = useMedia('(max-width: 639px)');

7+ const params = useParams<{ lookup: string }>();

43 return (

9 return (

44− <main className={cn("flex flex-col items-center h-full min-h-screen")}>

10+ <main className={cn("flex flex-col items-center min-h-screen", !params.lookup && 'justify-center')}>

11+ <div className="max-w-2xl w-full p-4 sm:py-12 sm:px-8 space-y-6">

45− <Outlet />

12+ <Outlet />

13+ </div>

46 <aside className='self-start mx-4 mb-6 mt-auto sm:m-0 sm:fixed left-4 bottom-4'>

14 <aside className='self-start mx-4 mb-6 mt-auto sm:m-0 sm:fixed left-4 bottom-4'>

47− {isMobile ? (

48− <DropdownMenu.Root>

49− <DropdownMenu.Trigger className='button fixed bottom-6 right-4 p-2 rounded-full' aria-label='Open Menu'>

50− <MenuIcon className='w-6 h-6' />

51− </DropdownMenu.Trigger>

52− <DropdownMenu.Content sideOffset={16} className='min-w-[200px] bg-linen shadow-lg rounded-xl'>

53− <div className='p-4 space-y-3 text-right bg-fawn/30 rounded-xl'>

54− {Object.entries(BrowsingRoutes).map(([k,v]) => <MobileNavLink key={v} to={v}>{k}</MobileNavLink>)}

55− <DropdownMenu.Separator className='border-t-2 border-mauve'/>

56− {Object.entries(PostingRoutes).map(([k,v]) => <MobileNavLink key={v} to={v}>{k}</MobileNavLink>)}

57− </div>

58− </DropdownMenu.Content>

59− </DropdownMenu.Root>

60− ) : (

61− <nav className='w-24 mb-10'>

15+ <nav className='mb-10'>

62− <ul className='font-semibold text-sm space-y-2'>

16+ <ul className='font-semibold text-sm space-y-4'>

63− {Object.entries(BrowsingRoutes).map(([k,v]) => <DesktopNavLink key={v} to={v} end={k === 'tags'}>{k}</DesktopNavLink>)}

17+ <li>

64− </ul>

18+ <NavLink to="/search" className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>search</NavLink>

65− <hr className='block my-4 border-mauve/60'/>

19+ </li>

66− <ul className='font-semibold text-sm space-y-2'>

20+ <li>

67− {Object.entries(PostingRoutes).map(([k,v]) => <DesktopNavLink key={v} to={v}>{k}</DesktopNavLink>)}

21+ <NavLink to="/manage-listings" end className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>my listings</NavLink>

68− </ul>

22+ </li>

69− </nav>

23+ <li>

70− )}

24+ <NavLink to="/manage-listings/post" className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>post listing</NavLink>

25+ </li>

26+ <li>

27+ <NavLink to="/manage-listings/apps" className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>add apps</NavLink>

28+ </li>

29+ <li>

30+ <NavLink to="/manage-listings/groups" className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>add groups</NavLink>

31+ </li>

32+ </ul>

33+ </nav>

71 <Meta className='text-sm'/>

34 <Meta className='text-sm'/>

72 </aside>

35 </aside>

73 </main>

36 </main>

ui/src/components/Listing.tsxdeleted−74

@@ -1,74 +0,0 @@

1−import { UsersIcon, UserRemoveIcon } from '@heroicons/react/solid';

2−import { deSig } from '@urbit/api';

3−import React from 'react';

4−import { ListingImage } from './ListingImage';

5−import { Listing as ListingType } from '../types/sphinx';

6−import { channelURL, normalizeLink, refToURL } from '../utils';

7−import { Pals } from '../state/pals';

8−import { ChannelPreview } from '../types';

9−import { useChannelPreview } from '../state/groups';

10−

11−interface ListingProps extends ListingType {

12− remove: (hash: string) => void;

13− removePal: (ship: string) => void;

14− outgoing: Pals;

15−}

16−

17−function getURL(link: string | { nest: string, where: string }, preview?: ChannelPreview) {

18− if (typeof link === 'string') {

19− return link;

20− }

21−

22− // Tlon routes channels under their group, which only the preview knows.

23− // A post deep link (post/:authorId/:postId) would also need the author,

24− // which listing refs don't carry, so link to the post's channel.

25− if (!preview) {

26− return '/apps/groups/';

27− }

28−

29− return channelURL(preview.group.flag, link.nest);

30−}

31−

32−export const Listing = ({ hash, time, source, post, remove, removePal, outgoing }: ListingProps) => {

33− const cite = normalizeLink(post.link);

34− const link = refToURL(cite);

35− const preview = useChannelPreview(typeof link === 'object' ? link.nest : '');

36− const hardURL = getURL(link, preview);

37−

38− return (

39− <article className='group-1 flex w-full'>

40− <ListingImage {...post} className="hidden sm:inline-block w-24 h-24 rounded-xl" />

41− <div className='flex-1 min-w-0 sm:ml-4'>

42− <div className='flex items-center'>

43− <ListingImage {...post} className="flex-none sm:hidden w-14 h-14 mr-2 mb-2 rounded-xl" />

44− <a className='flex-1 min-w-0 mb-2 hover:text-rosy transition-colors' href={hardURL}>

45− <h2 className='block font-semibold text-lg leading-none mb-1'>{post.title}</h2>

46− <div className='font-mono text-xs space-x-3 truncate'>

47− <strong>%{post.type}</strong>

48− <span>{cite}</span>

49− </div>

50− </a>

51− </div>

52− <p className='mb-2 text-sm'>{post.description}</p>

53− <div className='flex flex-col items-start sm:flex-row sm:items-center w-full font-mono text-xs text-zinc-500 sm:opacity-0 group-1-hover:opacity-100 transition-opacity'>

54− <div className='flex items-center'>

55− <span className='inline-flex items-center'>

56− <span className='font-semibold font-sans mr-1'>by:</span>

57− <span>{source}</span>

58− {outgoing[deSig(source) || ''] && (

59− <button className='group-2 relative inline-flex items-center justify-center px-2 hover:text-rosy' aria-label='Remove pal' title="Remove Pal" onClick={() => removePal(deSig(source) || '')}>

60− <UsersIcon className='h-4 w-4 opacity-0 sm:opacity-100 group-2-hover:opacity-0' />

61− <UserRemoveIcon className='absolute h-4 w-4 sm:opacity-0 group-2-hover:opacity-100' />

62− </button>

63− )}

64− </span>

65− <time dateTime={(new Date(time)).toISOString()} className="ml-3">

66− {(new Date(time)).toLocaleString()}

67− </time>

68− </div>

69− <button className='sm:ml-auto font-semibold font-sans hover:text-rosy bg-transparent border-0' onClick={() => remove(hash)}>remove</button>

70− </div>

71− </div>

72− </article>

73− )

74−}

ui/src/components/ListingImage.tsxdeleted−26

@@ -1,26 +0,0 @@

1−import cn from 'classnames';

2−import React from 'react';

3−import { normalizeColor } from '../utils';

4−

5−interface ListingImageProps {

6− image: string;

7− color: string;

8− className?: string;

9− imageClasses?: string;

10− colorClasses?: string;

11−}

12−

13−export const ListingImage = ({ image, color, className, imageClasses, colorClasses }: ListingImageProps) => {

14− return image ? (

15− <img

16− src={image}

17− className={cn('object-cover', className, imageClasses)}

18− style={{ backgroundColor: color ? normalizeColor(color) : undefined }}

19− />

20− ) : (

21− <div

22− className={cn('bg-rosy/20', className, colorClasses)}

23− style={{ backgroundColor: color ? normalizeColor(color) : undefined }}

24− />

25− )

26−}

ui/src/components/Listings.tsx+47−4

@@ -1,17 +1,19 @@

1+import { UserRemoveIcon, UsersIcon } from '@heroicons/react/solid';

2+import { deSig, uxToHex } from '@urbit/api';

1import cn from 'classnames';

3import cn from 'classnames';

2import React from 'react';

4import React from 'react';

3import { usePals } from '../state/pals';

5import { usePals } from '../state/pals';

4−import { Listing as ListingType } from '../types/sphinx';

6+import { Listing } from '../types/sphinx';

5−import { Listing } from './Listing';

7interface ListingsProps {

8interface ListingsProps {

8− listings: ListingType[];

9+ listings: Listing[];

9 remove: (hash: string) => void;

10 remove: (hash: string) => void;

10 className?: string;

11 className?: string;

11}

12}

13export const Listings = ({ listings, remove, className }: ListingsProps) => {

14export const Listings = ({ listings, remove, className }: ListingsProps) => {

14 const { installed, outgoing, remove: removePal } = usePals();

15 const { installed, outgoing, remove: removePal } = usePals();

16+ console.log(outgoing);

15 if (!listings) {

17 if (!listings) {

16 return null;

18 return null;

17 }

19 }

@@ -33,7 +35,48 @@ export const Listings = ({ listings, remove, className }: ListingsProps) => {

33 <ul className={cn('space-y-6', className)}>

35 <ul className={cn('space-y-6', className)}>

34 {listings && listings.map(l => (

36 {listings && listings.map(l => (

35 <li key={l.hash}>

37 <li key={l.hash}>

36− <Listing {...l} outgoing={outgoing} remove={remove} removePal={removePal} />

38+ <article className='group-1 flex w-full'>

39+ {l.post.image ? (

40+ <img

41+ src={l.post.image}

42+ className="w-24 h-24 object-cover rounded-xl"

43+ style={{ backgroundColor: l.post.color ? `#${uxToHex(l.post.color)}` : undefined }}

44+ />

45+ ) : (

46+ <div

47+ className='w-24 h-24 bg-rosy/20 rounded-xl'

48+ style={{ backgroundColor: l.post.color ? `#${uxToHex(l.post.color)}` : undefined }}

49+ />

50+ )}

51+ <div className='flex-1 ml-4'>

52+ <a className='block w-full mb-2 hover:text-rosy transition-colors' href={l.post.link}>

53+ <h2 className='block font-semibold text-lg leading-none mb-1'>{l.post.title}</h2>

54+ <div className='font-mono text-xs space-x-3'>

55+ <strong>%{l.post.type}</strong>

56+ <span>{l.post.link.replace('web+urbitgraph://', '')}</span>

57+ </div>

58+ </a>

59+ <p className='mb-2 text-sm'>{l.post.description}</p>

60+ <div className='flex flex-col items-start sm:flex-row sm:items-center w-full font-mono text-xs text-zinc-500 opacity-0 group-1-hover:opacity-100 transition-opacity'>

61+ <div className='flex items-center'>

62+ <span className='inline-flex items-center'>

63+ <span className='font-semibold font-sans mr-1'>by:</span>

64+ <span>{l.source}</span>

65+ {outgoing[deSig(l.source) || ''] && (

66+ <button className='group-2 relative inline-flex items-center justify-center px-2 hover:text-rosy' aria-label='Remove pal' title="Remove Pal" onClick={() => removePal(deSig(l.source) || '')}>

67+ <UsersIcon className='h-4 w-4 group-2-hover:opacity-0' />

68+ <UserRemoveIcon className='absolute h-4 w-4 opacity-0 group-2-hover:opacity-100' />

69+ </button>

70+ )}

71+ </span>

72+ <time dateTime={(new Date(l.time)).toISOString()} className="ml-3">

73+ {(new Date(l.time)).toLocaleString()}

74+ </time>

75+ </div>

76+ <button className='sm:ml-auto font-semibold font-sans hover:text-rosy bg-transparent border-0' onClick={() => remove(l.hash)}>remove</button>

77+ </div>

78+ </div>

79+ </article>

37 </li>

80 </li>

38 ))}

81 ))}

39 </ul>

82 </ul>

ui/src/components/Meta.tsx+4−4

@@ -1,10 +1,10 @@

1+import { PlusIcon } from '@heroicons/react/solid';

1import { ChargeUpdateInitial, scryCharges } from '@urbit/api';

2import { ChargeUpdateInitial, scryCharges } from '@urbit/api';

2import React, { useEffect, useState } from 'react';

3import React, { useEffect, useState } from 'react';

4+import { Link } from 'react-router-dom';

3import api from '../api';

5import api from '../api';

4import { Logo } from './Logo';

6import { Logo } from './Logo';

6−const SOURCE = 'github.com/iko-soy/sphinx';

7−

8interface MetaProps {

9 className?: string;

10}

@@ -32,9 +32,9 @@ export const Meta = ({ className }: MetaProps) => {

32 </div>

33 <a

34 className="inline-block font-mono default-ring underline rounded-md hover:text-rosy"

35− href={`https://${SOURCE}`}

35+ href="web+urbitgraph://group/~nocsyx-lassul/sphinx"

36 >

37− {SOURCE}

37+ ~nocsyx-lassul/sphinx

38 </a>

39 </footer>

40 )

ui/src/components/PostOptions.tsx+18−24

@@ -1,53 +1,47 @@

1import { CheckIcon } from '@heroicons/react/solid';

2+import { uxToHex } from '@urbit/api';

2import cn from 'classnames';

3import cn from 'classnames';

3import React from 'react';

4import React from 'react';

4import { useFormContext } from 'react-hook-form';

5import { useFormContext } from 'react-hook-form';

5import { PostOption, PostOptionsForm } from '../types/sphinx';

6import { PostOption, PostOptionsForm } from '../types/sphinx';

6−import { normalizeColor } from '../utils';

8interface PostOptionsProps {

9 options: PostOption[];

10− showTags?: boolean;

11 className?: string;

10 className?: string;

12}

11}

14−export const PostOptions = ({ options, showTags = false, className }: PostOptionsProps) => {

13+export const PostOptions = ({ options, className }: PostOptionsProps) => {

15 const { register } = useFormContext<PostOptionsForm>();

14 const { register } = useFormContext<PostOptionsForm>();

17 return (

16 return (

18 <ul className={cn('space-y-3', className)}>

17 <ul className={cn('space-y-3', className)}>

19− {options && options.map((o, index) => (

18+ {options && options.map(o => (

20 <li key={o.key}>

19 <li key={o.key}>

21 <input {...register('options')} id={o.key} value={o.key} type="checkbox" className='sr-only' />

20 <input {...register('options')} id={o.key} value={o.key} type="checkbox" className='sr-only' />

22− <label htmlFor={o.key} className='checked-bg-fawn group-1 relative grid grid-rows-[auto,auto] sm:grid-rows-1 grid-cols-[64px,1fr] sm:grid-cols-[64px,1fr,24px] w-full p-2 hover:bg-fawn cursor-pointer rounded-xl'>

21+ <label htmlFor={o.key} className='checked-bg-fawn group-1 flex w-full p-2 hover:bg-fawn cursor-pointer rounded-xl'>

23− <div className='absolute z-10 top-7 left-7 flex items-center justify-center h-6 w-6 border-2 border-solid border-mauve rounded bg-linen/80'>

24− <CheckIcon className='show-when-checked h-4 w-4 opacity-0' />

25− </div>

26 {o.post.image ? (

22 {o.post.image ? (

27 <img

23 <img

28 src={o.post.image}

24 src={o.post.image}

29− className="show-when-checked w-16 h-16 col-span-1 object-cover rounded-lg opacity-60"

25+ className="w-16 h-16 object-cover rounded-lg"

30− loading={index > 15 ? 'lazy' : 'eager'}

31− style={{ backgroundColor: o.post.color ? normalizeColor(o.post.color) : undefined }}

26+ style={{ backgroundColor: o.post.color ? `#${uxToHex(o.post.color)}` : undefined }}

32 />

27 />

33 ) : (

28 ) : (

34 <div

29 <div

35− className='w-16 h-16 col-span-1 bg-rosy/20 rounded-lg'

30+ className='w-16 h-16 bg-rosy/20 rounded-lg'

36− style={{ backgroundColor: o.post.color ? normalizeColor(o.post.color) : undefined }}

31+ style={{ backgroundColor: o.post.color ? `#${uxToHex(o.post.color)}` : undefined }}

37 />

32 />

38 )}

33 )}

39− <div className='ml-4 min-w-0 sm:space-y-2'>

34+ <div className='flex-1 ml-4'>

40− <span className='block font-semibold text-lg leading-none mb-2 sm:mb-0'>{o.post.title}</span>

35+ <span className='block font-semibold text-lg leading-none mb-1'>{o.post.title}</span>

41− <div className='flex flex-col sm:flex-row sm:items-center w-full text-xs space-y-2 sm:space-y-0 sm:space-x-3 truncate'>

36+ <div className='font-mono text-xs space-x-3'>

42− <strong className='font-mono'>%{o.post.type}</strong>

37+ <strong>%{o.post.type}</strong>

43− {showTags && <p><strong>tags: </strong><em>{o.post.tags.join()}</em></p>}

44− </div>

45− <p className='hidden sm:block font-mono text-xs truncate'>{o.post.link.replace('web+urbitgraph://', '')}</p>

38+ <span>{o.post.link.replace('web+urbitgraph://', '')}</span>

39+ </div>

40+ <p className='text-sm'>{o.post.description}</p>

41+ </div>

42+ <div className='flex items-center justify-center m-5 h-6 w-6 border-2 border-solid border-mauve rounded'>

43+ <CheckIcon className='show-when-checked h-4 w-4 opacity-0' />

46 </div>

44 </div>

47− <div className='col-span-2 row-start-2 mt-2'>

48− <p className='font-mono text-xs truncate sm:hidden'>{o.post.link.replace('web+urbitgraph://', '')}</p>

49− <p className='text-sm'>{o.post.description}</p>

50− </div>

51 </label>

45 </label>

52 </li>

46 </li>

53 ))}

47 ))}

ui/src/components/SearchInput.tsx+1−4

@@ -1,16 +1,14 @@

1import { SearchIcon } from '@heroicons/react/solid';

2import cn from 'classnames';

3import React, { ChangeEvent, useCallback } from 'react';

4−import { Spinner } from './Spinner';

6interface SearchInputProps {

5interface SearchInputProps {

7 lookup: string;

6 lookup: string;

8− loading: boolean;

9 className?: string;

7 className?: string;

10 onChange: (value: string) => void;

8 onChange: (value: string) => void;

11}

13−export const SearchInput = ({ lookup, loading, className, onChange }: SearchInputProps) => {

11+export const SearchInput = ({ lookup, className, onChange }: SearchInputProps) => {

14 const onInput = useCallback((event: ChangeEvent<HTMLInputElement>) => {

12 const onInput = useCallback((event: ChangeEvent<HTMLInputElement>) => {

15 const { value } = event.target;

13 const { value } = event.target;

16 onChange(value);

14 onChange(value);

@@ -26,7 +24,6 @@ export const SearchInput = ({ lookup, loading, className, onChange }: SearchInpu

26 placeholder="Search"

24 placeholder="Search"

27 className={cn('w-full py-1 pl-9 pr-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30')}

25 className={cn('w-full py-1 pl-9 pr-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30')}

28 />

26 />

29− {loading && <Spinner className='absolute right-2 h-5 w-5' />}

30 </div>

27 </div>

31 )

28 )

32}

29}

ui/src/components/Spinner.tsx+1−1

@@ -4,7 +4,7 @@ import React from 'react';

4export const Spinner = ({ className }: { className: string }) => {

5 return (

6 <svg className={cn('spinner', className)} xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">

7− <circle cx="12" cy="12" r="10" className="stroke-current" strokeOpacity="0.4" strokeWidth="4"></circle>

7+ <circle cx="12" cy="12" r="10" className="stroke-current" strokeOpacity="0.4" stroke-width="4"></circle>

8 <path className="fill-current" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>

9 </svg>

10 )

ui/src/components/TagCloud.tsxdeleted−18

@@ -1,18 +0,0 @@

1−import cn from 'classnames';

2−import React from 'react';

3−import { NavLink } from 'react-router-dom';

4−

5−interface TagCloudProps {

6− tags: [string, number][];

7−}

8−

9−export const TagCloud = ({ tags }: TagCloudProps) => (

10− <section className='flex flex-wrap gap-2'>

11− {tags.map(([t, count]) => (

12− <NavLink key={t} to={`/tags/${t}`} className={({ isActive }) => cn("py-0.5 px-1.5 space-x-2 rounded-md font-semibold", isActive ? 'bg-lavender text-linen' : 'bg-fawn')}>

13− <span>{t}</span>

14− <span className='opacity-60'>{count}</span>

15− </NavLink>

16− ))}

17− </section>

18−)

ui/src/components/TagField.tsx+61−66

@@ -3,7 +3,6 @@ import React, { Component, KeyboardEventHandler, useCallback, useState } from 'r

3import CreatableSelect from 'react-select/creatable';

4import { ActionMeta, components, ControlProps, MultiValue, MultiValueGenericProps, MultiValueRemoveProps, OnChangeValue } from 'react-select';

5import { XIcon } from '@heroicons/react/solid';

6−import { MAX_TAG_BYTES, MAX_TAGS, byteLength } from '../utils';

8export interface Option {

7export interface Option {

9 readonly label: string;

8 readonly label: string;

@@ -69,6 +68,10 @@ export const TagField = ({ tags, onTags, className }: TagFieldProps) => {

69 value: OnChangeValue<Option, true>,

68 value: OnChangeValue<Option, true>,

70 actionMeta: ActionMeta<Option>

69 actionMeta: ActionMeta<Option>

71 ) => {

70 ) => {

71+ console.group('Value Changed');

72+ console.log(value);

73+ console.log(`action: ${actionMeta.action}`);

74+ console.groupEnd();

72 onTags(value);

75 onTags(value);

73 }, []);

76 }, []);

@@ -82,76 +85,68 @@ export const TagField = ({ tags, onTags, className }: TagFieldProps) => {

82 switch (event.key) {

85 switch (event.key) {

83 case 'Enter':

86 case 'Enter':

84 case 'Tab':

87 case 'Tab':

85− // %sphinx drops listings with more than 8 tags and doesn't index

88+ console.group('Value Added');

86− // longer tags, so keep the input; Tab still moves on

89+ console.log(tags);

87− if (tags.length >= MAX_TAGS || byteLength(input) > MAX_TAG_BYTES) {

90+ console.groupEnd();

88− if (event.key === 'Enter') event.preventDefault();

89− return;

90− }

92− event.preventDefault();

93 setInput('');

92 setInput('');

94− if (!tags.some(t => t.value === input)) {

95− onTags([...tags, createOption(input)])

93+ onTags([...tags, createOption(input)])

96− }

94+ event.preventDefault();

97 }

95 }

98 }, [input, tags]);

96 }, [input, tags]);

100 return (

98 return (

101− <div className={className}>

102− <CreatableSelect<Option, true>

99+ <CreatableSelect<Option, true>

100+ className={className}

103− components={{

101+ components={{

104− ...components,

102+ ...components,

105− Control,

103+ Control,

106− MultiValueContainer: TagContainer,

104+ MultiValueContainer: TagContainer,

107− MultiValueLabel: TagLabel,

105+ MultiValueLabel: TagLabel,

108− MultiValueRemove: TagRemove,

106+ MultiValueRemove: TagRemove,

109− DropdownIndicator: null

107+ DropdownIndicator: null

110− }}

108+ }}

111− styles={{

109+ styles={{

112− control: (base) => ({}),

110+ control: (base) => ({}),

113− input: (base) => ({

111+ input: (base) => ({

114− ...base,

112+ ...base,

115− padding: 0,

113+ padding: 0,

116− margin: 0,

114+ margin: 0,

117− }),

115+ }),

118− clearIndicator: (base) => ({

116+ clearIndicator: (base) => ({

119− ...base,

117+ ...base,

120− cursor: 'pointer',

118+ cursor: 'pointer',

121− padding: 0

119+ padding: 0

122− }),

120+ }),

123− multiValue: (base) => ({

121+ multiValue: (base) => ({

124− ...base,

122+ ...base,

125− backgroundColor: '',

123+ backgroundColor: '',

126− margin: '0 2px',

124+ margin: '0 2px',

127− }),

125+ }),

128− multiValueRemove: (base) => ({

126+ multiValueRemove: (base) => ({

129− ...base,

127+ ...base,

130− paddingRight: '',

128+ paddingRight: '',

131− paddingLeft: '',

129+ paddingLeft: '',

132− '&:hover': {

130+ '&:hover': {

133− color: 'inherit',

131+ color: 'inherit',

134− backgroundColor: 'inherit',

132+ backgroundColor: 'inherit',

135− },

133+ },

136− }),

134+ }),

137− valueContainer: (base) => ({

135+ valueContainer: (base) => ({

138− ...base,

136+ ...base,

139− padding: 0

137+ padding: 0

140− })

138+ })

141− }}

139+ }}

142− isOptionDisabled={() => tags.length >= MAX_TAGS}

140+ isOptionDisabled={() => tags.length >= 8}

143− inputValue={input}

141+ inputValue={input}

144− isClearable

142+ isClearable

145− isMulti

143+ isMulti

146− menuIsOpen={false}

144+ menuIsOpen={false}

147− onChange={handleChange}

145+ onChange={handleChange}

148− onInputChange={handleInputChange}

146+ onInputChange={handleInputChange}

149− onKeyDown={handleKeyDown}

147+ onKeyDown={handleKeyDown}

150− placeholder="Type something and press enter..."

148+ placeholder="Type something and press enter..."

151− value={tags}

149+ value={tags}

152− />

150+ />

153− {byteLength(input) > MAX_TAG_BYTES && <div className='text-mauve/50 text-xs mt-1'>{MAX_TAG_BYTES} bytes per tag maximum</div>}

154− {tags.length >= MAX_TAGS && <div className='text-mauve/50 text-xs mt-1'>{MAX_TAGS} tags maximum</div>}

155− </div>

156 );

151 );

157}

152}

ui/src/env.d.ts−8

@@ -5,11 +5,3 @@ interface ImportMetaEnv extends Readonly<Record<string, string | boolean | undef

5interface ImportMeta {

6 readonly env: ImportMetaEnv;

8−

9−declare module 'remove-markdown-and-html' {

10− export default function removeMd(input: string): string;

11−}

12−

13−declare module 'urbit-ob' {

14− export function isValidPatp(patp: string): boolean;

15−}

ui/src/index.cssnew file+20

@@ -0,0 +1,20 @@

1+@tailwind base;

2+@tailwind components;

3+@tailwind utilities;

5+.flip {

6+ transform: rotateY(180deg);

7+}

9+input:checked + label .show-when-checked {

10+ @apply opacity-100;

11+}

12+

13+input:checked + .checked-bg-fawn,

14+input:checked + label .checked-bg-fawn {

15+ @apply bg-fawn;

16+}

17+

18+.spinner {

19+ @apply inline-flex items-center w-6 h-6 animate-spin;

20+}

ui/src/keys.tsdeleted−14

@@ -1,14 +0,0 @@

1−import { QueryKey } from "@tanstack/react-query";

2−

3−export const GROUPS_KEY: QueryKey = ['groups'];

4−export const VATS_KEY: QueryKey = ['vats'];

5−export const PALS_KEY: QueryKey = ['pals'];

6−export const TAGS_KEY: QueryKey = ['tags'];

7−export const CHARGES_KEY: QueryKey = ['charges'];

8−export const APP_LISTINGS_KEY: QueryKey = ['app-listings'];

9−export const GROUP_LISTINGS_KEY: QueryKey = ['group-listings'];

10−export const POST_LISTINGS_KEY: QueryKey = ['post-listings'];

11−export const PUBLISHED_KEY: QueryKey = ['published'];

12−export const notesKey = (diary?: string): QueryKey => diary ? ['notes', diary] : ['notes'];

13−export const tagKey = (tag?: string) => (start: number, size: number): QueryKey => ['tag', tag || '', size, start];

14−export const lookupKey = (selected: string, lookup: string | undefined) => (start: number, size: number): QueryKey => ['lookup', selected, size.toString(), start.toString(), lookup || ''];

ui/src/logic/useMedia.tsdeleted−25

@@ -1,25 +0,0 @@

1−import { useCallback, useEffect, useState } from 'react';

2−

3−export default function useMedia(mediaQuery: string) {

4− const [match, setMatch] = useState(false);

5−

6− const update = useCallback((e: MediaQueryListEvent) => {

7− setMatch(e.matches);

8− }, []);

9−

10− useEffect(() => {

11− const query = window.matchMedia(mediaQuery);

12−

13− query.addEventListener('change', update);

14− update({ matches: query.matches } as MediaQueryListEvent);

15− return () => {

16− query.removeEventListener('change', update);

17− };

18− }, [update, mediaQuery]);

19−

20− return match;

21−}

22−

23−export function useIsMobile() {

24− return useMedia('(max-width: 639px)');

25−}

ui/src/logic/utils.tsdeleted−11

@@ -1,11 +0,0 @@

1−export function preSig(ship: string): string {

2− if (!ship) {

3− return '';

4− }

5−

6− if (ship.trim().startsWith('~')) {

7− return ship.trim();

8− }

9−

10− return '~'.concat(ship.trim());

11−}

ui/src/main.tsx+1−1

@@ -1,7 +1,7 @@

1import React from 'react';

2import ReactDOM from 'react-dom';

3import { App } from './app';

4−import './styles/index.css';

4+import './index.css';

6ReactDOM.render(

7 <React.StrictMode>

ui/src/manage-listings/AllListings.tsxdeleted−65

@@ -1,65 +0,0 @@

1−import React from 'react';

2−import { useMutation, useQueryClient } from '@tanstack/react-query';

3−import { useParams } from 'react-router-dom';

4−import api from '../api';

5−import { Listings } from '../components/Listings';

6−import { Paginator } from '../components/Paginator';

7−import { useSearch } from '../state/search';

8−import { Remove, Search } from '../types/sphinx';

9−import { PUBLISHED_KEY } from '../keys';

10−import { formatUd } from '../utils';

11−

12−interface RouteParams extends Record<string, string | undefined> {

13− limit?: string;

14− page?: string;

15−}

16−

17−export const AllListings = () => {

18− const queryClient = useQueryClient();

19− const {

20− limit,

21− page

22− } = useParams<RouteParams>();

23− const {

24− results,

25− pages,

26− pageInt,

27− linkBuild

28− } = useSearch({

29− key: (start, size) => ['all', start, size],

30− fetcher: (start, size) => api.scry<Search>({

31− app: 'sphinx',

32− path: `/lookup/all/${formatUd(start)}/${formatUd(size)}`

33− }),

34− enabled: true,

35− limit,

36− page,

37− linkPrefix: '/manage-listings/all'

38− })

39− const { mutate } = useMutation((hash: string) => {

40− return api.poke<Remove>({

41− app: 'sphinx',

42− mark: 'remove',

43− json: hash

44− })

45− }, {

46− onSuccess: () => {

47− queryClient.invalidateQueries(PUBLISHED_KEY);

48− }

49− });

50−

51− return (

52− <>

53− <header className='flex items-center'>

54− <h1 className='text-2xl font-semibold'>All Listings</h1>

55− </header>

56− {results && <div className='flex justify-end border-t border-zinc-300'>

57− <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

58− </div>}

59− <Listings listings={results.listings} remove={mutate} />

60− {results && pages > 1 && <div className='flex justify-end border-t border-zinc-300'>

61− <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

62− </div>}

63− </>

64− )

65−}

ui/src/manage-listings/Apps.tsx+4−5

@@ -1,13 +1,12 @@

1import React, { useCallback, useEffect, useState } from 'react';

2import { FormProvider, useForm } from 'react-hook-form';

3−import { useMutation, useQueryClient } from '@tanstack/react-query';

3+import { useMutation, useQueryClient } from 'react-query';

4import { Link } from 'react-router-dom';

5import api from '../api';

6import { PostOptions } from '../components/PostOptions';

7import { Spinner } from '../components/Spinner';

8import { useApps } from '../state/apps';

9import { Declare, Listing, PostOption, PostOptionsForm } from '../types/sphinx';

10−import { APP_LISTINGS_KEY } from '../keys';

12function getAppKeys(apps: PostOption[]): string[] {

11function getAppKeys(apps: PostOption[]): string[] {

13 return apps.map(({ key }) => key);

12 return apps.map(({ key }) => key);

@@ -43,7 +42,7 @@ export const Apps = () => {

43 });

42 });

44 }, {

43 }, {

45 onSuccess: () => {

44 onSuccess: () => {

46− queryClient.invalidateQueries(APP_LISTINGS_KEY);

45+ queryClient.invalidateQueries('app-listings');

47 }

46 }

48 })

47 })

@@ -53,7 +52,7 @@ export const Apps = () => {

53 }, [reset, mutate]);

52 }, [reset, mutate]);

55 return (

54 return (

56− <div className='w-full space-y-6 m-auto'>

55+ <>

57 <header className='flex items-center'>

56 <header className='flex items-center'>

58 <h1 className='text-2xl font-semibold'>Add Apps</h1>

57 <h1 className='text-2xl font-semibold'>Add Apps</h1>

59 {apps.length > 0 && (

58 {apps.length > 0 && (

@@ -87,6 +86,6 @@ export const Apps = () => {

87 </div>

86 </div>

88 </form>

87 </form>

89 </FormProvider>

88 </FormProvider>

90− </div>

89+ </>

91 );

90 );

92}

91}

ui/src/manage-listings/Groups.tsx+5−6

@@ -1,13 +1,12 @@

1import React, { useCallback, useEffect, useState } from 'react';

2import { FormProvider, useForm } from 'react-hook-form';

3−import { useMutation, useQueryClient } from '@tanstack/react-query';

3+import { useMutation, useQueryClient } from 'react-query';

4import { Link } from 'react-router-dom';

5import api from '../api';

6import { PostOptions } from '../components/PostOptions';

7import { Spinner } from '../components/Spinner';

8import { useGroups } from '../state/groups';

9−import { Declare, PostOptionsForm } from '../types/sphinx';

9+import { Declare, PostOption, PostOptionsForm } from '../types/sphinx';

10−import { GROUP_LISTINGS_KEY } from '../keys';

12export const Groups = () => {

11export const Groups = () => {

13 const { groups, loading } = useGroups();

12 const { groups, loading } = useGroups();

@@ -50,7 +49,7 @@ export const Groups = () => {

50 });

49 });

51 }, {

50 }, {

52 onSuccess: () => {

51 onSuccess: () => {

53− queryClient.invalidateQueries(GROUP_LISTINGS_KEY)

52+ queryClient.invalidateQueries('group-listings')

54 }

53 }

55 })

54 })

@@ -60,7 +59,7 @@ export const Groups = () => {

60 }, [reset, mutate]);

59 }, [reset, mutate]);

62 return (

61 return (

63− <div className='w-full space-y-6 m-auto'>

62+ <>

64 <header className='flex items-center'>

63 <header className='flex items-center'>

65 <h1 className='text-2xl font-semibold'>Add Groups</h1>

64 <h1 className='text-2xl font-semibold'>Add Groups</h1>

66 {groups.length > 0 && (

65 {groups.length > 0 && (

@@ -94,6 +93,6 @@ export const Groups = () => {

94 </div>

93 </div>

95 </form>

94 </form>

96 </FormProvider>

95 </FormProvider>

97− </div>

96+ </>

98 );

97 );

99}

98}

ui/src/manage-listings/MyListings.tsx+6−6

@@ -1,13 +1,13 @@

1+import { size } from 'lodash';

1import React from 'react';

2import React from 'react';

2−import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';

3+import { useMutation, useQuery, useQueryClient } from 'react-query';

3import api from '../api';

4import api from '../api';

4import { Listings } from '../components/Listings';

5import { Listings } from '../components/Listings';

5import { Directory, Remove } from '../types/sphinx';

6import { Directory, Remove } from '../types/sphinx';

6−import { PUBLISHED_KEY } from '../keys';

8export const MyListings = () => {

9 const queryClient = useQueryClient();

10− const { data } = useQuery(PUBLISHED_KEY, () => api.scry<Directory>({

10+ const { data } = useQuery('published', () => api.scry<Directory>({

11 app: 'sphinx',

12 path: '/published'

13 }));

@@ -19,16 +19,16 @@ export const MyListings = () => {

19 })

20 }, {

21 onSuccess: () => {

22− queryClient.invalidateQueries(PUBLISHED_KEY);

22+ queryClient.invalidateQueries('published');

23 }

24 });

26 return (

27− <div className='w-full space-y-6 m-auto'>

27+ <>

28 <header className='flex items-center'>

29 <h1 className='text-2xl font-semibold'>My Listings</h1>

30 </header>

31 <Listings listings={Object.values(data || {})} remove={mutate} className="mt-6" />

32− </div>

32+ </>

33 )

34}

ui/src/manage-listings/Notebooks.tsxdeleted−70

@@ -1,70 +0,0 @@

1−import cn from 'classnames';

2−import React from 'react';

3−import { NavLink, useParams } from 'react-router-dom';

4−import { Spinner } from '../components/Spinner';

5−import useMedia from '../logic/useMedia';

6−import { useNotebooks } from '../state/posts';

7−import { Posts } from './Posts';

8−import { getColor, getImage } from '../utils';

9−

10−export const Notebooks = () => {

11− const { ship, name } = useParams<{ ship: string, name: string }>();

12− const limited = useMedia('(max-width: 899px)');

13− const { groups, notebooks, loading } = useNotebooks();

14− const sortedNotebooks = Object.entries(notebooks)

15− .sort(([,a], [,b]) => a.meta.title.localeCompare(b.meta.title));

16−

17− return (

18− <div className="flex-none flex flex-col max-w-5xl w-full p-4 sm:py-12 sm:px-8 space-y-6 sm:pl-32 xl:pl-8">

19− <div className='flex items-start'>

20− {((limited && !ship) || !limited) &&

21− <aside className='sticky top-4 sm:top-12 flex-none flex flex-col sm:w-72 sm:h-[80vh] pt-14 sm:pt-0 mr-6 self-start'>

22− <header className='flex-none fixed sm:static top-0 w-full p-4 pl-0 sm:p-0 bg-linen'>

23− <h1 className='text-2xl font-semibold ml-2 sm:mb-6'>Add Posts</h1>

24− </header>

25− <ul className='flex-1 sm:overflow-y-auto'>

26− {loading && <div className='flex items-center space-x-2 text-lavender mt-6'>

27− <Spinner className='w-6 h-6' />

28− <span>Loading notebooks...</span>

29− </div>}

30− {sortedNotebooks.map(([id, n], index) => {

31− const [,group] = groups.find(([k]) => k === n.perms.group) || [];

32− const image = group && (getImage(group.meta.image) || getImage(group.meta.cover) || '');

33− const color = group && (getColor(group.meta.image) || getColor(group.meta.cover) || '');

34−

35− return (

36− <li key={id}>

37− <NavLink to={`/manage-listings/posts/${id}`} className={({ isActive }) => cn('flex items-center p-2 space-x-2 leading-tight rounded-md hover:bg-fawn', isActive && 'bg-fawn')}>

38− {group && image ? (

39− <img

40− src={image}

41− className="flex-none w-10 h-10 object-cover rounded-md"

42− loading={index > 15 ? 'lazy' : 'eager'}

43− style={{ backgroundColor: color }}

44− />

45− ) : group ? (

46− <div

47− className='flex-none w-10 h-10 bg-rosy/20 rounded-md'

48− style={{ backgroundColor: color }}

49− />

50− ) : null}

51− <div className='flex flex-col min-w-0'>

52− <strong className='w-full truncate'>{n.meta.title}</strong>

53− {group && <span className='text-sm'>{group.meta.title}</span>}

54− </div>

55− </NavLink>

56− </li>

57− )}

58− )}

59− </ul>

60− </aside>

61− }

62− {((limited && ship) || !limited) &&

63− <section className='flex-1 min-w-0 space-y-6'>

64− {!loading && notebooks && ship && name && <Posts ship={ship} name={name} />}

65− </section>

66− }

67− </div>

68− </div>

69− )

70−}

ui/src/manage-listings/Post.tsx+22−40

@@ -1,49 +1,31 @@

1import debounce from 'lodash.debounce';

2import React, { useCallback, useEffect, useRef, useState } from 'react';

3import { FormProvider, useForm } from 'react-hook-form';

4−import { Link, useNavigate, useSearchParams } from 'react-router-dom';

4+import { Link, useNavigate } from 'react-router-dom';

5import { MultiValue } from 'react-select';

6import api from '../api';

7import { ErrorMessage } from '../components/ErrorMessage';

8import { Filter } from '../components/Filter';

9import { Option, TagField } from '../components/TagField';

10−import { Declare, Post as PostForm, PostType } from '../types/sphinx';

10+import { Declare, Post as PostForm } from '../types/sphinx';

11−import {

12− MAX_DESCRIPTION_BYTES, MAX_TAG_BYTES, MAX_TAGS, MAX_TITLE_BYTES, MAX_URL_BYTES,

13− byteLength, isListingImage, isListingLink

14−} from '../utils';

16−function errorMessages(length: number, url?: string) {

12+function errorMessages(length: number) {

17 return {

13 return {

18 required: 'This field is required.',

14 required: 'This field is required.',

19− bytes: `The maximum length is ${length} bytes (accented letters and emoji count as 2-4).`,

15+ maxLength: `The maximum length is ${length}.`

20− url

21 }

16 }

22}

17}

24−// lib/sphinx +lengths-valid counts UTF-8 bytes and drops longer listings silently

25−const maxBytes = (max: number) => ({ bytes: (value: string) => byteLength(value || '') <= max });

26−

27−// what lib/validate-url rejects, which %sphinx also drops silently

28−const URL_RULES = 'no spaces, #fragments, non-ASCII letters or characters like | [ ] { }';

29−

30export const Post = () => {

19export const Post = () => {

31− const [params] = useSearchParams();

32− // ?tags= can bring in tags that TagField wouldn't take

33− const defaultTags = params.getAll('tags')

34− .filter((t, i, all) => t && byteLength(t) <= MAX_TAG_BYTES && all.indexOf(t) === i)

35− .slice(0, MAX_TAGS)

36− .map(t => ({ label: t, value: t}));

37− const [tags, setTags] = useState<MultiValue<Option>>(defaultTags);

20+ const [tags, setTags] = useState<MultiValue<Option>>([]);

38 const [image, setImage] = useState<string>('');

21 const [image, setImage] = useState<string>('');

39 const form = useForm<PostForm>({

22 const form = useForm<PostForm>({

40 defaultValues: {

23 defaultValues: {

41− title: params.get('title') || '',

24+ title: '',

42− type: params.get('type') as PostType || 'other',

25+ type: 'other',

43− link: params.get('link') || '',

26+ link: '',

44− image: params.get('image') || '',

27+ image: '',

45− description: params.get('description') || '',

28+ description: ''

46− color: params.get('color') || ''

47 }

29 }

48 });

30 });

@@ -80,48 +62,48 @@ export const Post = () => {

80 }, [img]);

62 }, [img]);

82 return (

64 return (

83− <div className='w-full space-y-6 m-auto'>

65+ <>

84 <header>

66 <header>

85 <h1 className='text-2xl font-semibold'>Add a Listing</h1>

67 <h1 className='text-2xl font-semibold'>Add a Listing</h1>

86 </header>

68 </header>

87 <FormProvider {...form}>

69 <FormProvider {...form}>

88− {/* only our checks: the browser's type="url" check refuses relative links like /1/group/~zod/x */}

89− <form noValidate onSubmit={handleSubmit(onSubmit)}>

70+ <form onSubmit={handleSubmit(onSubmit)}>

90 <div className='flex w-full space-x-6'>

71 <div className='flex w-full space-x-6'>

91 <div className='flex-1 space-y-3'>

72 <div className='flex-1 space-y-3'>

92 <div>

73 <div>

93 <label htmlFor='title' className='text-sm font-semibold'>Title</label>

74 <label htmlFor='title' className='text-sm font-semibold'>Title</label>

94 <div className='flex items-center space-x-2'>

75 <div className='flex items-center space-x-2'>

95− <input {...register('title', { required: true, validate: maxBytes(MAX_TITLE_BYTES) })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='sphinx'/>

76+ <input {...register('title', { required: true, maxLength: 77 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='sphinx'/>

96 <Filter selected={type} onSelect={(value) => setValue('type', value)} />

77 <Filter selected={type} onSelect={(value) => setValue('type', value)} />

97 </div>

78 </div>

98− <ErrorMessage className='mt-1' field="title" messages={errorMessages(MAX_TITLE_BYTES)}/>

79+ <ErrorMessage className='mt-1' field="title" messages={errorMessages(77)}/>

99 </div>

80 </div>

100 <div className='flex items-center space-x-6'>

81 <div className='flex items-center space-x-6'>

101 <div className='flex-1 space-y-3'>

82 <div className='flex-1 space-y-3'>

102 <div>

83 <div>

103 <label htmlFor='image' className='text-sm font-semibold'>Image</label>

84 <label htmlFor='image' className='text-sm font-semibold'>Image</label>

104 <input type="url" {...register('image', {

85 <input type="url" {...register('image', {

105− validate: { ...maxBytes(MAX_URL_BYTES), url: isListingImage }

86+ maxLength: 1024

106 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='https://nyc3.digitaloceanspaces.com/...' />

87 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='https://nyc3.digitaloceanspaces.com/...' />

107− <ErrorMessage className='mt-1' field="image" messages={errorMessages(MAX_URL_BYTES, `Use a web address (https://host/path) with ${URL_RULES}.`)}/>

88+ <ErrorMessage className='mt-1' field="image" messages={errorMessages(1024)}/>

108 </div>

89 </div>

109 <div>

90 <div>

110 <label htmlFor='link' className='text-sm font-semibold'>Link</label>

91 <label htmlFor='link' className='text-sm font-semibold'>Link</label>

111− <input type="url" {...register('link', { required: true, validate: { ...maxBytes(MAX_URL_BYTES), url: isListingLink } })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='web+urbitgraph://~donmec-sallud/sphinx' />

92+ <input type="url" {...register('link', { required: true, maxLength: 1024 })} className='flex-1 w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='web+urbitgraph://~nocsyx-lassul/sphinx' />

112− <ErrorMessage className='mt-1' field="link" messages={errorMessages(MAX_URL_BYTES, `Use a link with ${URL_RULES}.`)} />

93+ <ErrorMessage className='mt-1' field="link" messages={errorMessages(1024)} />

113 </div>

94 </div>

114 </div>

95 </div>

115 <img className='flex-none object-cover w-28 h-28 mt-4 border-2 border-dashed border-mauve/60 rounded-lg' src={image || undefined} />

96 <img className='flex-none object-cover w-28 h-28 mt-4 border-2 border-dashed border-mauve/60 rounded-lg' src={image || undefined} />

116 </div>

97 </div>

117 <div>

98 <div>

118 <label htmlFor='description' className='text-sm font-semibold'>Description</label>

99 <label htmlFor='description' className='text-sm font-semibold'>Description</label>

119− <textarea {...register('description', { required: true, validate: maxBytes(MAX_DESCRIPTION_BYTES) })} rows={2} className='align-middle w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='An app for answering your riddles' />

100+ <textarea {...register('description', { required: true, maxLength: 256 })} rows={2} className='align-middle w-full py-1 px-2 bg-fawn/30 focus:outline-none focus:ring-2 ring-lavender rounded-lg border border-fawn/30' placeholder='An app for answering your riddles' />

120− <ErrorMessage className='mt-1' field="description" messages={errorMessages(MAX_DESCRIPTION_BYTES)} />

101+ <ErrorMessage className='mt-1' field="description" messages={errorMessages(256)} />

121 </div>

102 </div>

122 <div>

103 <div>

123 <label className='text-sm font-semibold'>Tags</label>

104 <label className='text-sm font-semibold'>Tags</label>

124 <TagField tags={tags} onTags={setTags} />

105 <TagField tags={tags} onTags={setTags} />

106+ {tags.length === 8 && <div className='text-mauve/50 text-xs mt-1'>8 tags maximum</div>}

125 </div>

107 </div>

126 <div className='pt-3'>

108 <div className='pt-3'>

127 <div className='flex justify-between border-t border-zinc-300 py-3'>

109 <div className='flex justify-between border-t border-zinc-300 py-3'>

@@ -137,6 +119,6 @@ export const Post = () => {

137 </div>

119 </div>

138 </form>

120 </form>

139 </FormProvider>

121 </FormProvider>

140− </div>

122+ </>

141 )

123 )

142}

124}

ui/src/manage-listings/Posts.tsxdeleted−122

@@ -1,122 +0,0 @@

1−import { ChevronLeftIcon } from '@heroicons/react/solid';

2−import React, { useCallback, useEffect, useState } from 'react';

3−import { FormProvider, useForm } from 'react-hook-form';

4−import { useMutation, useQueryClient } from '@tanstack/react-query';

5−import { Link } from 'react-router-dom';

6−import { MultiValue } from 'react-select';

7−import api from '../api';

8−import { Filter } from '../components/Filter';

9−import { PostOptions } from '../components/PostOptions';

10−import { Spinner } from '../components/Spinner';

11−import { TagField, Option } from '../components/TagField';

12−import useMedia from '../logic/useMedia';

13−import { usePosts } from '../state/posts';

14−import { Declare, PostOptionsForm, PostType } from '../types/sphinx';

15−import { POST_LISTINGS_KEY } from '../keys';

16−

17−interface PostsProps {

18− ship: string;

19− name: string;

20−}

21−

22−export const Posts = ({ ship, name }: PostsProps) => {

23− const limited = useMedia('(max-width: 899px)');

24− const [postType, setPostType] = useState<PostType>('content')

25− const [tags, setTags] = useState<MultiValue<Option>>([{ label: 'post', value: 'post' }])

26− const { loading, posts, notebook } = usePosts(ship, name, postType, tags.map(t => t.value));

27− const [firstLoad, setFirstLoad] = useState(true);

28− const form = useForm<PostOptionsForm>({

29− defaultValues: {

30− options: []

31− }

32− });

33− const { handleSubmit, reset, watch, setValue } = form;

34− const options = watch('options');

35−

36− useEffect(() => {

37− if (posts.length > 0 && firstLoad) {

38− reset({

39− options: []

40− })

41−

42− setFirstLoad(false);

43− }

44− }, [posts, firstLoad]);

45−

46− const toggleAll = useCallback(() => {

47− if (options.length !== posts.length) {

48− setValue('options', posts.map(p => p.key));

49− } else {

50− setValue('options', []);

51− }

52− }, [posts, options, setValue]);

53−

54− const queryClient = useQueryClient();

55− const { mutate } = useMutation(async (values: PostOptionsForm) => {

56− return api.poke<Declare[]>({

57− app: 'sphinx',

58− mark: 'declarations',

59− json: posts.filter(a => values.options.includes(a.key)).map(a => ({

60− post: a.post,

61− reach: 'friends'

62− }))

63− });

64− }, {

65− onSuccess: () => {

66− queryClient.invalidateQueries(POST_LISTINGS_KEY)

67− }

68− })

69−

70− const onSubmit = useCallback((values: PostOptionsForm) => {

71− mutate(values);

72− reset();

73− }, [reset, mutate]);

74−

75− return (

76− <>

77− <header className='flex items-center'>

78− {limited && (

79− <Link to="/manage-listings/posts" className='flex items-center'>

80− <ChevronLeftIcon className='h-6 w-6 text-mauve/60' />

81− <h1 className='text-2xl font-semibold'>{notebook?.meta.title}</h1>

82− </Link>

83− )}

84− {!limited && <h1 className='text-2xl font-semibold'>{notebook?.meta.title}</h1>}

85− {posts.length > 0 && (

86− <button className='p-1.5 ml-auto text-sm underline font-semibold' onClick={toggleAll}>

87− {options.length !== posts.length && 'select all'}

88− {options.length === posts.length && 'deselect all'}

89− </button>

90− )}

91− </header>

92− <div className='flex flex-col items-end sm:flex-row sm:items-center space-y-2 sm:space-y-0 sm:space-x-2'>

93− <TagField tags={tags} onTags={setTags} className="flex-1 w-full"/>

94− <Filter className='flex-none' selected={postType} onSelect={(value) => setPostType(value)} />

95− </div>

96− <FormProvider {...form}>

97− <form onSubmit={handleSubmit(onSubmit)}>

98− {posts.length === 0 && loading ? (

99− <div className='flex items-center space-x-2 text-lavender'>

100− <Spinner className='w-6 h-6' />

101− <span>Checking posts...</span>

102− </div>

103− ) : posts.length === 0 && !loading ? (

104− <h2 className='text-lavender'>All posts already indexed</h2>

105− ) : (

106− <PostOptions options={posts} showTags />

107− )}

108− <div className='flex justify-between border-t border-zinc-300 py-3 mt-6'>

109− <Link to="/search" className='flex items-center rounded-lg text-base font-semibold text-rosy bg-rosy/30 border-2 border-transparent hover:border-rosy leading-none py-2 px-3 transition-colors'>

110− Back to Search

111− </Link>

112− {posts.length > 0 && (

113− <button type="submit" className='flex items-center rounded-lg text-base font-semibold text-linen bg-rosy disabled:bg-zinc-200 disabled:text-zinc-400 disabled:border-transparent border-2 border-transparent hover:border-linen/60 leading-none py-2 px-3 transition-colors' disabled={options.length === 0}>

114− Publish

115− </button>

116− )}

117− </div>

118− </form>

119− </FormProvider>

120− </>

121− );

122−}

ui/src/pages/Search.tsx+41−40

@@ -1,8 +1,9 @@

1import cn from 'classnames';

2−import React, { useCallback, useRef, useState } from 'react';

2+import React, { useCallback, useEffect, useRef, useState } from 'react';

3import debounce from 'lodash.debounce';

4−import { useMutation, useQueryClient } from '@tanstack/react-query';

4+import { useMutation, useQuery, useQueryClient } from 'react-query';

5import { useNavigate, useParams } from 'react-router-dom';

6+import { stringToTa } from '@urbit/api';

6import { SearchInput } from '../components/SearchInput';

7import { SearchInput } from '../components/SearchInput';

7import { Listings } from '../components/Listings';

8import { Listings } from '../components/Listings';

8import { PostFilter, Remove, Search as SearchType } from '../types/sphinx';

9import { PostFilter, Remove, Search as SearchType } from '../types/sphinx';

@@ -11,11 +12,6 @@ import { Paginator } from '../components/Paginator';

11import { Filter } from '../components/Filter';

12import { Filter } from '../components/Filter';

12import { PlusSmIcon } from '@heroicons/react/solid';

13import { PlusSmIcon } from '@heroicons/react/solid';

13import { usePals } from '../state/pals';

14import { usePals } from '../state/pals';

14−import { TagCloud } from '../components/TagCloud';

15−import { useTags } from '../state/tags';

16−import { useSearch } from '../state/search';

17−import { encodeLookup, formatUd } from '../utils';

18−import { lookupKey } from '../keys';

20interface RouteParams extends Record<string, string | undefined> {

16interface RouteParams extends Record<string, string | undefined> {

21 lookup?: string;

17 lookup?: string;

@@ -23,6 +19,14 @@ interface RouteParams extends Record<string, string | undefined> {

23 page?: string;

19 page?: string;

24}

20}

22+function encodeLookup(value: string | undefined) {

23+ if (!value) {

24+ return '';

25+ }

26+

27+ return stringToTa(value).replace('~.', '~~');

28+}

29+

26export const Search = () => {

30export const Search = () => {

27 const navigate = useNavigate();

31 const navigate = useNavigate();

28 const {

32 const {

@@ -33,27 +37,16 @@ export const Search = () => {

33 const [selected, setSelected] = useState<PostFilter>('all')

37 const [selected, setSelected] = useState<PostFilter>('all')

34 const [rawSearch, setRawSearch] = useState(lookup || '');

38 const [rawSearch, setRawSearch] = useState(lookup || '');

35 const { installed: palsInstalled } = usePals();

39 const { installed: palsInstalled } = usePals();

36−

40+ const size = parseInt(limit || '10', 10);

37− const {

41+ const pageInt = parseInt(page || '1', 10) - 1;

38− size,

39− start,

40− pageInt,

42+ const start = pageInt * size;

41− pages,

43+ const { data } = useQuery<unknown, unknown, SearchType>(`lookup-${selected}-${size}-${start}-${lookup}`, () => api.scry<SearchType>({

42− results,

43− isLoading,

44− linkBuild

45− } = useSearch({

46− key: lookupKey(selected, lookup),

47− fetcher: (start, size) => api.scry<SearchType>({

48− app: 'sphinx',

44+ app: 'sphinx',

49− path: `/lookup/${selected}/${formatUd(start)}/${formatUd(size)}/${encodeLookup(lookup)}`

45+ path: `/lookup/${selected}/${start}/${size}/${encodeLookup(lookup)}`

50− }),

46+ }), {

51 enabled: !!lookup,

47 enabled: !!lookup,

52− limit,

48+ keepPreviousData: true

53− page,

54− linkPrefix: `/search/${lookup}`

55 });

49 });

56− const tags = useTags();

57 const queryClient = useQueryClient();

50 const queryClient = useQueryClient();

58 const { mutate } = useMutation((hash: string) => {

51 const { mutate } = useMutation((hash: string) => {

59 return api.poke<Remove>({

52 return api.poke<Remove>({

@@ -63,10 +56,16 @@ export const Search = () => {

63 })

56 })

64 }, {

57 }, {

65 onSuccess: () => {

58 onSuccess: () => {

66− queryClient.invalidateQueries(lookupKey(selected, lookup)(start, size))

59+ queryClient.invalidateQueries(`lookup-${selected}-${size}-${start}-${lookup}`)

67 }

60 }

68 });

61 });

63+ const total = data?.total || 0;

64+ const pages =

65+ total % size === 0

66+ ? total / size

67+ : Math.floor(total / size) + 1;

68+

70 const update = useRef(debounce((value: string) => {

69 const update = useRef(debounce((value: string) => {

71 if (!value) {

70 if (!value) {

72 return;

71 return;

@@ -80,34 +79,36 @@ export const Search = () => {

80 update.current(value);

79 update.current(value);

81 }, []);

80 }, []);

82+ const linkBuild = useCallback((page) => {

83+ if (!page) {

84+ return null;

85+ }

86+

87+ return `/search/${lookup}/${size}/${page || 1}`

88+ }, [lookup, size]);

89+

83 return (

90 return (

84− <div className={cn('w-full space-y-6', !lookup && 'm-auto')}>

91+ <>

85 <header className='flex items-center space-x-2'>

92 <header className='flex items-center space-x-2'>

86− <SearchInput className='flex-1' lookup={rawSearch} loading={!!lookup && isLoading} onChange={onChange} />

93+ <SearchInput className='flex-1' lookup={rawSearch} onChange={onChange} />

87 <Filter selected={selected} onSelect={setSelected} className="min-w-0 sm:w-20" />

94 <Filter selected={selected} onSelect={setSelected} className="min-w-0 sm:w-20" />

88 </header>

95 </header>

89 {!palsInstalled && (

96 {!palsInstalled && (

90 <div>

97 <div>

91− <a href="/apps/landscape/search/~paldev/apps/~paldev/pals" className='inline-flex items-center py-1 px-2 mr-2 font-semibold bg-green-800 text-linen rounded-md'>

98+ <a href="/apps/grid/leap/search/~paldev/apps/~paldev/pals" className='inline-flex items-center py-1 px-2 mr-2 font-semibold bg-green-800 text-linen rounded-md'>

92 <PlusSmIcon className='h-4 w-4' />

99 <PlusSmIcon className='h-4 w-4' />

93 install pals

100 install pals

94 </a>

101 </a>

95 to see listings from others

102 to see listings from others

96 </div>

103 </div>

97 )}

104 )}

98− {lookup && results && <div className='flex justify-end border-t border-zinc-300'>

105+ {lookup && data && <div className='flex justify-end border-t border-zinc-300'>

99 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

106 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

100 </div>}

107 </div>}

101− {lookup && <Listings listings={results.listings} remove={mutate} />}

108+ {lookup && <Listings listings={data?.listings || []} remove={mutate} />}

102− {!lookup && (

103− <div className='space-y-2'>

104− <h2 className='font-semibold'>top tags</h2>

105− <TagCloud tags={tags.slice(0,12)} />

106− </div>

107− )}

108− {results && pages > 1 && <div className='flex justify-end border-t border-zinc-300'>

109+ {data && pages > 1 && <div className='flex justify-end border-t border-zinc-300'>

109 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

110 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

110 </div>}

111 </div>}

111− </div>

112+ </>

112 )

113 )

113}

114}

ui/src/pages/Tag.tsxdeleted−82

@@ -1,82 +0,0 @@

1−import { PlusIcon, PlusSmIcon } from '@heroicons/react/solid';

2−import cn from 'classnames';

3−import qs from 'query-string';

4−import React from 'react';

5−import { useQueryClient, useMutation } from '@tanstack/react-query';

6−import { Link, useParams } from 'react-router-dom';

7−import api from '../api';

8−import { Listings } from '../components/Listings';

9−import { Paginator } from '../components/Paginator';

10−import { TagCloud } from '../components/TagCloud';

11−import { useSearch } from '../state/search';

12−import { useTags } from '../state/tags';

13−import { Remove, Search } from '../types/sphinx';

14−import { encodeLookup, formatUd } from '../utils';

15−import { tagKey } from '../keys';

16−

17−interface RouteParams extends Record<string, string | undefined> {

18− tag?: string;

19− limit?: string;

20− page?: string;

21−}

22−

23−export const Tag = () => {

24− const tags = useTags();

25− const { tag, limit, page } = useParams<RouteParams>();

26− const {

27− size,

28− start,

29− pageInt,

30− pages,

31− results,

32− linkBuild

33− } = useSearch({

34− key: tagKey(tag),

35− fetcher: (start, size) => api.scry<Search>({

36− app: 'sphinx',

37− path: `/lookup/tag/${formatUd(start)}/${formatUd(size)}/${encodeLookup(tag)}`

38− }),

39− enabled: !!tag,

40− limit,

41− page,

42− linkPrefix: `/tags/${tag}`

43− });

44− const queryClient = useQueryClient();

45− const { mutate } = useMutation((hash: string) => {

46− return api.poke<Remove>({

47− app: 'sphinx',

48− mark: 'remove',

49− json: hash

50− })

51− }, {

52− onSuccess: () => {

53− queryClient.invalidateQueries(tagKey(tag)(start, size))

54− }

55− });

56−

57− return (

58− <div className={cn('w-full space-y-6', !tag && 'm-auto')}>

59− {!tag && <h1 className='text-2xl font-semibold'>Tags</h1>}

60− <div className={cn('h-[136px] overflow-y-auto', tag && 'mb-12')}>

61− <TagCloud tags={tags} />

62− </div>

63− {tag && <header className='flex items-center justify-between'>

64− <h1 className='text-2xl font-semibold leading-none'>{tag}</h1>

65− <Link

66− to={{ pathname: '/manage-listings/post', search: qs.stringify({ tags: [tag] }) }}

67− className="inline-flex items-center px-2 pr-3 py-1 font-semibold text-linen bg-lavender hover:bg-rosy transition-colors rounded-lg"

68− >

69− <PlusSmIcon className='w-5 h-5' />

70− <span>Add</span>

71− </Link>

72− </header>}

73− {tag && results && <div className='flex justify-end border-t border-zinc-300'>

74− <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

75− </div>}

76− {tag && <Listings listings={results.listings} remove={mutate} />}

77− {results && pages > 1 && <div className='flex justify-end border-t border-zinc-300'>

78− <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />

79− </div>}

80− </div>

81− )

82−}

ui/src/routes.tsdeleted−16

@@ -1,16 +0,0 @@

1−export const BrowsingRoutes = {

2− search: "/search",

3− tags: "/tags",

4− apps: "/tags/app",

5− groups: "/tags/group",

6− jobs: "/tags/job",

7− 'my listings': "/manage-listings",

8− 'all listings': "/manage-listings/all"

9−}

10−

11−export const PostingRoutes = {

12− 'post listing': "/manage-listings/post",

13− 'add apps': "/manage-listings/apps",

14− 'add groups': "/manage-listings/groups",

15− 'add posts': "/manage-listings/posts"

16−}

ui/src/state/apps.ts+15−19

@@ -1,39 +1,35 @@

1−import { Charge, ChargeUpdateInitial, getPikes, Pike, Pikes, scryCharges } from "@urbit/api";

1+import { Charge, ChargeUpdateInitial, getVats, scryCharges, Vat, Vats } from "@urbit/api";

2−import { useQuery } from "@tanstack/react-query"

2+import { useQuery } from "react-query"

3import api from "../api";

4import { Post, Search } from "../types/sphinx";

5−import { APP_LISTINGS_KEY, CHARGES_KEY, VATS_KEY } from "../keys";

6−import { MAX_DESCRIPTION_BYTES, MAX_TITLE_BYTES, listingImage, truncateBytes } from "../utils";

8−function getAppPost(app: string, pike: Pike, charge: Charge): Post {

6+function getAppPost(app: string, vat: Vat, charge: Charge): Post {

9− const ship = pike.sync?.ship || `~${window.ship}`;

7+ const ship = vat.arak.rail?.publisher || vat.arak.rail?.ship || `~${window.ship}`;

11 return {

9 return {

12 type: 'app',

10 type: 'app',

13− title: truncateBytes(charge.title, MAX_TITLE_BYTES),

11+ title: charge.title,

14− // the desk on the publisher, which may differ from the local name

15− // (|install ~ship %desk, =local %other)

16− link: `/1/desk/${ship}/${pike.sync?.desk || app}`,

12+ link: `web+urbitgraph://${ship}/${app}`,

17− description: truncateBytes(charge.info || charge.title, MAX_DESCRIPTION_BYTES),

13+ description: charge.info || charge.title,

18− image: listingImage(charge.image),

14+ image: charge.image || '',

19 color: charge.color,

15 color: charge.color,

20 tags: ['app']

16 tags: ['app']

21 }

17 }

22}

18}

24export const useApps = () => {

20export const useApps = () => {

25− const { data: pikes, isLoading: pikesLoading } = useQuery(VATS_KEY, () => api.scry<Pikes>(getPikes));

21+ const { data: vats, isLoading: vatsLoading } = useQuery('vats', () => api.scry<Vats>(getVats));

26− const { data: charges, isLoading: chargesLoading } = useQuery(CHARGES_KEY, () => api.scry<ChargeUpdateInitial>(scryCharges));

22+ const { data: charges, isLoading: chargesLoading } = useQuery('charges', () => api.scry<ChargeUpdateInitial>(scryCharges));

27− const { data, isLoading } = useQuery(APP_LISTINGS_KEY, () => api.scry<Search>({

23+ const { data, isLoading } = useQuery('app-listings', () => api.scry<Search>({

28 app: 'sphinx',

24 app: 'sphinx',

29 path: '/lookup/app/0/999'

25 path: '/lookup/app/0/999'

30 }));

26 }));

32 return {

28 return {

33− loading: pikesLoading || chargesLoading || isLoading,

29+ loading: vatsLoading || chargesLoading || isLoading,

34− apps: !pikes || !charges || !data ? [] : Object.entries(charges.initial)

30+ apps: !vats || !charges || !data ? [] : Object.entries(charges.initial)

35− .filter(([k]) => k in pikes)

31+ .filter(([k]) => k in vats)

36− .map(([k,v]) => ({ key: k, post: getAppPost(k, pikes[k], v) }))

32+ .map(([k,v]) => ({ key: k, post: getAppPost(k, vats[k], v) }))

37 .filter(({ post }) => !data.listings.some(l => l.post.link === post.link || l.post.title === post.title))

33 .filter(({ post }) => !data.listings.some(l => l.post.link === post.link || l.post.title === post.title))

38 }

34 }

39}

35}

ui/src/state/groups.ts+17−62

@@ -1,76 +1,31 @@

1−import { useQuery } from "@tanstack/react-query"

1+import { GroupUpdateInitial, MetadataUpdateInitial } from "@urbit/api";

2+import { useQuery } from "react-query"

2import api from "../api"

3import api from "../api"

3−import { PostType, Search } from "../types/sphinx";

4+import { PostOption, PostType, Search } from "../types/sphinx";

4−import { ChannelPreview, Groups } from "../types";

5−import { useMemo } from "react";

6−import { GROUPS_KEY, GROUP_LISTINGS_KEY } from "../keys";

7−import { MAX_DESCRIPTION_BYTES, MAX_TITLE_BYTES, getColor, getImage, isColor, listingImage, truncateBytes } from "../utils";

9−export const usePublicGroups = () => {

10− const { data, ...query } = useQuery(GROUPS_KEY,

11− () => api.scry<Groups>({

12− app: 'groups',

13− path: '/groups/light'

14− }),

15− { initialData: {} }

16− );

18− const groups = useMemo(() => {

19− if (!data) return [];

20− return Object.entries(data).filter(([,v]) => !v.secret);

21− }, [data]);

22−

23− return {

24− ...query,

25− groups

26− }

27−}

29export const useGroups = () => {

8export const useGroups = () => {

30− const { groups, isLoading: loading } = usePublicGroups();

9+ const { data, isLoading: metadataLoading } = useQuery('metadata', () => api.subscribeOnce<{ 'metadata-update': MetadataUpdateInitial }>('metadata-store', '/all'));

10+ const { data: groupData, isLoading: groupDataLoading } = useQuery('groups', () => api.subscribeOnce<{ groupUpdate: GroupUpdateInitial }>('group-store', '/groups'));

31− const { data: d, isLoading } = useQuery(GROUP_LISTINGS_KEY, () => api.scry<Search>({

11+ const { data: d, isLoading } = useQuery('group-listings', () => api.scry<Search>({

32 app: 'sphinx',

12 app: 'sphinx',

33 path: '/lookup/group/0/999'

13 path: '/lookup/group/0/999'

34 }));

14 }));

36 return {

16 return {

37− loading: loading || isLoading,

17+ loading: metadataLoading || groupDataLoading || isLoading,

18+ groups: !data || !groupData || !d ? [] : Object.entries(data['metadata-update'].associations)

19+ .filter(([k,v]) => v['app-name'] === 'groups' && 'open' in (groupData.groupUpdate.initial[v.resource]?.policy || {}))

38− groups: groups.map(([k,v]) => ({ key: k, post: {

20+ .map(([k,v]) => ({ key: k, post: {

39 type: 'group' as PostType,

21 type: 'group' as PostType,

40− title: truncateBytes(v.meta.title, MAX_TITLE_BYTES),

22+ title: v.metadata.title,

41− link: `/1/group/${k}`, //`/apps/groups/groups/${k}`,

23+ link: v.group.replace('/ship/', 'web+urbitgraph://group/'),

42− image: listingImage(getImage(v.meta.image) || getImage(v.meta.cover)),

24+ image: v.metadata.picture,

43− color: getColor(v.meta.image) || getColor(v.meta.cover) || '',

25+ color: v.metadata.color,

44− description: truncateBytes(v.meta.description, MAX_DESCRIPTION_BYTES),

26+ description: v.metadata.description,

45 tags: ['group']

27 tags: ['group']

46 }}))

28 }}))

47− .filter(({ post }) => !d || d.listings.length === 0 || !d.listings.some(l => l.post.link === post.link || l.post.title === post.title))

29+ .filter(({ post }) => !d.listings.some(l => l.post.link === post.link || l.post.title === post.title))

48 }

30 }

49−}

31+}

50−

51−export function useChannelPreview(nest: string): ChannelPreview | undefined {

52− const { groups, isFetched } = usePublicGroups();

53− const group = groups.find(([,g]) => {

54− return !!g.channels[nest];

55− });

56−

57− // %groups asks the channel's host and answers once (mark channel-preview-1)

58− const { data } = useQuery(['channel-preview', nest],

59− () => api.subscribeOnce<ChannelPreview>('groups', `/v1/channels/${nest}/preview`, 5000),

60− {

61− // only for channels outside our groups, so wait until those are known

62− enabled: isFetched && !!nest && !group,

63− refetchOnMount: false,

64− refetchOnWindowFocus: false,

65− },

66− );

67−

68− return group ? {

69− nest,

70− meta: group[1].channels[nest].meta,

71− group: {

72− flag: group[0],

73− meta: group[1].meta,

74− }

75− } : data;

76−}

ui/src/state/pals.ts+5−6

@@ -1,14 +1,13 @@

1import { ChargeUpdateInitial, scryCharges } from '@urbit/api';

2−import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';

2+import { useMutation, useQuery, useQueryClient } from 'react-query';

3import api from '../api';

4−import { CHARGES_KEY, PALS_KEY } from '../keys';

6interface Pal {

5interface Pal {

7 lists: string[];

6 lists: string[];

8 ack: true | null;

7 ack: true | null;

11−export interface Pals {

10+interface Pals {

12 [k: string]: Pal;

11 [k: string]: Pal;

13}

12}

@@ -27,10 +26,10 @@ interface RemovePal {

28export const usePals = () => {

27export const usePals = () => {

29 const queryClient = useQueryClient();

28 const queryClient = useQueryClient();

30− const { data: charges } = useQuery(CHARGES_KEY, () => {

29+ const { data: charges } = useQuery('charges', () => {

31 return api.scry<ChargeUpdateInitial>(scryCharges);

30 return api.scry<ChargeUpdateInitial>(scryCharges);

32 })

31 })

33− const { data } = useQuery(PALS_KEY, () => {

32+ const { data } = useQuery('pals', () => {

34 return api.scry<PalsData>({

33 return api.scry<PalsData>({

35 app: 'pals',

34 app: 'pals',

36 path: '/json'

35 path: '/json'

@@ -49,7 +48,7 @@ export const usePals = () => {

49 })

48 })

50 }, {

49 }, {

51 onSuccess: () => {

50 onSuccess: () => {

52− queryClient.invalidateQueries(PALS_KEY);

51+ queryClient.invalidateQueries('pals');

53 }

52 }

54 })

53 })

ui/src/state/posts.tsdeleted−108

@@ -1,108 +0,0 @@

1−import { useQuery } from "@tanstack/react-query"

2−import api from "../api"

3−import { PostType, Search } from "../types/sphinx";

4−import { usePublicGroups } from "./groups";

5−import { POST_LISTINGS_KEY, notesKey } from "../keys";

6−import { ChannelsResponse, Diary, GroupChannel, NoteContent, PagedChannelPosts, VerseInline, inlineToString } from "../types";

7−import { useMemo } from "react";

8−import { udToDec } from '@urbit/api';

9−import { MAX_DESCRIPTION_BYTES, MAX_TITLE_BYTES, listingImage, normalizeLink, truncateBytes } from "../utils";

10−

11−// notebooks are %channels channels of kind %diary, keyed by nest

12−// "diary/~ship/name" (the old %diary agent is gone from the %groups desk)

13−const DIARY_PREFIX = 'diary/';

14−

15−export const useNotebooks = () => {

16− const { groups, isLoading: groupsLoading } = usePublicGroups();

17− const { data, isLoading } = useQuery(notesKey(), () => api.scry<ChannelsResponse>({

18− app: 'channels',

19− path: '/v1/channels'

20− }));

21−

22− const notebooks = useMemo(() => {

23− const nbs: Record<string, GroupChannel & Diary> = {};

24− if (!data) return nbs;

25−

26− Object.entries(data).forEach(([nest, v]) => {

27− if (!nest.startsWith(DIARY_PREFIX)) return;

28− const flag = nest.slice(DIARY_PREFIX.length);

29− const group = groups.find(([g]) => g === v.perms.group);

30− if (!group) return;

31−

32− const channel = group[1].channels[nest];

33− if (!channel) return;

34−

35− if (channel.readers.length === 0) {

36− nbs[flag] = { ...v, ...channel };

37− }

38− });

39−

40− return nbs;

41− }, [data, groups]);

42−

43− return {

44− notebooks,

45− groups,

46− loading: isLoading || groupsLoading

47− }

48−}

49−

50−export const usePosts = (ship: string, name: string, type: PostType, tags: string[]) => {

51− const flag = `${ship}/${name}`;

52− const { notebooks, loading } = useNotebooks();

53− const { data, isLoading } = useQuery(notesKey(flag), () => api.scry<PagedChannelPosts>({

54− app: 'channels',

55− path: `/v1/${DIARY_PREFIX}${flag}/posts/newest/9.999.999/outline`

56− }));

57− // every listing we have, ours or a mutual's, whatever its tags or type

58− // (%sphinx refuses to publish a listing it already has)

59− const { data: d, isLoading: postsLoading } = useQuery(POST_LISTINGS_KEY, () => api.scry<Search>({

60− app: 'sphinx',

61− path: '/lookup/all/0/9.999.999'

62− }));

63−

64− const items = data ? Object.entries(data.posts)

65− .flatMap(([id, post]) => {

66− if (!post) return []; // deleted post

67− const diary = post.essay['kind-data']?.diary;

68− return [{ key: id, post: {

69− type,

70− title: truncateBytes(diary?.title || '', MAX_TITLE_BYTES),

71− link: getPermalink(flag, id),

72− image: listingImage(diary?.image),

73− color: '',

74− description: getSnippet(post.essay.content),

75− tags

76− }}];

77− }) : [];

78−

79− // listings store refs; older ones may still be web+urbitgraph links

80− const listed = useMemo(

81− () => new Set((d?.listings || []).map(l => normalizeLink(l.post.link))),

82− [d]

83− );

84− const posts = items.filter(p => !listed.has(p.post.link));

85−

86− return {

87− notebook: notebooks[flag],

88− loading: loading || isLoading || postsLoading,

89− posts

90− }

91−}

92−

93−function getPermalink(flag: string, id: string): string {

94− return `/1/chan/${DIARY_PREFIX}${flag}/note/${udToDec(id)}`;

95−}

96−

97−// the first paragraph with any text, as plain text

98−function getSnippet(content: NoteContent): string {

99− const inlines = content.filter(c => 'inline' in c) as VerseInline[];

100− for (const verse of inlines) {

101− const text = verse.inline.map(inlineToString).join('').replace(/\s+/g, ' ').trim();

102− if (text) {

103− return truncateBytes(text, MAX_DESCRIPTION_BYTES);

104− }

105− }

106−

107− return '';

108−}

ui/src/state/search.tsdeleted−49

@@ -1,49 +0,0 @@

1−import { useCallback } from "react";

2−import { QueryKey, useQuery } from "@tanstack/react-query";

3−import { Search } from "../types/sphinx";

4−

5−interface UseSearchParams {

6− key: (start: number, size: number) => QueryKey;

7− fetcher: (start: number, size: number) => Promise<Search>;

8− enabled: boolean;

9− linkPrefix: string;

10− limit?: string;

11− page?: string;

12−}

13−

14−export const useSearch = ({ key, fetcher, enabled, limit, page, linkPrefix }: UseSearchParams) => {

15− const size = parseInt(limit || '10', 10);

16− const pageInt = parseInt(page || '1', 10) - 1;

17− const start = pageInt * size;

18−

19− const { data, ...query } = useQuery<Search>(key(start, size), () => fetcher(start, size), {

20− enabled,

21− keepPreviousData: true

22− });

23−

24− const total = data?.total || 0;

25− const pages =

26− total % size === 0

27− ? total / size

28− : Math.floor(total / size) + 1;

29−

30− const linkBuild = useCallback((page) => {

31− if (!page) {

32− return null;

33− }

34−

35− return `${linkPrefix}/${size}/${page || 1}`

36− }, [linkPrefix, size]);

37−

38− return {

39− results: data || {

40− listings: []

41− },

42− ...query,

43− size,

44− pageInt,

45− start,

46− pages,

47− linkBuild

48− }

49−}

ui/src/state/tags.tsdeleted−21

@@ -1,21 +0,0 @@

1−import { useMemo } from "react";

2−import { useQuery } from "@tanstack/react-query";

3−import api from "../api";

4−import { Tags } from "../types/sphinx";

5−import { TAGS_KEY } from "../keys";

6−

7−export const useTags = () => {

8− const { data } = useQuery(TAGS_KEY, () => api.scry<Tags>({

9− app: 'sphinx',

10− path: '/tags'

11− }));

12−

13− return useMemo(() => data ? Object.entries(data).sort(([tagA, a], [tagB, b]) => {

14− if (a === b) {

15− return tagA.localeCompare(tagB);

16− }

17−

18− return b - a

19− })

20− : [], [data]);

21−}

ui/src/styles/base.cssdeleted

No changes to the content.

ui/src/styles/components.cssdeleted−16

@@ -1,16 +0,0 @@

1−.button {

2− @apply flex items-center rounded-lg text-base font-semibold text-linen bg-rosy disabled:bg-zinc-200 disabled:text-zinc-400 disabled:border-transparent border-2 border-transparent hover:border-linen/60 leading-none py-2 px-3 transition-colors;

3−}

4−

5−input:checked + label .show-when-checked {

6− @apply opacity-100;

7−}

8−

9−input:checked + .checked-bg-fawn,

10−input:checked + label .checked-bg-fawn {

11− @apply bg-fawn;

12−}

13−

14−.spinner {

15− @apply inline-flex items-center w-6 h-6 animate-spin;

16−}

ui/src/styles/index.cssdeleted−8

@@ -1,8 +0,0 @@

1−@import 'tailwindcss/base';

2−@import './base';

3−

4−@import 'tailwindcss/components';

5−@import './components';

6−

7−@import 'tailwindcss/utilities';

8−@import './utilities';

ui/src/styles/utilities.cssdeleted−3

@@ -1,3 +0,0 @@

1−.flip {

2− transform: rotateY(180deg);

3−}

ui/src/types/index.tsdeleted−304

@@ -1,304 +0,0 @@

1−export interface GroupMeta {

2− title: string;

3− description: string;

4− image: string;

5− cover: string;

6−}

7−

8−export interface Vessel {

9− sects: string[];

10− joined: number;

11−}

12−

13−export interface Fleet {

14− [ship: string]: Vessel;

15−}

16−

17−export interface GroupChannel {

18− meta: GroupMeta;

19− readers: string[];

20−}

21−

22−export interface Channels {

23− [nest: string]: GroupChannel;

24−}

25−

26−export interface Group {

27− fleet: Fleet;

28− channels: Channels;

29− meta: GroupMeta;

30− secret: boolean;

31−}

32−

33−export interface Groups {

34− [flag: string]: Group;

35−}

36−

37−// %groups /v1/channels/<kind>/<ship>/<name>/preview (mark channel-preview-1).

38−// Previews built from our own groups only fill in flag and meta.

39−export interface GroupPreview {

40− flag: string;

41− meta: GroupMeta;

42− time?: number;

43− 'member-count'?: number;

44− privacy?: 'public' | 'private' | 'secret';

45−}

46−

47−export interface ChannelPreview {

48− nest: string;

49− meta: GroupMeta;

50− group: GroupPreview;

51−}

52−

53−export interface Ship {

54− ship: string;

55−}

56−

57−export interface Italics {

58− italics: Inline[];

59−}

60−

61−export interface Bold {

62− bold: Inline[];

63−}

64−

65−export interface Strikethrough {

66− strike: Inline[];

67−}

68−

69−export interface Break {

70− break: null;

71−}

72−

73−export interface InlineCode {

74− 'inline-code': string;

75−}

76−

77−export interface BlockCode {

78− code: string;

79−}

80−

81−export interface Blockquote {

82− blockquote: Inline[];

83−}

84−

85−/**

86− A reference to the accompanying blocks, indexed at 0

87−*/

88−export interface BlockReference {

89− block: {

90− index: number;

91− text: string;

92− };

93−}

94−

95−export interface Tag {

96− tag: string;

97−}

98−

99−export interface Link {

100− link: {

101− href: string;

102− content: string;

103− };

104−}

105−

106−export interface Task {

107− task: {

108− checked: boolean;

109− content: Inline[];

110− };

111−}

112−

113−// a role mention

114−export interface Sect {

115− sect: string | null;

116−}

117−

118−export type Inline =

119− | string

120− | Bold

121− | Italics

122− | Strikethrough

123− | Ship

124− | Break

125− | InlineCode

126− | BlockCode

127− | Blockquote

128− | BlockReference

129− | Tag

130− | Link

131− | Task

132− | Sect;

133−

134−export type InlineKey =

135− | 'italics'

136− | 'bold'

137− | 'strike'

138− | 'blockquote'

139− | 'inline-code'

140− | 'block'

141− | 'code'

142− | 'tag'

143− | 'link'

144− | 'break';

145−

146−export function isBold(item: unknown): item is Bold {

147− return typeof item === 'object' && item !== null && 'bold' in item;

148−}

149−

150−export function isItalics(item: unknown): item is Italics {

151− return typeof item === 'object' && item !== null && 'italics' in item;

152−}

153−

154−export function isLink(item: unknown): item is Link {

155− return typeof item === 'object' && item !== null && 'link' in item;

156−}

157−

158−export function isStrikethrough(item: unknown): item is Strikethrough {

159− return typeof item === 'object' && item !== null && 'strike' in item;

160−}

161−

162−export function isBlockquote(item: unknown): item is Blockquote {

163− return typeof item === 'object' && item !== null && 'blockquote' in item;

164−}

165−

166−export function isInlineCode(item: unknown): item is InlineCode {

167− return typeof item === 'object' && item !== null && 'inline-code' in item;

168−}

169−

170−export function isBlockCode(item: unknown): item is BlockCode {

171− return typeof item === 'object' && item !== null && 'code' in item;

172−}

173−

174−export function isBreak(item: unknown): item is Break {

175− return typeof item === 'object' && item !== null && 'break' in item;

176−}

177−

178−export function isShip(item: unknown): item is Ship {

179− return typeof item === 'object' && item !== null && 'ship' in item;

180−}

181−

182−export function isTag(item: unknown): item is Tag {

183− return typeof item === 'object' && item !== null && 'tag' in item;

184−}

185−

186−export function isTask(item: unknown): item is Task {

187− return typeof item === 'object' && item !== null && 'task' in item;

188−}

189−

190−// plain text of an inline; text runs carry their own whitespace

191−export function inlineToString(inline: Inline): string {

192− if (typeof inline === 'string') {

193− return inline;

194− }

195−

196− if (isBold(inline)) {

197− return inline.bold.map(inlineToString).join('');

198− }

199−

200− if (isItalics(inline)) {

201− return inline.italics.map(inlineToString).join('');

202− }

203−

204− if (isStrikethrough(inline)) {

205− return inline.strike.map(inlineToString).join('');

206− }

207−

208− if (isLink(inline)) {

209− return inline.link.content || inline.link.href;

210− }

211−

212− if (isBlockquote(inline)) {

213− return inline.blockquote.map(inlineToString).join('');

214− }

215−

216− if (isInlineCode(inline)) {

217− return inline['inline-code'];

218− }

219−

220− if (isBlockCode(inline)) {

221− return inline.code;

222− }

223−

224− if (isTag(inline)) {

225− return inline.tag;

226− }

227−

228− if (isTask(inline)) {

229− return inline.task.content.map(inlineToString).join('');

230− }

231−

232− if (isShip(inline)) {

233− return inline.ship;

234− }

235−

236− if (isBreak(inline)) {

237− return ' ';

238− }

239−

240− return '';

241−}

242−

243−// story verses (lib/story-json): {inline: [...]} or {block: {...}}

244−export interface VerseInline {

245− inline: Inline[];

246−}

247−

248−export interface VerseBlock {

249− block: any;

250−}

251−

252−export type Verse = VerseInline | VerseBlock;

253−

254−export type NoteContent = Verse[];

255−

256−export interface DiaryPerm {

257− writers: string[];

258− group: string;

259−}

260−

261−export interface Diary {

262− perms: DiaryPerm;

263−}

264−

265−// %channels /v1/channels (mark %channels): keyed by nest "<kind>/~ship/name";

266−// posts are always empty here

267−export interface ChannelSummary extends Diary {

268− posts: Record<string, unknown>;

269− order: string[];

270− view: string;

271− sort: string;

272−}

273−

274−export interface ChannelsResponse {

275− [nest: string]: ChannelSummary;

276−}

277−

278−// %channels /v1/<kind>/~ship/name/posts/newest/<count>/outline

279−// (mark %channel-posts)

280−export interface ChannelEssay {

281− content: NoteContent;

282− author: string;

283− sent: number;

284− 'kind-data': {

285− diary?: { title: string; image: string };

286− heap?: string | null;

287− chat?: { notice: null } | null;

288− };

289−}

290−

291−export interface ChannelPost {

292− seal: { id: string };

293− revision: string;

294− essay: ChannelEssay;

295− type: 'post';

296−}

297−

298−export interface PagedChannelPosts {

299− // keyed by @ud post id ("170.141..."); null for a deleted post

300− posts: { [id: string]: ChannelPost | null };

301− newer: string | null;

302− older: string | null;

303− total: number;

304−}

ui/src/types/sphinx.ts−4

@@ -45,8 +45,4 @@ export interface PostOption {

46export interface PostOptionsForm {

47 options: string[];

48−}

49−

50−export interface Tags {

51− [key: string]: number;

52}

48}

ui/src/utils.tsdeleted−196

@@ -1,196 +0,0 @@

1−import { stringToTa, uxToHex } from "@urbit/api";

2−import { parseToRgba } from "color2k";

3−import { isValidPatp } from "urbit-ob";

4−

5−export function encodeLookup(value: string | undefined) {

6− if (!value) {

7− return '';

8− }

9−

10− return stringToTa(value).replace('~.', '~~');

11−}

12−

13−export function isColor(color: string): boolean {

14− try {

15− parseToRgba(color);

16− return true;

17− } catch (error) {

18− return false;

19− }

20−}

21−

22−export function getColor(image: string): string | undefined {

23− return isColor(image) ? image : undefined;

24−}

25−

26−export function getImage(image: string): string | undefined {

27− return isColor(image) ? undefined : image;

28−}

29−

30−export function normalizeColor(color: string): string {

31− if (color.startsWith('#')) {

32− return color;

33− }

34−

35− return `#${uxToHex(color)}`

36−}

37−

38−export function normalizeLink(link: string): string {

39− // ref or URL format

40− if (!link.startsWith('web+urbitgraph://') || link.startsWith('http')) {

41− return link;

42− }

43−

44− // old format

45− const normLink = link.replace('web+urbitgraph://', '');

46− const parts = normLink.split('/');

47− const first = parts[0];

48−

49− if (first !== 'group') {

50− return `/1/desk/${normLink}`;

51− }

52−

53− if (parts.length === 3) {

54− return `/1/group/${parts[1]}/${parts[2]}`;

55− }

56−

57− return `/1/chan/diary/${parts[4]}/${parts[5]}/note/${parts[6]}`

58−}

59−

60−// Tlon web routes (tlon-apps packages/app/navigation/linking.ts):

61−// /apps/groups/group/:groupId[/channel/:channelId], ids URI-encoded.

62−export function groupURL(flag: string): string {

63− return `/apps/groups/group/${encodeURIComponent(flag)}`;

64−}

65−

66−export function channelURL(flag: string, nest: string): string {

67− return `${groupURL(flag)}/channel/${encodeURIComponent(nest)}`;

68−}

69−

70−export function refToURL(cite: string): string | { nest: string, where: string } {

71− // plain web links (e.g. manual listings) are used as they are

72− if (/^https?:\/\//i.test(cite)) {

73− return cite;

74− }

75−

76− const parts = cite.slice(1).split('/');

77− if (parts[0] !== '1') {

78− return '';

79− }

80−

81− const type = parts[1];

82− if (type === 'desk') {

83− const ship = parts[2];

84− const desk = parts[3];

85− return `/apps/landscape/search/${ship}/apps/${ship}/${desk}`;

86− }

87−

88− if (type === 'group') {

89− const ship = parts[2];

90− const name = parts[3];

91− return groupURL(`${ship}/${name}`);

92− }

93−

94− const chanType = parts[2];

95− const ship = parts[3];

96− const name = parts[4];

97− return {

98− nest: `${chanType}/${ship}/${name}`,

99− where: parts.slice(5).join('/'),

100− }

101−}

102−

103−// a number as Hoon prints @ud: `slav %ud` reads 1.000 but not 1000

104−// (@urbit/api's decToUd turns 0 into '')

105−export function formatUd(n: number): string {

106− return String(n).replace(/\B(?=(\d{3})+$)/g, '.');

107−}

108−

109−const encoder = new TextEncoder();

110−

111−// lib/sphinx +lengths-valid limits, in UTF-8 bytes

112−export const MAX_TITLE_BYTES = 77;

113−export const MAX_DESCRIPTION_BYTES = 256;

114−export const MAX_URL_BYTES = 1024;

115−export const MAX_TAGS = 8;

116−// the longest tag +catalog indexes

117−export const MAX_TAG_BYTES = 64;

118−

119−export function byteLength(text: string): number {

120− return encoder.encode(text).length;

121−}

122−

123−// lib/validate-url (de-purl:html in zuse) as regular expressions: an optional

124−// scheme://host[:port] (host a DNS name or IPv4, or a ~ship without a port),

125−// then an optional /path and ?key=value&key=value query. No #fragment, no

126−// spaces or non-ASCII, none of | [ ] { } ^ ` \ and no '=' inside a value.

127−// %sphinx silently drops a listing whose image or link fails this.

128−const QUERY_CHAR = "(?:[A-Za-z0-9_.!~*'()+/?:,-]|%[0-9A-Fa-f]{2})";

129−const PATH_CHAR = "(?:[A-Za-z0-9_.!~*'()$&+,;=:@/-]|%[0-9A-Fa-f]{2})";

130−const PAIR = `${QUERY_CHAR}+(?:=${QUERY_CHAR}*)?`;

131−const PATH_QUERY = `(?:/${PATH_CHAR}*)?(?:[?](?:${PAIR}(?:[&;]${PAIR})*)?)?`;

132−const SCHEME = '[A-Za-z][A-Za-z0-9+.-]*://';

133−const LABEL = '[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?';

134−const LAST_LABEL = '[A-Za-z](?:[A-Za-z0-9-]*[A-Za-z0-9])?';

135−const OCTET = '(?:0|[1-9][0-9]{0,2})';

136−const HOST = `(?:(?:${LABEL}[.])*${LAST_LABEL}|${OCTET}(?:[.]${OCTET}){3})(?::(?:0|[1-9][0-9]*))?`;

137−// the shape of a @p; isListingLink checks the syllables with isValidPatp

138−const SHIP = '~[a-z]{3}(?:[a-z]{3})?(?:--?[a-z]{6})*';

139−const IMAGE_RE = new RegExp(`^${SCHEME}${HOST}${PATH_QUERY}$`);

140−const LINK_RE = new RegExp(`^(?:${SCHEME}(?:${HOST}|(${SHIP})))?${PATH_QUERY}$`);

141−

142−export function isListingImage(image: string): boolean {

143− return !image || (byteLength(image) <= MAX_URL_BYTES && IMAGE_RE.test(image));

144−}

145−

146−export function isListingLink(link: string): boolean {

147− if (byteLength(link) > MAX_URL_BYTES) {

148− return false;

149− }

150−

151− const match = LINK_RE.exec(link);

152− return !!match && (!match[1] || isValidPatp(match[1]));

153−}

154−

155−// A listing image %sphinx accepts, or '' (so the listing goes out without

156−// one): http(s) URLs are percent-encoded by URL and lose their #fragment;

157−// anything else, data: URIs included (docket images may be one), is dropped.

158−export function listingImage(image: string | null | undefined): string {

159− if (!image) {

160− return '';

161− }

162−

163− try {

164− const url = new URL(image);

165− if (url.protocol !== 'http:' && url.protocol !== 'https:') {

166− return '';

167− }

168−

169− url.hash = '';

170− return isListingImage(url.href) ? url.href : '';

171− } catch (e) {

172− return '';

173− }

174−}

175−

176−// %sphinx measures listing fields in UTF-8 bytes (lib/sphinx +lengths-valid)

177−// and silently drops listings that are too long, so cut text to at most `max`

178−// bytes on a code point boundary, marking the cut with an ellipsis.

179−export function truncateBytes(text: string, max: number): string {

180− if (encoder.encode(text).length <= max) {

181− return text;

182− }

183−

184− const ellipsis = '...';

185− let out = '';

186− let size = 0;

187− for (const char of text) {

188− size += encoder.encode(char).length;

189− if (size > max - ellipsis.length) {

190− break;

191− }

192− out += char;

193− }

194−

195− return `${out.trimEnd()}${ellipsis}`;

196−}

ui/tailwind.config.js−1

@@ -1,4 +1,3 @@

1−/** @type {import('tailwindcss').Config} */

2module.exports = {

1module.exports = {

3 content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'],

2 content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'],

4 theme: {

3 theme: {

ui/tsconfig.json+1−1

@@ -2,7 +2,7 @@

2 "compilerOptions": {

3 "target": "ESNext",

4 "lib": ["DOM", "DOM.Iterable", "ESNext"],

5− "allowJs": true,

5+ "allowJs": false,

6 "skipLibCheck": false,

7 "esModuleInterop": false,

8 "allowSyntheticDefaultImports": true,

ui/vite.config.ts+1−7

@@ -9,12 +9,6 @@ export default ({ mode }) => {

9 console.log(SHIP_URL);

11 return defineConfig({

12− plugins: [urbitPlugin({ base: 'sphinx', target: SHIP_URL, changeOrigin: true, secure: false }), reactRefresh()],

12+ plugins: [urbitPlugin({ base: 'sphinx', target: SHIP_URL, secure: false }), reactRefresh()]

13− // The entry chunk has no import or export, so esbuild 0.14 minifies it as

14− // a sloppy-mode script and hoists the block-level functions in

15− // @radix-ui/react-focus-scope and react-use-body-pointer-events in random

16− // order: rebuilds would give a different bundle and glob hash. Browsers

17− // run the bundle as a module, which is strict anyway.

18− build: { rollupOptions: { output: { banner: '"use strict";' } } }

19 });

13 });

20};

14};