Skip to content

Commit 39eeece

Browse files
media_session_id is not required
1 parent 12f6bef commit 39eeece

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/dpp/cluster.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ void cluster::log(dpp::loglevel severity, const std::string &msg) const {
154154
dpp::log_t logmsg(nullptr, msg);
155155
logmsg.severity = severity;
156156
logmsg.message = msg;
157+
size_t pos{0};
158+
while ((pos = logmsg.message.find(token, pos)) != std::string::npos) {
159+
logmsg.message.replace(pos, token.length(), "*****");
160+
pos += 5;
161+
}
157162
on_log.call(logmsg);
158163
}
159164
}

src/dpp/discordclient.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,14 @@ void discord_client::log(dpp::loglevel severity, const std::string &msg) const
456456
{
457457
if (!creator->on_log.empty()) {
458458
/* Pass to user if they've hooked the event */
459-
dpp::log_t logmsg(nullptr, msg);
459+
dpp::log_t logmsg(const_cast<discord_client*>(this), msg);
460460
logmsg.severity = severity;
461461
logmsg.message = msg;
462+
size_t pos{0};
463+
while ((pos = logmsg.message.find(token, pos)) != std::string::npos) {
464+
logmsg.message.replace(pos, token.length(), "*****");
465+
pos += 5;
466+
}
462467
creator->on_log.call(logmsg);
463468
}
464469
}

src/dpp/discordvoiceclient.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,6 @@ bool discord_voice_client::handle_frame(const std::string &data, ws_opcode opcod
666666
send_silence(20);
667667
}
668668

669-
/* Set the session id */
670-
this->sessionid = j["d"]["media_session_id"];
671-
672669
/* Fire on_voice_ready */
673670
if (!creator->on_voice_ready.empty()) {
674671
voice_ready_t rdy(nullptr, data);

0 commit comments

Comments
 (0)