Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
672bf4f4
"README.md" did not exist on "1264c8ac89e5bfa757acee8d26437f14621206a4"
Commit
672bf4f4
authored
4 years ago
by
Devin Ragotzy
Browse files
Options
Downloads
Patches
Plain Diff
Cargo lock update and a few doc additions
parent
fe795d38
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Cargo.lock
+11
-11
11 additions, 11 deletions
Cargo.lock
src/client_server/config.rs
+1
-5
1 addition, 5 deletions
src/client_server/config.rs
src/client_server/room.rs
+1
-0
1 addition, 0 deletions
src/client_server/room.rs
src/database/rooms.rs
+1
-1
1 addition, 1 deletion
src/database/rooms.rs
with
14 additions
and
17 deletions
Cargo.lock
+
11
−
11
View file @
672bf4f4
...
...
@@ -144,9 +144,9 @@ dependencies = [
[[package]]
name = "autocfg"
version = "1.0.
0
"
version = "1.0.
1
"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d
"
checksum = "
cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
"
[[package]]
name = "backtrace"
...
...
@@ -247,9 +247,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "cc"
version = "1.0.5
8
"
version = "1.0.5
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518
"
checksum = "
66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381
"
[[package]]
name = "cfg-if"
...
...
@@ -960,9 +960,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.7
4
"
version = "0.2.7
6
"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10
"
checksum = "
755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3
"
[[package]]
name = "lock_api"
...
...
@@ -1358,9 +1358,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
version = "0.2.
8
"
version = "0.2.
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea
"
checksum = "
c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20
"
[[package]]
name = "proc-macro-crate"
...
...
@@ -2088,7 +2088,7 @@ checksum = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
[[package]]
name = "state-res"
version = "0.1.0"
source = "git+https://github.com/ruma/state-res#
4e9b428c0db50ac3a3421ced12a6fd202a1c36a3
"
source = "git+https://github.com/ruma/state-res#
d93a965ad17781fa9554bb3cea71673c054b9f3f
"
dependencies = [
"itertools",
"js_int",
...
...
@@ -2179,9 +2179,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
[[package]]
name = "syn"
version = "1.0.3
8
"
version = "1.0.3
9
"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "
e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c
1f
4
"
checksum = "
891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f1
1f
9
"
dependencies = [
"proc-macro2",
"quote",
...
...
This diff is collapsed.
Click to expand it.
src/client_server/config.rs
+
1
−
5
View file @
672bf4f4
...
...
@@ -56,11 +56,7 @@ pub fn get_global_account_data_route(
let
data
=
db
.account_data
.get
::
<
Raw
<
ruma
::
events
::
AnyBasicEvent
>>
(
None
,
sender_id
,
EventType
::
try_from
(
&
body
.event_type
)
.expect
(
"EventType::try_from can never fail"
),
)
?
.get
::
<
Raw
<
ruma
::
events
::
AnyBasicEvent
>>
(
None
,
sender_id
,
body
.event_type
.clone
()
.into
())
?
.ok_or
(
Error
::
BadRequest
(
ErrorKind
::
NotFound
,
"Data not found."
))
?
;
Ok
(
get_global_account_data
::
Response
{
account_data
:
data
}
.into
())
...
...
This diff is collapsed.
Click to expand it.
src/client_server/room.rs
+
1
−
0
View file @
672bf4f4
...
...
@@ -195,6 +195,7 @@ pub fn create_room_route(
content
:
match
preset
{
create_room
::
RoomPreset
::
PublicChat
=>
{
serde_json
::
to_value
(
guest_access
::
GuestAccessEventContent
::
new
(
// In a public room a joining is the only way to access
guest_access
::
GuestAccess
::
Forbidden
,
))
.expect
(
"event is valid, we just created it"
)
...
...
This diff is collapsed.
Click to expand it.
src/database/rooms.rs
+
1
−
1
View file @
672bf4f4
...
...
@@ -722,7 +722,7 @@ pub fn build_and_append_pdu(
}
EventType
::
RoomMember
=>
event_auth
::
is_membership_change_allowed
(
// TODO this is a bit of a hack but not sure how to have a type
// declared in `state_res` crate
b
e
// declared in `state_res` crate e
asily convert to/from conduit::PduEvent
Requester
{
prev_event_ids
:
prev_events
.to_owned
(),
room_id
:
&
room_id
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment