Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
320 Commits 157 Branches 36 Tags
6343eea4178336e50b77b5113d020516405b4dc6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timo Kösters 6343eea417 Merge pull request 'Docker add healthcheck and mention Docker Hub image' (#196) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/196
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-25 09:40:08 +02:00
Timo Kösters 0f524955b2 Merge pull request 'fix: send notification count updates when private read receipts change' (#194) from fixrr into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/194
 2020-08-24 13:39:39 +02:00
Timo 0c1cc8d82b Fix CI 2020-08-24 11:31:19 +02:00
Timo 33215d6099 fix: send notification count updates when private read receipts change 2020-08-24 10:46:20 +02:00
Timo Kösters 9aa5e99a0f Merge pull request 'fix: put reason of redaction in the redacted event' (#193) from redact into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/193
 2020-08-24 10:43:05 +02:00
Timo Kösters f0cb17d7a5 Merge branch 'master' into redact 2020-08-24 10:42:00 +02:00
Timo 38663228f5 fix: put reason of redaction in the redacted event 2020-08-23 16:47:27 +02:00
Timo Kösters 8e55623bde Merge pull request 'More Federation' (#181) from docs into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/181
 2020-08-23 16:15:01 +02:00
Timo 7ba9263cc6 improvement: show most recent PDUs first when searching 2020-08-23 16:14:11 +02:00
Timo 366554630a fix: account registration 2020-08-23 16:14:11 +02:00
Timo 804d097a18 fix: wake up /sync for typing events 2020-08-23 16:14:10 +02:00
Timo c092f06068 docs: /sync 2020-08-23 16:14:10 +02:00
Timo df936e8e7e improvement: guests are more spec-conform 2020-08-23 16:14:10 +02:00
Timo 64789537f5 fix: device list when leaving rooms 2020-08-23 16:14:09 +02:00
Timo 4323cf5fec improvement: device list works better 
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
 2020-08-23 16:14:09 +02:00
Timo f23fb32e95 fix: set limited to true when skipping messages in /sync 2020-08-23 16:14:09 +02:00
timokoesters e457e19088 feat: search pdus 2020-08-23 16:14:08 +02:00
Timo 27d35f5ab4 docs: fix /register method 2020-08-23 16:14:08 +02:00
Timo 69a7cb5142 fix dependency version 2020-08-23 16:14:07 +02:00
Timo 3ff17f69ad fmt 2020-08-23 16:14:07 +02:00
Timo 4be68eba76 feat: allow querying conduit's room list over federation 2020-08-23 16:14:07 +02:00
Timo 940f533d61 refactor: avoid some allocations when redacting 2020-08-23 16:14:06 +02:00
Timo 04eee089e0 feat: first steps towards joining rooms over federation 2020-08-23 16:14:06 +02:00
timokoesters f40f1d9f75 docs: endpoint documentation 2020-08-23 16:14:06 +02:00
Timo Kösters cfda76860b Merge pull request 'Make default server name more obvious' (#192) from spaetz/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/192
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-18 20:51:15 +02:00
Timo Kösters 6191c3bd00 Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-17 14:13:19 +02:00
Timo Kösters 2d96323d5f Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/184
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-13 09:04:22 +02:00
Timo Kösters 4b3d6e736f Merge pull request 'Alpine based Docker image' (#152) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/152
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-12 21:42:58 +02:00
Timo 2fc99c05e1 docs: add documentation to the repo and improve layout 2020-08-12 21:17:53 +02:00
Timo Kösters 0f1e3d8214 Merge pull request 'Make State struct constructable by lib user' (#178) from DevinR528/conduit:library-mode into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/178
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-04 08:03:41 +02:00
Timo Kösters 4a8bc93b1a Merge pull request 'Send invites only if invited during the sync request' (#176) from gnieto/conduit:fix/send-invite-when-needed into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/176
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-02 10:41:05 +02:00
Timo Kösters 935f0e6185 Merge pull request 'feat: handle /publicRooms pagination' (#174) from publicrooms-pagination into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/174
 2020-07-30 22:52:23 +02:00
timokoesters 98f37302a6 feat: handle /publicRooms pagination 2020-07-30 22:51:02 +02:00
Timo Kösters 5cfda2f5d3 Merge pull request 'feat: handle inhibit_login in /register' (#173) from inhibit-login into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/173
 2020-07-30 22:21:09 +02:00
timokoesters 0616acbde6 feat: handle inhibit_login in /register 2020-07-30 20:52:37 +02:00
Timo Kösters acc7b15981 Merge pull request 'refactor: put endpoints into modules' (#172) from route-files into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/172
 2020-07-30 19:09:43 +02:00
timokoesters c1c62b7eb4 refactor: put endpoints into modules 2020-07-30 18:34:03 +02:00
Timo Kösters 485a24398b Merge pull request 'Implement ignore invite when inviting user is ignored' (#164) from DevinR528/conduit:ignored-list-invite into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/164
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-30 15:27:08 +02:00
Timo Kösters 100e3d6d6d Merge pull request 'improvement: handle limit and set limited in /user_directory/search' (#169) from user-dir-limit into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/169
 2020-07-30 15:19:21 +02:00
timokoesters 52b1df6fd2 improvement: handle limit and set limited in /user_directory/search 2020-07-30 15:17:34 +02:00
Timo Kösters 18dcf44aa4 Merge pull request 'fix: send device list updates when user is in no rooms' (#170) from fix-set-up-encryption into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/170
 2020-07-30 14:46:27 +02:00
timokoesters ce460ea159 fix: send device list updates when user is in no rooms 2020-07-30 14:09:05 +02:00
Timo Kösters c824652de6 Merge pull request 'Fix clippy warnings and run rustfmt' (#163) from DevinR528/conduit:clippy-fix2 into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/163
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-30 08:20:31 +02:00
timokoesters b67372b11b refactor: make all mods in database pub 
Now they can easily export their own structs
 2020-07-29 21:48:31 +02:00
Timo Kösters 3ccbd02081 Merge pull request 'Long polling and more' (#162) from longpoll into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/162
 2020-07-29 21:17:58 +02:00
timokoesters e0d0fb4703 fix: only send device_one_time_keys_count when there are updates 2020-07-29 20:44:06 +02:00
timokoesters 66bc25fcd3 feat: implement /keys/changes 2020-07-29 18:05:16 +02:00
timokoesters 0693387769 improvement: more efficient /sync and only send device updates when sharing a room 2020-07-29 17:03:04 +02:00
timokoesters 310b0fcd86 fix ci 2020-07-29 13:05:38 +02:00
timokoesters d891bbb5dc improve: presence 2020-07-29 13:05:38 +02:00
timokoesters 05f9d927b8 fix: account data 2020-07-29 13:05:37 +02:00
timokoesters 21eb8d4fe3 fix: problems with pdu serialization 2020-07-29 12:59:40 +02:00
timokoesters dd3dab39ae feat: whoami route 2020-07-29 12:59:40 +02:00
timokoesters 489cbc0a93 refactor: use <_> instead of <_parameter_name> 2020-07-29 12:59:36 +02:00
Timo Kösters c4260bde81 Merge pull request 'Timo's Conditionally emit rocket::http_verb attr macros if lib/bin' (#157) from timo-make-lib into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/157
 2020-07-27 20:40:30 +02:00
Timo Kösters b82fd02ee3 Merge pull request 'Implement /rooms/<room_id>/joined_members' (#143) from joined_members into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/143
 2020-07-27 18:22:04 +02:00
Timo Kösters fdb7b8f0f1 Merge pull request 'Implement max_request_size config option' (#153) from media-size-config into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/153
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-27 18:08:50 +02:00
timokoesters 5f47cbf7dc improvement: documentation 2020-07-27 18:06:36 +02:00
Timo Kösters 3451b10a4b Merge pull request 'Fix CI' (#161) from fix-ci into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/161
 2020-07-27 08:21:34 +02:00
timokoesters 2765071201 Fix CI 2020-07-27 08:19:14 +02:00
Timo Kösters 75d91b9064 Merge pull request 'feat: encryption_disabled config option' (#160) from disable-encryption-config into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/160
 2020-07-27 08:15:04 +02:00
timokoesters 808a7deae3 cargo fmt 2020-07-26 22:45:10 +02:00
timokoesters dc5fb7e33a feat: encryption_disabled config option 
Can be used with ROCKET_ENCRYPTION_DISABLED=true
 2020-07-26 22:41:29 +02:00
Timo Kösters c3d142ad28 Merge pull request 'fix: stop /messages at to' (#159) from fix-to into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/159
 2020-07-26 22:21:39 +02:00
timokoesters b7df8fe83c fix: stop /messages at to 
Fixes #150
 2020-07-26 22:21:05 +02:00
Timo Kösters 20ab19d828 Merge pull request 'Upgrade ruma' (#158) from jplatte/conduit:up-ruma into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/158
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-26 17:20:11 +02:00
Timo Kösters f8544bf6e3 Merge pull request 'improvement: only remove to-device events when sure the client received them' (#139) from improve-to-device-removal into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/139
 2020-07-26 14:14:08 +02:00
timokoesters 16576d19cd improvement: only remove to-device events when sure the client received them 
To make this work, I had to remove the recommended limit of 100
to-device events per /sync
(https://matrix.org/docs/spec/client_server/latest#id72)
 2020-07-26 13:59:19 +02:00
Timo Kösters 678f33acf9 Merge pull request 'Moving to ruma-monorepo' (#133) from DevinR528/conduit:ruma-mono into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/133
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-25 22:02:45 +02:00
Timo Kösters be43b9557e Merge pull request 'improvement: switch to stable rust' (#151) from stable into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/151
 2020-07-23 10:23:01 +02:00
timokoesters d8e1248df6 improvement: switch to stable rust 2020-07-22 22:42:01 +02:00
Timo Kösters 9c095f1538 Update README, fix CI (#148) 
Update 'README.md'

Update README, fix CI

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/148
 2020-07-16 07:50:11 +02:00
Timo Kösters b9de21949d Update to rocket master (#147) 
Merge branch 'master' into rocket

Update to rocket master

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/147
 2020-07-14 18:23:26 +02:00
Timo Kösters b03d030b71 Merge pull request 'Improve README' (#145) from readme into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/145
 2020-07-11 09:57:43 +02:00
timokoesters f361cb3d39 Improve README 2020-07-11 09:55:44 +02:00
Timo Kösters 8409146415 Merge pull request 'Implement /logout/all' (#141) from CapsizeGlimmer/conduit:logout-all into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/141
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-09 19:21:12 +02:00
Timo Kösters e809d819ac Merge pull request 'Key backups and cross signing' (#132) from cross-signing into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/132
 2020-06-26 19:01:32 +02:00
timokoesters b83fba5c44 chore: update dependencies 2020-06-26 18:04:08 +02:00
timokoesters 54ad1fbed9 fix: CI 2020-06-26 16:26:29 +02:00
timokoesters 05f1f73e10 improvement: upgrade to sled 0.32 
BREAKING CHANGE: old databases are not compatible anymore
 2020-06-26 16:26:28 +02:00
timokoesters 24c544f650 fix: DMs show up as rooms 2020-06-26 15:16:15 +02:00
timokoesters a49a572d76 feat: cross-signing 2020-06-26 15:16:15 +02:00
timokoesters 7031240af3 improvement: /members route 2020-06-16 23:25:15 +02:00
timokoesters 02fe030b2a improvement: better default push rules 2020-06-16 23:25:14 +02:00
Timo Kösters e7803e310a Merge pull request 'fix: update rocket version' (#127) from fix into master 2020-06-16 13:55:20 +02:00
timokoesters db685e0cf7 fix: update rocket version 2020-06-16 13:53:15 +02:00
Timo Kösters 0f72bd9f32 Merge pull request 'fix: update ruma version' (#125) from fix into master 2020-06-16 12:21:12 +02:00
timokoesters 13d474f6ee fix: update ruma version 2020-06-16 12:19:58 +02:00
Timo Kösters bc959f7634 Merge pull request 'Update 'README.md'' (#123) from timo-patch-1 into master 2020-06-16 08:44:24 +02:00
Timo Kösters 853ccd6fbf Update 'README.md' 2020-06-16 08:43:46 +02:00
Timo Kösters b0bbc049fa Merge pull request 'Update 'README.md'' (#122) from timo-bitcoin into master 2020-06-16 08:42:13 +02:00
Timo Kösters c6194b27a3 Update 'README.md' 2020-06-16 08:21:06 +02:00
Timo Kösters 7b23069943 Merge pull request 'Remove unused imports' (#119) from PublicByte/conduit:remove-unused-imports into master 2020-06-11 22:34:49 +02:00
Timo Kösters 4c98079c4c Merge pull request 'refactor: better error handling' (#116) from error-handling into master 2020-06-11 15:21:23 +02:00
timokoesters 56d4742201 improvement: log bad database errors automatically 2020-06-11 14:58:44 +02:00
timokoesters 2368a90584 refactor: better error handling 2020-06-11 13:14:35 +02:00
Timo Kösters 80935c5826 Merge pull request 'fix' (#115) from uiaa into master 2020-06-08 15:19:48 +02:00
timokoesters f2a5d46628 fix 2020-06-08 15:17:58 +02:00
Timo Kösters c681f0c494 Merge pull request 'Uiaa + Close registration + optimizations' (#113) from uiaa into master 2020-06-08 14:30:45 +02:00
timokoesters 95047272e8 fix: let example config show how to use registration_disabled 2020-06-08 14:29:44 +02:00