mirror of
https://github.com/coracle-social/coracle.git
synced 2024-10-06 11:43:30 +00:00
Fix onboarding, move some stuff to env vars, fix cursor
This commit is contained in:
parent
ec040ce262
commit
51a90fe9a7
1
.ackrc
1
.ackrc
@ -1,4 +1,5 @@
|
|||||||
--ignore-dir=node_modules
|
--ignore-dir=node_modules
|
||||||
|
--ignore-dir=android
|
||||||
--ignore-dir=dist
|
--ignore-dir=dist
|
||||||
--ignore-file=match:package-lock.json
|
--ignore-file=match:package-lock.json
|
||||||
--ignore-file=match:.svg
|
--ignore-file=match:.svg
|
||||||
|
3
.env
3
.env
@ -1,3 +1,6 @@
|
|||||||
VITE_THEME_DARK=transparent:transparent,black:#0f0f0e,white:#FFFFFF,accent:#EB5E28,accent-light:#FB652C,gray-1:#FFFFFF,gray-2:#FAF6F1,gray-3:#F2EBE1,gray-4:#E9E0D3,gray-5:#B3AA98,gray-6:#565249,gray-7:#393530,gray-8:#252422,danger:#ff0000,warning:#ebd112,success:#37ab51,input:#FAF6F1,input-hover:#F2EBE1
|
VITE_THEME_DARK=transparent:transparent,black:#0f0f0e,white:#FFFFFF,accent:#EB5E28,accent-light:#FB652C,gray-1:#FFFFFF,gray-2:#FAF6F1,gray-3:#F2EBE1,gray-4:#E9E0D3,gray-5:#B3AA98,gray-6:#565249,gray-7:#393530,gray-8:#252422,danger:#ff0000,warning:#ebd112,success:#37ab51,input:#FAF6F1,input-hover:#F2EBE1
|
||||||
VITE_THEME_LIGHT=transparent:transparent,black:#0f0f0e,white:#FFFFFF,accent:#EB5E28,accent-light:#FB652C,gray-8:#FFFFFF,gray-7:#FAF6F1,gray-6:#F2EBE1,gray-5:#B3AA98,gray-4:#B3AA98,gray-3:#565249,gray-2:#393530,gray-1:#252422,danger:#ff0000,warning:#ebd112,success:#37ab51,input:#FAF6F1,input-hover:#F2EBE1
|
VITE_THEME_LIGHT=transparent:transparent,black:#0f0f0e,white:#FFFFFF,accent:#EB5E28,accent-light:#FB652C,gray-8:#FFFFFF,gray-7:#FAF6F1,gray-6:#F2EBE1,gray-5:#B3AA98,gray-4:#B3AA98,gray-3:#565249,gray-2:#393530,gray-1:#252422,danger:#ff0000,warning:#ebd112,success:#37ab51,input:#FAF6F1,input-hover:#F2EBE1
|
||||||
VITE_DUFFLEPUD_URL=https://dufflepud.onrender.com
|
VITE_DUFFLEPUD_URL=https://dufflepud.onrender.com
|
||||||
|
VITE_DEFAULT_FOLLOWS=97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322,3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93
|
||||||
|
VITE_FORCE_RELAYS=
|
||||||
|
VITE_LOGO_URL=
|
||||||
|
@ -1 +0,0 @@
|
|||||||
VITE_DUFFLEPUD_URL=https://dufflepud.onrender.com
|
|
@ -1,15 +1,12 @@
|
|||||||
# Current
|
# Current
|
||||||
|
|
||||||
- [ ] Fix multiplexing
|
- [ ] Fix cursor
|
||||||
- [ ] Extract libraries
|
|
||||||
- Cursor
|
|
||||||
- parseContent
|
|
||||||
- Tags
|
|
||||||
- [ ] Image classification
|
- [ ] Image classification
|
||||||
- https://github.com/bhky/opennsfw2
|
- https://github.com/bhky/opennsfw2
|
||||||
|
|
||||||
# Core
|
# Core
|
||||||
|
|
||||||
|
- [ ] Key login should accept bech32 and hex
|
||||||
- [ ] Make mutes private
|
- [ ] Make mutes private
|
||||||
- [ ] Write multi-relay pagination into paravel and open source it
|
- [ ] Write multi-relay pagination into paravel and open source it
|
||||||
- https://github.com/nostr-protocol/nips/pull/408
|
- https://github.com/nostr-protocol/nips/pull/408
|
||||||
|
BIN
package-lock.json
generated
BIN
package-lock.json
generated
Binary file not shown.
@ -49,7 +49,7 @@
|
|||||||
"lru-cache": "^7.18.3",
|
"lru-cache": "^7.18.3",
|
||||||
"nostr-tools": "^1.7.4",
|
"nostr-tools": "^1.7.4",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"paravel": "^0.1.14",
|
"paravel": "^0.1.15",
|
||||||
"qr-scanner": "^1.4.2",
|
"qr-scanner": "^1.4.2",
|
||||||
"qrcode": "^1.5.1",
|
"qrcode": "^1.5.1",
|
||||||
"ramda": "^0.28.0",
|
"ramda": "^0.28.0",
|
||||||
|
@ -154,7 +154,9 @@ class Cursor {
|
|||||||
|
|
||||||
return load({
|
return load({
|
||||||
relays: relays,
|
relays: relays,
|
||||||
filter: ensurePlural(filter).map(mergeLeft({until, limit: this.limit})),
|
filter: ensurePlural(filter).map(
|
||||||
|
mergeLeft({until, limit: this.limit, since: this.since})
|
||||||
|
),
|
||||||
onChunk: events => {
|
onChunk: events => {
|
||||||
for (const event of events) {
|
for (const event of events) {
|
||||||
if (event.created_at < this.until[event.seen_on]) {
|
if (event.created_at < this.until[event.seen_on]) {
|
||||||
|
@ -95,12 +95,17 @@ const Meta = {
|
|||||||
|
|
||||||
const forceUrls = (import.meta.env.VITE_FORCE_RELAYS || "").split(",").filter(identity)
|
const forceUrls = (import.meta.env.VITE_FORCE_RELAYS || "").split(",").filter(identity)
|
||||||
|
|
||||||
const defaultUrls = [
|
const countRelay = forceUrls[0] || "wss://rbr.bio"
|
||||||
"wss://purplepag.es",
|
|
||||||
"wss://relay.damus.io",
|
const defaultUrls =
|
||||||
"wss://relay.nostr.band",
|
forceUrls.length > 0
|
||||||
"wss://nostr-pub.wellorder.net",
|
? forceUrls
|
||||||
]
|
: [
|
||||||
|
"wss://purplepag.es",
|
||||||
|
"wss://relay.damus.io",
|
||||||
|
"wss://relay.nostr.band",
|
||||||
|
"wss://nostr-pub.wellorder.net",
|
||||||
|
]
|
||||||
|
|
||||||
const getUrls = relays => {
|
const getUrls = relays => {
|
||||||
if (relays.length === 0) {
|
if (relays.length === 0) {
|
||||||
@ -378,7 +383,7 @@ async function subscribe({relays, filter, onEvent, onEose}: SubscribeOpts) {
|
|||||||
|
|
||||||
async function count(filter) {
|
async function count(filter) {
|
||||||
const filters = ensurePlural(filter)
|
const filters = ensurePlural(filter)
|
||||||
const executor = await getExecutor(["wss://rbr.bio"])
|
const executor = await getExecutor([countRelay])
|
||||||
|
|
||||||
return new Promise(resolve => {
|
return new Promise(resolve => {
|
||||||
const sub = executor.count(filters, {
|
const sub = executor.count(filters, {
|
||||||
|
@ -1,14 +1,11 @@
|
|||||||
import {uniq, without} from "ramda"
|
import {uniq, identity, without} from "ramda"
|
||||||
import {Tags} from "src/util/nostr"
|
import {Tags} from "src/util/nostr"
|
||||||
import {getPersonWithFallback} from "src/agent/db"
|
import {getPersonWithFallback} from "src/agent/db"
|
||||||
import user from "src/agent/user"
|
import user from "src/agent/user"
|
||||||
|
|
||||||
export const defaultFollows = [
|
export const defaultFollows = (import.meta.env.VITE_DEFAULT_FOLLOWS || "")
|
||||||
"97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322", // hodlbod
|
.split(",")
|
||||||
"3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d", // fiatjaf
|
.filter(identity)
|
||||||
"82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2", // jack
|
|
||||||
"6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93", // Gigi
|
|
||||||
]
|
|
||||||
|
|
||||||
export const getFollows = pubkey =>
|
export const getFollows = pubkey =>
|
||||||
Tags.wrap(getPersonWithFallback(pubkey).petnames).type("p").values().all()
|
Tags.wrap(getPersonWithFallback(pubkey).petnames).type("p").values().all()
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
import {getPersonWithFallback} from "src/agent/db"
|
import {getPersonWithFallback} from "src/agent/db"
|
||||||
import network from "src/agent/network"
|
import network from "src/agent/network"
|
||||||
import user from "src/agent/user"
|
import user from "src/agent/user"
|
||||||
|
import pool from "src/agent/pool"
|
||||||
import keys from "src/agent/keys"
|
import keys from "src/agent/keys"
|
||||||
import {loadAppData} from "src/app/state"
|
import {loadAppData} from "src/app/state"
|
||||||
import {modal} from "src/partials/state"
|
import {modal} from "src/partials/state"
|
||||||
@ -24,6 +25,17 @@
|
|||||||
|
|
||||||
const privkey = generatePrivateKey()
|
const privkey = generatePrivateKey()
|
||||||
|
|
||||||
|
const {relays} = user
|
||||||
|
|
||||||
|
if ($relays.length === 0) {
|
||||||
|
user.updateRelays(() =>
|
||||||
|
(pool.forceUrls.length > 0 ? pool.forceUrls : pool.defaultUrls).map(url => ({
|
||||||
|
url,
|
||||||
|
write: true,
|
||||||
|
}))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const signup = async () => {
|
const signup = async () => {
|
||||||
await keys.login("privkey", privkey)
|
await keys.login("privkey", privkey)
|
||||||
|
|
||||||
|
@ -8,20 +8,10 @@
|
|||||||
import Content from "src/partials/Content.svelte"
|
import Content from "src/partials/Content.svelte"
|
||||||
import RelayCard from "src/app/shared/RelayCard.svelte"
|
import RelayCard from "src/app/shared/RelayCard.svelte"
|
||||||
import {watch} from "src/agent/db"
|
import {watch} from "src/agent/db"
|
||||||
import pool from "src/agent/pool"
|
|
||||||
import user from "src/agent/user"
|
import user from "src/agent/user"
|
||||||
|
|
||||||
const {relays} = user
|
const {relays} = user
|
||||||
|
|
||||||
if ($relays.length === 0) {
|
|
||||||
user.updateRelays(() =>
|
|
||||||
(pool.forceUrls.length > 0 ? pool.forceUrls : pool.defaultUrls).map(url => ({
|
|
||||||
url,
|
|
||||||
write: true,
|
|
||||||
}))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
let q = ""
|
let q = ""
|
||||||
let search
|
let search
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user