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
c62d6539
Commit
c62d6539
authored
8 months ago
by
Jason Volk
Browse files
Options
Downloads
Patches
Plain Diff
tweak some log levels
Signed-off-by:
Jason Volk
<
jason@zemos.net
>
parent
454dd43d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!520
Panic / Error Handling
,
!517
Admin commands (#136) + membership incidentals
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/api/client/membership.rs
+3
-3
3 additions, 3 deletions
src/api/client/membership.rs
with
3 additions
and
3 deletions
src/api/client/membership.rs
+
3
−
3
View file @
c62d6539
...
...
@@ -659,7 +659,7 @@ pub async fn join_room_by_id_helper(
let
state_lock
=
services
()
.rooms.state.mutex
.lock
(
room_id
)
.await
;
if
matches!
(
services
()
.rooms.state_cache
.is_joined
(
sender_user
,
room_id
),
Ok
(
true
))
{
info
!
(
"{sender_user} is already joined in {room_id}"
);
debug_warn
!
(
"{sender_user} is already joined in {room_id}"
);
return
Ok
(
join_room_by_id
::
v3
::
Response
{
room_id
:
room_id
.into
(),
});
...
...
@@ -1018,7 +1018,7 @@ async fn join_room_by_id_helper_local(
sender_user
:
&
UserId
,
room_id
:
&
RoomId
,
reason
:
Option
<
String
>
,
servers
:
&
[
OwnedServerName
],
_third_party_signed
:
Option
<&
ThirdPartySigned
>
,
state_lock
:
mutex_map
::
Guard
<
()
>
,
)
->
Result
<
join_room_by_id
::
v3
::
Response
>
{
info
!
(
"We can join locally"
);
debug
!
(
"We can join locally"
);
let
join_rules_event
=
services
()
...
...
@@ -1118,7 +1118,7 @@ async fn join_room_by_id_helper_local(
.iter
()
.any
(|
server_name
|
!
server_is_ours
(
server_name
))
{
info
!
(
"We couldn't do the join locally, maybe federation can help to satisfy the restricted join requirements"
);
warn
!
(
"We couldn't do the join locally, maybe federation can help to satisfy the restricted join requirements"
);
let
(
make_join_response
,
remote_server
)
=
make_join_request
(
sender_user
,
room_id
,
servers
)
.await
?
;
let
room_version_id
=
match
make_join_response
.room_version
{
...
...
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