Fix some typos
This commit is contained in:
committed by
Tobias Fella
parent
889b7dd2e6
commit
a92587cc50
@@ -159,7 +159,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
|
|||||||
Q_EMIT childrenHaveHighlightNotificationsChanged();
|
Q_EMIT childrenHaveHighlightNotificationsChanged();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
connect(&SpaceHierarchyCache::instance(), &SpaceHierarchyCache::spaceNotifcationCountChanged, this, [this](const QStringList &spaces) {
|
connect(&SpaceHierarchyCache::instance(), &SpaceHierarchyCache::spaceNotificationCountChanged, this, [this](const QStringList &spaces) {
|
||||||
if (spaces.contains(id())) {
|
if (spaces.contains(id())) {
|
||||||
Q_EMIT childrenNotificationCountChanged();
|
Q_EMIT childrenNotificationCountChanged();
|
||||||
Q_EMIT childrenHaveHighlightNotificationsChanged();
|
Q_EMIT childrenHaveHighlightNotificationsChanged();
|
||||||
@@ -1121,7 +1121,7 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
|
|||||||
});
|
});
|
||||||
} else if (state == PushNotificationState::MentionKeyword) {
|
} else if (state == PushNotificationState::MentionKeyword) {
|
||||||
/**
|
/**
|
||||||
* To only get notifcations for @ mentions and keywords a room rule with "don't_notify" is set.
|
* To only get notifications for @ mentions and keywords a room rule with "don't_notify" is set.
|
||||||
*
|
*
|
||||||
* Note - This works becuase a default override rule which catches all user mentions will
|
* Note - This works becuase a default override rule which catches all user mentions will
|
||||||
* take precedent and notify. See https://spec.matrix.org/v1.3/client-server-api/#default-override-rules. Any keywords will also have a similar override
|
* take precedent and notify. See https://spec.matrix.org/v1.3/client-server-api/#default-override-rules. Any keywords will also have a similar override
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ void SpaceHierarchyCache::cacheSpaceHierarchy()
|
|||||||
if (neoChatRoom != nullptr && (changes & (NeoChatRoom::Change::UnreadStats | NeoChatRoom::Change::Highlights))) {
|
if (neoChatRoom != nullptr && (changes & (NeoChatRoom::Change::UnreadStats | NeoChatRoom::Change::Highlights))) {
|
||||||
const auto parents = parentSpaces(neoChatRoom->id());
|
const auto parents = parentSpaces(neoChatRoom->id());
|
||||||
if (parents.count() > 0) {
|
if (parents.count() > 0) {
|
||||||
Q_EMIT spaceNotifcationCountChanged(parents);
|
Q_EMIT spaceNotificationCountChanged(parents);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ public:
|
|||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void spaceHierarchyChanged();
|
void spaceHierarchyChanged();
|
||||||
void connectionChanged();
|
void connectionChanged();
|
||||||
void spaceNotifcationCountChanged(const QStringList &spaces);
|
void spaceNotificationCountChanged(const QStringList &spaces);
|
||||||
void recommendedSpaceHiddenChanged();
|
void recommendedSpaceHiddenChanged();
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ FormCard.AbstractFormDelegate {
|
|||||||
enabled: root.enabled
|
enabled: root.enabled
|
||||||
down: checked
|
down: checked
|
||||||
onToggled: {
|
onToggled: {
|
||||||
root.notificatonActionChanged(root.notifcationRuleAction());
|
root.notificatonActionChanged(root.notificationRuleAction());
|
||||||
}
|
}
|
||||||
|
|
||||||
QQC2.ToolTip {
|
QQC2.ToolTip {
|
||||||
@@ -99,7 +99,7 @@ FormCard.AbstractFormDelegate {
|
|||||||
enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
|
enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
|
||||||
down: checked
|
down: checked
|
||||||
onToggled: {
|
onToggled: {
|
||||||
root.notificatonActionChanged(root.notifcationRuleAction());
|
root.notificatonActionChanged(root.notificationRuleAction());
|
||||||
}
|
}
|
||||||
|
|
||||||
QQC2.ToolTip {
|
QQC2.ToolTip {
|
||||||
@@ -121,7 +121,7 @@ FormCard.AbstractFormDelegate {
|
|||||||
enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
|
enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
|
||||||
down: checked
|
down: checked
|
||||||
onToggled: {
|
onToggled: {
|
||||||
root.notificatonActionChanged(root.notifcationRuleAction());
|
root.notificatonActionChanged(root.notificationRuleAction());
|
||||||
}
|
}
|
||||||
|
|
||||||
QQC2.ToolTip {
|
QQC2.ToolTip {
|
||||||
@@ -144,7 +144,7 @@ FormCard.AbstractFormDelegate {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function notifcationRuleAction() {
|
function notificationRuleAction() {
|
||||||
if (onButton.checked) {
|
if (onButton.checked) {
|
||||||
if (noisyButton.checked && highlightButton.checked && root.highlightable) {
|
if (noisyButton.checked && highlightButton.checked && root.highlightable) {
|
||||||
return PushRuleAction.NoisyHighlight;
|
return PushRuleAction.NoisyHighlight;
|
||||||
|
|||||||
Reference in New Issue
Block a user