2249 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Timo Kösters	c86f9a5c5b	Merge branch 'pr_upstream_reqwest' into 'next' ... Use upstream `reqwest` instead of vendored one See merge request famedly/conduit!527	2024-01-24 21:59:34 +00:00
Timo Kösters	e0358a9de5	Merge branch 'send_push_to_invited_user' into 'next' ... feat: send push notification on invite to invited user and etc Closes #399 See merge request famedly/conduit!559	2024-01-24 17:55:22 +00:00
Tobias Bucher	69d0003222	Use upstream reqwest instead of vendored one ... This uses the `ClientBuilder::dns_resolver` function that was added in reqwest 0.11.13, instead of the homebrew `ClientBuilder::resolve_fn`.	2024-01-24 17:12:43 +01:00
Timo Kösters	5cf9f3df48	Merge branch 'lints' into 'next' ... fix CI See merge request famedly/conduit!564	2024-01-24 15:42:20 +00:00
Charles Hall	0b7ed5adc9	add debian package building in ci ... This uses a separate step and docker image, which I'm not a huge fan of. At least I could get this to work for now, but I won't be shocked when it breaks later. I know, I know, fixing this kind of problem is the exact reason I bothered to do this, but I was really struggling to do better here. Maybe I can take a second pass at this later. Also, this explicitly names the caches, because without this, various things related to linking will break.	2024-01-24 07:22:37 -08:00
Charles Hall	4de54db305	redo docker image and build it in ci	2024-01-24 07:22:37 -08:00
Charles Hall	02781e4f9b	use nix-filter to filter sources ... This prevents nix from rebuilding conduit when files that don't actually effect the build are changed.	2024-01-24 07:22:37 -08:00
Charles Hall	f8bdfd82b0	update flake.lock ... Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07) → 'github:ipetkov/crane/742170d82cd65c925dcddc5c3d6185699fbbad08' (2024-01-18) • Removed input 'crane/flake-compat' • Removed input 'crane/flake-utils' • Removed input 'crane/rust-overlay' • Removed input 'crane/rust-overlay/flake-utils' • Removed input 'crane/rust-overlay/nixpkgs' • Updated input 'fenix': 'github:nix-community/fenix/39096fe3f379036ff4a5fa198950b8e79defe939' (2023-07-16) → 'github:nix-community/fenix/e132ea0eb0c799a2109a91688e499d7bf4962801' (2024-01-18) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8' (2023-07-15) → 'github:rust-lang/rust-analyzer/9d9b34354d2f13e33568c9c55b226dd014a146a0' (2024-01-17) • Updated input 'flake-utils': 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8acef304efe70152463a6399f73e636bcc363813' (2023-07-15) → 'github:NixOS/nixpkgs/842d9d80cfd4560648c785f8a4e6f3b096790e19' (2024-01-17)	2024-01-24 07:22:37 -08:00
Charles Hall	7e66d2e2c0	use nix and engage to manage ci	2024-01-24 07:22:37 -08:00
Charles Hall	ffd03a256b	remove workflow rules ... I don't think these are actually necessary? At least in my own testing, I haven't seen duplicate pipelines for a single commit when converting from just a branch to a merge request.	2024-01-24 07:22:37 -08:00
Charles Hall	9d592d60d2	remove dockerlint step because it does nothing ... It's configured to let the pipeline pass even if there are warnings or errors, i.e. it's pointless.	2024-01-24 07:22:37 -08:00
Charles Hall	25ceb5ebd8	remove commented out ci step ... If you want it back, just look at the git history.	2024-01-24 07:22:37 -08:00
Charles Hall	6f052fff98	improve nix flake ... Also fix the comment in `Cargo.toml` about the rust-version stuff.	2024-01-24 07:22:37 -08:00
Charles Hall	e8ac881b2f	add an engage file ... See <https://charles.page.computer.surgery/engage/> for info.	2024-01-24 07:22:37 -08:00
Charles Hall	0d17aedae5	fix cargo doc lints ... Rustdoc (rightfully) thought the `[commandbody]` "tags" were broken links, so I've just made them links to nothing instead.	2024-01-24 07:22:37 -08:00
Charles Hall	ab1fff2642	fix cargo clippy lints	2024-01-24 07:22:37 -08:00
Charles Hall	92c5b6b86c	fix cargo check lints	2024-01-24 07:22:25 -08:00
Charles Hall	dc2f53e773	comment out heed backend things ... The code in conduit doesn't compile.	2024-01-18 12:27:48 -08:00
Timo Kösters	2475995102	Merge branch 'conduit/declare-1.5-support' into 'next' ... declare 1.5 support See merge request famedly/conduit!568	2024-01-17 17:56:21 +00:00
Charles Hall	835f4ad8cf	declare 1.5 support	2024-01-16 13:52:56 -08:00
Val Lorentz	8175bc1246	Explicitly match RoomVersionId::V11	2023-12-24 19:04:48 +01:00
Val Lorentz	eb7ac91cd5	Reuse existing get_room_version	2023-12-24 19:02:03 +01:00
Timo Kösters	ca6219723b	Merge branch 'conduit/envrc-shebang' into 'next' ... add shebang to .envrc See merge request famedly/conduit!566	2023-12-24 15:36:52 +00:00
Timo Kösters	40c7c248fb	Merge branch 'conduit/rm-presence-panic' into 'next' ... don't panic on missing presence status for a user See merge request famedly/conduit!565	2023-12-24 15:36:36 +00:00
Charles Hall	8f3f5c01f9	add shebang to .envrc ... All this really does is make syntax highlighting and shellcheck work by default in more editors.	2023-12-23 22:21:19 -08:00
Charles Hall	9d7f7b871b	don't panic on missing presence status for a user	2023-12-23 21:01:01 -08:00
Timo Kösters	30f0871e21	Merge branch 'sendjoin-signature-error' into 'next' ... Log underlying error when rejecting sendjoin response See merge request famedly/conduit!563	2023-12-11 15:11:42 +00:00
Val Lorentz	98e81c6217	Log underlying error when rejecting sendjoin response	2023-12-03 19:38:09 +01:00
Val Lorentz	5a7bb1e8f1	Return error instead of panic when first event is not m.room.create	2023-12-02 17:51:19 +01:00
Val Lorentz	520806d413	Use Ruma's redact_content_in_place instead of custom implementation	2023-12-01 19:12:23 +01:00
Val Lorentz	9646439a94	Enable support for room v11	2023-12-01 18:29:15 +01:00
Val Lorentz	fac995036a	create_hash_and_sign_event: Use actual version of RoomCreate events, instead of the default	2023-12-01 18:29:15 +01:00
Val Lorentz	18bfd79ef2	Remove "creator" key when upgrading rooms to v11	2023-12-01 18:28:51 +01:00
Val Lorentz	a3b8eea9b4	Move "redacts" key to "content" in redaction events in v11 rooms	2023-12-01 18:28:51 +01:00
Val Lorentz	d39d30008a	Remove "creator" property from rooms >= v11	2023-12-01 15:11:26 +01:00
AndSDev	f3b6b3e222	feat: send push notification on invite to invited user and etc	2023-11-07 12:46:53 +00:00
Timo Kösters	3bfdae795d	Merge branch 'sliding' into 'next' ... Sliding sync improvements and redaction fixes See merge request famedly/conduit!549	2023-09-13 18:57:57 +00:00
Timo Kösters	75c80df271	Sliding sync improvements and redaction fixes	2023-09-13 20:54:53 +02:00
Timo Kösters	094cb888d4	Merge branch 'badacl' into 'next' ... fix: ACL error shouldn't break the whole request See merge request famedly/conduit!542	2023-09-13 18:46:03 +00:00
Timo Kösters	fa725a14e2	Merge branch 'lukehmcc-next-patch-37096' into 'next' ... Update README.md to fix typo & fix compatibility with new versions of docker compose See merge request famedly/conduit!545	2023-09-11 18:34:06 +00:00
Luke McCarthy	9b3664aeeb	Update README.md to fix typo & fix compatibility with new versions of docker compose	2023-08-27 02:14:03 +00:00
Jonas Zohren	90fea00dc7	Merge branch 'docs-docker-coturn' into 'next' ... Docs: coturn instructions for docker See merge request famedly/conduit!498	2023-08-23 14:18:42 +00:00
Jonas Zohren	20924a44f1	Suggestion on how to generate a secure key	2023-08-23 11:17:47 +02:00
purplemeteorite	38d6426b0e	coturn setup instructions for docker	2023-08-23 11:09:21 +02:00
Timo Kösters	9b55ce933a	Back off from more events, don't retry auth events	2023-08-12 09:53:32 +02:00
Timo Kösters	f73a657a23	fix: ACL error shouldn't break the whole request	2023-08-11 20:29:22 +02:00
Timo Kösters	6dfb262ddf	Merge branch 'patch-3' into 'next' ... log handling previous event time as debug See merge request famedly/conduit!540	2023-08-11 09:27:42 +00:00
Timo Kösters	75cdc3a1f6	Merge branch 'roomversionwarnings' into 'next' ... Do not show "Invalid room version" errors when server is not in room See merge request famedly/conduit!541	2023-08-11 09:27:23 +00:00
Timo Kösters	11103a92ed	Do not show "Invalid room version" errors when server is not in room	2023-08-11 10:48:48 +02:00
girlbossceo	ce2017a10e	log handling previous event time as debug ... Signed-off-by: girlbossceo <june@girlboss.ceo>	2023-08-10 23:12:37 +00:00