Merge pull request #1541 from NepNep21/ignore-users
Support (un)ignoring users (#546)
This commit is contained in:
commit
a583de297c
12 changed files with 285 additions and 11 deletions
|
|
@ -1042,6 +1042,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
return tr("Read receipts");
|
||||
case HiddenTimelineEvents:
|
||||
return tr("Hidden events");
|
||||
case IgnoredUsers:
|
||||
return tr("Ignored users");
|
||||
case DesktopNotifications:
|
||||
return tr("Desktop notifications");
|
||||
case AlertOnNotification:
|
||||
|
|
@ -1485,6 +1487,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
return tr("Regularly redact expired events as specified in the event expiration "
|
||||
"configuration. Since this is currently not executed server side, you need "
|
||||
"to have one client running this regularly.");
|
||||
case IgnoredUsers:
|
||||
return tr("Manage your ignored users.");
|
||||
}
|
||||
} else if (role == Type) {
|
||||
switch (index.row()) {
|
||||
|
|
@ -1571,6 +1575,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
return KeyStatus;
|
||||
case HiddenTimelineEvents:
|
||||
return ConfigureHiddenEvents;
|
||||
case IgnoredUsers:
|
||||
return ManageIgnoredUsers;
|
||||
}
|
||||
} else if (role == ValueLowerBound) {
|
||||
switch (index.row()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue