Merge pull request #888 from 23rd/patch-21-userinfo-in-search

Fixed moderation buttons in UserInfoPopup from SearchPopup.
This commit is contained in:
pajlada 2019-01-22 22:23:50 +01:00 committed by GitHub
commit 5863b0aab2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -115,6 +115,9 @@ UserInfoPopup::UserInfoPopup()
TwitchChannel *twitchChannel = TwitchChannel *twitchChannel =
dynamic_cast<TwitchChannel *>(this->channel_.get()); dynamic_cast<TwitchChannel *>(this->channel_.get());
bool visibilityMod = false;
bool visibilityUnmod = false;
if (twitchChannel) if (twitchChannel)
{ {
qDebug() << this->userName_; qDebug() << this->userName_;
@ -124,11 +127,12 @@ UserInfoPopup::UserInfoPopup()
getApp()->accounts->twitch.getCurrent()->getUserName(), getApp()->accounts->twitch.getCurrent()->getUserName(),
this->userName_, Qt::CaseInsensitive) == 0; this->userName_, Qt::CaseInsensitive) == 0;
mod->setVisible(twitchChannel->isBroadcaster() && !isMyself); visibilityMod = twitchChannel->isBroadcaster() && !isMyself;
unmod->setVisible( visibilityUnmod = visibilityMod ||
(twitchChannel->isBroadcaster() && !isMyself) || (twitchChannel->isMod() && isMyself);
(twitchChannel->isMod() && isMyself));
} }
mod->setVisible(visibilityMod);
unmod->setVisible(visibilityUnmod);
}); });
} }
@ -143,11 +147,10 @@ UserInfoPopup::UserInfoPopup()
TwitchChannel *twitchChannel = TwitchChannel *twitchChannel =
dynamic_cast<TwitchChannel *>(this->channel_.get()); dynamic_cast<TwitchChannel *>(this->channel_.get());
if (twitchChannel) bool hasModRights = twitchChannel ? twitchChannel->hasModRights()
{ : false;
lineMod->setVisible(twitchChannel->hasModRights()); lineMod->setVisible(hasModRights);
timeout->setVisible(twitchChannel->hasModRights()); timeout->setVisible(hasModRights);
}
}); });
timeout->buttonClicked.connect([this](auto item) { timeout->buttonClicked.connect([this](auto item) {