diff --git a/.vscode/launch.json b/.vscode/launch.json index 298c3be5..35b505d2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "request": "launch", "name": "Launch Program", "type": "node", - "program": "${workspaceFolder}/src/server.ts", + "program": "${workspaceFolder}/packages/ditto/server.ts", "cwd": "${workspaceFolder}", "runtimeExecutable": "deno", "runtimeArgs": [ diff --git a/Dockerfile b/Dockerfile index 21b03689..78ae7fad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV PORT 5000 WORKDIR /app RUN mkdir -p data && chown -R deno data COPY . . -RUN deno cache --allow-import src/server.ts +RUN deno cache --allow-import packages/ditto/server.ts RUN apt-get update && apt-get install -y unzip curl RUN deno task soapbox CMD deno task start diff --git a/deno.json b/deno.json index c735663d..ee6868d9 100644 --- a/deno.json +++ b/deno.json @@ -1,15 +1,17 @@ { - "version": "1.1.0", + "workspace": [ + "./packages/ditto" + ], "tasks": { - "start": "deno run -A --env-file --deny-read=.env src/server.ts", - "dev": "deno run -A --env-file --deny-read=.env --watch src/server.ts", + "start": "deno run -A --env-file --deny-read=.env packages/ditto/server.ts", + "dev": "deno run -A --env-file --deny-read=.env --watch packages/ditto/server.ts", "hook": "deno run --allow-read --allow-run --allow-write https://deno.land/x/deno_hooks@0.1.1/mod.ts", "db:export": "deno run -A --env-file --deny-read=.env scripts/db-export.ts", "db:import": "deno run -A --env-file --deny-read=.env scripts/db-import.ts", "db:cleanup": "deno run -A --env-file --deny-read=.env scripts/db-policy.ts", "db:migrate": "deno run -A --env-file --deny-read=.env scripts/db-migrate.ts", "nostr:pull": "deno run -A --env-file --deny-read=.env scripts/nostr-pull.ts", - "debug": "deno run -A --env-file --deny-read=.env --inspect src/server.ts", + "debug": "deno run -A --env-file --deny-read=.env --inspect packages/ditto/server.ts", "test": "deno test -A --env-file=.env.test --deny-read=.env --junit-path=./deno-test.xml", "check": "deno check --allow-import .", "nsec": "deno run scripts/nsec.ts", @@ -20,7 +22,7 @@ "stats:recompute": "deno run -A --env-file --deny-read=.env scripts/stats-recompute.ts", "soapbox": "curl -O https://dl.soapbox.pub/main/soapbox.zip && mkdir -p public && mv soapbox.zip public/ && cd public/ && unzip -o soapbox.zip && rm soapbox.zip", "trends": "deno run -A --env-file --deny-read=.env scripts/trends.ts", - "clean:deps": "deno cache --reload src/app.ts", + "clean:deps": "deno cache --reload packages/ditto/app.ts", "db:populate:nip05": "deno run -A --env-file --deny-read=.env scripts/db-populate-nip05.ts", "db:populate-search": "deno run -A --env-file --deny-read=.env scripts/db-populate-search.ts", "db:populate-extensions": "deno run -A --env-file --deny-read=.env scripts/db-populate-extensions.ts", @@ -37,7 +39,7 @@ "./public" ], "imports": { - "@/": "./src/", + "@/": "./packages/ditto/", "@b-fuze/deno-dom": "jsr:@b-fuze/deno-dom@^0.1.47", "@bradenmacdonald/s3-lite-client": "jsr:@bradenmacdonald/s3-lite-client@^0.7.4", "@cashu/cashu-ts": "npm:@cashu/cashu-ts@^2.2.0", @@ -71,7 +73,6 @@ "comlink": "npm:comlink@^4.4.1", "comlink-async-generator": "npm:comlink-async-generator@^0.0.1", "commander": "npm:commander@12.1.0", - "deno.json": "./deno.json", "entities": "npm:entities@^4.5.0", "fast-stable-stringify": "npm:fast-stable-stringify@^1.0.0", "formdata-helper": "npm:formdata-helper@^0.3.0", diff --git a/log.json b/log.json deleted file mode 100644 index 4eff9bd2..00000000 --- a/log.json +++ /dev/null @@ -1,226 +0,0 @@ -{ - "level": "error", - "ns": "ditto.sql", - "sql": "select * from (select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"kind\" = any($1) and \"nostr_events\".\"pubkey\" = any($2) order by \"nostr_events\".\"created_at\" desc, \"nostr_events\".\"id\" asc limit $3) as \"e\" union all select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"kind\" = any($4) and (\"nostr_events\".\"tags_index\" @> $5 or \"nostr_events\".\"tags_index\" @> $6 or \"nostr_events\".\"tags_index\" @> $7 or \"nostr_events\".\"tags_index\" @> $8 or \"nostr_events\".\"tags_index\" @> $9 or \"nostr_events\".\"tags_index\" @> $10 or \"nostr_events\".\"tags_index\" @> $11 or \"nostr_events\".\"tags_index\" @> $12 or \"nostr_events\".\"tags_index\" @> $13 or \"nostr_events\".\"tags_index\" @> $14 or \"nostr_events\".\"tags_index\" @> $15 or \"nostr_events\".\"tags_index\" @> $16 or \"nostr_events\".\"tags_index\" @> $17 or \"nostr_events\".\"tags_index\" @> $18 or \"nostr_events\".\"tags_index\" @> $19 or \"nostr_events\".\"tags_index\" @> $20 or \"nostr_events\".\"tags_index\" @> $21 or \"nostr_events\".\"tags_index\" @> $22 or \"nostr_events\".\"tags_index\" @> $23 or \"nostr_events\".\"tags_index\" @> $24 or \"nostr_events\".\"tags_index\" @> $25 or \"nostr_events\".\"tags_index\" @> $26 or \"nostr_events\".\"tags_index\" @> $27 or \"nostr_events\".\"tags_index\" @> $28 or \"nostr_events\".\"tags_index\" @> $29 or \"nostr_events\".\"tags_index\" @> $30 or \"nostr_events\".\"tags_index\" @> $31 or \"nostr_events\".\"tags_index\" @> $32 or \"nostr_events\".\"tags_index\" @> $33 or \"nostr_events\".\"tags_index\" @> $34 or \"nostr_events\".\"tags_index\" @> $35 or \"nostr_events\".\"tags_index\" @> $36 or \"nostr_events\".\"tags_index\" @> $37 or \"nostr_events\".\"tags_index\" @> $38 or \"nostr_events\".\"tags_index\" @> $39 or \"nostr_events\".\"tags_index\" @> $40 or \"nostr_events\".\"tags_index\" @> $41 or \"nostr_events\".\"tags_index\" @> $42 or \"nostr_events\".\"tags_index\" @> $43 or \"nostr_events\".\"tags_index\" @> $44 or \"nostr_events\".\"tags_index\" @> $45 or \"nostr_events\".\"tags_index\" @> $46 or \"nostr_events\".\"tags_index\" @> $47 or \"nostr_events\".\"tags_index\" @> $48 or \"nostr_events\".\"tags_index\" @> $49 or \"nostr_events\".\"tags_index\" @> $50 or \"nostr_events\".\"tags_index\" @> $51 or \"nostr_events\".\"tags_index\" @> $52 or \"nostr_events\".\"tags_index\" @> $53) order by \"nostr_events\".\"created_at\" desc, \"nostr_events\".\"id\" asc limit $54) as \"e\" union all select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"kind\" = any($55) and \"nostr_events\".\"pubkey\" = any($56) order by \"nostr_events\".\"created_at\" desc, \"nostr_events\".\"id\" asc limit $57) as \"e\" union all select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"id\" = any($58) and \"nostr_events\".\"kind\" = any($59) limit $60) as \"e\" union all select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"kind\" = any($61) and \"nostr_events\".\"pubkey\" = any($62) order by \"nostr_events\".\"created_at\" desc, \"nostr_events\".\"id\" asc limit $63) as \"e\" union all select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"kind\" = any($64) and \"nostr_events\".\"pubkey\" = any($65) order by \"nostr_events\".\"created_at\" desc, \"nostr_events\".\"id\" asc limit $66) as \"e\" union all select * from (select \"nostr_events\".* from \"nostr_events\" where \"nostr_events\".\"kind\" = any($67) and (\"nostr_events\".\"tags_index\" @> $68 or \"nostr_events\".\"tags_index\" @> $69 or \"nostr_events\".\"tags_index\" @> $70 or \"nostr_events\".\"tags_index\" @> $71 or \"nostr_events\".\"tags_index\" @> $72 or \"nostr_events\".\"tags_index\" @> $73 or \"nostr_events\".\"tags_index\" @> $74 or \"nostr_events\".\"tags_index\" @> $75 or \"nostr_events\".\"tags_index\" @> $76 or \"nostr_events\".\"tags_index\" @> $77 or \"nostr_events\".\"tags_index\" @> $78 or \"nostr_events\".\"tags_index\" @> $79 or \"nostr_events\".\"tags_index\" @> $80 or \"nostr_events\".\"tags_index\" @> $81 or \"nostr_events\".\"tags_index\" @> $82 or \"nostr_events\".\"tags_index\" @> $83 or \"nostr_events\".\"tags_index\" @> $84 or \"nostr_events\".\"tags_index\" @> $85 or \"nostr_events\".\"tags_index\" @> $86 or \"nostr_events\".\"tags_index\" @> $87 or \"nostr_events\".\"tags_index\" @> $88 or \"nostr_events\".\"tags_index\" @> $89 or \"nostr_events\".\"tags_index\" @> $90 or \"nostr_events\".\"tags_index\" @> $91 or \"nostr_events\".\"tags_index\" @> $92 or \"nostr_events\".\"tags_index\" @> $93 or \"nostr_events\".\"tags_index\" @> $94 or \"nostr_events\".\"tags_index\" @> $95 or \"nostr_events\".\"tags_index\" @> $96 or \"nostr_events\".\"tags_index\" @> $97 or \"nostr_events\".\"tags_index\" @> $98 or \"nostr_events\".\"tags_index\" @> $99 or \"nostr_events\".\"tags_index\" @> $100 or \"nostr_events\".\"tags_index\" @> $101 or \"nostr_events\".\"tags_index\" @> $102 or \"nostr_events\".\"tags_index\" @> $103 or \"nostr_events\".\"tags_index\" @> $104 or \"nostr_events\".\"tags_index\" @> $105 or \"nostr_events\".\"tags_index\" @> $106 or \"nostr_events\".\"tags_index\" @> $107 or \"nostr_events\".\"tags_index\" @> $108 or \"nostr_events\".\"tags_index\" @> $109 or \"nostr_events\".\"tags_index\" @> $110 or \"nostr_events\".\"tags_index\" @> $111 or \"nostr_events\".\"tags_index\" @> $112 or \"nostr_events\".\"tags_index\" @> $113 or \"nostr_events\".\"tags_index\" @> $114 or \"nostr_events\".\"tags_index\" @> $115 or \"nostr_events\".\"tags_index\" @> $116 or \"nostr_events\".\"tags_index\" @> $117 or \"nostr_events\".\"tags_index\" @> $118 or \"nostr_events\".\"tags_index\" @> $119 or \"nostr_events\".\"tags_index\" @> $120 or \"nostr_events\".\"tags_index\" @> $121 or \"nostr_events\".\"tags_index\" @> $122 or \"nostr_events\".\"tags_index\" @> $123 or \"nostr_events\".\"tags_index\" @> $124 or \"nostr_events\".\"tags_index\" @> $125 or \"nostr_events\".\"tags_index\" @> $126 or \"nostr_events\".\"tags_index\" @> $127 or \"nostr_events\".\"tags_index\" @> $128 or \"nostr_events\".\"tags_index\" @> $129 or \"nostr_events\".\"tags_index\" @> $130 or \"nostr_events\".\"tags_index\" @> $131 or \"nostr_events\".\"tags_index\" @> $132 or \"nostr_events\".\"tags_index\" @> $133 or \"nostr_events\".\"tags_index\" @> $134 or \"nostr_events\".\"tags_index\" @> $135 or \"nostr_events\".\"tags_index\" @> $136 or \"nostr_events\".\"tags_index\" @> $137 or \"nostr_events\".\"tags_index\" @> $138 or \"nostr_events\".\"tags_index\" @> $139 or \"nostr_events\".\"tags_index\" @> $140 or \"nostr_events\".\"tags_index\" @> $141 or \"nostr_events\".\"tags_index\" @> $142 or \"nostr_events\".\"tags_index\" @> $143 or \"nostr_events\".\"tags_index\" @> $144 or \"nostr_events\".\"tags_index\" @> $145 or \"nostr_events\".\"tags_index\" @> $146 or \"nostr_events\".\"tags_index\" @> $147 or \"nostr_events\".\"tags_index\" @> $148 or \"nostr_events\".\"tags_index\" @> $149 or \"nostr_events\".\"tags_index\" @> $150 or \"nostr_events\".\"tags_index\" @> $151) order by \"nostr_events\".\"created_at\" desc, \"nostr_events\".\"id\" asc limit $152) as \"e\") as \"e\" limit $153", - "parameters": [ - [1311, 30311], - [ - "02f0a63d98f72eb5224509914b4c93763130442e984ad8795176a4b1f91bde2c", - "068334b2f9cd5e30b43866c4b60bd31234e29be9bc11b06af037ec248df4f7ae", - "175f568d77fb0cb7400f0ddd8aed1738cd797532b314ef053a1669d4dba7433a", - "1e7168756bccf2309ca35661d06bab6bcd0448420ab349aabddaaf02746b1515", - "3ebc74907d1f928f209ef210e872cac033eaf3ff89e6853286d45d91e351ef9e", - "4a565f2661964aef0c3ee87b99c9a5731aa8dd8a80326f96a46fd7f207e8613a", - "7de29c8960c03250fe4d056b2fc03205534a0438164e7f9fd172c3f1f3707aeb", - "874943db57c24414f2892f122781be219f5c84b167ab7918f2ce0d9399f4404f", - "877308276be50ce9bafa7e5e374e4fcbf5e9859a21918f34baefd000746b7d35", - "b0962615c3193c379b247f2e464ef5096cff45cd5b2d715d8c80c057b0a562b9", - "c1fc7771f5fa418fd3ac49221a18f19b42ccb7a663da8f04cbbf6c08c80d20b1", - "f4df339e62003bbee1ab82df38a8a7bcae2a297932d86ba78d1484195509ce38", - "f728d9e6e7048358e70930f5ca64b097770d989ccd86854fe618eda9c8a38106", - "fe3254bc4e54721b976e6b2ca04ef7040fcc00c49e10498cc8134036592000ec" - ], - 300, - [30311], - { "p": ["068334b2f9cd5e30b43866c4b60bd31234e29be9bc11b06af037ec248df4f7ae"] }, - { "p": ["b111f67497d54b95ce4954853f9270199fc16a2cee6fcc2832bb9ab91581b9ce"] }, - { "p": ["1d485daf0a86dea7b549eaa80b8b215c7518f5bedc179470efe0f4f854130429"] }, - { "p": ["3ebc74907d1f928f209ef210e872cac033eaf3ff89e6853286d45d91e351ef9e"] }, - { "p": ["f2c96c97f6419a538f84cf3fa72e2194605e1848096e6e5170cce5b76799d400"] }, - { "p": ["877308276be50ce9bafa7e5e374e4fcbf5e9859a21918f34baefd000746b7d35"] }, - { "p": ["02f0a63d98f72eb5224509914b4c93763130442e984ad8795176a4b1f91bde2c"] }, - { "p": ["9358c67695d9e78bde2bf3ce1eb0a5059553687632a177e7d25deeff9f2912fc"] }, - { "p": ["f3b633c30007c2fbedbbd028c2e973066504c15138b22d5c24f16a65f1a90ec4"] }, - { "p": ["805e3c98b42a2175a081666b4e077bab32136ea6cf4b9976a952569917d9e329"] }, - { "p": ["7de29c8960c03250fe4d056b2fc03205534a0438164e7f9fd172c3f1f3707aeb"] }, - { "p": ["39cc53c9e3f7d4980b21bea5ebc8a5b9cdf7fa6539430b5a826e8ad527168656"] }, - { "p": ["175f568d77fb0cb7400f0ddd8aed1738cd797532b314ef053a1669d4dba7433a"] }, - { "p": ["83d8bb23328c67ece2adf1306db97e3f027b853d8bdaf226d01c2e0f2ceade2e"] }, - { "p": ["b83a28b7e4e5d20bd960c5faeb6625f95529166b8bdb045d42634a2f35919450"] }, - { "p": ["be7bf5de068c1d842ed34a7c270507ec940f5ea51671cfd062a95e9d09420d0a"] }, - { "p": ["4b03001ce314dc42cf52e78234fdc1ed3e6a8c9556ef9e9a3b7de641cca3da71"] }, - { "p": ["59c2e15ad7bc0b5c97b8438b2763a5c409ff76ab985ab5f1f47c4bcdd25e6e8d"] }, - { "p": ["f728d9e6e7048358e70930f5ca64b097770d989ccd86854fe618eda9c8a38106"] }, - { "p": ["4a565f2661964aef0c3ee87b99c9a5731aa8dd8a80326f96a46fd7f207e8613a"] }, - { "p": ["b0962615c3193c379b247f2e464ef5096cff45cd5b2d715d8c80c057b0a562b9"] }, - { "p": ["58ead82fa15b550094f7f5fe4804e0fe75b779dbef2e9b20511eccd69e6d08f9"] }, - { "p": ["a9434ee165ed01b286becfc2771ef1705d3537d051b387288898cc00d5c885be"] }, - { "p": ["f7849c6c90c4ffe3be8059bd899d85d3fd38c0bb79749f9e79653820351ad8f8"] }, - { "p": ["d9a3041b0aa3cdf3b74bb3ad043da8a40ca149c891b2049b29f346b79225218c"] }, - { "p": ["8c1f616306523c19b9cba6e5c72d7f8efd55940620f40f24a5f1f253ac921ba2"] }, - { "p": ["787338757fc25d65cd929394d5e7713cf43638e8d259e8dcf5c73b834eb851f2"] }, - { "p": ["266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5"] }, - { "p": ["b9a537523bba2fcdae857d90d8a760de4f2139c9f90d986f747ce7d0ec0d173d"] }, - { "p": ["af740d198babb8c7b82d0a4718eb354bb3f6af9a98639b85d4a5cf1371caba85"] }, - { "p": ["fe3254bc4e54721b976e6b2ca04ef7040fcc00c49e10498cc8134036592000ec"] }, - { "p": ["5b0e8da6fdfba663038690b37d216d8345a623cc33e111afd0f738ed7792bc54"] }, - { "p": ["1e7168756bccf2309ca35661d06bab6bcd0448420ab349aabddaaf02746b1515"] }, - { "p": ["06bc9ab7c06cbaa8fb9089ea326736340473fc54b77ae1e093766b70427c48f5"] }, - { "p": ["f985d309197c805e1719c73185b574fc3ee407d7c1b6157dee99c6ace2599bbb"] }, - { "p": ["c6f7077f1699d50cf92a9652bfebffac05fc6842b9ee391089d959b8ad5d48fd"] }, - { "p": ["c1fc7771f5fa418fd3ac49221a18f19b42ccb7a663da8f04cbbf6c08c80d20b1"] }, - { "p": ["22ada61c62ff6c743d28981309269744278b49172a53a44c5f61517628021425"] }, - { "p": ["874943db57c24414f2892f122781be219f5c84b167ab7918f2ce0d9399f4404f"] }, - { "p": ["ee85604f8ec6e4e24f8eaf2a624d042ebd431dae448fe11779adcfb6bb78575e"] }, - { "p": ["eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f"] }, - { "p": ["d8a6ecf0c396eaa8f79a4497fe9b77dc977633451f3ca5c634e208659116647b"] }, - { "p": ["de90c5db36a4011f9d584dfc18de1a5724686867984793ef526331b51f8b43e9"] }, - { "p": ["f6900e6b42a83a6d66589714de49ac86919c6464857d9e164b953bcf9c7e939d"] }, - { "p": ["977b690ce1f7d254efb8e4ed985240b0084424e4151ab118ca7b62129d267f3d"] }, - { "p": ["4506e04e4b7079ce07e38e9875678a81ad33a456c696d708ef8e9a2d8c16ba04"] }, - { "p": ["76596e4aec7ff38009c0b20c49c80331ff92cdd58535d9f83b824d07a92a8e88"] }, - { "p": ["f4df339e62003bbee1ab82df38a8a7bcae2a297932d86ba78d1484195509ce38"] }, - { "p": ["e0cf1bd90cced52f578c2e090593b0cd169780317d43ac46927abff2d61da062"] }, - 100, - [42], - [ - "02f0a63d98f72eb5224509914b4c93763130442e984ad8795176a4b1f91bde2c", - "068334b2f9cd5e30b43866c4b60bd31234e29be9bc11b06af037ec248df4f7ae", - "175f568d77fb0cb7400f0ddd8aed1738cd797532b314ef053a1669d4dba7433a", - "1e7168756bccf2309ca35661d06bab6bcd0448420ab349aabddaaf02746b1515", - "3ebc74907d1f928f209ef210e872cac033eaf3ff89e6853286d45d91e351ef9e", - "4a565f2661964aef0c3ee87b99c9a5731aa8dd8a80326f96a46fd7f207e8613a", - "7de29c8960c03250fe4d056b2fc03205534a0438164e7f9fd172c3f1f3707aeb", - "874943db57c24414f2892f122781be219f5c84b167ab7918f2ce0d9399f4404f", - "877308276be50ce9bafa7e5e374e4fcbf5e9859a21918f34baefd000746b7d35", - "b0962615c3193c379b247f2e464ef5096cff45cd5b2d715d8c80c057b0a562b9", - "c1fc7771f5fa418fd3ac49221a18f19b42ccb7a663da8f04cbbf6c08c80d20b1", - "f4df339e62003bbee1ab82df38a8a7bcae2a297932d86ba78d1484195509ce38", - "f728d9e6e7048358e70930f5ca64b097770d989ccd86854fe618eda9c8a38106", - "fe3254bc4e54721b976e6b2ca04ef7040fcc00c49e10498cc8134036592000ec" - ], - 500, - ["5a5cc47d07308f553c294758f6e0bb066cc7aa760e2cae9b29b7c79df7dfb69d"], - [40, 42], - 1, - [30402], - [ - "02f0a63d98f72eb5224509914b4c93763130442e984ad8795176a4b1f91bde2c", - "068334b2f9cd5e30b43866c4b60bd31234e29be9bc11b06af037ec248df4f7ae", - "175f568d77fb0cb7400f0ddd8aed1738cd797532b314ef053a1669d4dba7433a", - "1e7168756bccf2309ca35661d06bab6bcd0448420ab349aabddaaf02746b1515", - "3ebc74907d1f928f209ef210e872cac033eaf3ff89e6853286d45d91e351ef9e", - "4a565f2661964aef0c3ee87b99c9a5731aa8dd8a80326f96a46fd7f207e8613a", - "7de29c8960c03250fe4d056b2fc03205534a0438164e7f9fd172c3f1f3707aeb", - "874943db57c24414f2892f122781be219f5c84b167ab7918f2ce0d9399f4404f", - "877308276be50ce9bafa7e5e374e4fcbf5e9859a21918f34baefd000746b7d35", - "b0962615c3193c379b247f2e464ef5096cff45cd5b2d715d8c80c057b0a562b9", - "c1fc7771f5fa418fd3ac49221a18f19b42ccb7a663da8f04cbbf6c08c80d20b1", - "f4df339e62003bbee1ab82df38a8a7bcae2a297932d86ba78d1484195509ce38", - "f728d9e6e7048358e70930f5ca64b097770d989ccd86854fe618eda9c8a38106", - "fe3254bc4e54721b976e6b2ca04ef7040fcc00c49e10498cc8134036592000ec" - ], - 300, - [34550, 4550], - [ - "02f0a63d98f72eb5224509914b4c93763130442e984ad8795176a4b1f91bde2c", - "068334b2f9cd5e30b43866c4b60bd31234e29be9bc11b06af037ec248df4f7ae", - "175f568d77fb0cb7400f0ddd8aed1738cd797532b314ef053a1669d4dba7433a", - "1e7168756bccf2309ca35661d06bab6bcd0448420ab349aabddaaf02746b1515", - "3ebc74907d1f928f209ef210e872cac033eaf3ff89e6853286d45d91e351ef9e", - "4a565f2661964aef0c3ee87b99c9a5731aa8dd8a80326f96a46fd7f207e8613a", - "7de29c8960c03250fe4d056b2fc03205534a0438164e7f9fd172c3f1f3707aeb", - "874943db57c24414f2892f122781be219f5c84b167ab7918f2ce0d9399f4404f", - "877308276be50ce9bafa7e5e374e4fcbf5e9859a21918f34baefd000746b7d35", - "b0962615c3193c379b247f2e464ef5096cff45cd5b2d715d8c80c057b0a562b9", - "c1fc7771f5fa418fd3ac49221a18f19b42ccb7a663da8f04cbbf6c08c80d20b1", - "f4df339e62003bbee1ab82df38a8a7bcae2a297932d86ba78d1484195509ce38", - "f728d9e6e7048358e70930f5ca64b097770d989ccd86854fe618eda9c8a38106", - "fe3254bc4e54721b976e6b2ca04ef7040fcc00c49e10498cc8134036592000ec" - ], - 300, - [40, 41, 42], - { "t": ["krux"] }, - { "t": ["krux"] }, - { "t": ["KRUX"] }, - { "t": ["Krux"] }, - { "t": ["seedsigner"] }, - { "t": ["seedsigner"] }, - { "t": ["SEEDSIGNER"] }, - { "t": ["Seedsigner"] }, - { "t": ["wallet"] }, - { "t": ["wallet"] }, - { "t": ["WALLET"] }, - { "t": ["Wallet"] }, - { "t": ["thinkpad"] }, - { "t": ["thinkpad"] }, - { "t": ["THINKPAD"] }, - { "t": ["Thinkpad"] }, - { "t": ["linux"] }, - { "t": ["linux"] }, - { "t": ["LINUX"] }, - { "t": ["Linux"] }, - { "t": ["gentoo"] }, - { "t": ["gentoo"] }, - { "t": ["GENTOO"] }, - { "t": ["Gentoo"] }, - { "t": ["monero"] }, - { "t": ["monero"] }, - { "t": ["MONERO"] }, - { "t": ["Monero"] }, - { "t": ["cakewallet"] }, - { "t": ["cakewallet"] }, - { "t": ["CAKEWALLET"] }, - { "t": ["Cakewallet"] }, - { "t": ["havenoretro"] }, - { "t": ["havenoretro"] }, - { "t": ["HAVENORETRO"] }, - { "t": ["Havenoretro"] }, - { "t": ["amethyst"] }, - { "t": ["amethyst"] }, - { "t": ["AMETHYST"] }, - { "t": ["Amethyst"] }, - { "t": ["docchain"] }, - { "t": ["docchain"] }, - { "t": ["DOCCHAIN"] }, - { "t": ["Docchain"] }, - { "t": ["foamed"] }, - { "t": ["foamed"] }, - { "t": ["FOAMED"] }, - { "t": ["Foamed"] }, - { "t": ["obsidian"] }, - { "t": ["obsidian"] }, - { "t": ["OBSIDIAN"] }, - { "t": ["Obsidian"] }, - { "t": ["4runner"] }, - { "t": ["4runner"] }, - { "t": ["4RUNNER"] }, - { "t": ["4runner"] }, - { "t": ["stackwallet"] }, - { "t": ["stackwallet"] }, - { "t": ["STACKWALLET"] }, - { "t": ["Stackwallet"] }, - { "t": ["tinyseed"] }, - { "t": ["tinyseed"] }, - { "t": ["TINYSEED"] }, - { "t": ["Tinyseed"] }, - { "t": ["keystone"] }, - { "t": ["keystone"] }, - { "t": ["KEYSTONE"] }, - { "t": ["Keystone"] }, - { "t": ["xmrsigner"] }, - { "t": ["xmrsigner"] }, - { "t": ["XMRSIGNER"] }, - { "t": ["Xmrsigner"] }, - { "t": ["zapchat"] }, - { "t": ["zapchat"] }, - { "t": ["ZAPCHAT"] }, - { "t": ["Zapchat"] }, - { "t": ["zellij"] }, - { "t": ["zellij"] }, - { "t": ["ZELLIJ"] }, - { "t": ["Zellij"] }, - { "t": ["gunstr"] }, - { "t": ["gunstr"] }, - { "t": ["GUNSTR"] }, - { "t": ["Gunstr"] }, - 300, - 100 - ], - "error": { - "name": "PostgresError", - "message": "canceling statement due to statement timeout", - "stack": "PostgresError: canceling statement due to statement timeout\n at ErrorResponse (https://gitlab.com/soapbox-pub/postgres.js/-/raw/e79d7d2039446fbf7a37d4eca0d17e94a94b8b53/deno/src/connection.js:793:26)\n at handle (https://gitlab.com/soapbox-pub/postgres.js/-/raw/e79d7d2039446fbf7a37d4eca0d17e94a94b8b53/deno/src/connection.js:479:6)\n at data (https://gitlab.com/soapbox-pub/postgres.js/-/raw/e79d7d2039446fbf7a37d4eca0d17e94a94b8b53/deno/src/connection.js:318:9)\n at https://gitlab.com/soapbox-pub/postgres.js/-/raw/e79d7d2039446fbf7a37d4eca0d17e94a94b8b53/deno/polyfills.js:138:30\n at Array.forEach ()\n at call (https://gitlab.com/soapbox-pub/postgres.js/-/raw/e79d7d2039446fbf7a37d4eca0d17e94a94b8b53/deno/polyfills.js:138:16)\n at success (https://gitlab.com/soapbox-pub/postgres.js/-/raw/e79d7d2039446fbf7a37d4eca0d17e94a94b8b53/deno/polyfills.js:98:9)\n at eventLoopTick (ext:core/01_core.js:177:7)" - }, - "duration": 1.0028296069999996 -} diff --git a/src/DittoPush.ts b/packages/ditto/DittoPush.ts similarity index 100% rename from src/DittoPush.ts rename to packages/ditto/DittoPush.ts diff --git a/src/DittoUploads.ts b/packages/ditto/DittoUploads.ts similarity index 100% rename from src/DittoUploads.ts rename to packages/ditto/DittoUploads.ts diff --git a/src/RelayError.test.ts b/packages/ditto/RelayError.test.ts similarity index 100% rename from src/RelayError.test.ts rename to packages/ditto/RelayError.test.ts diff --git a/src/RelayError.ts b/packages/ditto/RelayError.ts similarity index 100% rename from src/RelayError.ts rename to packages/ditto/RelayError.ts diff --git a/src/app.ts b/packages/ditto/app.ts similarity index 99% rename from src/app.ts rename to packages/ditto/app.ts index 3c11a78c..0c677517 100644 --- a/src/app.ts +++ b/packages/ditto/app.ts @@ -178,7 +178,7 @@ const app = new Hono({ strict: false }); /** User-provided files in the gitignored `public/` directory. */ const publicFiles = serveStatic({ root: './public/' }); /** Static files provided by the Ditto repo, checked into git. */ -const staticFiles = serveStatic({ root: './static/' }); +const staticFiles = serveStatic({ root: new URL('./static/', import.meta.url).pathname }); app.use('*', cacheControlMiddleware({ noStore: true })); diff --git a/src/assets/captcha/bg/A Large Body of Water Surrounded By Mountains.jpg b/packages/ditto/assets/captcha/bg/A Large Body of Water Surrounded By Mountains.jpg similarity index 100% rename from src/assets/captcha/bg/A Large Body of Water Surrounded By Mountains.jpg rename to packages/ditto/assets/captcha/bg/A Large Body of Water Surrounded By Mountains.jpg diff --git a/src/assets/captcha/bg/A Trail of Footprints In The Sand.jpg b/packages/ditto/assets/captcha/bg/A Trail of Footprints In The Sand.jpg similarity index 100% rename from src/assets/captcha/bg/A Trail of Footprints In The Sand.jpg rename to packages/ditto/assets/captcha/bg/A Trail of Footprints In The Sand.jpg diff --git a/src/assets/captcha/bg/Ashim DSilva.jpg b/packages/ditto/assets/captcha/bg/Ashim DSilva.jpg similarity index 100% rename from src/assets/captcha/bg/Ashim DSilva.jpg rename to packages/ditto/assets/captcha/bg/Ashim DSilva.jpg diff --git a/src/assets/captcha/bg/Canazei Granite Ridges.jpg b/packages/ditto/assets/captcha/bg/Canazei Granite Ridges.jpg similarity index 100% rename from src/assets/captcha/bg/Canazei Granite Ridges.jpg rename to packages/ditto/assets/captcha/bg/Canazei Granite Ridges.jpg diff --git a/src/assets/captcha/bg/Martin Adams.jpg b/packages/ditto/assets/captcha/bg/Martin Adams.jpg similarity index 100% rename from src/assets/captcha/bg/Martin Adams.jpg rename to packages/ditto/assets/captcha/bg/Martin Adams.jpg diff --git a/src/assets/captcha/bg/Morskie Oko.jpg b/packages/ditto/assets/captcha/bg/Morskie Oko.jpg similarity index 100% rename from src/assets/captcha/bg/Morskie Oko.jpg rename to packages/ditto/assets/captcha/bg/Morskie Oko.jpg diff --git a/src/assets/captcha/bg/Mr. Lee.jpg b/packages/ditto/assets/captcha/bg/Mr. Lee.jpg similarity index 100% rename from src/assets/captcha/bg/Mr. Lee.jpg rename to packages/ditto/assets/captcha/bg/Mr. Lee.jpg diff --git a/src/assets/captcha/bg/Nattu Adnan.jpg b/packages/ditto/assets/captcha/bg/Nattu Adnan.jpg similarity index 100% rename from src/assets/captcha/bg/Nattu Adnan.jpg rename to packages/ditto/assets/captcha/bg/Nattu Adnan.jpg diff --git a/src/assets/captcha/bg/Photo by SpaceX.jpg b/packages/ditto/assets/captcha/bg/Photo by SpaceX.jpg similarity index 100% rename from src/assets/captcha/bg/Photo by SpaceX.jpg rename to packages/ditto/assets/captcha/bg/Photo by SpaceX.jpg diff --git a/src/assets/captcha/bg/Photo of Valley.jpg b/packages/ditto/assets/captcha/bg/Photo of Valley.jpg similarity index 100% rename from src/assets/captcha/bg/Photo of Valley.jpg rename to packages/ditto/assets/captcha/bg/Photo of Valley.jpg diff --git a/src/assets/captcha/bg/Snow-Capped Mountain.jpg b/packages/ditto/assets/captcha/bg/Snow-Capped Mountain.jpg similarity index 100% rename from src/assets/captcha/bg/Snow-Capped Mountain.jpg rename to packages/ditto/assets/captcha/bg/Snow-Capped Mountain.jpg diff --git a/src/assets/captcha/bg/Sunset by the Pier.jpg b/packages/ditto/assets/captcha/bg/Sunset by the Pier.jpg similarity index 100% rename from src/assets/captcha/bg/Sunset by the Pier.jpg rename to packages/ditto/assets/captcha/bg/Sunset by the Pier.jpg diff --git a/src/assets/captcha/bg/Tj Holowaychuk.jpg b/packages/ditto/assets/captcha/bg/Tj Holowaychuk.jpg similarity index 100% rename from src/assets/captcha/bg/Tj Holowaychuk.jpg rename to packages/ditto/assets/captcha/bg/Tj Holowaychuk.jpg diff --git a/src/assets/captcha/bg/Viktor Forgacs.jpg b/packages/ditto/assets/captcha/bg/Viktor Forgacs.jpg similarity index 100% rename from src/assets/captcha/bg/Viktor Forgacs.jpg rename to packages/ditto/assets/captcha/bg/Viktor Forgacs.jpg diff --git a/src/assets/captcha/bg/copyright.txt b/packages/ditto/assets/captcha/bg/copyright.txt similarity index 100% rename from src/assets/captcha/bg/copyright.txt rename to packages/ditto/assets/captcha/bg/copyright.txt diff --git a/src/assets/captcha/puzzle-hole.png b/packages/ditto/assets/captcha/puzzle-hole.png similarity index 100% rename from src/assets/captcha/puzzle-hole.png rename to packages/ditto/assets/captcha/puzzle-hole.png diff --git a/src/assets/captcha/puzzle-hole.svg b/packages/ditto/assets/captcha/puzzle-hole.svg similarity index 100% rename from src/assets/captcha/puzzle-hole.svg rename to packages/ditto/assets/captcha/puzzle-hole.svg diff --git a/src/assets/captcha/puzzle-mask.png b/packages/ditto/assets/captcha/puzzle-mask.png similarity index 100% rename from src/assets/captcha/puzzle-mask.png rename to packages/ditto/assets/captcha/puzzle-mask.png diff --git a/src/assets/captcha/puzzle-mask.svg b/packages/ditto/assets/captcha/puzzle-mask.svg similarity index 100% rename from src/assets/captcha/puzzle-mask.svg rename to packages/ditto/assets/captcha/puzzle-mask.svg diff --git a/src/caches/pipelineEncounters.ts b/packages/ditto/caches/pipelineEncounters.ts similarity index 100% rename from src/caches/pipelineEncounters.ts rename to packages/ditto/caches/pipelineEncounters.ts diff --git a/src/caches/translationCache.ts b/packages/ditto/caches/translationCache.ts similarity index 100% rename from src/caches/translationCache.ts rename to packages/ditto/caches/translationCache.ts diff --git a/src/config.ts b/packages/ditto/config.ts similarity index 100% rename from src/config.ts rename to packages/ditto/config.ts diff --git a/src/controllers/api/accounts.ts b/packages/ditto/controllers/api/accounts.ts similarity index 100% rename from src/controllers/api/accounts.ts rename to packages/ditto/controllers/api/accounts.ts diff --git a/src/controllers/api/admin.ts b/packages/ditto/controllers/api/admin.ts similarity index 100% rename from src/controllers/api/admin.ts rename to packages/ditto/controllers/api/admin.ts diff --git a/src/controllers/api/apps.ts b/packages/ditto/controllers/api/apps.ts similarity index 100% rename from src/controllers/api/apps.ts rename to packages/ditto/controllers/api/apps.ts diff --git a/src/controllers/api/blocks.ts b/packages/ditto/controllers/api/blocks.ts similarity index 100% rename from src/controllers/api/blocks.ts rename to packages/ditto/controllers/api/blocks.ts diff --git a/src/controllers/api/bookmarks.ts b/packages/ditto/controllers/api/bookmarks.ts similarity index 100% rename from src/controllers/api/bookmarks.ts rename to packages/ditto/controllers/api/bookmarks.ts diff --git a/src/controllers/api/captcha.ts b/packages/ditto/controllers/api/captcha.ts similarity index 100% rename from src/controllers/api/captcha.ts rename to packages/ditto/controllers/api/captcha.ts diff --git a/src/controllers/api/cashu.test.ts b/packages/ditto/controllers/api/cashu.test.ts similarity index 100% rename from src/controllers/api/cashu.test.ts rename to packages/ditto/controllers/api/cashu.test.ts diff --git a/src/controllers/api/cashu.ts b/packages/ditto/controllers/api/cashu.ts similarity index 100% rename from src/controllers/api/cashu.ts rename to packages/ditto/controllers/api/cashu.ts diff --git a/src/controllers/api/ditto.ts b/packages/ditto/controllers/api/ditto.ts similarity index 100% rename from src/controllers/api/ditto.ts rename to packages/ditto/controllers/api/ditto.ts diff --git a/src/controllers/api/fallback.ts b/packages/ditto/controllers/api/fallback.ts similarity index 100% rename from src/controllers/api/fallback.ts rename to packages/ditto/controllers/api/fallback.ts diff --git a/src/controllers/api/instance.ts b/packages/ditto/controllers/api/instance.ts similarity index 100% rename from src/controllers/api/instance.ts rename to packages/ditto/controllers/api/instance.ts diff --git a/src/controllers/api/markers.ts b/packages/ditto/controllers/api/markers.ts similarity index 100% rename from src/controllers/api/markers.ts rename to packages/ditto/controllers/api/markers.ts diff --git a/src/controllers/api/media.ts b/packages/ditto/controllers/api/media.ts similarity index 100% rename from src/controllers/api/media.ts rename to packages/ditto/controllers/api/media.ts diff --git a/src/controllers/api/mutes.ts b/packages/ditto/controllers/api/mutes.ts similarity index 100% rename from src/controllers/api/mutes.ts rename to packages/ditto/controllers/api/mutes.ts diff --git a/src/controllers/api/notifications.ts b/packages/ditto/controllers/api/notifications.ts similarity index 100% rename from src/controllers/api/notifications.ts rename to packages/ditto/controllers/api/notifications.ts diff --git a/src/controllers/api/oauth.ts b/packages/ditto/controllers/api/oauth.ts similarity index 100% rename from src/controllers/api/oauth.ts rename to packages/ditto/controllers/api/oauth.ts diff --git a/src/controllers/api/pleroma.ts b/packages/ditto/controllers/api/pleroma.ts similarity index 100% rename from src/controllers/api/pleroma.ts rename to packages/ditto/controllers/api/pleroma.ts diff --git a/src/controllers/api/preferences.ts b/packages/ditto/controllers/api/preferences.ts similarity index 100% rename from src/controllers/api/preferences.ts rename to packages/ditto/controllers/api/preferences.ts diff --git a/src/controllers/api/push.ts b/packages/ditto/controllers/api/push.ts similarity index 100% rename from src/controllers/api/push.ts rename to packages/ditto/controllers/api/push.ts diff --git a/src/controllers/api/reactions.ts b/packages/ditto/controllers/api/reactions.ts similarity index 100% rename from src/controllers/api/reactions.ts rename to packages/ditto/controllers/api/reactions.ts diff --git a/src/controllers/api/reports.ts b/packages/ditto/controllers/api/reports.ts similarity index 100% rename from src/controllers/api/reports.ts rename to packages/ditto/controllers/api/reports.ts diff --git a/src/controllers/api/search.ts b/packages/ditto/controllers/api/search.ts similarity index 100% rename from src/controllers/api/search.ts rename to packages/ditto/controllers/api/search.ts diff --git a/src/controllers/api/statuses.ts b/packages/ditto/controllers/api/statuses.ts similarity index 100% rename from src/controllers/api/statuses.ts rename to packages/ditto/controllers/api/statuses.ts diff --git a/src/controllers/api/streaming.ts b/packages/ditto/controllers/api/streaming.ts similarity index 100% rename from src/controllers/api/streaming.ts rename to packages/ditto/controllers/api/streaming.ts diff --git a/src/controllers/api/suggestions.ts b/packages/ditto/controllers/api/suggestions.ts similarity index 100% rename from src/controllers/api/suggestions.ts rename to packages/ditto/controllers/api/suggestions.ts diff --git a/src/controllers/api/timelines.ts b/packages/ditto/controllers/api/timelines.ts similarity index 100% rename from src/controllers/api/timelines.ts rename to packages/ditto/controllers/api/timelines.ts diff --git a/src/controllers/api/translate.ts b/packages/ditto/controllers/api/translate.ts similarity index 100% rename from src/controllers/api/translate.ts rename to packages/ditto/controllers/api/translate.ts diff --git a/src/controllers/api/trends.ts b/packages/ditto/controllers/api/trends.ts similarity index 100% rename from src/controllers/api/trends.ts rename to packages/ditto/controllers/api/trends.ts diff --git a/src/controllers/error.ts b/packages/ditto/controllers/error.ts similarity index 100% rename from src/controllers/error.ts rename to packages/ditto/controllers/error.ts diff --git a/src/controllers/frontend.ts b/packages/ditto/controllers/frontend.ts similarity index 95% rename from src/controllers/frontend.ts rename to packages/ditto/controllers/frontend.ts index 413b4ade..ec9f11a5 100644 --- a/src/controllers/frontend.ts +++ b/packages/ditto/controllers/frontend.ts @@ -18,7 +18,7 @@ export const frontendController: AppMiddleware = async (c) => { c.header('Cache-Control', 'max-age=86400, s-maxage=30, public, stale-if-error=604800'); try { - const content = await Deno.readTextFile(new URL('../../public/index.html', import.meta.url)); + const content = await Deno.readTextFile(new URL('../../../public/index.html', import.meta.url)); if (content.includes(META_PLACEHOLDER)) { const params = getPathParams(c.req.path); diff --git a/src/controllers/manifest.ts b/packages/ditto/controllers/manifest.ts similarity index 100% rename from src/controllers/manifest.ts rename to packages/ditto/controllers/manifest.ts diff --git a/src/controllers/metrics.ts b/packages/ditto/controllers/metrics.ts similarity index 100% rename from src/controllers/metrics.ts rename to packages/ditto/controllers/metrics.ts diff --git a/src/controllers/nostr/relay-info.ts b/packages/ditto/controllers/nostr/relay-info.ts similarity index 100% rename from src/controllers/nostr/relay-info.ts rename to packages/ditto/controllers/nostr/relay-info.ts diff --git a/src/controllers/nostr/relay.ts b/packages/ditto/controllers/nostr/relay.ts similarity index 100% rename from src/controllers/nostr/relay.ts rename to packages/ditto/controllers/nostr/relay.ts diff --git a/src/controllers/well-known/nodeinfo.ts b/packages/ditto/controllers/well-known/nodeinfo.ts similarity index 100% rename from src/controllers/well-known/nodeinfo.ts rename to packages/ditto/controllers/well-known/nodeinfo.ts diff --git a/src/controllers/well-known/nostr.ts b/packages/ditto/controllers/well-known/nostr.ts similarity index 100% rename from src/controllers/well-known/nostr.ts rename to packages/ditto/controllers/well-known/nostr.ts diff --git a/src/cron.ts b/packages/ditto/cron.ts similarity index 100% rename from src/cron.ts rename to packages/ditto/cron.ts diff --git a/src/db/DittoDB.ts b/packages/ditto/db/DittoDB.ts similarity index 100% rename from src/db/DittoDB.ts rename to packages/ditto/db/DittoDB.ts diff --git a/src/db/DittoDatabase.ts b/packages/ditto/db/DittoDatabase.ts similarity index 100% rename from src/db/DittoDatabase.ts rename to packages/ditto/db/DittoDatabase.ts diff --git a/src/db/DittoTables.ts b/packages/ditto/db/DittoTables.ts similarity index 100% rename from src/db/DittoTables.ts rename to packages/ditto/db/DittoTables.ts diff --git a/src/db/KyselyLogger.ts b/packages/ditto/db/KyselyLogger.ts similarity index 100% rename from src/db/KyselyLogger.ts rename to packages/ditto/db/KyselyLogger.ts diff --git a/src/db/adapters/DittoPglite.ts b/packages/ditto/db/adapters/DittoPglite.ts similarity index 100% rename from src/db/adapters/DittoPglite.ts rename to packages/ditto/db/adapters/DittoPglite.ts diff --git a/src/db/adapters/DittoPostgres.ts b/packages/ditto/db/adapters/DittoPostgres.ts similarity index 100% rename from src/db/adapters/DittoPostgres.ts rename to packages/ditto/db/adapters/DittoPostgres.ts diff --git a/src/db/migrations/000_create_events.ts b/packages/ditto/db/migrations/000_create_events.ts similarity index 100% rename from src/db/migrations/000_create_events.ts rename to packages/ditto/db/migrations/000_create_events.ts diff --git a/src/db/migrations/001_add_relays.ts b/packages/ditto/db/migrations/001_add_relays.ts similarity index 100% rename from src/db/migrations/001_add_relays.ts rename to packages/ditto/db/migrations/001_add_relays.ts diff --git a/src/db/migrations/002_events_fts.ts b/packages/ditto/db/migrations/002_events_fts.ts similarity index 100% rename from src/db/migrations/002_events_fts.ts rename to packages/ditto/db/migrations/002_events_fts.ts diff --git a/src/db/migrations/003_events_admin.ts b/packages/ditto/db/migrations/003_events_admin.ts similarity index 100% rename from src/db/migrations/003_events_admin.ts rename to packages/ditto/db/migrations/003_events_admin.ts diff --git a/src/db/migrations/004_add_user_indexes.ts b/packages/ditto/db/migrations/004_add_user_indexes.ts similarity index 100% rename from src/db/migrations/004_add_user_indexes.ts rename to packages/ditto/db/migrations/004_add_user_indexes.ts diff --git a/src/db/migrations/005_rework_tags.ts b/packages/ditto/db/migrations/005_rework_tags.ts similarity index 100% rename from src/db/migrations/005_rework_tags.ts rename to packages/ditto/db/migrations/005_rework_tags.ts diff --git a/src/db/migrations/006_pragma.ts b/packages/ditto/db/migrations/006_pragma.ts similarity index 100% rename from src/db/migrations/006_pragma.ts rename to packages/ditto/db/migrations/006_pragma.ts diff --git a/src/db/migrations/007_unattached_media.ts b/packages/ditto/db/migrations/007_unattached_media.ts similarity index 100% rename from src/db/migrations/007_unattached_media.ts rename to packages/ditto/db/migrations/007_unattached_media.ts diff --git a/src/db/migrations/008_wal.ts b/packages/ditto/db/migrations/008_wal.ts similarity index 100% rename from src/db/migrations/008_wal.ts rename to packages/ditto/db/migrations/008_wal.ts diff --git a/src/db/migrations/009_add_stats.ts b/packages/ditto/db/migrations/009_add_stats.ts similarity index 100% rename from src/db/migrations/009_add_stats.ts rename to packages/ditto/db/migrations/009_add_stats.ts diff --git a/src/db/migrations/010_drop_users.ts b/packages/ditto/db/migrations/010_drop_users.ts similarity index 100% rename from src/db/migrations/010_drop_users.ts rename to packages/ditto/db/migrations/010_drop_users.ts diff --git a/src/db/migrations/011_kind_author_index.ts b/packages/ditto/db/migrations/011_kind_author_index.ts similarity index 100% rename from src/db/migrations/011_kind_author_index.ts rename to packages/ditto/db/migrations/011_kind_author_index.ts diff --git a/src/db/migrations/012_tags_composite_index.ts b/packages/ditto/db/migrations/012_tags_composite_index.ts similarity index 100% rename from src/db/migrations/012_tags_composite_index.ts rename to packages/ditto/db/migrations/012_tags_composite_index.ts diff --git a/src/db/migrations/013_soft_deletion.ts b/packages/ditto/db/migrations/013_soft_deletion.ts similarity index 100% rename from src/db/migrations/013_soft_deletion.ts rename to packages/ditto/db/migrations/013_soft_deletion.ts diff --git a/src/db/migrations/014_stats_indexes.ts.ts b/packages/ditto/db/migrations/014_stats_indexes.ts.ts similarity index 100% rename from src/db/migrations/014_stats_indexes.ts.ts rename to packages/ditto/db/migrations/014_stats_indexes.ts.ts diff --git a/src/db/migrations/015_add_pubkey_domains.ts b/packages/ditto/db/migrations/015_add_pubkey_domains.ts similarity index 100% rename from src/db/migrations/015_add_pubkey_domains.ts rename to packages/ditto/db/migrations/015_add_pubkey_domains.ts diff --git a/src/db/migrations/016_pubkey_domains_updated_at.ts b/packages/ditto/db/migrations/016_pubkey_domains_updated_at.ts similarity index 100% rename from src/db/migrations/016_pubkey_domains_updated_at.ts rename to packages/ditto/db/migrations/016_pubkey_domains_updated_at.ts diff --git a/src/db/migrations/017_rm_relays.ts b/packages/ditto/db/migrations/017_rm_relays.ts similarity index 100% rename from src/db/migrations/017_rm_relays.ts rename to packages/ditto/db/migrations/017_rm_relays.ts diff --git a/src/db/migrations/018_events_created_at_kind_index.ts b/packages/ditto/db/migrations/018_events_created_at_kind_index.ts similarity index 100% rename from src/db/migrations/018_events_created_at_kind_index.ts rename to packages/ditto/db/migrations/018_events_created_at_kind_index.ts diff --git a/src/db/migrations/019_ndatabase_schema.ts b/packages/ditto/db/migrations/019_ndatabase_schema.ts similarity index 100% rename from src/db/migrations/019_ndatabase_schema.ts rename to packages/ditto/db/migrations/019_ndatabase_schema.ts diff --git a/src/db/migrations/020_drop_deleted_at.ts b/packages/ditto/db/migrations/020_drop_deleted_at.ts similarity index 100% rename from src/db/migrations/020_drop_deleted_at.ts rename to packages/ditto/db/migrations/020_drop_deleted_at.ts diff --git a/src/db/migrations/020_pgfts.ts b/packages/ditto/db/migrations/020_pgfts.ts similarity index 100% rename from src/db/migrations/020_pgfts.ts rename to packages/ditto/db/migrations/020_pgfts.ts diff --git a/src/db/migrations/021_pgfts_index.ts b/packages/ditto/db/migrations/021_pgfts_index.ts similarity index 100% rename from src/db/migrations/021_pgfts_index.ts rename to packages/ditto/db/migrations/021_pgfts_index.ts diff --git a/src/db/migrations/022_event_stats_reactions.ts b/packages/ditto/db/migrations/022_event_stats_reactions.ts similarity index 100% rename from src/db/migrations/022_event_stats_reactions.ts rename to packages/ditto/db/migrations/022_event_stats_reactions.ts diff --git a/src/db/migrations/023_add_nip46_tokens.ts b/packages/ditto/db/migrations/023_add_nip46_tokens.ts similarity index 100% rename from src/db/migrations/023_add_nip46_tokens.ts rename to packages/ditto/db/migrations/023_add_nip46_tokens.ts diff --git a/src/db/migrations/024_event_stats_quotes_count.ts b/packages/ditto/db/migrations/024_event_stats_quotes_count.ts similarity index 100% rename from src/db/migrations/024_event_stats_quotes_count.ts rename to packages/ditto/db/migrations/024_event_stats_quotes_count.ts diff --git a/src/db/migrations/025_event_stats_add_zap_count.ts b/packages/ditto/db/migrations/025_event_stats_add_zap_count.ts similarity index 100% rename from src/db/migrations/025_event_stats_add_zap_count.ts rename to packages/ditto/db/migrations/025_event_stats_add_zap_count.ts diff --git a/src/db/migrations/026_tags_name_index.ts b/packages/ditto/db/migrations/026_tags_name_index.ts similarity index 100% rename from src/db/migrations/026_tags_name_index.ts rename to packages/ditto/db/migrations/026_tags_name_index.ts diff --git a/src/db/migrations/027_add_zap_events.ts b/packages/ditto/db/migrations/027_add_zap_events.ts similarity index 100% rename from src/db/migrations/027_add_zap_events.ts rename to packages/ditto/db/migrations/027_add_zap_events.ts diff --git a/src/db/migrations/028_stable_sort.ts b/packages/ditto/db/migrations/028_stable_sort.ts similarity index 100% rename from src/db/migrations/028_stable_sort.ts rename to packages/ditto/db/migrations/028_stable_sort.ts diff --git a/src/db/migrations/029_tag_queries.ts b/packages/ditto/db/migrations/029_tag_queries.ts similarity index 100% rename from src/db/migrations/029_tag_queries.ts rename to packages/ditto/db/migrations/029_tag_queries.ts diff --git a/src/db/migrations/030_pg_events_jsonb.ts b/packages/ditto/db/migrations/030_pg_events_jsonb.ts similarity index 100% rename from src/db/migrations/030_pg_events_jsonb.ts rename to packages/ditto/db/migrations/030_pg_events_jsonb.ts diff --git a/src/db/migrations/031_rm_unattached_media.ts b/packages/ditto/db/migrations/031_rm_unattached_media.ts similarity index 100% rename from src/db/migrations/031_rm_unattached_media.ts rename to packages/ditto/db/migrations/031_rm_unattached_media.ts diff --git a/src/db/migrations/032_add_author_search.ts b/packages/ditto/db/migrations/032_add_author_search.ts similarity index 100% rename from src/db/migrations/032_add_author_search.ts rename to packages/ditto/db/migrations/032_add_author_search.ts diff --git a/src/db/migrations/033_add_language.ts b/packages/ditto/db/migrations/033_add_language.ts similarity index 100% rename from src/db/migrations/033_add_language.ts rename to packages/ditto/db/migrations/033_add_language.ts diff --git a/src/db/migrations/034_move_author_search_to_author_stats.ts b/packages/ditto/db/migrations/034_move_author_search_to_author_stats.ts similarity index 100% rename from src/db/migrations/034_move_author_search_to_author_stats.ts rename to packages/ditto/db/migrations/034_move_author_search_to_author_stats.ts diff --git a/src/db/migrations/035_author_stats_followers_index.ts b/packages/ditto/db/migrations/035_author_stats_followers_index.ts similarity index 100% rename from src/db/migrations/035_author_stats_followers_index.ts rename to packages/ditto/db/migrations/035_author_stats_followers_index.ts diff --git a/src/db/migrations/036_stats64.ts b/packages/ditto/db/migrations/036_stats64.ts similarity index 100% rename from src/db/migrations/036_stats64.ts rename to packages/ditto/db/migrations/036_stats64.ts diff --git a/src/db/migrations/037_auth_tokens.ts b/packages/ditto/db/migrations/037_auth_tokens.ts similarity index 100% rename from src/db/migrations/037_auth_tokens.ts rename to packages/ditto/db/migrations/037_auth_tokens.ts diff --git a/src/db/migrations/038_push_subscriptions.ts b/packages/ditto/db/migrations/038_push_subscriptions.ts similarity index 100% rename from src/db/migrations/038_push_subscriptions.ts rename to packages/ditto/db/migrations/038_push_subscriptions.ts diff --git a/src/db/migrations/039_pg_notify.ts b/packages/ditto/db/migrations/039_pg_notify.ts similarity index 100% rename from src/db/migrations/039_pg_notify.ts rename to packages/ditto/db/migrations/039_pg_notify.ts diff --git a/src/db/migrations/040_add_bunker_pubkey.ts b/packages/ditto/db/migrations/040_add_bunker_pubkey.ts similarity index 100% rename from src/db/migrations/040_add_bunker_pubkey.ts rename to packages/ditto/db/migrations/040_add_bunker_pubkey.ts diff --git a/src/db/migrations/041_pg_notify_id_only.ts b/packages/ditto/db/migrations/041_pg_notify_id_only.ts similarity index 100% rename from src/db/migrations/041_pg_notify_id_only.ts rename to packages/ditto/db/migrations/041_pg_notify_id_only.ts diff --git a/src/db/migrations/042_add_search_ext.ts b/packages/ditto/db/migrations/042_add_search_ext.ts similarity index 100% rename from src/db/migrations/042_add_search_ext.ts rename to packages/ditto/db/migrations/042_add_search_ext.ts diff --git a/src/db/migrations/043_rm_language.ts b/packages/ditto/db/migrations/043_rm_language.ts similarity index 100% rename from src/db/migrations/043_rm_language.ts rename to packages/ditto/db/migrations/043_rm_language.ts diff --git a/src/db/migrations/044_search_ext_drop_default.ts b/packages/ditto/db/migrations/044_search_ext_drop_default.ts similarity index 100% rename from src/db/migrations/044_search_ext_drop_default.ts rename to packages/ditto/db/migrations/044_search_ext_drop_default.ts diff --git a/src/db/migrations/045_streaks.ts b/packages/ditto/db/migrations/045_streaks.ts similarity index 100% rename from src/db/migrations/045_streaks.ts rename to packages/ditto/db/migrations/045_streaks.ts diff --git a/src/db/migrations/046_author_stats_nip05.ts b/packages/ditto/db/migrations/046_author_stats_nip05.ts similarity index 100% rename from src/db/migrations/046_author_stats_nip05.ts rename to packages/ditto/db/migrations/046_author_stats_nip05.ts diff --git a/src/db/migrations/047_add_domain_favicons.ts b/packages/ditto/db/migrations/047_add_domain_favicons.ts similarity index 100% rename from src/db/migrations/047_add_domain_favicons.ts rename to packages/ditto/db/migrations/047_add_domain_favicons.ts diff --git a/src/db/migrations/048_rm_pubkey_domains.ts b/packages/ditto/db/migrations/048_rm_pubkey_domains.ts similarity index 100% rename from src/db/migrations/048_rm_pubkey_domains.ts rename to packages/ditto/db/migrations/048_rm_pubkey_domains.ts diff --git a/src/db/migrations/049_author_stats_sorted.ts b/packages/ditto/db/migrations/049_author_stats_sorted.ts similarity index 100% rename from src/db/migrations/049_author_stats_sorted.ts rename to packages/ditto/db/migrations/049_author_stats_sorted.ts diff --git a/src/db/migrations/050_notify_only_insert.ts b/packages/ditto/db/migrations/050_notify_only_insert.ts similarity index 100% rename from src/db/migrations/050_notify_only_insert.ts rename to packages/ditto/db/migrations/050_notify_only_insert.ts diff --git a/src/db/migrations/051_notify_replaceable.ts b/packages/ditto/db/migrations/051_notify_replaceable.ts similarity index 100% rename from src/db/migrations/051_notify_replaceable.ts rename to packages/ditto/db/migrations/051_notify_replaceable.ts diff --git a/packages/ditto/deno.json b/packages/ditto/deno.json new file mode 100644 index 00000000..31f80278 --- /dev/null +++ b/packages/ditto/deno.json @@ -0,0 +1,13 @@ +{ + "name": "@ditto/ditto", + "version": "1.1.0", + "exports": {}, + "imports": { + "deno.json": "./deno.json" + }, + "lint": { + "rules": { + "exclude": ["verbatim-module-syntax"] + } + } +} diff --git a/src/entities/MastodonAccount.ts b/packages/ditto/entities/MastodonAccount.ts similarity index 100% rename from src/entities/MastodonAccount.ts rename to packages/ditto/entities/MastodonAccount.ts diff --git a/src/entities/MastodonAttachment.ts b/packages/ditto/entities/MastodonAttachment.ts similarity index 100% rename from src/entities/MastodonAttachment.ts rename to packages/ditto/entities/MastodonAttachment.ts diff --git a/src/entities/MastodonMention.ts b/packages/ditto/entities/MastodonMention.ts similarity index 100% rename from src/entities/MastodonMention.ts rename to packages/ditto/entities/MastodonMention.ts diff --git a/src/entities/MastodonStatus.ts b/packages/ditto/entities/MastodonStatus.ts similarity index 100% rename from src/entities/MastodonStatus.ts rename to packages/ditto/entities/MastodonStatus.ts diff --git a/src/entities/MastodonTranslation.ts b/packages/ditto/entities/MastodonTranslation.ts similarity index 100% rename from src/entities/MastodonTranslation.ts rename to packages/ditto/entities/MastodonTranslation.ts diff --git a/src/entities/PreviewCard.ts b/packages/ditto/entities/PreviewCard.ts similarity index 100% rename from src/entities/PreviewCard.ts rename to packages/ditto/entities/PreviewCard.ts diff --git a/src/filter.test.ts b/packages/ditto/filter.test.ts similarity index 100% rename from src/filter.test.ts rename to packages/ditto/filter.test.ts diff --git a/src/filter.ts b/packages/ditto/filter.ts similarity index 100% rename from src/filter.ts rename to packages/ditto/filter.ts diff --git a/src/firehose.ts b/packages/ditto/firehose.ts similarity index 100% rename from src/firehose.ts rename to packages/ditto/firehose.ts diff --git a/src/interfaces/DittoEvent.ts b/packages/ditto/interfaces/DittoEvent.ts similarity index 100% rename from src/interfaces/DittoEvent.ts rename to packages/ditto/interfaces/DittoEvent.ts diff --git a/src/interfaces/DittoFilter.ts b/packages/ditto/interfaces/DittoFilter.ts similarity index 100% rename from src/interfaces/DittoFilter.ts rename to packages/ditto/interfaces/DittoFilter.ts diff --git a/src/interfaces/DittoPagination.ts b/packages/ditto/interfaces/DittoPagination.ts similarity index 100% rename from src/interfaces/DittoPagination.ts rename to packages/ditto/interfaces/DittoPagination.ts diff --git a/src/interfaces/DittoTranslator.ts b/packages/ditto/interfaces/DittoTranslator.ts similarity index 100% rename from src/interfaces/DittoTranslator.ts rename to packages/ditto/interfaces/DittoTranslator.ts diff --git a/src/metrics.ts b/packages/ditto/metrics.ts similarity index 100% rename from src/metrics.ts rename to packages/ditto/metrics.ts diff --git a/src/middleware/auth98Middleware.ts b/packages/ditto/middleware/auth98Middleware.ts similarity index 100% rename from src/middleware/auth98Middleware.ts rename to packages/ditto/middleware/auth98Middleware.ts diff --git a/src/middleware/cacheControlMiddleware.test.ts b/packages/ditto/middleware/cacheControlMiddleware.test.ts similarity index 100% rename from src/middleware/cacheControlMiddleware.test.ts rename to packages/ditto/middleware/cacheControlMiddleware.test.ts diff --git a/src/middleware/cacheControlMiddleware.ts b/packages/ditto/middleware/cacheControlMiddleware.ts similarity index 100% rename from src/middleware/cacheControlMiddleware.ts rename to packages/ditto/middleware/cacheControlMiddleware.ts diff --git a/src/middleware/cspMiddleware.ts b/packages/ditto/middleware/cspMiddleware.ts similarity index 100% rename from src/middleware/cspMiddleware.ts rename to packages/ditto/middleware/cspMiddleware.ts diff --git a/src/middleware/logiMiddleware.ts b/packages/ditto/middleware/logiMiddleware.ts similarity index 100% rename from src/middleware/logiMiddleware.ts rename to packages/ditto/middleware/logiMiddleware.ts diff --git a/src/middleware/metricsMiddleware.ts b/packages/ditto/middleware/metricsMiddleware.ts similarity index 100% rename from src/middleware/metricsMiddleware.ts rename to packages/ditto/middleware/metricsMiddleware.ts diff --git a/src/middleware/notActivitypubMiddleware.ts b/packages/ditto/middleware/notActivitypubMiddleware.ts similarity index 100% rename from src/middleware/notActivitypubMiddleware.ts rename to packages/ditto/middleware/notActivitypubMiddleware.ts diff --git a/src/middleware/paginationMiddleware.ts b/packages/ditto/middleware/paginationMiddleware.ts similarity index 100% rename from src/middleware/paginationMiddleware.ts rename to packages/ditto/middleware/paginationMiddleware.ts diff --git a/src/middleware/rateLimitMiddleware.ts b/packages/ditto/middleware/rateLimitMiddleware.ts similarity index 100% rename from src/middleware/rateLimitMiddleware.ts rename to packages/ditto/middleware/rateLimitMiddleware.ts diff --git a/src/middleware/requireSigner.ts b/packages/ditto/middleware/requireSigner.ts similarity index 100% rename from src/middleware/requireSigner.ts rename to packages/ditto/middleware/requireSigner.ts diff --git a/src/middleware/signerMiddleware.ts b/packages/ditto/middleware/signerMiddleware.ts similarity index 100% rename from src/middleware/signerMiddleware.ts rename to packages/ditto/middleware/signerMiddleware.ts diff --git a/src/middleware/storeMiddleware.ts b/packages/ditto/middleware/storeMiddleware.ts similarity index 100% rename from src/middleware/storeMiddleware.ts rename to packages/ditto/middleware/storeMiddleware.ts diff --git a/src/middleware/swapNutzapsMiddleware.ts b/packages/ditto/middleware/swapNutzapsMiddleware.ts similarity index 100% rename from src/middleware/swapNutzapsMiddleware.ts rename to packages/ditto/middleware/swapNutzapsMiddleware.ts diff --git a/src/middleware/translatorMiddleware.ts b/packages/ditto/middleware/translatorMiddleware.ts similarity index 100% rename from src/middleware/translatorMiddleware.ts rename to packages/ditto/middleware/translatorMiddleware.ts diff --git a/src/middleware/uploaderMiddleware.ts b/packages/ditto/middleware/uploaderMiddleware.ts similarity index 100% rename from src/middleware/uploaderMiddleware.ts rename to packages/ditto/middleware/uploaderMiddleware.ts diff --git a/src/nostr-wasm.ts b/packages/ditto/nostr-wasm.ts similarity index 100% rename from src/nostr-wasm.ts rename to packages/ditto/nostr-wasm.ts diff --git a/src/notify.ts b/packages/ditto/notify.ts similarity index 100% rename from src/notify.ts rename to packages/ditto/notify.ts diff --git a/src/pipeline.ts b/packages/ditto/pipeline.ts similarity index 100% rename from src/pipeline.ts rename to packages/ditto/pipeline.ts diff --git a/src/policies/MuteListPolicy.test.ts b/packages/ditto/policies/MuteListPolicy.test.ts similarity index 100% rename from src/policies/MuteListPolicy.test.ts rename to packages/ditto/policies/MuteListPolicy.test.ts diff --git a/src/policies/MuteListPolicy.ts b/packages/ditto/policies/MuteListPolicy.ts similarity index 100% rename from src/policies/MuteListPolicy.ts rename to packages/ditto/policies/MuteListPolicy.ts diff --git a/src/precheck.ts b/packages/ditto/precheck.ts similarity index 100% rename from src/precheck.ts rename to packages/ditto/precheck.ts diff --git a/src/queries.ts b/packages/ditto/queries.ts similarity index 100% rename from src/queries.ts rename to packages/ditto/queries.ts diff --git a/src/schema.test.ts b/packages/ditto/schema.test.ts similarity index 100% rename from src/schema.test.ts rename to packages/ditto/schema.test.ts diff --git a/src/schema.ts b/packages/ditto/schema.ts similarity index 100% rename from src/schema.ts rename to packages/ditto/schema.ts diff --git a/src/schemas/mastodon.ts b/packages/ditto/schemas/mastodon.ts similarity index 100% rename from src/schemas/mastodon.ts rename to packages/ditto/schemas/mastodon.ts diff --git a/src/schemas/nostr.ts b/packages/ditto/schemas/nostr.ts similarity index 100% rename from src/schemas/nostr.ts rename to packages/ditto/schemas/nostr.ts diff --git a/src/schemas/pagination.ts b/packages/ditto/schemas/pagination.ts similarity index 100% rename from src/schemas/pagination.ts rename to packages/ditto/schemas/pagination.ts diff --git a/src/schemas/pleroma-api.ts b/packages/ditto/schemas/pleroma-api.ts similarity index 100% rename from src/schemas/pleroma-api.ts rename to packages/ditto/schemas/pleroma-api.ts diff --git a/src/sentry.ts b/packages/ditto/sentry.ts similarity index 100% rename from src/sentry.ts rename to packages/ditto/sentry.ts diff --git a/src/server.ts b/packages/ditto/server.ts similarity index 100% rename from src/server.ts rename to packages/ditto/server.ts diff --git a/src/signers/AdminSigner.ts b/packages/ditto/signers/AdminSigner.ts similarity index 100% rename from src/signers/AdminSigner.ts rename to packages/ditto/signers/AdminSigner.ts diff --git a/src/signers/ConnectSigner.ts b/packages/ditto/signers/ConnectSigner.ts similarity index 100% rename from src/signers/ConnectSigner.ts rename to packages/ditto/signers/ConnectSigner.ts diff --git a/src/signers/ReadOnlySigner.ts b/packages/ditto/signers/ReadOnlySigner.ts similarity index 100% rename from src/signers/ReadOnlySigner.ts rename to packages/ditto/signers/ReadOnlySigner.ts diff --git a/src/startup.ts b/packages/ditto/startup.ts similarity index 100% rename from src/startup.ts rename to packages/ditto/startup.ts diff --git a/static/favicon.ico b/packages/ditto/static/favicon.ico similarity index 100% rename from static/favicon.ico rename to packages/ditto/static/favicon.ico diff --git a/static/images/avi.png b/packages/ditto/static/images/avi.png similarity index 100% rename from static/images/avi.png rename to packages/ditto/static/images/avi.png diff --git a/static/images/banner.png b/packages/ditto/static/images/banner.png similarity index 100% rename from static/images/banner.png rename to packages/ditto/static/images/banner.png diff --git a/static/images/thumbnail.png b/packages/ditto/static/images/thumbnail.png similarity index 100% rename from static/images/thumbnail.png rename to packages/ditto/static/images/thumbnail.png diff --git a/src/storages.ts b/packages/ditto/storages.ts similarity index 100% rename from src/storages.ts rename to packages/ditto/storages.ts diff --git a/src/storages/AdminStore.ts b/packages/ditto/storages/AdminStore.ts similarity index 100% rename from src/storages/AdminStore.ts rename to packages/ditto/storages/AdminStore.ts diff --git a/src/storages/EventsDB.test.ts b/packages/ditto/storages/EventsDB.test.ts similarity index 100% rename from src/storages/EventsDB.test.ts rename to packages/ditto/storages/EventsDB.test.ts diff --git a/src/storages/EventsDB.ts b/packages/ditto/storages/EventsDB.ts similarity index 100% rename from src/storages/EventsDB.ts rename to packages/ditto/storages/EventsDB.ts diff --git a/src/storages/InternalRelay.test.ts b/packages/ditto/storages/InternalRelay.test.ts similarity index 100% rename from src/storages/InternalRelay.test.ts rename to packages/ditto/storages/InternalRelay.test.ts diff --git a/src/storages/InternalRelay.ts b/packages/ditto/storages/InternalRelay.ts similarity index 100% rename from src/storages/InternalRelay.ts rename to packages/ditto/storages/InternalRelay.ts diff --git a/src/storages/UserStore.test.ts b/packages/ditto/storages/UserStore.test.ts similarity index 100% rename from src/storages/UserStore.test.ts rename to packages/ditto/storages/UserStore.test.ts diff --git a/src/storages/UserStore.ts b/packages/ditto/storages/UserStore.ts similarity index 100% rename from src/storages/UserStore.ts rename to packages/ditto/storages/UserStore.ts diff --git a/src/storages/hydrate.bench.ts b/packages/ditto/storages/hydrate.bench.ts similarity index 100% rename from src/storages/hydrate.bench.ts rename to packages/ditto/storages/hydrate.bench.ts diff --git a/src/storages/hydrate.test.ts b/packages/ditto/storages/hydrate.test.ts similarity index 100% rename from src/storages/hydrate.test.ts rename to packages/ditto/storages/hydrate.test.ts diff --git a/src/storages/hydrate.ts b/packages/ditto/storages/hydrate.ts similarity index 100% rename from src/storages/hydrate.ts rename to packages/ditto/storages/hydrate.ts diff --git a/src/storages/search-store.ts b/packages/ditto/storages/search-store.ts similarity index 100% rename from src/storages/search-store.ts rename to packages/ditto/storages/search-store.ts diff --git a/src/test.ts b/packages/ditto/test.ts similarity index 100% rename from src/test.ts rename to packages/ditto/test.ts diff --git a/src/translators/DeepLTranslator.test.ts b/packages/ditto/translators/DeepLTranslator.test.ts similarity index 100% rename from src/translators/DeepLTranslator.test.ts rename to packages/ditto/translators/DeepLTranslator.test.ts diff --git a/src/translators/DeepLTranslator.ts b/packages/ditto/translators/DeepLTranslator.ts similarity index 100% rename from src/translators/DeepLTranslator.ts rename to packages/ditto/translators/DeepLTranslator.ts diff --git a/src/translators/LibreTranslateTranslator.test.ts b/packages/ditto/translators/LibreTranslateTranslator.test.ts similarity index 100% rename from src/translators/LibreTranslateTranslator.test.ts rename to packages/ditto/translators/LibreTranslateTranslator.test.ts diff --git a/src/translators/LibreTranslateTranslator.ts b/packages/ditto/translators/LibreTranslateTranslator.ts similarity index 100% rename from src/translators/LibreTranslateTranslator.ts rename to packages/ditto/translators/LibreTranslateTranslator.ts diff --git a/src/trends.test.ts b/packages/ditto/trends.test.ts similarity index 100% rename from src/trends.test.ts rename to packages/ditto/trends.test.ts diff --git a/src/trends.ts b/packages/ditto/trends.ts similarity index 100% rename from src/trends.ts rename to packages/ditto/trends.ts diff --git a/src/types/MastodonPush.ts b/packages/ditto/types/MastodonPush.ts similarity index 100% rename from src/types/MastodonPush.ts rename to packages/ditto/types/MastodonPush.ts diff --git a/src/types/webmanifest.ts b/packages/ditto/types/webmanifest.ts similarity index 100% rename from src/types/webmanifest.ts rename to packages/ditto/types/webmanifest.ts diff --git a/src/uploaders/DenoUploader.ts b/packages/ditto/uploaders/DenoUploader.ts similarity index 100% rename from src/uploaders/DenoUploader.ts rename to packages/ditto/uploaders/DenoUploader.ts diff --git a/src/uploaders/IPFSUploader.ts b/packages/ditto/uploaders/IPFSUploader.ts similarity index 100% rename from src/uploaders/IPFSUploader.ts rename to packages/ditto/uploaders/IPFSUploader.ts diff --git a/src/uploaders/S3Uploader.ts b/packages/ditto/uploaders/S3Uploader.ts similarity index 100% rename from src/uploaders/S3Uploader.ts rename to packages/ditto/uploaders/S3Uploader.ts diff --git a/src/utils.ts b/packages/ditto/utils.ts similarity index 100% rename from src/utils.ts rename to packages/ditto/utils.ts diff --git a/src/utils/PleromaConfigDB.test.ts b/packages/ditto/utils/PleromaConfigDB.test.ts similarity index 100% rename from src/utils/PleromaConfigDB.test.ts rename to packages/ditto/utils/PleromaConfigDB.test.ts diff --git a/src/utils/PleromaConfigDB.ts b/packages/ditto/utils/PleromaConfigDB.ts similarity index 100% rename from src/utils/PleromaConfigDB.ts rename to packages/ditto/utils/PleromaConfigDB.ts diff --git a/src/utils/SimpleLRU.test.ts b/packages/ditto/utils/SimpleLRU.test.ts similarity index 100% rename from src/utils/SimpleLRU.test.ts rename to packages/ditto/utils/SimpleLRU.test.ts diff --git a/src/utils/SimpleLRU.ts b/packages/ditto/utils/SimpleLRU.ts similarity index 100% rename from src/utils/SimpleLRU.ts rename to packages/ditto/utils/SimpleLRU.ts diff --git a/src/utils/abort.ts b/packages/ditto/utils/abort.ts similarity index 100% rename from src/utils/abort.ts rename to packages/ditto/utils/abort.ts diff --git a/src/utils/aes.bench.ts b/packages/ditto/utils/aes.bench.ts similarity index 100% rename from src/utils/aes.bench.ts rename to packages/ditto/utils/aes.bench.ts diff --git a/src/utils/aes.test.ts b/packages/ditto/utils/aes.test.ts similarity index 100% rename from src/utils/aes.test.ts rename to packages/ditto/utils/aes.test.ts diff --git a/src/utils/aes.ts b/packages/ditto/utils/aes.ts similarity index 100% rename from src/utils/aes.ts rename to packages/ditto/utils/aes.ts diff --git a/src/utils/api.ts b/packages/ditto/utils/api.ts similarity index 100% rename from src/utils/api.ts rename to packages/ditto/utils/api.ts diff --git a/src/utils/auth.bench.ts b/packages/ditto/utils/auth.bench.ts similarity index 100% rename from src/utils/auth.bench.ts rename to packages/ditto/utils/auth.bench.ts diff --git a/src/utils/auth.test.ts b/packages/ditto/utils/auth.test.ts similarity index 100% rename from src/utils/auth.test.ts rename to packages/ditto/utils/auth.test.ts diff --git a/src/utils/auth.ts b/packages/ditto/utils/auth.ts similarity index 100% rename from src/utils/auth.ts rename to packages/ditto/utils/auth.ts diff --git a/src/utils/bolt11.test.ts b/packages/ditto/utils/bolt11.test.ts similarity index 100% rename from src/utils/bolt11.test.ts rename to packages/ditto/utils/bolt11.test.ts diff --git a/src/utils/bolt11.ts b/packages/ditto/utils/bolt11.ts similarity index 100% rename from src/utils/bolt11.ts rename to packages/ditto/utils/bolt11.ts diff --git a/src/utils/connect.ts b/packages/ditto/utils/connect.ts similarity index 100% rename from src/utils/connect.ts rename to packages/ditto/utils/connect.ts diff --git a/src/utils/crypto.test.ts b/packages/ditto/utils/crypto.test.ts similarity index 100% rename from src/utils/crypto.test.ts rename to packages/ditto/utils/crypto.test.ts diff --git a/src/utils/crypto.ts b/packages/ditto/utils/crypto.ts similarity index 100% rename from src/utils/crypto.ts rename to packages/ditto/utils/crypto.ts diff --git a/src/utils/favicon.ts b/packages/ditto/utils/favicon.ts similarity index 100% rename from src/utils/favicon.ts rename to packages/ditto/utils/favicon.ts diff --git a/src/utils/formdata.test.ts b/packages/ditto/utils/formdata.test.ts similarity index 100% rename from src/utils/formdata.test.ts rename to packages/ditto/utils/formdata.test.ts diff --git a/src/utils/formdata.ts b/packages/ditto/utils/formdata.ts similarity index 100% rename from src/utils/formdata.ts rename to packages/ditto/utils/formdata.ts diff --git a/src/utils/html.ts b/packages/ditto/utils/html.ts similarity index 100% rename from src/utils/html.ts rename to packages/ditto/utils/html.ts diff --git a/src/utils/instance.ts b/packages/ditto/utils/instance.ts similarity index 100% rename from src/utils/instance.ts rename to packages/ditto/utils/instance.ts diff --git a/src/utils/language.test.ts b/packages/ditto/utils/language.test.ts similarity index 100% rename from src/utils/language.test.ts rename to packages/ditto/utils/language.test.ts diff --git a/src/utils/language.ts b/packages/ditto/utils/language.ts similarity index 100% rename from src/utils/language.ts rename to packages/ditto/utils/language.ts diff --git a/src/utils/lnurl.ts b/packages/ditto/utils/lnurl.ts similarity index 100% rename from src/utils/lnurl.ts rename to packages/ditto/utils/lnurl.ts diff --git a/src/utils/log.ts b/packages/ditto/utils/log.ts similarity index 100% rename from src/utils/log.ts rename to packages/ditto/utils/log.ts diff --git a/src/utils/lookup.test.ts b/packages/ditto/utils/lookup.test.ts similarity index 100% rename from src/utils/lookup.test.ts rename to packages/ditto/utils/lookup.test.ts diff --git a/src/utils/lookup.ts b/packages/ditto/utils/lookup.ts similarity index 100% rename from src/utils/lookup.ts rename to packages/ditto/utils/lookup.ts diff --git a/src/utils/media.test.ts b/packages/ditto/utils/media.test.ts similarity index 100% rename from src/utils/media.test.ts rename to packages/ditto/utils/media.test.ts diff --git a/src/utils/media.ts b/packages/ditto/utils/media.ts similarity index 100% rename from src/utils/media.ts rename to packages/ditto/utils/media.ts diff --git a/src/utils/nip05.ts b/packages/ditto/utils/nip05.ts similarity index 100% rename from src/utils/nip05.ts rename to packages/ditto/utils/nip05.ts diff --git a/src/utils/nip98.ts b/packages/ditto/utils/nip98.ts similarity index 100% rename from src/utils/nip98.ts rename to packages/ditto/utils/nip98.ts diff --git a/src/utils/note.test.ts b/packages/ditto/utils/note.test.ts similarity index 100% rename from src/utils/note.test.ts rename to packages/ditto/utils/note.test.ts diff --git a/src/utils/note.ts b/packages/ditto/utils/note.ts similarity index 100% rename from src/utils/note.ts rename to packages/ditto/utils/note.ts diff --git a/src/utils/og-metadata.ts b/packages/ditto/utils/og-metadata.ts similarity index 100% rename from src/utils/og-metadata.ts rename to packages/ditto/utils/og-metadata.ts diff --git a/src/utils/outbox.test.ts b/packages/ditto/utils/outbox.test.ts similarity index 100% rename from src/utils/outbox.test.ts rename to packages/ditto/utils/outbox.test.ts diff --git a/src/utils/outbox.ts b/packages/ditto/utils/outbox.ts similarity index 100% rename from src/utils/outbox.ts rename to packages/ditto/utils/outbox.ts diff --git a/src/utils/pleroma.ts b/packages/ditto/utils/pleroma.ts similarity index 100% rename from src/utils/pleroma.ts rename to packages/ditto/utils/pleroma.ts diff --git a/src/utils/purify.ts b/packages/ditto/utils/purify.ts similarity index 100% rename from src/utils/purify.ts rename to packages/ditto/utils/purify.ts diff --git a/src/utils/ratelimiter/MemoryRateLimiter.test.ts b/packages/ditto/utils/ratelimiter/MemoryRateLimiter.test.ts similarity index 100% rename from src/utils/ratelimiter/MemoryRateLimiter.test.ts rename to packages/ditto/utils/ratelimiter/MemoryRateLimiter.test.ts diff --git a/src/utils/ratelimiter/MemoryRateLimiter.ts b/packages/ditto/utils/ratelimiter/MemoryRateLimiter.ts similarity index 100% rename from src/utils/ratelimiter/MemoryRateLimiter.ts rename to packages/ditto/utils/ratelimiter/MemoryRateLimiter.ts diff --git a/src/utils/ratelimiter/MultiRateLimiter.test.ts b/packages/ditto/utils/ratelimiter/MultiRateLimiter.test.ts similarity index 100% rename from src/utils/ratelimiter/MultiRateLimiter.test.ts rename to packages/ditto/utils/ratelimiter/MultiRateLimiter.test.ts diff --git a/src/utils/ratelimiter/MultiRateLimiter.ts b/packages/ditto/utils/ratelimiter/MultiRateLimiter.ts similarity index 100% rename from src/utils/ratelimiter/MultiRateLimiter.ts rename to packages/ditto/utils/ratelimiter/MultiRateLimiter.ts diff --git a/src/utils/ratelimiter/RateLimitError.ts b/packages/ditto/utils/ratelimiter/RateLimitError.ts similarity index 100% rename from src/utils/ratelimiter/RateLimitError.ts rename to packages/ditto/utils/ratelimiter/RateLimitError.ts diff --git a/src/utils/ratelimiter/types.ts b/packages/ditto/utils/ratelimiter/types.ts similarity index 100% rename from src/utils/ratelimiter/types.ts rename to packages/ditto/utils/ratelimiter/types.ts diff --git a/src/utils/search.test.ts b/packages/ditto/utils/search.test.ts similarity index 100% rename from src/utils/search.test.ts rename to packages/ditto/utils/search.test.ts diff --git a/src/utils/search.ts b/packages/ditto/utils/search.ts similarity index 100% rename from src/utils/search.ts rename to packages/ditto/utils/search.ts diff --git a/src/utils/stats.test.ts b/packages/ditto/utils/stats.test.ts similarity index 100% rename from src/utils/stats.test.ts rename to packages/ditto/utils/stats.test.ts diff --git a/src/utils/stats.ts b/packages/ditto/utils/stats.ts similarity index 100% rename from src/utils/stats.ts rename to packages/ditto/utils/stats.ts diff --git a/src/utils/tags.test.ts b/packages/ditto/utils/tags.test.ts similarity index 100% rename from src/utils/tags.test.ts rename to packages/ditto/utils/tags.test.ts diff --git a/src/utils/tags.ts b/packages/ditto/utils/tags.ts similarity index 100% rename from src/utils/tags.ts rename to packages/ditto/utils/tags.ts diff --git a/src/utils/text.ts b/packages/ditto/utils/text.ts similarity index 100% rename from src/utils/text.ts rename to packages/ditto/utils/text.ts diff --git a/src/utils/time.test.ts b/packages/ditto/utils/time.test.ts similarity index 100% rename from src/utils/time.test.ts rename to packages/ditto/utils/time.test.ts diff --git a/src/utils/time.ts b/packages/ditto/utils/time.ts similarity index 100% rename from src/utils/time.ts rename to packages/ditto/utils/time.ts diff --git a/src/utils/unfurl.ts b/packages/ditto/utils/unfurl.ts similarity index 100% rename from src/utils/unfurl.ts rename to packages/ditto/utils/unfurl.ts diff --git a/src/utils/upload.ts b/packages/ditto/utils/upload.ts similarity index 100% rename from src/utils/upload.ts rename to packages/ditto/utils/upload.ts diff --git a/src/utils/worker.test.ts b/packages/ditto/utils/worker.test.ts similarity index 100% rename from src/utils/worker.test.ts rename to packages/ditto/utils/worker.test.ts diff --git a/src/utils/worker.ts b/packages/ditto/utils/worker.ts similarity index 100% rename from src/utils/worker.ts rename to packages/ditto/utils/worker.ts diff --git a/src/utils/zap-split.ts b/packages/ditto/utils/zap-split.ts similarity index 100% rename from src/utils/zap-split.ts rename to packages/ditto/utils/zap-split.ts diff --git a/src/views.ts b/packages/ditto/views.ts similarity index 100% rename from src/views.ts rename to packages/ditto/views.ts diff --git a/src/views/ditto.ts b/packages/ditto/views/ditto.ts similarity index 100% rename from src/views/ditto.ts rename to packages/ditto/views/ditto.ts diff --git a/src/views/mastodon/accounts.ts b/packages/ditto/views/mastodon/accounts.ts similarity index 100% rename from src/views/mastodon/accounts.ts rename to packages/ditto/views/mastodon/accounts.ts diff --git a/src/views/mastodon/admin-accounts.ts b/packages/ditto/views/mastodon/admin-accounts.ts similarity index 100% rename from src/views/mastodon/admin-accounts.ts rename to packages/ditto/views/mastodon/admin-accounts.ts diff --git a/src/views/mastodon/attachments.ts b/packages/ditto/views/mastodon/attachments.ts similarity index 100% rename from src/views/mastodon/attachments.ts rename to packages/ditto/views/mastodon/attachments.ts diff --git a/src/views/mastodon/emojis.ts b/packages/ditto/views/mastodon/emojis.ts similarity index 100% rename from src/views/mastodon/emojis.ts rename to packages/ditto/views/mastodon/emojis.ts diff --git a/src/views/mastodon/notifications.ts b/packages/ditto/views/mastodon/notifications.ts similarity index 100% rename from src/views/mastodon/notifications.ts rename to packages/ditto/views/mastodon/notifications.ts diff --git a/src/views/mastodon/push.ts b/packages/ditto/views/mastodon/push.ts similarity index 100% rename from src/views/mastodon/push.ts rename to packages/ditto/views/mastodon/push.ts diff --git a/src/views/mastodon/relationships.ts b/packages/ditto/views/mastodon/relationships.ts similarity index 100% rename from src/views/mastodon/relationships.ts rename to packages/ditto/views/mastodon/relationships.ts diff --git a/src/views/mastodon/reports.ts b/packages/ditto/views/mastodon/reports.ts similarity index 100% rename from src/views/mastodon/reports.ts rename to packages/ditto/views/mastodon/reports.ts diff --git a/src/views/mastodon/statuses.ts b/packages/ditto/views/mastodon/statuses.ts similarity index 100% rename from src/views/mastodon/statuses.ts rename to packages/ditto/views/mastodon/statuses.ts diff --git a/src/views/meta.ts b/packages/ditto/views/meta.ts similarity index 100% rename from src/views/meta.ts rename to packages/ditto/views/meta.ts diff --git a/src/workers/policy.ts b/packages/ditto/workers/policy.ts similarity index 100% rename from src/workers/policy.ts rename to packages/ditto/workers/policy.ts diff --git a/src/workers/policy.worker.ts b/packages/ditto/workers/policy.worker.ts similarity index 100% rename from src/workers/policy.worker.ts rename to packages/ditto/workers/policy.worker.ts diff --git a/src/workers/verify.ts b/packages/ditto/workers/verify.ts similarity index 100% rename from src/workers/verify.ts rename to packages/ditto/workers/verify.ts diff --git a/src/workers/verify.worker.ts b/packages/ditto/workers/verify.worker.ts similarity index 100% rename from src/workers/verify.worker.ts rename to packages/ditto/workers/verify.worker.ts