Matthias Ahouansou
07bb369c5c
perf: remove unnecessary async
2 years ago
Matthias Ahouansou
17dd8cb918
style: rename Sync(Mutex|RwLock) to Std(Mutex|RwLock)
2 years ago
Matthias Ahouansou
e33d8430d3
typo: colsures -> closures
2 years ago
Matthias Ahouansou
c58af8485d
revert: remove dependency on async_recursion
2 years ago
Matthias Ahouansou
becaad677f
refactor: use async-aware RwLocks and Mutexes where possible
2 years ago
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
2 years ago
Matthias Ahouansou
4934020ee7
style: remove unnecessary else block
2 years ago
Timo Kösters
7bb480ceb8
Merge branch 'readme' into 'next'
...
docs: small fixes for the README
See merge request famedly/conduit!592
2 years ago
Matthias Ahouansou
da5975d727
fix: avoid panics when admin room is not available
2 years ago
Timo Kösters
56a57d5489
docs: small fixes for the README
2 years ago
Matthias Ahouansou
e06e15d4ec
fix(accounts): don't give guests admin
2 years ago
Timo Kösters
18e684b92e
Merge branch 'performance' into 'next'
...
Improvements to /sync performance and db size
See merge request famedly/conduit!590
2 years ago
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
2 years ago
Timo Kösters
62dda7a43f
improvement: delete old rocksdb LOG files
2 years ago
Timo Kösters
99ab234f40
Merge branch 'fixes' into 'next'
...
Avoid panic when client is confused about rooms
See merge request famedly/conduit!588
2 years ago
Timo Kösters
e83416bb5a
Merge branch 'fixnginx' into 'next'
...
Fixed nginx proxy_pass directive
See merge request famedly/conduit!589
2 years ago
olly1240
726b6f0fa6
Fixed nginx proxy_pass directive
2 years ago
Timo Kösters
d7fd89df49
fix: avoid panic when client is confused about rooms
2 years ago
Timo Kösters
f4e57fdb22
Avoid federation when it is not necessary
2 years ago
Timo Kösters
4f096adcfa
Merge branch 'bump-ruma' into 'next'
...
Bump ruma to latest commit
See merge request famedly/conduit!586
2 years ago
Matthias Ahouansou
21a5fa3ef0
refactor: use re-exported JsOption from ruma rather than directly adding it as a dependency
2 years ago
Matthias Ahouansou
b27e9ea95c
chore: bump ruma to latest commit (as of 2024-02-25)
2 years ago
Matthias Ahouansou
8aa915acb9
bump ruma, support deprecated user login field
2 years ago
Matthias Ahouansou
ace9637bc2
replace unwraps with expects
2 years ago
Charles Hall
be1e2e9307
Merge branch 'ci/push-dockerhub' into 'next'
...
feat(ci): push oci-image to docker hub
See merge request famedly/conduit!584
2 years ago
Samuel Meenzen
1c6a4b1b24
feat(ci): push oci-image to docker hub
2 years ago
Matthias Ahouansou
976a73a0e5
style: appease rustfmt
2 years ago
Matthias Ahouansou
4c06f329c4
refactor: appease clippy
2 years ago
Matthias Ahouansou
d841b81c56
chore: update Cargo.lock
2 years ago
Matthias Ahouansou
e707084345
chore: bump ruma to latest commit (as of 2024-02-16)
2 years ago
strawberry
6dcc8b6cf1
bump ruma to latest commit (syncv3 JsOption and push optional power levels)
...
Signed-off-by: strawberry <strawberry@puppygock.gay>
2 years ago
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>
2 years ago
Charles Hall
72a13d8353
Merge branch 'flake-compat' into 'next'
...
support non-flake users
See merge request famedly/conduit!581
2 years ago
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>
2 years ago
Timo Kösters
f4f2d05b5b
Merge branch 'update-ring' into 'next'
...
update ring to ^0.17
See merge request famedly/conduit!580
2 years ago
Charles Hall
c3c7bcb2ed
Merge branch 'publish-oci-image' into 'next'
...
Publish oci image to the gitlab registry
See merge request famedly/conduit!570
2 years ago
Samuel Meenzen
d6c57f9b2e
Publish oci image to the gitlab registry
2 years ago
Charles Hall
7fb9e99649
update ring and jsonwebtoken to remove ring ^0.16
2 years ago
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
2 years ago
Charles Hall
0a281e81a5
Merge branch 'fix-oci-image-cross' into 'next'
...
pass pkgsCrossStatic to mkOciImage, not pkgsHost
See merge request famedly/conduit!579
2 years ago
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.
2 years ago
Charles Hall
986343877c
Merge branch 'artifact-links' into 'next'
...
update DEPLOY.md with new build links
See merge request famedly/conduit!578
2 years ago
Charles Hall
2d47710b55
update DEPLOY.md with new build links
2 years ago
Charles Hall
10542a1d70
Merge branch 'use-upstream-crane' into 'next'
...
switch crane input back to upstream
See merge request famedly/conduit!576
2 years ago
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.
2 years ago
Charles Hall
5787a70bab
Merge branch 'fix-complement' into 'next'
...
make complement (mostly) work again
See merge request famedly/conduit!575
2 years ago
Charles Hall
cf8f1f2546
make a bunch of changes so complement works again
...
Well, kinda. It crashed on me after 10 minutes because the tests timed
out like in <https://github.com/matrix-org/complement/issues/394 >.
Sounds like this means it's a them problem though.
I want to use Nix to build this image instead in the future but this
will at least make it work for now and give me a reference for while I'm
porting it. I also want to make Conduit natively understand Complement's
requirements instead of `sed`ing a bunch of stuff and needing a reverse
proxy in the container. Should be more reliable that way.
I'm not making this run in CI until the above stuff is addressed and
until I can decide on a way to pin the revision of Complement being
tested against.
2 years ago
Charles Hall
3c2fc4a4c6
Merge branch 'oci-image-ca-certs' into 'next'
...
add ca certificates to the OCI image
See merge request famedly/conduit!574
2 years ago
Charles Hall
dffd771e7c
add ca certificates to the OCI image
...
Without this, checking the authority of TLS certificates fails, making
Conduit (rightly) refuse to connect to anything.
2 years ago
Charles Hall
4da8c7e282
Merge branch 'docker-tag' into 'next'
...
change docker tag back to `next`
See merge request famedly/conduit!573
2 years ago