Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initialize list of blocked users on IgnoresPage construction #4437

Merged
merged 9 commits into from
Mar 26, 2023
Merged

Initialize list of blocked users on IgnoresPage construction #4437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f31e48c
Initialize list of blocked users on IgnoresPage construction
Muzuwi Mar 6, 2023
c2fd365
Merge remote-tracking branch 'origin/master' into fix-blocked-users-l…
pajlada Mar 26, 2023
e74800c
self-include: use absolute path
pajlada Mar 26, 2023
5a8e409
onShow: use this-> prefix
pajlada Mar 26, 2023
85406cc
remove unused include
pajlada Mar 26, 2023
70dbb4a
clang-tidy: use * to CLARIFY pointer
pajlada Mar 26, 2023
783842c
Clear block list if user is not logged in
pajlada Mar 26, 2023
4871101
Add an additional changelog entry for the logged out stuff
pajlada Mar 26, 2023
094d30c
update changelog entry phrasing
pajlada Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
- Bugfix: Fixed an issue where context-menu items for zero-width emotes displayed the wrong provider. (#4460)
- Bugfix: Fixed an issue where the "Enable zero-width emotes" setting was showing the inverse state. (#4462)
- Bugfix: Fixed username rendering in Qt 6. (#4476)
- Bugfix: Fixed blocked user list being empty when opening the settings dialog for the first time. (#4437)
- Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437)
- Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472)
- Dev: Ignore unhandled BTTV user-events. (#4438)
- Dev: Only log debug messages when NDEBUG is not defined. (#4442)
Expand Down
7 changes: 4 additions & 3 deletions src/widgets/settingspages/IgnoresPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#include "IgnoresPage.hpp"
#include "widgets/settingspages/IgnoresPage.hpp"

#include "Application.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/ignores/IgnoreController.hpp"
#include "controllers/ignores/IgnoreModel.hpp"
#include "controllers/ignores/IgnorePhrase.hpp"
#include "providers/twitch/TwitchAccount.hpp"
Expand Down Expand Up @@ -39,6 +38,7 @@ IgnoresPage::IgnoresPage()
addPhrasesTab(tabs.appendTab(new QVBoxLayout, "Messages"));
addUsersTab(*this, tabs.appendTab(new QVBoxLayout, "Users"),
this->userListModel_);
this->onShow();
}

void addPhrasesTab(LayoutCreator<QVBoxLayout> layout)
Expand Down Expand Up @@ -115,12 +115,13 @@ void addUsersTab(IgnoresPage &page, LayoutCreator<QVBoxLayout> users,

void IgnoresPage::onShow()
{
auto app = getApp();
auto *app = getApp();

auto user = app->accounts->twitch.getCurrent();

if (user->isAnon())
{
this->userListModel_.setStringList({});
return;
}

Expand Down