From b25c904fc357e9225bae7af2864e9151527479aa Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 04:28:56 +0000 Subject: [PATCH 01/13] DragonflyDB --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 835b991dfc..561a4900fd 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) - Install with [nvm](https://github.com/nvm-sh/nvm) - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 -- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended) or [Titan](https://github.com/distributedio/titan) +- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended) or [DragonflyDB](https://github.com/dragonflydb/dragonfly) ### 😗 Optional dependencies From 0a81b34584a0bb93a578bf1fa20adb13e2c4bd57 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 04:37:05 +0000 Subject: [PATCH 02/13] Update 'README.md' --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 561a4900fd..9917a70ab6 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,8 @@ This guide will work for both **starting from scratch** and **migrating from Mis - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) - Install with [nvm](https://github.com/nvm-sh/nvm) - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 -- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended) or [DragonflyDB](https://github.com/dragonflydb/dragonfly) +- 🐲 At least [DragonflyDB](https://github.com/dragonflydb/dragonfly) or [Redis](https://redis.io/) v6 + - DragonflyDB is a drop-in replacement for Redis that's a lot faster, but will break Bull Dashoard. ### 😗 Optional dependencies From 4a32e407a99406278109b22d5928980b1bc94549 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 04:37:43 +0000 Subject: [PATCH 03/13] Redis v6 is minimum --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9917a70ab6..13ce4d3d5e 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) - Install with [nvm](https://github.com/nvm-sh/nvm) - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 -- 🐲 At least [DragonflyDB](https://github.com/dragonflydb/dragonfly) or [Redis](https://redis.io/) v6 +- 🐲 At least [DragonflyDB](https://github.com/dragonflydb/dragonfly) or at least [Redis](https://redis.io/) v6 - DragonflyDB is a drop-in replacement for Redis that's a lot faster, but will break Bull Dashoard. ### 😗 Optional dependencies From b12227efbfb2f1d2a27bb29333f34a9f641a61cd Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 04:38:21 +0000 Subject: [PATCH 04/13] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13ce4d3d5e..cb7908c797 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) - Install with [nvm](https://github.com/nvm-sh/nvm) - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 -- 🐲 At least [DragonflyDB](https://github.com/dragonflydb/dragonfly) or at least [Redis](https://redis.io/) v6 +- 🐲 At least [DragonflyDB](https://github.com/dragonflydb/dragonfly) v0.12 or at least [Redis](https://redis.io/) v6 - DragonflyDB is a drop-in replacement for Redis that's a lot faster, but will break Bull Dashoard. ### 😗 Optional dependencies From 45c585e5d88e4413d703f3d58c4445cf0e19fff6 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 04:42:48 +0000 Subject: [PATCH 05/13] Nvm, dragonfly needs more work... --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index cb7908c797..4c5239a21c 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,7 @@ This guide will work for both **starting from scratch** and **migrating from Mis - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) - Install with [nvm](https://github.com/nvm-sh/nvm) - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 -- 🐲 At least [DragonflyDB](https://github.com/dragonflydb/dragonfly) v0.12 or at least [Redis](https://redis.io/) v6 - - DragonflyDB is a drop-in replacement for Redis that's a lot faster, but will break Bull Dashoard. +- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend) ### 😗 Optional dependencies From bff657c5429ad9a0fbb1a628841e9fe22567446f Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 04:47:10 +0000 Subject: [PATCH 06/13] Update 'CALCKEY.md' --- CALCKEY.md | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/CALCKEY.md b/CALCKEY.md index 8dc0ebce3e..018858dcc2 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -2,23 +2,28 @@ ## Planned -- MFM button -- Sonic search support -- Use Cassandra for storing notes -- Federate with note edits -- Classic mode make instance icon bring up new context menu -- Exclude self from antenna -- Backfill remote users -- User "choices" (recommended users) like Mastodon and Soapbox -- Option to publicize instance blocks -- Fully revamp non-logged-in screen -- Personal notes for all accounts -- Non-nyaify cat mode -- Timeline filters -- Filter notifications by user -- Join Reason system like Mastodon/Pleroma -- Build flag to remove NSFW/AI stuff -- [Rat mode?](https://stop.voring.me/notes/933fx97bmd) +- Stucture + - Sonic search support + - DragonflyDB support + - Use Cassandra for storing notes + - Rewrite backend in Rust and Axum +- Function + - Federate with note edits + - User "choices" (recommended users) like Mastodon and Soapbox + - Join Reason system like Mastodon/Pleroma + - Option to publicize instance blocks + - Backfill remote users + - Build flag to remove NSFW/AI stuff + - Timeline filters + - Filter notifications by user + - Non-nyaify cat mode + - Exclude self from antenna +- Form + - MFM button + - Personal notes for all accounts + - Fully revamp non-logged-in screen + - Classic mode make instance icon bring up new context menu + - [Rat mode?](https://stop.voring.me/notes/933fx97bmd) ## Work in progress From 3775d37031e98e55e264b99b9b75702ce30fa2d2 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 7 Dec 2022 05:07:17 +0000 Subject: [PATCH 07/13] Cl --- CALCKEY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CALCKEY.md b/CALCKEY.md index 018858dcc2..5deaff1e3d 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -3,6 +3,7 @@ ## Planned - Stucture + - Weblate project - Sonic search support - DragonflyDB support - Use Cassandra for storing notes From 16704d5707c30e603bb3572e72daf796505cb7c0 Mon Sep 17 00:00:00 2001 From: Undefined Date: Thu, 8 Dec 2022 15:17:00 +0100 Subject: [PATCH 08/13] Use redis 7.0-alpine in docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7f55e8b7d5..f9b64e75c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: redis: restart: always - image: docker.io/redis:4.0-alpine + image: docker.io/redis:7.0-alpine networks: - network volumes: From de507b56f3325bce47b3916145700d8a992ac13a Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 9 Dec 2022 22:42:43 +0000 Subject: [PATCH 09/13] CL progress + links --- CALCKEY.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CALCKEY.md b/CALCKEY.md index 5deaff1e3d..52cccf2e17 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -3,11 +3,10 @@ ## Planned - Stucture - - Weblate project - - Sonic search support - - DragonflyDB support - - Use Cassandra for storing notes - - Rewrite backend in Rust and Axum + - [Sonic](https://github.com/valeriansaliou/sonic) support + - [DragonflyDB](https://github.com/dragonflydb/dragonfly) support + - Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes + - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum) - Function - Federate with note edits - User "choices" (recommended users) like Mastodon and Soapbox @@ -29,6 +28,7 @@ ## Work in progress - Account migration +- Weblate project - Link verification - Better Messaging UI - Better API Documentation From 6932ed5df5c2e79e770a982c7f31507c8d2247e2 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 9 Dec 2022 22:44:05 +0000 Subject: [PATCH 10/13] =?UTF-8?q?docs:=20=F0=9F=93=9D=20better=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CALCKEY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CALCKEY.md b/CALCKEY.md index 52cccf2e17..99ad2fab40 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -3,8 +3,8 @@ ## Planned - Stucture - - [Sonic](https://github.com/valeriansaliou/sonic) support - - [DragonflyDB](https://github.com/dragonflydb/dragonfly) support + - [Sonic](https://crates.io/crates/sonic-server) support + - [DragonflyDB](https://dragonflydb.io/) support - Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum) - Function From 6becb2f272055f1bcc646acaeae90149f34f3431 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 9 Dec 2022 22:44:47 +0000 Subject: [PATCH 11/13] =?UTF-8?q?docs:=20=F0=9F=93=9D=20be=20more=20descri?= =?UTF-8?q?ptive=20with=20new=20techs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CALCKEY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CALCKEY.md b/CALCKEY.md index 99ad2fab40..42c77715a9 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -3,8 +3,8 @@ ## Planned - Stucture - - [Sonic](https://crates.io/crates/sonic-server) support - - [DragonflyDB](https://dragonflydb.io/) support + - [Sonic](https://crates.io/crates/sonic-server) support as an ElasticSearch alternative + - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative - Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum) - Function From 877362eeaaff495054c24964cf523c3cbc395e2b Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 9 Dec 2022 22:45:36 +0000 Subject: [PATCH 12/13] =?UTF-8?q?docs:=20=F0=9F=93=9D=20scylla=20will=20be?= =?UTF-8?q?=20optional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CALCKEY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CALCKEY.md b/CALCKEY.md index 42c77715a9..c1faa5a0a9 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -5,7 +5,7 @@ - Stucture - [Sonic](https://crates.io/crates/sonic-server) support as an ElasticSearch alternative - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative - - Use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes + - Optionally use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum) - Function - Federate with note edits From 8c8ae7c9147668e10bb98026abbd8b6b86dd8b80 Mon Sep 17 00:00:00 2001 From: chimiana Date: Sat, 10 Dec 2022 03:18:45 +0000 Subject: [PATCH 13/13] Update Dockerfile with python3 dependency required for docker-compose build step to succeed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ca634c4f8..44fb1ef8aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ COPY . ./ # Install Dependencies RUN apk update -RUN apk add git ffmpeg tini alpine-sdk +RUN apk add git ffmpeg tini alpine-sdk python3 # Configure corepack and yarn RUN corepack enable