Skip to content

Commit 7f9766b

Browse files
committed
Merge remote-tracking branch 'origin/main' into BranchName
# Conflicts: # .gitignore
2 parents a79deb8 + 84bb828 commit 7f9766b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+9362
-790
lines changed

.gitignore

Lines changed: 132 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ NOTE.md
1111
/classifier/*.tsv
1212
Rocket.toml
1313
*.pem
14+
**/data/
1415

1516
# dotenv environment variable files
1617
.env
@@ -24,4 +25,134 @@ Rocket.toml
2425
rustc-*.txt
2526
/botenv/
2627

27-
.idea/
28+
.idea/
29+
# Node.gitignore
30+
31+
# Logs
32+
logs
33+
*.log
34+
npm-debug.log*
35+
yarn-debug.log*
36+
yarn-error.log*
37+
lerna-debug.log*
38+
.pnpm-debug.log*
39+
40+
# Diagnostic reports (https://nodejs.org/api/report.html)
41+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
42+
43+
# Runtime data
44+
pids
45+
*.pid
46+
*.seed
47+
*.pid.lock
48+
49+
# Directory for instrumented libs generated by jscoverage/JSCover
50+
lib-cov
51+
52+
# Coverage directory used by tools like istanbul
53+
coverage
54+
*.lcov
55+
56+
# nyc test coverage
57+
.nyc_output
58+
59+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
60+
.grunt
61+
62+
# Bower dependency directory (https://bower.io/)
63+
bower_components
64+
65+
# node-waf configuration
66+
.lock-wscript
67+
68+
# Compiled binary addons (https://nodejs.org/api/addons.html)
69+
build/Release
70+
71+
# Dependency directories
72+
node_modules/
73+
jspm_packages/
74+
75+
# Snowpack dependency directory (https://snowpack.dev/)
76+
web_modules/
77+
78+
# TypeScript cache
79+
*.tsbuildinfo
80+
81+
# Optional npm cache directory
82+
.npm
83+
84+
# Optional eslint cache
85+
.eslintcache
86+
87+
# Optional stylelint cache
88+
.stylelintcache
89+
90+
# Microbundle cache
91+
.rpt2_cache/
92+
.rts2_cache_cjs/
93+
.rts2_cache_es/
94+
.rts2_cache_umd/
95+
96+
# Optional REPL history
97+
.node_repl_history
98+
99+
# Output of 'npm pack'
100+
*.tgz
101+
102+
# Yarn Integrity file
103+
.yarn-integrity
104+
105+
# parcel-bundler cache (https://parceljs.org/)
106+
.cache
107+
.parcel-cache
108+
109+
# Next.js build output
110+
.next
111+
out
112+
113+
# Nuxt.js build / generate output
114+
.nuxt
115+
dist
116+
117+
# Gatsby files
118+
.cache/
119+
# Comment in the public line in if your project uses Gatsby and not Next.js
120+
# https://nextjs.org/blog/next-9-1#public-directory-support
121+
# public
122+
123+
# vuepress build output
124+
.vuepress/dist
125+
126+
# vuepress v2.x temp and cache directory
127+
.temp
128+
129+
# vitepress build output
130+
**/.vitepress/dist
131+
132+
# vitepress cache directory
133+
**/.vitepress/cache
134+
135+
# Docusaurus cache and generated files
136+
.docusaurus
137+
138+
# Serverless directories
139+
.serverless/
140+
141+
# FuseBox cache
142+
.fusebox/
143+
144+
# DynamoDB Local files
145+
.dynamodb/
146+
147+
# TernJS port file
148+
.tern-port
149+
150+
# Stores VSCode versions used for testing VSCode extensions
151+
.vscode-test
152+
153+
# yarn v2
154+
.yarn/cache
155+
.yarn/unplugged
156+
.yarn/build-state.yml
157+
.yarn/install-state.gz
158+
.pnp.*

Cargo.toml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = [ "rsky-common", "rsky-crypto","rsky-feedgen", "rsky-firehose", "rsky-identity", "rsky-labeler", "rsky-lexicon", "rsky-pds", "rsky-syntax", "rsky-jetstream-subscriber", "rsky-repo"]
2+
members = [ "rsky-common", "rsky-crypto","rsky-feedgen", "rsky-firehose", "rsky-identity", "rsky-labeler", "rsky-lexicon", "rsky-pds", "rsky-syntax", "rsky-jetstream-subscriber", "rsky-repo", "cypher/backend", "cypher/frontend", "rsky-satnav"]
33
resolver = "2"
44

55
[workspace.dependencies]
@@ -17,12 +17,23 @@ rand = "0.8.5"
1717
rand_core = "0.6.4"
1818
secp256k1 = { version = "0.28.2", features = ["global-context", "serde", "rand", "hashes","rand-std"] }
1919
serde_json = { version = "1.0.96",features = ["preserve_order"] }
20-
rsky-lexicon = {path = "rsky-lexicon", version = "0.2.5"}
20+
rsky-lexicon = {path = "rsky-lexicon", version = "0.2.7"}
2121
rsky-identity = {path = "rsky-identity", version = "0.1.0"}
2222
rsky-crypto = {path = "rsky-crypto", version = "0.1.1"}
2323
rsky-syntax = {path = "rsky-syntax", version = "0.1.0"}
2424
rsky-common = {path = "rsky-common", version = "0.1.1"}
2525
rsky-repo = {path = "rsky-repo", version = "0.0.1"}
26+
rsky-firehose = {path = "rsky-firehose", version = "0.2.0"}
2627

2728
[profile.release]
2829
debug = 2 # Or any level from 0 to 2
30+
31+
[profile.wasm-dev]
32+
inherits = "dev"
33+
opt-level = 1
34+
35+
[profile.server-dev]
36+
inherits = "dev"
37+
38+
[profile.android-dev]
39+
inherits = "dev"

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ rsky (/ˈrɪski/) is intended to be a full implementation of [AT Protocol](https
4646
- `rsky-firehose`: Firehose consumer.
4747
- `rsky-jetstream-subscriber`: Firehose consumer for Jetstream.
4848
- `rsky-labeler`: Firehose consumer that labels content.
49+
- `Cypher`: An AT Protocol app-view designed for local-only posting and global views.
50+
- `rsky-satnav`: "Structured Archive Traversal, Navigation & Verification", a DASL CAR and AT Protocol repository explorer.
4951

5052
## About AT Protocol
5153

@@ -60,7 +62,7 @@ The Authenticated Transfer Protocol ("ATP" or "atproto") is a decentralized soci
6062

6163
- [x] Feedgen and firehose consumer
6264
- [x] PDS implementation
63-
- [ ] Frontend bluesky client
65+
- [x] Frontend bluesky client
6466
- [ ] Feedgen admin client
6567

6668
## Backers

bots/main.py

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)