shruub
/
conduit
mirror of https://gitlab.com/famedly/conduit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,315 Commits
49 Branches
7 Tags
20 MiB
config-env-var-split
restricted-make-send-join
next
master
make-send-leave
error-parse-image-thumbnail
update-device-seen-on-usage
presence
chore/format-nix
all-the-lints
generate-config
push-federation-invites-to-appservices
unstable-msc4125
jonas-test-ci-docker-building-quemu-on-fsinfo-runner
askstate
recoverbroken
Nyaaori/temp-combined-feature-branch
Nyaaori/destructive-rocksdb-recovery
Nyaaori/full-profile-directory
Nyaaori/read-receipt-config-options
Nyaaori/private-read-receipts
Nyaaori/federation-backfill
Nyaaori/declare-msc3827
Nyaaori/remove-misisng-e2ee-readme
Nyaaori/refactor-next
refactor-ci-fix
bump-docker-alpine-to-3.16.2
jplatte/up-ruma
mdbook-docs-preparation
async
complement-integration
brokenjoinfix
state_full_ids_cache
ticho34782694/conduit-rocksdb-memory-usage
docs-the-second
serve-element-web
perf
nyaaori/older-room-versions
unbeatable-101-next-patch-64009
docs-overhaul
state-res-perf
stablecrosssigning
member-reason
admin-command-for-cache-memory-usage
measure-cache-memory-usage
lesscache
locks
state-res-closure-rebased
ruma-client
v0.2.0
v0.3.0
v0.4.0
v0.5.0
v0.6.0
v0.7.0
v0.8.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'chore/format-nix'
${ noResults }
Commit Graph

2315 Commits (chore/format-nix)
 

Author SHA1 Message Date
Matthias Ahouansou e06e15d4ec
fix(accounts): don't give guests admin 4 months ago
Timo Kösters 18e684b92e Merge branch 'performance' into 'next' 
Improvements to /sync performance and db size

See merge request famedly/conduit!590
 4 months 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
 4 months ago
Timo Kösters 62dda7a43f
improvement: delete old rocksdb LOG files 4 months ago
Timo Kösters 99ab234f40
Merge branch 'fixes' into 'next' 
Avoid panic when client is confused about rooms

See merge request famedly/conduit!588
 4 months ago
Timo Kösters e83416bb5a
Merge branch 'fixnginx' into 'next' 
Fixed nginx proxy_pass directive

See merge request famedly/conduit!589
 4 months ago
olly1240 726b6f0fa6
Fixed nginx proxy_pass directive 4 months ago
Timo Kösters d7fd89df49
fix: avoid panic when client is confused about rooms 4 months ago
Timo Kösters f4e57fdb22
Avoid federation when it is not necessary 4 months ago
Timo Kösters 4f096adcfa Merge branch 'bump-ruma' into 'next' 
Bump ruma to latest commit

See merge request famedly/conduit!586
 4 months ago
Matthias Ahouansou 21a5fa3ef0 refactor: use re-exported JsOption from ruma rather than directly adding it as a dependency 4 months ago
Matthias Ahouansou b27e9ea95c chore: bump ruma to latest commit (as of 2024-02-25) 4 months ago
Matthias Ahouansou 8aa915acb9 bump ruma, support deprecated user login field 4 months ago
Matthias Ahouansou ace9637bc2 replace unwraps with expects 4 months 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
 5 months ago
Samuel Meenzen 1c6a4b1b24 feat(ci): push oci-image to docker hub 5 months ago
Matthias Ahouansou 976a73a0e5 style: appease rustfmt 5 months ago
Matthias Ahouansou 4c06f329c4 refactor: appease clippy 5 months ago
Matthias Ahouansou d841b81c56 chore: update Cargo.lock 5 months ago
Matthias Ahouansou e707084345 chore: bump ruma to latest commit (as of 2024-02-16) 5 months ago
strawberry 6dcc8b6cf1 bump ruma to latest commit (syncv3 JsOption and push optional power levels) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 5 months 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>
 5 months ago
Charles Hall 72a13d8353 Merge branch 'flake-compat' into 'next' 
support non-flake users

See merge request famedly/conduit!581
 5 months 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>
 5 months ago
Timo Kösters f4f2d05b5b Merge branch 'update-ring' into 'next' 
update ring to ^0.17

See merge request famedly/conduit!580
 5 months ago
Charles Hall c3c7bcb2ed Merge branch 'publish-oci-image' into 'next' 
Publish oci image to the gitlab registry

See merge request famedly/conduit!570
 5 months ago
Samuel Meenzen d6c57f9b2e Publish oci image to the gitlab registry 5 months ago
Charles Hall 7fb9e99649
update ring and jsonwebtoken to remove ring ^0.16 5 months 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
 5 months ago
Charles Hall 0a281e81a5 Merge branch 'fix-oci-image-cross' into 'next' 
pass pkgsCrossStatic to mkOciImage, not pkgsHost

See merge request famedly/conduit!579
 5 months 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.
 5 months ago
Charles Hall 986343877c Merge branch 'artifact-links' into 'next' 
update DEPLOY.md with new build links

See merge request famedly/conduit!578
 5 months ago
Charles Hall 2d47710b55
update DEPLOY.md with new build links 5 months ago
Charles Hall 10542a1d70 Merge branch 'use-upstream-crane' into 'next' 
switch crane input back to upstream

See merge request famedly/conduit!576
 5 months 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.
 5 months ago
Charles Hall 5787a70bab Merge branch 'fix-complement' into 'next' 
make complement (mostly) work again

See merge request famedly/conduit!575
 5 months 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.
 5 months 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
 5 months 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.
 5 months ago
Charles Hall 4da8c7e282 Merge branch 'docker-tag' into 'next' 
change docker tag back to `next`

See merge request famedly/conduit!573
 5 months ago
Charles Hall 0df5d18fd6
change docker tag back to `next` 
I misunderstood what the general meaning of the `latest` tag was.
 5 months ago
Charles Hall 825ceac1c3 Merge branch 'update-rust' into 'next' 
update rust toolchain

See merge request famedly/conduit!572
 5 months ago
Charles Hall 3e389256f5
switch lint config to `manifest-lint` feature 
I removed some lint configuration in the process:

* `#[allow(clippy::suspicious_else_formatting)]` because nothing is
  currently triggering it.
* `#[warn(clippy::future_not_send)]` because some stuff under
  `src/lib.rs` is. And also like, auto-trait leakage generally means
  this isn't a problem, and if things really need to be `Send`, then
  you'll probably know to mark it manually.
* `#[warn(rust_2018_idioms)]` and replaced it with
  `explicit-outlives-requirements = "warn"` which is the most useful
  lint in that group that isn't enabled by default.
 5 months ago
Charles Hall a7892a28ec
refer directly to stdenv since it's in scope 5 months ago
Charles Hall 9453dbc740
update rust toolchain 
It comes with a bunch of new lints (yay!) so I fixed them all so CI will
keep working.

Also apparently something about linking changed because I had to change
the checks for deciding the linker flags for static x86_64 builds to
keep working.
 5 months ago
Charles Hall bf48c10d28 Merge branch 'cross' into 'next' 
cross compile static binaries for x86_64 and aarch64

See merge request famedly/conduit!569
 5 months ago
Charles Hall 7c1a3e41d9
add package to build an aarch64 oci image 
And build it as an artifact in CI.
 5 months ago
Charles Hall 2a04a361e0
break oci image builder into a function 
Now it can be reused for different `pkgs` and `package`s.
 5 months ago
Charles Hall 0e8e4f1083
add static cross to aarch64-unknown-linux-musl 5 months ago
Charles Hall 81ae579b25
add static cross to x86_64-unknown-linux-musl 5 months ago