Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
39a32d55
Commit
39a32d55
authored
Mar 31, 2018
by
Link Mauve
Committed by
louiz’
Apr 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use jid.bare() instead of manual concatenation
parent
5ef7ba08
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
src/bridge/bridge.cpp
src/bridge/bridge.cpp
+1
-1
src/xmpp/adhoc_commands_handler.cpp
src/xmpp/adhoc_commands_handler.cpp
+1
-1
No files found.
src/bridge/bridge.cpp
View file @
39a32d55
...
...
@@ -103,7 +103,7 @@ const std::string& Bridge::get_jid() const
std
::
string
Bridge
::
get_bare_jid
()
const
{
Jid
jid
(
this
->
user_jid
);
return
jid
.
local
+
"@"
+
jid
.
domain
;
return
jid
.
bare
()
;
}
Xmpp
::
body
Bridge
::
make_xmpp_body
(
const
std
::
string
&
str
,
const
std
::
string
&
encoding
)
...
...
src/xmpp/adhoc_commands_handler.cpp
View file @
39a32d55
...
...
@@ -41,7 +41,7 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
XmlSubNode
condition
(
error
,
STANZA_NS
":item-not-found"
);
}
else
if
(
command_it
->
second
.
is_admin_only
()
&&
Config
::
get
(
"admin"
,
""
)
!=
jid
.
local
+
"@"
+
jid
.
domain
)
Config
::
get
(
"admin"
,
""
)
!=
jid
.
bare
()
)
{
XmlSubNode
error
(
command_node
,
ADHOC_NS
":error"
);
error
[
"type"
]
=
"cancel"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment