1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-18 02:50:51 +01:00
Commit graph

2092 commits

Author SHA1 Message Date
timokoesters
b7f7a39973
feat: kick,ban,unban user route 2020-06-04 16:51:36 +02:00
timokoesters
a8df1acdfd
feat: load replies, forward pagination 2020-06-04 13:58:55 +02:00
Timo Kösters
c655870d23 Merge pull request 'Small fixes' (#98) from fix into master 2020-06-04 12:05:54 +02:00
timokoesters
168f2281fd
improvement: bundle typing events and only send on changes
Fixes #67 and #49
2020-06-04 11:17:36 +02:00
timokoesters
8328eeb5ac
Make sytest not fail 2020-06-04 09:53:26 +02:00
timokoesters
1c85b0fd05
remove tests in favor of sytests 2020-06-04 09:48:33 +02:00
timokoesters
b192fddf2f
fix: show device display names 2020-06-04 09:48:32 +02:00
timokoesters
325e373684
refactor: small changes 2020-06-03 22:30:51 +02:00
timokoesters
19c9e4b916
fix: room version 6 2020-06-03 22:30:50 +02:00
Timo Kösters
77318af563 Merge pull request 'Implement devices API (#20)' (#97) from fix into master 2020-06-03 14:12:01 +02:00
gnieto
0883c44659
Implement devices API (#20)
small improvements

Cargo fmt

Simplify insert and update methods

Review feedback

Remove has_device method calls

Load all devices with a single db call

Remove device as in logout

Put all metadata on the same tree

Create userdevice key fucntion

Implement devices API

Implement all the devices endpoints. There's a couple of pending tasks:

- Integrate the "logout" logic once it lands to master (this should
  remove the given device from the database).
- Track and store last seen timestamp and IP.

Co-authored-by: timokoesters <timo@koesters.xyz>
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
2020-06-03 14:09:50 +02:00
gnieto
ed9b544ace Implement devices API (#20)
small improvements

Cargo fmt

Simplify insert and update methods

Review feedback

Remove has_device method calls

Load all devices with a single db call

Remove device as in logout

Put all metadata on the same tree

Create userdevice key fucntion

Implement devices API

Implement all the devices endpoints. There's a couple of pending tasks:

- Integrate the "logout" logic once it lands to master (this should
  remove the given device from the database).
- Track and store last seen timestamp and IP.

Co-authored-by: timokoesters <timo@koesters.xyz>
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
2020-06-03 13:41:30 +02:00
Timo Kösters
720d48bd67 Merge pull request 'get_state_events_for_key_route returns the content of the requested event instead of the all event.' (#95) from jbbouille/conduit:fix-get_state_events_for_key_route-returning-all-event into master 2020-06-03 10:27:13 +02:00
Jean-Baptiste Petit
1222289c75 get_state_events_for_key_route return the content of the requested event instead of the all event. 2020-06-03 09:30:34 +02:00
Timo Kösters
0a1c4f3649 Merge pull request 'Black list temporaly some room creation tests.' (#50) from jbbouille/conduit:blacklist_some_creation_room_tests into master 2020-06-02 14:44:51 +02:00
Jean-Baptiste Petit
75e75c3b2f Black list temporaly some room creation tests. 2020-06-02 13:57:41 +02:00
Timo Kösters
4c2c0e2458 Merge pull request 'Better notifications and fix redactions' (#44) from notification into master 2020-06-01 22:25:24 +02:00
timokoesters
5a47c75427
fix: make redactions permanent 2020-06-01 20:58:49 +02:00
timokoesters
b519bc6962
fix: only show notifications for messages 2020-06-01 20:16:18 +02:00
Timo Kösters
3aa0c8ed25 Merge pull request 'Room visibility, aliases and redaction' (#40) from alias into master 2020-05-31 10:23:04 +02:00
timokoesters
4e507ef706
feat: room visibility and aliases 2020-05-31 09:46:11 +02:00
timokoesters
9c26e22ad7
improvement: load aliases from database 2020-05-31 08:01:11 +02:00
timokoesters
18bf67748c
feat: redaction 2020-05-31 08:01:10 +02:00
Timo Kösters
16538a6c16 Update 'README.md' 2020-05-29 10:04:19 +02:00
Timo Kösters
55842a0e57 Update 'README.md' 2020-05-29 09:54:30 +02:00
Timo Kösters
25ebde5af8 Merge pull request 'fix: /register lowercases user ids' (#28) from lowercase into master 2020-05-27 08:26:32 +02:00
timokoesters
ca77c79222
fix: /register lowercases user ids
fixes #24
2020-05-27 07:09:23 +02:00
Timo Kösters
dd80a8591d Merge pull request 'Get device_id from body instead of auth data' (#27) from gnieto/conduit:fix/create-device into master 2020-05-27 07:03:21 +02:00
Guillem Nieto
4b3b562347 Get device_id from body instead of auth data
Device_id was retrieved from the auth data instead of login's body and
this was causing that a new device was created on every login.

This is (I guess) provoking that some sytests are failing (for example,
"POST /login returns the same device_id as that in the request").
2020-05-26 21:06:54 +02:00
Timo Kösters
d0e5a39d1d Merge pull request 'Move create room test into blacklist - fixes #23' (#26) from jbbouille/conduit:remove_create_public_room_test into master 2020-05-26 16:57:11 +02:00
Jean-Baptiste Petit
43ed80c6c2 Move create room test into blacklist - fixes #23 2020-05-26 16:01:38 +02:00
timokoesters
58683585cc
improvement: show more info in public rooms list 2020-05-25 20:16:36 +02:00
Timo Kösters
63c62a4afa Update 'README.md' 2020-05-25 17:36:54 +02:00
Timo Kösters
1096c2847b Merge pull request 'Access control' (#22) from control into master 2020-05-25 16:59:40 +02:00
timokoesters
b6c0e9bfb2
feat: access control 2020-05-25 16:40:00 +02:00
timokoesters
c8ba9dce01
feat: proper room creation 2020-05-25 16:39:58 +02:00
josias
b106d1393b Add logout route and database methods (#21)
Condense keys

Move remove methods to remove_device

Code cleanup

Add method for removing todevice events

Remove unnecessary existence checks

Add logout route and database methods

Co-authored-by: Josias <justjosias@tutanota.com>
2020-05-24 22:10:09 +02:00
timokoesters
1014388a9c
fix: one time keys are never removed 2020-05-23 19:17:55 +02:00
timokoesters
5d6542a8a6
improvement: video link in readme 2020-05-21 18:10:04 +02:00
timokoesters
d95e8b4880
fix: problem with to-device for all devices 2020-05-21 13:52:54 +02:00
timokoesters
43478a5870
fix: send correct membership events when joining / creating rooms 2020-05-20 09:24:44 +02:00
timokoesters
8df2a1a072
improvement: add room topic to public room dir 2020-05-20 00:12:07 +02:00
timokoesters
e0fccffde0
fix: changing avatar url now sends room events 2020-05-19 23:52:02 +02:00
timokoesters
ada260bf42
fix: use png for thumbnails 2020-05-19 23:51:37 +02:00
Timo Kösters
cf91996336 Merge pull request 'fix: riot sometimes freaks out when refreshing' (#18) from media into master 2020-05-19 23:02:42 +02:00
timokoesters
eb4af85765
fix: riot sometimes freaks out when refreshing 2020-05-19 22:56:28 +02:00
Timo Kösters
108d8988d8 Merge pull request 'feat: image thumbnails' (#17) from media into master 2020-05-19 20:01:13 +02:00
timokoesters
d544d28b6e
feat: image thumbnails 2020-05-19 19:59:52 +02:00
timokoesters
61f4f2c716
improvement: implement GET publicRooms 2020-05-19 16:28:03 +02:00
timokoesters
821c608c6a
feat: media 2020-05-18 22:50:42 +02:00