aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Sadie Powell2022-09-19 23:46:53 +0100
committerGravatar Sadie Powell2022-09-19 23:46:53 +0100
commit68fe8cb864bf8dd59e54a968775b998942df6e61 (patch)
tree64fc7d96616f873abe81cc856f6cdae29f720fbc
parentRework the snotices sent when a rehash loads/unloads a module. (diff)
parentFix forwarding tags when sending a numeric to a remote user. (diff)
Merge branch 'insp3' into master.
-rw-r--r--include/clientprotocolmsg.h1
-rw-r--r--src/modules/m_spanningtree/num.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/clientprotocolmsg.h b/include/clientprotocolmsg.h
index 22a462b63..30dca847d 100644
--- a/include/clientprotocolmsg.h
+++ b/include/clientprotocolmsg.h
@@ -58,6 +58,7 @@ class ClientProtocol::Messages::Numeric
void InitFromNumeric(const ::Numeric::Numeric& numeric)
{
+ AddTags(numeric.GetParams().GetTags());
InitCommand(numeric.GetNumeric());
for (const auto& param : numeric.GetParams())
PushParamRef(param);
diff --git a/src/modules/m_spanningtree/num.cpp b/src/modules/m_spanningtree/num.cpp
index bbe23dca4..34cb7711d 100644
--- a/src/modules/m_spanningtree/num.cpp
+++ b/src/modules/m_spanningtree/num.cpp
@@ -60,4 +60,5 @@ CommandNum::Builder::Builder(SpanningTree::RemoteUser* target, const Numeric::Nu
push(*i);
push_last(params.back());
}
+ push_tags(params.GetTags());
}