conduit

Commit Graph

Author	SHA1	Message	Date
Charles Hall	fe7d8c4f12	add nix flake Also add `.envrc` for direnv + Nix users. This makes developing locally easier for us NixOS folks. The flake itself will allow NixOS users to pull code directly from Conduit's repository, making it completely trivial to stay up-to-date with every commit. I'd also like to add a NixOS module directly to this repository at some point so that new configuration options will be available in the NixOS module faster. But for now, NixOS users can simply override `serivces.matrix-conduit.package` and get pretty much all the functionality. I've added myself to the `CODEOWNERS` file for the Nix files, since I am willing to maintain this stuff. I use Conduit on NixOS so I'm personally invested in having this work. Lastly, `.gitignore` was updated to exclude symlinks created by `direnv` and `nix build` and other such Nix commands. This doesn't come without maintenance burden, however: * The `sha256` in `flake.nix` will need to be updated whenever Conduit's MSRV is updated, but that should be pretty infrequent. * `nix flake update` should be run every so often to pull in updates to `nixpkgs` and other flake inputs. I think downstream users can also override this themselves with `inputs.<name>.inputs.<name>.follows`. * `nix flake check` should be run in CI to ensure Nix builds keep working. * `nixpkgs-fmt --check $(fd '\.nix')` (or similar) should be run in CI to ensure style uniformity.	4 years ago
Timo Kösters	cb2b5beea8	Merge branch 'fix_persy' into 'next' fix: update persy implementation after refactor See merge request famedly/conduit!396	4 years ago
Timo Kösters	2231a69b4c	fix: make previous MR compile	4 years ago
Timo Kösters	13052388a7	Merge branch 'conduit-next' into next	4 years ago
Max Cohen	6fd39ae174	Raise 404 when room doesn't exist Raise 404 "Room not found" when changing or accessing room visibility settings (`GET` and `PUT /_matrix/client/r0/directory/list/room/{roomId}`). See issue #290	4 years ago
Timo Kösters	2627ca5e3d	Merge branch 'update-rust' into 'next' update rust to avoid a cargo problem See merge request famedly/conduit!395	4 years ago
Timo Kösters	ed5b8d6a46	Merge branch 'Nyaaori/fix-whoami-appservices' into 'next' Fix is_guest value on whoami for appservice users Closes #310 See merge request famedly/conduit!401	4 years ago
Nyaaori	2d0fdddd34	Do not return true for is_guest on whoami for appservice users	4 years ago
Timo Kösters	3054af41ba	Merge branch 'Nyaaori/bump-default-room-version' into 'next' Bump default room version to V9 See merge request famedly/conduit!400	4 years ago
Nyaaori	1e1a144dfa	Move room version 10 out of experimental/unstable	4 years ago
Nyaaori	cc3e1f58cc	Bump default room version to V9; per matrix spec recommendation	4 years ago
Timo Kösters	b1991c8f4f	Merge branch 'Nyaaori/rejoin-fix' into 'next' Rejoin over federation if we are not participating See merge request famedly/conduit!399	4 years ago
Timo Kösters	6f7f2820ce	Merge branch 'Nyaaori/restricted-join-fix' into 'next' Fix doing restricted joins into rooms we are not participating in See merge request famedly/conduit!398	4 years ago
Nyaaori	e9697f13d6	Handle initiating restricted joins over federation Allows Conduit users to join restricted rooms if we are not currently participating	4 years ago
Nyaaori	3b0aa23fdf	Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation	4 years ago
Timo Kösters	aca6218c0a	Merge branch 'unrecognizedmethods' into 'next' fix: send unrecognized error on wrong http methods See merge request famedly/conduit!397	4 years ago
Timo Kösters	3a45628e1d	fix: send unrecognized error on wrong http methods	4 years ago
AndSDev	e923f63c49	fix(service/rooms/timeline): fix validating for non-joined members	4 years ago
Tglman	842feabced	fix: update persy implementation after refactor	4 years ago
Charles Hall	286936db32	msrv is 1.63 in Cargo.toml; use that	4 years ago
Charles Hall	bf7c4b4001	update rust to avoid a cargo problem We were hitting [this bug][0] when trying to select a version for clap ^4. [0]: https://github.com/rust-lang/cargo/issues/10623	4 years ago
AndSDev	d755a96c2c	refactor(service/rooms/timeline): add cache for server_name	4 years ago
Timo Kösters	c948324cf2	Merge branch 'fix-admin-help' into 'next' fix `@conduit help` not working in the admin room See merge request famedly/conduit!392	4 years ago
AndSDev	76f81ac201	feat(db/rooms): disable banning for last user and conduit user in admins room	4 years ago
Timo Kösters	ce188daccb	Merge branch 'conduit-lower-default-log-level' into HEAD	4 years ago
exin	98702da4e6	Lower default log level for docker	4 years ago
exin	92f7f0c849	Lower log level commented config options	4 years ago
exin	7451abe3ea	Lower default log level for docker and debian	4 years ago
exin	3e6c66b899	Fix formatting	4 years ago
exin	3a40bf8ae0	Add error for invalid log config Log config falls back to "warn"	4 years ago
exin	9c922db14b	Lower default log level Update config-example.toml to accordingly Closes #281	4 years ago
Timo Kösters	175fba5739	Merge branch 'fix-login-token' into 'next' fix(client/login): username in lowercase for login by token See merge request famedly/conduit!380	4 years ago
AndSDev	912491cb28	style(db/rooms): refactor admin room pdu validating	4 years ago
AndSDev	da2dbd2877	feat(db/rooms): disable leaving from admin room for last user	4 years ago
AndSDev	c67f95ebff	feat(db/rooms): disable leaving from admin room for conduit user	4 years ago
AndSDev	3a8321f9ad	feat(db/rooms): encryption is not allowed in the admins room	4 years ago
Timo Kösters	f46d64e52f	Merge branch 'unstability' into 'next' Mark unstable versions as unstable in /capabilities See merge request famedly/conduit!394	4 years ago
Timo Kösters	8c6e75a0cd	Mark unstable versions as unstable in /capabilities	4 years ago
Timo Kösters	c23b4946c5	Merge branch 'fixallthebugs' into 'next' fix: all the e2ee problems See merge request famedly/conduit!393	4 years ago
Timo Kösters	ac52b234fa	fix: all the e2ee problems	4 years ago
AndSDev	9a47069f45	fix(client/login): username in lowercase for login by token	4 years ago
Charles Hall	7ef9fe3454	add regression tests This way we don't regress on accident again in the future.	4 years ago
Charles Hall	fc852f8be6	resolve `cargo check --features clap/deprecated` This has no functional effects.	4 years ago
Charles Hall	4710f739c0	clap v4 turned more things into optional features So we need to re-enable some things. See their changelog[0] for details. [0]: https://github.com/clap-rs/clap/blob/master/CHANGELOG.md#migrating	4 years ago
Charles Hall	3c20c1b72e	fix `cargo test`	4 years ago
Timo Kösters	37eb686b5b	Merge branch 'fixfluffy' into 'next' fix: fluffychat login works again See merge request famedly/conduit!391	4 years ago
Timo Kösters	fdd64fc966	fix: fluffychat login works again	4 years ago
Timo Kösters	4d982d05af	Merge branch 'claimfast' into 'next' improvement: more efficient /claim See merge request famedly/conduit!389	4 years ago
Timo Kösters	1e725bc548	Merge branch 'fixmakejoin' into 'next' fix: make join should not send event id See merge request famedly/conduit!390	4 years ago
Timo Kösters	dd8f4681a2	fix: make join should not send event id	4 years ago

... 3 4 5 6 7 ...

1915 Commits (0b4e3de9c0135258eb68a0fa3cccdfff45de81d4) All Branches Search

1915 Commits (0b4e3de9c0135258eb68a0fa3cccdfff45de81d4)

All Branches