continuwuity

magmaus3/continuwuity

Fork 0

Commit graph

91d5fbd56c Merge branch 'up-ruma' into 'next' Timo Kösters 2022-02-12 20:59:07 +00:00
d4217007fe

fix: do not panic on a JSON not containing the PDU M0dEx 2022-02-12 21:40:07 +01:00
35b82d51cf fix compilations Jonathan de Jong 2022-02-12 21:04:38 +01:00
0ed1e42aed update ruma Jonathan de Jong 2022-02-12 21:01:53 +01:00
2b644ef7b7 Merge branch 'tracing-cleanup' into 'next' Timo Kösters 2022-02-12 15:50:24 +00:00
0ad6eac4f8

Remove all tracing::instrument attributes from database::abstraction::* Jonas Platte 2022-02-12 16:28:43 +01:00
accdb77315

Clean up tracing::instrument attributes Jonas Platte 2022-02-12 15:03:30 +01:00
914152fcbd Merge branch 'syncfast' into 'next' Timo Kösters 2022-02-12 15:11:03 +00:00
2a00c547a1

improvement: faster /syncs Timo Kösters 2022-02-08 09:25:44 +01:00
adeb8ee425

Remove no-op conversions Jonas Platte 2022-02-12 15:03:07 +01:00
d74074ad53

Remove tracing::instrument attribute from util functions Jonas Platte 2022-02-12 15:01:28 +01:00
41d3da245e Merge branch 'update_turn_readme' into 'next' Timo Kösters 2022-02-12 13:04:07 +00:00
0565b5a6c8 Merge branch 'show-dns-setup-error' into 'next' Timo Kösters 2022-02-12 13:01:41 +00:00
f3502beb94 Merge branch 'welcome-message-command-hint' into 'next' Timo Kösters 2022-02-12 12:28:53 +00:00
d6b9874b35 Merge branch 'fix-admin-self-commands' into 'next' Timo Kösters 2022-02-12 12:27:57 +00:00
1d01e2a077 Merge branch 'axum' into 'next' Timo Kösters 2022-02-12 12:22:41 +00:00
ce714cfd07

Bump version Jonas Platte 2022-02-12 13:20:55 +01:00
50b24b37c2

Upgrade Ruma Jonas Platte 2022-02-12 02:06:30 +01:00
9db0473ed5

Improve error messages in Ruma wrapper FromRequest impl Jonas Platte 2022-02-09 14:03:38 +01:00
5d8c80b170

Strip quotes from X-Matrix fields Jonas Platte 2022-02-09 14:01:44 +01:00
21ae63d46b

Rewrite query parameter parsing Jonas Platte 2022-02-09 12:32:18 +01:00
c8951a1d9c

Use axum-server for direct TLS support Jonas Platte 2022-01-22 18:38:39 +01:00
5fa9190117

Simplify return type of most route handlers Jonas Platte 2022-01-22 16:58:32 +01:00
77a87881c9

Add message to unsupported HTTP method panic Jonas Platte 2022-01-22 15:03:58 +01:00
7bf538f549

Fix axum route conflicts Jonas Platte 2022-01-22 14:45:12 +01:00
a5757ab195

Generalize RumaHandler Jonas Platte 2022-01-22 13:51:55 +01:00
d1d2217019

Clean up error handling for server_server::get_server_keys_route Jonas Platte 2022-01-22 13:32:21 +01:00
1f7b3fa4ac

Port from Rocket to axum Jonas Platte 2022-01-20 11:51:31 +01:00
8709c3ae7b Merge branch 'refactor2' into 'next' Timo Kösters 2022-02-12 11:50:23 +00:00
5db4c001d1

Remove another unnecessary use of an event enum Jonas Platte 2022-02-12 01:58:36 +01:00
583ec51f9f

Remove unnecessary use of event enum Jonas Platte 2022-02-12 01:55:53 +01:00
f602d32aaa

feat: add the actual server name to the welcome message M0dEx 2022-02-11 18:51:28 +01:00
a6976e6d2d

feat: add 'available' to the help command line in the welcome message M0dEx 2022-02-11 18:40:51 +01:00
f2b8aa28f3

feat: add a line with the help command to the welcome message M0dEx 2022-02-11 18:26:56 +01:00
bfbefb0cd2 Display actual error message from TokioAsyncResolver, if any Andrej Kacian 2022-02-07 12:55:21 +01:00
31918bb990 Fix admin room processing commands from its own messages Andrei Vasiliu 2022-02-05 08:57:15 +02:00
f110b5710a Move appservice howto into whats-next; again, rename placeholder TURN url Torsten Flammiger 2022-02-04 21:11:50 +01:00
1cc0b55650 Resolve merge conflict Torsten Flammiger 2022-02-04 19:28:57 +01:00
63a2c6cce5 Add new TURN Readme and reference it from DEPLOY.md Torsten Flammiger 2022-02-04 19:11:29 +01:00
faa0cdb595 Merge branch 'next' into 'master' Jonas Zohren 2022-02-04 18:00:01 +00:00
0cec421930 Merge branch 'ci-hotfix-sytest-on-master' into 'next' Jonas Zohren 2022-02-04 17:51:57 +00:00
826b077e21

fix(ci): Always build debug version for sytest Jonas Zohren 2022-02-04 18:43:13 +01:00
9c8c784fe7 Merge branch 'next' into 'master' Timo Kösters 2022-02-04 17:37:26 +00:00
4dcc080ad9 Merge branch 'pre-release-doc-changes' into 'next' Jonas Zohren 2022-02-04 17:12:33 +00:00
d55992dc83 Merge branch 'jemallocfeature' into 'next' Timo Kösters 2022-02-04 17:08:03 +00:00
103dc7e09b

Pre-0.3 doc adjustments Jonas Zohren 2022-02-04 17:57:59 +01:00
dffa5570e7 Merge branch 'emptysearchcrash' into 'next' Timo Kösters 2022-02-04 16:42:56 +00:00
dd03608f17

use our own reqwest fork Timo Kösters 2022-02-04 17:24:45 +01:00
eb0b2c429f

fix: crash on empty search Timo Kösters 2022-02-04 17:15:21 +01:00
8d8edddb2e

feat: allow disabling jemalloc via feature Timo Kösters 2022-02-04 16:59:30 +01:00
f35ad27627 Merge branch 'contextfix' into 'next' Timo Kösters 2022-02-04 13:45:57 +00:00
72cd52e57c

fix: lazy loading for /context Timo Kösters 2022-02-04 13:30:42 +01:00
8db7d2c025 Merge branch 'asonix/encourage-reqwest-reuse' into 'next' Timo Kösters 2022-02-04 11:27:41 +00:00
51cca1a60f Merge branch 'create-admin-room' into 'next' Timo Kösters 2022-02-03 21:09:21 +00:00
e1c0dcb6bb Create admin room and hide migration messages on first run Andrei Vasiliu 2022-02-03 20:52:41 +02:00
86a9ec9f44 Merge branch 'up-ruma' into 'next' Timo Kösters 2022-02-03 19:41:47 +00:00
d23d6fbb37

Upgrade Ruma Jonas Platte 2022-02-03 20:23:35 +01:00
2d9c5791a6 Merge branch 'rocket-config' into 'next' Timo Kösters 2022-02-03 19:20:49 +00:00
92571d961f

Remove mutation from default_config and set default log_level to off Jonas Platte 2022-02-03 19:54:29 +01:00
7a388f4d72 Merge branch 'command-refactor' into 'next' Timo Kösters 2022-02-03 18:43:54 +00:00
b56efcdc2a Merge remote-tracking branch 'origin/next' into command-refactor Andrei Vasiliu 2022-02-03 20:28:43 +02:00
6399a7fe4e Remove dash from admin command help Andrei Vasiliu 2022-02-03 20:21:04 +02:00
79345dc2a6 Merge branch 'refactor' into 'next' Timo Kösters 2022-02-03 12:50:55 +00:00
974c10e739

Move Config out of database module Jonas Platte 2022-02-03 13:30:04 +01:00
ce60fc6859

Stop using set_env to configure tracing-subscriber Jonas Platte 2022-01-22 13:27:54 +01:00
abb4b4cf0b

Remove TryFrom, TryInto imports Jonas Platte 2022-02-03 13:24:04 +01:00
4bbff69a24 Merge remote-tracking branch 'origin/next' into command-refactor Andrei Vasiliu 2022-02-03 13:07:15 +02:00
b4755ba15b Merge branch 'tests' into 'next' Timo Kösters 2022-02-03 10:12:04 +00:00
9ef3abacd4

fix: initial state deserialize->serialize error Timo Kösters 2022-02-02 18:03:50 +01:00
87225e70c3 Parse admin command body templates from doc comments Andrei Vasiliu 2022-02-02 21:35:57 +02:00
510a44699d Merge branch 'fix-healthcheck-no-port' into 'next' Jonas Zohren 2022-02-02 14:07:49 +00:00
c4733676cf Apply feedback from Ticho Jonas Zohren 2022-02-02 13:35:15 +00:00
e5bac5e4f5

fix: Running in Docker Jonas Zohren 2022-02-02 14:07:35 +01:00
9478c75f9d

Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers Jonas Zohren 2022-02-01 23:51:38 +00:00
e24d75cffc

Return the ID of the appservice that was created by register_appservice Torsten Flammiger 2022-01-31 11:52:33 +01:00
8f69f02e59

add error handling for register_appservice too Torsten Flammiger 2022-01-31 10:07:49 +01:00
da7b55b39c

Cleanup appservice events after removing the appservice Torsten Flammiger 2022-01-31 09:27:31 +01:00
bfcf2db497

fix: mention dependencies to build from source user 2022-01-28 22:26:56 -08:00
a5f004d7e9

fix: signature mismatch on odd send_join servers Timo Kösters 2022-02-02 12:36:55 +01:00
004dfdeaac Merge branch 'ci-test-using-prebuilt-images' into 'next' Jonas Zohren 2022-02-01 23:51:38 +00:00
fa4099b138 Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers Jonas Zohren 2022-02-01 23:51:38 +00:00
caf9834e50

feat: cache capacity modifier Timo Kösters 2022-02-01 14:42:13 +01:00
23aecb78c7

fix: use to_lowercase on /register/available username Timo Kösters 2022-01-31 15:39:46 +01:00
e17bbdd42d

tests Timo Kösters 2022-01-28 17:26:43 +01:00
95ca43e20f Merge branch 'cleanup_events_after_unregister_appservice' into 'next' Timo Kösters 2022-01-31 13:24:01 +00:00
28d3b348d2 Return the ID of the appservice that was created by register_appservice Torsten Flammiger 2022-01-31 11:52:33 +01:00
78502aa6b1 add error handling for register_appservice too Torsten Flammiger 2022-01-31 10:07:49 +01:00
cc13112592 Cleanup appservice events after removing the appservice Torsten Flammiger 2022-01-31 09:27:31 +01:00
677f044d13 Refactor admin code to always defer command processing Andrei Vasiliu 2022-01-30 23:15:53 +02:00
fb2a7ebf66 Merge branch 'build-dependencies-deploy' into 'next' Timo Kösters 2022-01-29 08:35:54 +00:00
8ff95a5a48 fix: mention dependencies to build from source user 2022-01-28 22:26:56 -08:00
401b88d16d

fix: Healtcheck use netstat for port as fallback Jonas Zohren 2022-01-28 23:23:58 +01:00
8c1cf733b5 Merge branch 'fix-healthcheck-no-port' into 'next' Jonas Zohren 2022-01-28 21:48:25 +00:00
44f7a85077

fix: Use default port for healthcheck as fallback Jonas Zohren 2022-01-28 22:19:19 +01:00
b39ddf7be9 Rename reqwest clients, mention cheap client clones in comment Aode (lion) 2022-01-28 12:42:47 -06:00
296c68c0cd Merge branch 'get-thumbnail-mxc-as-ref' into 'next' Jonas Platte 2022-01-27 17:14:42 +00:00
529e88c7f9 Do not copy mxc string unnecessarily in db.get_thumbnail() Andrej Kacian 2022-01-27 17:47:09 +01:00
1059f35fdc use pre-constructed client for well-known requests also Aode (lion) 2022-01-27 10:19:28 -06:00
f8d1c1a8af Re-use a basic request in all possible cases Aode (Lion) 2022-01-24 18:42:15 -06:00
20006c91af Merge branch 'media-download-followup' into 'next' Timo Kösters 2022-01-27 16:24:15 +00:00