ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash for push rules without action

Browse Source 
@nvrwhere how much sense does this fix make? i only know that it doesn't crash anymore
This commit is contained in:
Tobias Fella
2023-09-01 11:33:29 +00:00
parent 167349b9d2
commit 4fd36fb221
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neochatroom.cpp
View File

@@ -1586,6 +1586,11 @@ void NeoChatRoom::updatePushNotificationState(QString type)
for (const auto &i : roomRuleArray) { for (const auto &i : roomRuleArray) {
QJsonObject roomRule = i.toObject(); QJsonObject roomRule = i.toObject();
if (roomRule["rule_id"_ls] == id()) { if (roomRule["rule_id"_ls] == id()) {
if (roomRule["actions"_ls].toArray().size() == 0) {
m_currentPushNotificationState = PushNotificationState::MentionKeyword;
Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
return;
}
QString notifyAction = roomRule["actions"_ls].toArray()[0].toString(); QString notifyAction = roomRule["actions"_ls].toArray()[0].toString();
if (notifyAction == "notify"_ls) { if (notifyAction == "notify"_ls) {
m_currentPushNotificationState = PushNotificationState::All; m_currentPushNotificationState = PushNotificationState::All;
@@ -1604,6 +1609,10 @@ void NeoChatRoom::updatePushNotificationState(QString type)
for (const auto &i : overrideRuleArray) { for (const auto &i : overrideRuleArray) {
QJsonObject overrideRule = i.toObject(); QJsonObject overrideRule = i.toObject();
if (overrideRule["rule_id"_ls] == id()) { if (overrideRule["rule_id"_ls] == id()) {
if (overrideRule["actions"_ls].toArray().isEmpty()) {
m_currentPushNotificationState = PushNotificationState::Mute;
Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
}
QString notifyAction = overrideRule["actions"_ls].toArray()[0].toString(); QString notifyAction = overrideRule["actions"_ls].toArray()[0].toString();
if (notifyAction == "dont_notify"_ls) { if (notifyAction == "dont_notify"_ls) {
m_currentPushNotificationState = PushNotificationState::Mute; m_currentPushNotificationState = PushNotificationState::Mute;