Timo Kösters
37b4a1cd0d
Merge branch 'dbg_clippy' into 'master'
...
Add dbg_macro check
See merge request famedly/conduit!75
2021-05-12 18:44:01 +00:00
Timo Kösters
68c5c57486
Merge branch 'improvements' into 'master'
...
improvement: bug fixes and refactors
See merge request famedly/conduit!78
2021-05-12 18:29:26 +00:00
Timo Kösters
f62258ba35
improvement: bug fixes and refactors
...
- power level content override adds to the default event instead of
replacing it
- sending code refactored to make edus possible
- remove presence events when restarting conduit
- remove room_id field from read receipts over /sync
- handle incoming read receipts
- fix array bounds bug in server_server.rs
2021-05-12 20:15:24 +02:00
Timo Kösters
ad5e51dc25
Merge branch 'up-ruma' into 'master'
...
Upgrade Ruma
See merge request famedly/conduit!77
2021-05-08 07:46:26 +00:00
Timo Kösters
bd16850fd4
Merge branch 'trusted' into 'master'
...
fix: add trusted_servers to config and deploy guide
See merge request famedly/conduit!74
2021-05-05 10:42:55 +00:00
Timo Kösters
3408d74f93
fix: add trusted_servers to config and deploy guide
2021-05-05 12:27:49 +02:00
Timo Kösters
861cc76363
Merge branch 'uiaa' into 'master'
...
improvement: uiaa works like in synapse
See merge request famedly/conduit!73
2021-05-05 10:18:26 +00:00
Timo Kösters
cf94b8e712
improvement: uiaa works like in synapse
2021-05-04 19:05:30 +02:00
Timo Kösters
b42d34858e
Merge branch 'up-ruma' into 'master'
...
Upgrade ruma and clean up request sending code
See merge request famedly/conduit!72
2021-05-02 16:59:31 +00:00
Timo Kösters
27d25914e1
Merge branch 'roomdir' into 'master'
...
improvement: optimize room directory
Closes #36
See merge request famedly/conduit!71
2021-04-28 15:58:54 +00:00
Timo Kösters
3c3062a316
improvement: optimize room directory
2021-04-28 17:56:15 +02:00
Timo Kösters
d35ad69af1
Merge branch 'up-ruma' into 'master'
...
Bump ruma
See merge request famedly/conduit!70
2021-04-28 09:44:04 +00:00
Timo Kösters
f9f37cfcf8
Merge branch 'invites' into 'master'
...
feat: send invites over federation
Closes #53
See merge request famedly/conduit!69
2021-04-26 16:53:53 +00:00
Timo Kösters
58463bba93
feat: send invites over federation
2021-04-25 14:10:21 +02:00
Timo Kösters
abe176e3d0
Merge branch 'sending' into 'master'
...
fix: send transaction retry code
See merge request famedly/conduit!68
2021-04-24 21:17:18 +00:00
Timo Kösters
3dfc245633
fix: send transaction retry code
2021-04-24 18:26:41 +02:00
Timo Kösters
dd0b2597b7
Merge branch 'signatures' into 'master'
...
feat: verify signatures for incoming requests
Closes #77
See merge request famedly/conduit!65
2021-04-24 12:55:41 +00:00
Timo Kösters
2fc1ec2ad5
fix: logging
2021-04-24 13:34:35 +02:00
Timo Kösters
226045ea4b
improvement: warning on misconfigured reverse proxy
2021-04-24 12:29:02 +02:00
Timo Kösters
23f81bfaf7
chore: update dependencies
2021-04-24 12:18:19 +02:00
Timo Kösters
bb234ca002
fix: only show one typing event per user
2021-04-24 12:17:45 +02:00
Timo Kösters
6e84d317b2
improvement: update ruma
2021-04-24 12:17:44 +02:00
Timo Kösters
1f84013b2a
feat: verify signatures for incoming requests
2021-04-24 12:17:44 +02:00
Timo Kösters
f89e3668fd
Merge branch 'deploy-proxy' into 'master'
...
Document proper proxy options in DEPLOY.md
See merge request famedly/conduit!67
2021-04-24 08:57:11 +00:00
Timo Kösters
8c72909bb8
Merge branch 'tls-name' into 'master'
...
Validate TLS certificates according to Matrix spec
See merge request famedly/conduit!60
2021-04-23 05:22:07 +00:00
Timo Kösters
14c7ecf722
Merge branch 'improvements' into 'master'
...
Implement /devices
Closes #62
See merge request famedly/conduit!64
2021-04-21 09:03:18 +00:00
Timo Kösters
2f440e644d
fix: clippy
2021-04-21 10:59:07 +02:00
Timo Kösters
71ed1b295a
feat: /devices route
2021-04-21 10:51:56 +02:00
Timo Kösters
e815486030
fix: don't allow inviting other users (not implemented yet)
2021-04-21 10:00:23 +02:00
Timo Kösters
1937cf554f
Merge branch 'add-ci' into 'master'
...
Add basic CI
See merge request famedly/conduit!41
2021-04-20 12:23:28 +00:00
Timo Kösters
9adcc20335
Merge branch 'update-readme' into 'master'
...
docs: update readme
See merge request famedly/conduit!63
2021-04-20 11:21:18 +00:00
Timo Kösters
4c4e1f9027
docs: update readme
2021-04-20 13:07:00 +02:00
Timo Kösters
ad19264c38
Merge branch 'fix-fetch' into 'master'
...
fix: bug when fetching events over federation
See merge request famedly/conduit!62
2021-04-19 10:00:47 +00:00
Timo Kösters
0b9182455c
fix: use working email
2021-04-19 11:57:17 +02:00
Timo Kösters
d4e0ba245b
fix: bug when fetching events over federation
2021-04-19 11:55:27 +02:00
Timo Kösters
0b89ffe566
Merge branch 'make-join' into 'master'
...
feat: make_join, send_join and /directory
See merge request famedly/conduit!59
2021-04-16 21:15:27 +00:00
Timo Kösters
eedac4fd96
feat: make_join, send_join and /directory
2021-04-16 18:18:29 +02:00
Timo Kösters
6d109b9902
Merge branch 'mdformatting' into 'master'
...
docs: Fix markdown formatting in DEPLOY.md
See merge request famedly/conduit!58
2021-04-16 09:24:52 +00:00
Timo Kösters
18398e1f17
Merge branch 'bump-stateres' into 'master'
...
Bump stateres
See merge request famedly/conduit!57
2021-04-14 15:47:00 +00:00
Timo Kösters
04b08d4505
chore: bump stateres
2021-04-14 17:46:17 +02:00
Timo Kösters
f6c4da829e
Merge branch 'better-joining' into 'master'
...
improvement: use invite state as hints to what servers to ask for joining
See merge request famedly/conduit!56
2021-04-14 13:06:14 +00:00
Timo Kösters
bc98425dfe
improvement: use invite state as hints to what servers to ask for joining
2021-04-14 14:46:40 +02:00
Timo Kösters
d6b59cd20c
Merge branch 'develop' into 'master'
...
State resolution overhaul
See merge request famedly/conduit!53
2021-04-14 11:36:53 +00:00
Timo Kösters
001d8dc257
fix: don't do expensive operation on local /send
2021-04-14 12:55:14 +02:00
Timo Kösters
c1953efa6b
chore: code cleanup
2021-04-14 10:43:31 +02:00
Timo Kösters
abddfc2d2a
Merge remote-tracking branch 'famedly/master' into develop
2021-04-14 10:26:28 +02:00
Timo Kösters
5951294638
feat: join cursed rooms
...
this removes several restrictions and tries to continue verifying a pdu
event if some auth events fail (it drops/ignores bad pdus)
2021-04-14 09:39:06 +02:00
Timo Kösters
8b40e0a85f
improvement: fetch signing keys in parallel when joining a room
2021-04-13 22:54:01 +02:00
Timo Kösters
5049d0e01b
improvement: check signatures on join
2021-04-13 18:17:51 +02:00
Timo Kösters
b4f79b77ba
feat: reject invites over federation
2021-04-13 17:41:14 +02:00
Timo Kösters
662a0cf1df
improvement: better and more efficient message count calculation
2021-04-12 12:40:16 +02:00
Timo Kösters
1dc85895a7
fix: show warning for invalid user ids
2021-04-12 10:12:52 +02:00
Timo Kösters
a961732f5f
fix: overflow
2021-04-11 21:35:17 +02:00
Timo Kösters
a8231eef25
fix: alias parsing
2021-04-11 21:29:37 +02:00
Timo Kösters
8773e5013d
feat: incoming invites over federation
2021-04-11 21:04:31 +02:00
Timo Kösters
b427395648
Merge branch 'add-vscode-settings' into 'master'
...
Add settings.json for vscode rust-analyzer
See merge request famedly/conduit!45
2021-04-11 10:56:38 +00:00
Timo Kösters
b4bbbd26bf
Merge branch 'MTRNord/propose-better-systemd-user' into 'master'
...
fix: Do not run conduit as root instead use a separate user
See merge request famedly/conduit!49
2021-04-11 10:52:52 +00:00
Timo Kösters
b0ea692706
fix: malformed pushrule error when event does not trigger any actions
2021-04-11 10:50:30 +02:00
Timo Kösters
588de12d79
fix: lost forward extremity
2021-04-11 10:12:29 +02:00
Timo Kösters
044e65afcc
fix: move back to sled stable
2021-04-11 10:12:05 +02:00
Timo Kösters
84f4ce73e5
fix: membership deserializing
2021-04-09 21:45:22 +02:00
Timo Kösters
51aa6448bc
fix: use sled main to avoid deadlock
2021-04-07 17:58:33 +02:00
Timo Kösters
f3f95a73d0
improvement: /event route
2021-04-07 15:57:23 +02:00
Timo Kösters
d0cdbe2e2b
Merge branch 'up-ruma' into 'develop'
...
Upgrade ruma
See merge request famedly/conduit!48
2021-04-07 13:55:31 +00:00
Timo Kösters
c9b1f0ca83
Merge branch 'k0gen-master-patch-33282' into 'master'
...
No need to log out and back in fix
See merge request famedly/conduit!47
2021-04-03 13:04:55 +00:00
Timo Kösters
db7044a950
sytest test
2021-03-26 13:41:05 +01:00
Timo Kösters
8c6a49bec3
Merge branch 'update_CI_for_develop' into 'develop'
...
Update Complement CI container
See merge request famedly/conduit!46
2021-03-26 12:31:34 +00:00
Timo Kösters
cd4dc13731
fix: use correct room versions
2021-03-26 13:30:17 +01:00
Timo Kösters
c213769d9f
improvement: refactor state res and fix a few bugs in the process
2021-03-25 23:55:40 +01:00
Timo Kösters
16eed1d8c2
chore: get rid of warnings
2021-03-24 12:44:10 +01:00
Timo Kösters
e50f2864de
improvement: save state for send_join pdu
2021-03-24 11:46:15 +01:00
Timo Kösters
e305889b72
feat: room_account_data endpoints
2021-03-24 08:48:28 +01:00
Timo Kösters
1d00a8c41f
improvement: better logging
...
Use CONDUIT_LOG or the log setting in the config
2021-03-23 22:06:09 +01:00
Timo Kösters
46d8f36a2c
fix: media thumbnail calculation and appservice detection
2021-03-23 21:18:16 +01:00
Timo Kösters
3ea7d162db
fix: various improvements and fixes
2021-03-23 12:59:27 +01:00
Timo Kösters
363c629faf
fix: signature key fetching, optimize push sending
2021-03-22 14:04:41 +01:00
Timo Kösters
d4c76f4654
chore: update ruma
2021-03-18 19:38:08 +01:00
Timo Kösters
f775c76d8a
chore: get rid of warnings
2021-03-18 18:33:43 +01:00
Timo Kösters
abe9122df6
Merge branch 'more-gitignore' into 'master'
...
Add more gitignore
See merge request famedly/conduit!42
2021-03-18 17:09:04 +00:00
Timo Kösters
5cb15551f3
improvement: use db compression
2021-03-18 13:13:08 +01:00
Timo Kösters
a0fa0ee7a0
fix: join appservice room with alias
2021-03-18 12:03:44 +01:00
Timo Kösters
a77fcd106e
feat: implement /state_ids and fix federation stuff
2021-03-18 00:11:13 +01:00
Timo Kösters
100307c936
improvement: optimize state storage
2021-03-17 22:31:28 +01:00
Timo Kösters
44425a903a
fix: multiple federation/pusher fixes
2021-03-16 18:00:46 +01:00
Timo Kösters
21f785d530
Merge branch 'correct-sendtxn' into pushers
2021-03-15 09:56:04 +01:00
Timo Kösters
6da40225bb
improvement: make state res actually work
2021-03-13 16:30:12 +01:00
Timo Kösters
e785ff6f56
Merge branch 'sled-no-metrics' into 'master'
...
fix: avoid illegal instruction crash
See merge request famedly/conduit!38
2021-03-12 17:29:47 +00:00
Timo Kösters
7bc58461cd
fix: avoid illegal instruction crash
...
see https://github.com/spacejam/sled/issues/1232
2021-03-12 16:22:35 +01:00
Timo Kösters
6538d91567
Merge branch 'readme' into 'master'
...
docs: add icon and license to readme
See merge request famedly/conduit!37
2021-03-04 20:37:50 +00:00
Timo Kösters
96431069a9
docs: add icon and license to readme
2021-03-04 21:37:24 +01:00
Timo Kösters
3436e844c2
Merge branch 'valkum-master-patch-62987' into 'master'
...
Fix Complement CI paths
See merge request famedly/conduit!36
2021-03-04 17:51:52 +00:00
Timo Kösters
643109309b
Merge branch 'incoming-pdu' into 'master'
...
fix: don't accept incoming pdus if we know about them already
Closes #70
See merge request famedly/conduit!33
2021-03-04 14:38:07 +00:00
Timo Kösters
03440f4b15
Merge branch 'readme' into 'master'
...
docs: small readme changes
See merge request famedly/conduit!35
2021-03-04 14:35:12 +00:00
Timo Kösters
79c910efdf
Merge branch 'clippy_again' into 'master'
...
Fix more clippy errors in master
See merge request famedly/conduit!34
2021-03-04 14:30:28 +00:00
Timo Kösters
bb1064ce04
docs: small readme changes
2021-03-04 15:28:28 +01:00
Timo Kösters
1ce00f90fe
fix: don't accept incoming pdus if we know about them already
2021-03-04 13:37:16 +01:00
Timo Kösters
bd6507eafb
Merge branch 'valkum-master-patch-25423' into 'master'
...
Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23
2021-03-04 12:35:12 +00:00
Timo Kösters
eaeba35f3c
Merge branch 'valkum/complement' into 'master'
...
Sync paths with CI pipeline due to dockerignore
See merge request famedly/conduit!24
2021-03-04 12:32:55 +00:00
Timo Kösters
3e274d7d2c
Merge branch 'valkum/conduit-update_rocket' into 'master'
...
update dependencies
See merge request famedly/conduit!32
2021-03-04 12:32:22 +00:00
Timo Kösters
105f893cf3
chore: bump other dependencies to make it work
2021-03-04 12:29:08 +01:00