Charles Hall
e70f33741c
update flake.lock
...
Also switch names to match the newer upstream nixpkgs code.
Flake lock file updates:
• Updated input 'attic':
'github:zhaofengli/attic/fbe252a5c21febbe920c025560cbd63b20e24f3b' (2024-01-18)
→ 'github:zhaofengli/attic/6eabc3f02fae3683bffab483e614bebfcd476b21' (2024-02-14)
• Updated input 'fenix':
'github:nix-community/fenix/e132ea0eb0c799a2109a91688e499d7bf4962801' (2024-01-18)
→ 'github:nix-community/fenix/c8943ea9e98d41325ff57d4ec14736d330b321b2' (2024-03-05)
• Updated input 'fenix/rust-analyzer-src':
'github:rust-lang/rust-analyzer/9d9b34354d2f13e33568c9c55b226dd014a146a0' (2024-01-17)
→ 'github:rust-lang/rust-analyzer/9f14343f9ee24f53f17492c5f9b653427e2ad15e' (2024-03-04)
• Updated input 'flake-utils':
'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
→ 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/842d9d80cfd4560648c785f8a4e6f3b096790e19' (2024-01-17)
→ 'github:NixOS/nixpkgs/b8697e57f10292a6165a20f03d2f42920dfaf973' (2024-03-03)
2024-03-05 15:06:51 -08:00
Charles Hall
161ad8f9a4
update to latest crane before a regression
...
Once these issues are fixed, or at least just the one against crane, we
can go back to `ref=master`.
Flake lock file updates:
• Updated input 'crane':
'github:ipetkov/crane/c798790eabec3e3da48190ae3698ac227aab770c' (2024-01-28)
→ 'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e' (2024-02-11)
2024-03-05 15:06:51 -08:00
Timo Kösters
732d331847
Merge branch 'async-mutex-guards' into 'next'
...
refactor: use async-aware RwLocks and Mutexes where possible
See merge request famedly/conduit!595
2024-03-05 22:19:27 +00:00
Matthias Ahouansou
ee7efdd403
typo: as -> has
2024-03-05 20:31:40 +00:00
Matthias Ahouansou
07bb369c5c
perf: remove unnecessary async
2024-03-05 20:20:19 +00:00
Matthias Ahouansou
17dd8cb918
style: rename Sync(Mutex|RwLock) to Std(Mutex|RwLock)
2024-03-05 20:16:28 +00:00
Matthias Ahouansou
e33d8430d3
typo: colsures -> closures
2024-03-05 20:13:39 +00:00
Matthias Ahouansou
c58af8485d
revert: remove dependency on async_recursion
2024-03-05 19:59:24 +00:00
Matthias Ahouansou
becaad677f
refactor: use async-aware RwLocks and Mutexes where possible
2024-03-05 14:23:59 +00:00
Timo Kösters
57575b7c6f
Merge branch 'dont-give-guests-admin' into 'next'
...
fix(accounts): don't give guests admin
See merge request famedly/conduit!591
2024-03-04 17:00:14 +00:00
Matthias Ahouansou
4934020ee7
style: remove unnecessary else block
2024-03-04 09:33:03 +00:00
Timo Kösters
7bb480ceb8
Merge branch 'readme' into 'next'
...
docs: small fixes for the README
See merge request famedly/conduit!592
2024-03-03 23:13:47 +00:00
Matthias Ahouansou
da5975d727
fix: avoid panics when admin room is not available
2024-03-03 22:42:24 +00:00
Timo Kösters
56a57d5489
docs: small fixes for the README
2024-03-03 15:56:03 +01:00
Matthias Ahouansou
e06e15d4ec
fix(accounts): don't give guests admin
2024-03-03 11:26:58 +00:00
Timo Kösters
18e684b92e
Merge branch 'performance' into 'next'
...
Improvements to /sync performance and db size
See merge request famedly/conduit!590
2024-03-02 15:20:21 +00:00
Timo Kösters
a159fff08a
improvement: deactivate old presence code because it slows down sync
...
The problem is that for each sync, it creates a new rocksdb iterator for each room, and creating iterators is somewhat expensive
2024-02-29 10:31:25 +01:00
Timo Kösters
62dda7a43f
improvement: delete old rocksdb LOG files
2024-02-29 10:28:06 +01:00
Timo Kösters
99ab234f40
Merge branch 'fixes' into 'next'
...
Avoid panic when client is confused about rooms
See merge request famedly/conduit!588
2024-02-28 16:19:48 +00:00
Timo Kösters
e83416bb5a
Merge branch 'fixnginx' into 'next'
...
Fixed nginx proxy_pass directive
See merge request famedly/conduit!589
2024-02-28 16:09:55 +00:00
olly1240
726b6f0fa6
Fixed nginx proxy_pass directive
2024-02-28 16:38:06 +01:00
Timo Kösters
d7fd89df49
fix: avoid panic when client is confused about rooms
2024-02-28 16:31:41 +01:00
Timo Kösters
f4e57fdb22
Avoid federation when it is not necessary
2024-02-28 16:27:08 +01:00
Timo Kösters
4f096adcfa
Merge branch 'bump-ruma' into 'next'
...
Bump ruma to latest commit
See merge request famedly/conduit!586
2024-02-25 19:35:54 +00:00
Matthias Ahouansou
21a5fa3ef0
refactor: use re-exported JsOption from ruma rather than directly adding it as a dependency
2024-02-25 10:30:30 +00:00
Matthias Ahouansou
b27e9ea95c
chore: bump ruma to latest commit (as of 2024-02-25)
2024-02-25 08:49:20 +00:00
Matthias Ahouansou
8aa915acb9
bump ruma, support deprecated user login field
2024-02-23 20:29:17 +00:00
Matthias Ahouansou
ace9637bc2
replace unwraps with expects
2024-02-23 19:39:30 +00:00
Charles Hall
be1e2e9307
Merge branch 'ci/push-dockerhub' into 'next'
...
feat(ci): push oci-image to docker hub
See merge request famedly/conduit!584
2024-02-18 01:36:50 +00:00
Samuel Meenzen
1c6a4b1b24
feat(ci): push oci-image to docker hub
2024-02-18 01:36:50 +00:00
Matthias Ahouansou
976a73a0e5
style: appease rustfmt
2024-02-16 21:19:40 +00:00
Matthias Ahouansou
4c06f329c4
refactor: appease clippy
2024-02-16 21:13:59 +00:00
Matthias Ahouansou
d841b81c56
chore: update Cargo.lock
2024-02-16 20:52:19 +00:00
Matthias Ahouansou
e707084345
chore: bump ruma to latest commit (as of 2024-02-16)
2024-02-16 20:52:07 +00:00
strawberry
6dcc8b6cf1
bump ruma to latest commit (syncv3 JsOption and push optional power levels)
...
Signed-off-by: strawberry <strawberry@puppygock.gay>
2024-02-16 20:45:48 +00:00
strawberry
a2ac491c54
bump ruma, add wrong room keys error code, tiny logging change
...
can't update ruma to very latest commit because of the weird JsOption thing for syncv4 that i can't wrap my head around how to use, not important anyways
Signed-off-by: strawberry <strawberry@pupbrain.dev>
2024-02-16 20:45:27 +00:00
Charles Hall
72a13d8353
Merge branch 'flake-compat' into 'next'
...
support non-flake users
See merge request famedly/conduit!581
2024-02-02 03:32:41 +00:00
Raito Bezarius
3a63f9dfb6
feat: support non-flake users
...
This uses flakes-compat to read the `flake.nix` and expose it
to non-flake users.
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-02-01 19:19:56 -08:00
Timo Kösters
f4f2d05b5b
Merge branch 'update-ring' into 'next'
...
update ring to ^0.17
See merge request famedly/conduit!580
2024-02-01 10:45:28 +00:00
Charles Hall
c3c7bcb2ed
Merge branch 'publish-oci-image' into 'next'
...
Publish oci image to the gitlab registry
See merge request famedly/conduit!570
2024-01-30 17:04:48 +00:00
Samuel Meenzen
d6c57f9b2e
Publish oci image to the gitlab registry
2024-01-30 17:04:47 +00:00
Charles Hall
7fb9e99649
update ring and jsonwebtoken to remove ring ^0.16
2024-01-29 16:21:42 -08:00
Charles Hall
1274b48ebb
run cargo update
...
`IndexMap::remove` was deprecated in favor of explicitly named methods.
I assume that we actually needed to be using `shift_remove`, otherwise
we probably wouldn't be bothering with `indexmap` here in the first
place. I wonder if this fixes any bugs lol
2024-01-29 16:17:25 -08:00
Charles Hall
0a281e81a5
Merge branch 'fix-oci-image-cross' into 'next'
...
pass pkgsCrossStatic to mkOciImage, not pkgsHost
See merge request famedly/conduit!579
2024-01-29 23:50:56 +00:00
Charles Hall
a43bde69fa
pass pkgsCrossStatic to mkOciImage, not pkgsHost
...
This fixes a bug where the aarch64 OCI image had metadata saying it was
an x86_64 OCI image. On top of that, I think the metadata was actually
right (aside from Conduit's binary): since all other packages were being
pulled from `pkgsHost`, an OCI image cross compiled for aarch64 from a
different architecture would result in unexecutable binaries (e.g. tini)
since they were compiled for the completely wrong architecture.
2024-01-29 15:39:09 -08:00
Charles Hall
986343877c
Merge branch 'artifact-links' into 'next'
...
update DEPLOY.md with new build links
See merge request famedly/conduit!578
2024-01-29 23:04:24 +00:00
Charles Hall
2d47710b55
update DEPLOY.md with new build links
2024-01-29 14:55:48 -08:00
Charles Hall
10542a1d70
Merge branch 'use-upstream-crane' into 'next'
...
switch crane input back to upstream
See merge request famedly/conduit!576
2024-01-28 21:54:38 +00:00
Charles Hall
c167f7a6ad
switch crane input back to upstream
...
Thanks to the crane maintainer to fixing my issue in a way that doesn't
suck, unlike my attempt in the fork we were briefly using.
2024-01-28 13:31:03 -08:00
Charles Hall
5787a70bab
Merge branch 'fix-complement' into 'next'
...
make complement (mostly) work again
See merge request famedly/conduit!575
2024-01-28 03:21:04 +00:00
