Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
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
savoirfairelinux
jami-daemon
Commits
f1661d58
Commit
f1661d58
authored
6 months ago
by
François-Simon Fauteux-Chapleau
Browse files
Options
Downloads
Patches
Plain Diff
conversation_module: only ask for invite if needed
GitLab:
#1081
Change-Id: I3ac3468e8ff5b41250a76ab7f40b6ca0e7331f09
parent
cc574c8f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/jamidht/conversation_module.cpp
+12
-7
12 additions, 7 deletions
src/jamidht/conversation_module.cpp
with
12 additions
and
7 deletions
src/jamidht/conversation_module.cpp
+
12
−
7
View file @
f1661d58
...
@@ -582,6 +582,10 @@ ConversationModule::Impl::fetchNewCommits(const std::string& peer,
...
@@ -582,6 +582,10 @@ ConversationModule::Impl::fetchNewCommits(const std::string& peer,
auto
conv
=
getConversation
(
conversationId
);
auto
conv
=
getConversation
(
conversationId
);
if
(
!
conv
)
{
if
(
!
conv
)
{
if
(
oldReq
==
std
::
nullopt
)
{
// We didn't find a conversation or a request with the given ID.
// This suggests that someone tried to send us an invitation but
// that we didn't receive it, so we ask for a new one.
JAMI_WARNING
(
"[Account {}] Unable to find conversation {}, ask for an invite"
,
JAMI_WARNING
(
"[Account {}] Unable to find conversation {}, ask for an invite"
,
accountId_
,
accountId_
,
conversationId
);
conversationId
);
...
@@ -589,6 +593,7 @@ ConversationModule::Impl::fetchNewCommits(const std::string& peer,
...
@@ -589,6 +593,7 @@ ConversationModule::Impl::fetchNewCommits(const std::string& peer,
{},
{},
std
::
map
<
std
::
string
,
std
::
string
>
{{
MIME_TYPE_INVITE
,
conversationId
}},
std
::
map
<
std
::
string
,
std
::
string
>
{{
MIME_TYPE_INVITE
,
conversationId
}},
0
);
0
);
}
return
;
return
;
}
}
std
::
unique_lock
lk
(
conv
->
mtx
);
std
::
unique_lock
lk
(
conv
->
mtx
);
...
...
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