New privuser gummys #2305

woogerboy21 · 2016-12-08T04:47:21Z

This PR add's new gummy images based on the users privilege level. For VIP's there is now a star in front of the gummy. And for registered user that are donor's, there is a purple gummy. Sample image:

This change add's new user gummy icons for vip/donator priv levels that are now available.

Corrected missing gummy in chat view.

ZeldaZach · 2016-12-08T05:20:09Z

Fixed pawns in chat @ https://gist.github.com/ZeldaZach/19cb54e32534c5ff363c050b3d1e012b

YaY for Zach!

There is something seriously wrong with the bitmap cache for the userlevel pixmap generation

ZeldaZach · 2016-12-08T05:52:08Z

cockatrice/src/pixmapgenerator.cpp

+    if (privLevel.size() == 0)
+        privkeysize = 1;
+
+    int key = height * 10000 + (int)userLevel + (int)isBuddy + privkeysize;


This can easily collide as userLevel, isBuddy, and privkeysize are all single numbers... Try changing to something like int key = height * 10000 + (int)userLevel*88 + (int)isBuddy*54 + privkeysize*31;

ZeldaZach · 2016-12-08T08:02:26Z

cockatrice/src/userlist.cpp

@@ -276,7 +276,7 @@ void UserListTWI::setUserInfo(const ServerInfo_User &_userInfo)
    userInfo = _userInfo;

    setData(0, Qt::UserRole, userInfo.user_level());
-    setIcon(0, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(userInfo.user_level()), false)));
+    setIcon(0, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(userInfo.user_level()), false, QString::fromStdString(userInfo.privlevel()))));


This won't work for offline users due to server configurations in the query ordering. I've fixed it in https://gist.github.com/ZeldaZach/d901c34d770d75618244a6489125b201

Oh I see. That's odd.... ill have to test this out.

It looks like the evalUserQueryResult function has a method to pass in if you want all the user data or just some of it. With the current way its written privlevel is only returned when all the data is requested. Which doesnt happen when a user is offline(?). Not entirely sure as to why this is, but there probably was a reasoning behind it at some point.

@ZeldaZach Even with this change I see the following when the user is offline (maybe i missed something in your gist):

The gist only re-ordered the query to have the privlevel called each time. Maybe I did something wrong. Can you manual the queries at hand and see what returns?

Now i understand the problem, thank you

This should be fixed now with the most recent commit. Missed the change in the Buddy/Ignore list queries in the servatrice_database_interface and is why i didnt see the icon's in the above post.

Seems like I'm getting better at this ^ 👍

ctrlaltca · 2016-12-08T09:14:12Z

cockatrice/src/pixmapgenerator.cpp

+    if (privLevel.size() == 0)
+        privkeysize = 1;
+
+    int key = height * 10000 + (int)userLevel * 88 + (int)isBuddy * 54 + privkeysize * 31;


These magic numbers are quite hard to understand; also, using the length of privLevel as a key will cause collisions if in the future we'll add new levels.
Maybe a better idea is to change the pmCache map to use string keys:

QMap<QString, QPixmap> UserLevelPixmapGenerator::pmCache;

and then generate the key like this:

QString key = QString::number(height * 10000 + (int) userLevel + (int) isBuddy) + privLevel;

These were magic numbers added to avoid collisions, but a QString key should work too

ctrlaltca · 2016-12-08T09:30:07Z

cockatrice/src/chatview.cpp

@@ -146,7 +146,8 @@ void ChatView::appendMessage(QString message, RoomMessageTypeFlags messageType,
            (sender == QString::fromStdString(tabSupervisor->getUserInfo()->name()))) {
            senderFormat.setForeground(QBrush(getCustomMentionColor()));
            senderFormat.setFontWeight(QFont::Bold);
-        } else {
+        }
+        else {


Check braces style: https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md#braces

ctrlaltca · 2016-12-08T09:30:27Z

cockatrice/src/chatview.cpp

@@ -155,12 +156,14 @@ void ChatView::appendMessage(QString message, RoomMessageTypeFlags messageType,
        senderFormat.setAnchorHref("user://" + QString::number(userLevel) + "_" + sender);
        if (sameSender) {
            cursor.insertText("    ");
-        } else {
+        }
+        else {


Check braces style: Check braces style: https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md#braces

ctrlaltca · 2016-12-08T09:38:27Z

cockatrice/src/chatview.cpp

            if (!sender.isEmpty() && tabSupervisor->getUserListsTab()) {
                const int pixelSize = QFontInfo(cursor.charFormat().font()).pixelSize();
                QMap<QString, UserListTWI *> buddyList = tabSupervisor->getUserListsTab()->getBuddyList()->getUsers();
-                cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel,
-                                                                            buddyList.contains(sender)).toImage());
+                QMap<QString, UserListTWI *> userList = tabSupervisor->getUserListsTab()->getAllUsersList()->getUsers();


This works fine, but it will need some refactoring in the future; right now we are retrieving data from the QGroupBox in the userlist tab, instead we should have a generic "connection" object that provides this data.
This is related to point 2 discussed in PR #2267

As in through something like tabSupervisor or did you have another means of getting the usersInfo ? Also currently (without the changes made) the way that the chatview works is broken given what you state isnt it?

I knew this would need changes. My first goal was to make this work and from there try and figure out a more optimal solution.

I'm fine with this as is until we can come up with a better solution in the future. No need to withhold this PR for it.

I think that's more or less what he was saying

Corrected issue's per request.

Updated query order for userinfo to return privlevel information properly

woogerboy21 · 2016-12-08T22:34:42Z

Please re-test this PR and make sure its working as expected before committing

ZeldaZach

I see nothing holding this PR back now.
The pawns appear when correctly called, as I've tested. The server will need to be re-built in order for these changes to take effect.

Glad we could figure this out!!

ZeldaZach · 2016-12-08T23:24:24Z

cockatrice/src/chatview.cpp

            if (!sender.isEmpty() && tabSupervisor->getUserListsTab()) {
                const int pixelSize = QFontInfo(cursor.charFormat().font()).pixelSize();
                QMap<QString, UserListTWI *> buddyList = tabSupervisor->getUserListsTab()->getBuddyList()->getUsers();
-                cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel,
-                                                                            buddyList.contains(sender)).toImage());
+                QMap<QString, UserListTWI *> userList = tabSupervisor->getUserListsTab()->getAllUsersList()->getUsers();


I'm fine with this as is until we can come up with a better solution in the future. No need to withhold this PR for it.

ZeldaZach · 2016-12-08T23:25:52Z

cockatrice/src/pixmapgenerator.cpp

        levelString = "normal";

    if (isBuddy)
        levelString.append("_buddy");
-
+    


Can remove this extra space

Daenyth

This looks reasonable.

Daenyth · 2016-12-09T00:06:53Z

cockatrice/src/pixmapgenerator.cpp

-
-    int key = height * 10000 + (int) userLevel + (int) isBuddy;
+    
+    QString key = QString::number(height * 10000 + (int)userLevel + (int)isBuddy) + privLevel;


If userLevel can be 2 or 1, then this collides because 2 + 0 == 1 + 1

Why not just height + ":" + userLevel + ":" + isBuddy or so?

userLevel can be 0,1,2. Wouldnt the calculation be height * 1000 +0,1,2 + 0,1 + 3,4,7 ?

I agree, this should be
QString key = QString::number(height * 10000) + ":" + (int)userLevel + ":" + (int)isBuddy + ":" + privLevel;

Daenyth · 2016-12-09T00:09:03Z

servatrice/src/servatrice_database_interface.cpp

        if (!email.isEmpty())
            result.set_email(email.toStdString());

-        const QString clientid = query->value(9).toString();
+        const QString clientid = query->value(10).toString();


If there's a way in the future to get value from the column name of the query result we wouldn't have to keep bumping numbers like this. Like if you could query->value("clientId"). This might already be possible, I haven't checked the docs.

No change needed for now, maybe something to look at later

Sounds good to me

Daenyth · 2016-12-09T00:10:24Z

To be clear, my 'approve' is on the general approach; we still need to fix the key collision

ZeldaZach · 2016-12-09T03:28:11Z

Once the change asked for by Dae is added I'm ready to merge this in. I left a comment with what it should look like.

Reviewed by two others

changed key calculation per request and removed blank space

woogerboy21 added 3 commits December 7, 2016 22:52

New user gummys based on account privilege level

056700c

This change add's new user gummy icons for vip/donator priv levels that are now available.

Fixed missing gummy in chat view

5253852

Corrected missing gummy in chat view.

Removed flashy chat

b09fc7e

woogerboy21 added the App - Cockatrice Tickets relating to the cockatrice application label Dec 8, 2016

woogerboy21 requested review from ctrlaltca and poixen December 8, 2016 04:49

Fixed chat box gummy's

76590c5

YaY for Zach!

ZeldaZach removed request for ctrlaltca and poixen December 8, 2016 05:33

woogerboy21 added 2 commits December 8, 2016 00:46

Removed Cache

63e61d3

There is something seriously wrong with the bitmap cache for the userlevel pixmap generation

Repaired Cache

aede15c

ZeldaZach reviewed Dec 8, 2016

View reviewed changes

ctrlaltca previously requested changes Dec 8, 2016

View reviewed changes

woogerboy21 and others added 3 commits December 8, 2016 08:14

fixed key calculation and bracket format

22c32a2

Corrected issue's per request.

Fix buddy/ignore list

a4bf799

Updated query order for userinfo to return privlevel information properly

Merge branch 'master' into new_privuser_gummys

7a909cb

ZeldaZach approved these changes Dec 8, 2016

View reviewed changes

Daenyth approved these changes Dec 9, 2016

View reviewed changes

updated key calculation

0f08371

changed key calculation per request and removed blank space

ZeldaZach merged commit 960ecaa into Cockatrice:master Dec 9, 2016

tooomm mentioned this pull request Jan 4, 2017

Customizable User Ranks #1177

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New privuser gummys #2305

New privuser gummys #2305

woogerboy21 commented Dec 8, 2016 •

edited

Loading

ZeldaZach commented Dec 8, 2016

ZeldaZach Dec 8, 2016

ZeldaZach Dec 8, 2016

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016

woogerboy21 Dec 8, 2016 •

edited

Loading

ZeldaZach Dec 8, 2016

ctrlaltca Dec 8, 2016

woogerboy21 Dec 8, 2016 •

edited

Loading

ZeldaZach Dec 8, 2016

ctrlaltca Dec 8, 2016

ZeldaZach Dec 8, 2016

ctrlaltca Dec 8, 2016

ctrlaltca Dec 8, 2016

ctrlaltca Dec 8, 2016

woogerboy21 Dec 8, 2016 •

edited

Loading

ZeldaZach Dec 8, 2016

ZeldaZach Dec 8, 2016

Daenyth Dec 9, 2016

woogerboy21 commented Dec 8, 2016

ZeldaZach left a comment

ZeldaZach Dec 8, 2016

ZeldaZach Dec 8, 2016

Daenyth left a comment

Daenyth Dec 9, 2016

woogerboy21 Dec 9, 2016 •

edited

Loading

woogerboy21 Dec 9, 2016

ZeldaZach Dec 9, 2016

Daenyth Dec 9, 2016

ZeldaZach Dec 9, 2016

Daenyth commented Dec 9, 2016

ZeldaZach commented Dec 9, 2016


		int key = height * 10000 + (int) userLevel + (int) isBuddy;

		QString key = QString::number(height * 10000 + (int)userLevel + (int)isBuddy) + privLevel;

New privuser gummys #2305

New privuser gummys #2305

Conversation

woogerboy21 commented Dec 8, 2016 • edited Loading

ZeldaZach commented Dec 8, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

woogerboy21 Dec 8, 2016 • edited Loading

Choose a reason for hiding this comment

woogerboy21 Dec 8, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

woogerboy21 Dec 8, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

woogerboy21 Dec 8, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

woogerboy21 Dec 8, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

woogerboy21 commented Dec 8, 2016

ZeldaZach left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Daenyth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

woogerboy21 Dec 9, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Daenyth commented Dec 9, 2016

ZeldaZach commented Dec 9, 2016

woogerboy21 commented Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 8, 2016 •

edited

Loading

woogerboy21 Dec 9, 2016 •

edited

Loading