Skip to content

Hotfix for admin handle colouring #67

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

Merged
merged 3 commits into from
Mar 16, 2021
Merged

Hotfix for admin handle colouring #67

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27fb903
Issues-466:Topcoder admins should be shown in orange
atelomycterus Mar 16, 2021
f10cee6
Merge pull request #66 from topcoder-platform/issues-466
jmgasper Mar 16, 2021
a8ff602
Merge branch 'master' into develop
jmgasper Mar 16, 2021
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
53 changes: 27 additions & 26 deletions Topcoder/class.topcoder.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,22 +1559,32 @@ public static function hasTopcoderAdminRole($user) {


/**
* Get a photo url from Topcoder Member Profile
* @param $name vanilla user name
* @return null|string photo url
* Check if the list of Topcoder roles includes Topcoder admin roles
* @param false $topcoderRoles
* @return bool true, if the list of Topcoder roles includes at least one Topcoder admin role
*/
//TODO: remove , not found usages
/*
public static function getTopcoderPhotoUrl($name) {
$topcoderProfile = self::getTopcoderProfile($name);
if($topcoderProfile !== null) {
return $topcoderProfile->photoURL;
private static function isTopcoderAdmin($topcoderRoles = false) {
if($topcoderRoles) {
$roleNames = array_column($topcoderRoles, 'roleName');
$lowerRoleNames = array_map('strtolower', $roleNames);
return count(array_intersect($lowerRoleNames, ["connect manager", "admin", "administrator"])) > 0;
}
return null;

return false;
}

/**
* Get Topcoder Role names
* @param false $topcoderRoles
* @return array|false|null
*/
private static function getTopcoderRoleNames($topcoderRoles = false) {
return $topcoderRoles ? array_column($topcoderRoles, 'roleName') : [];
}
*/

/**
* Load Topcoder User Details from Topcoder API.
* User is registered in Vanilla
* Data is cached if a cache is enabled
* @param $vanillaUser
* @return array|void
Expand All @@ -1593,13 +1603,8 @@ private static function loadTopcoderUserDetails($vanillaUser) {
$cachedUser['TopcoderUserID'] = $topcoderProfile->userId;
$cachedUser['PhotoUrl'] = $topcoderProfile->photoURL;
$topcoderRoles = self::loadTopcoderRoles($topcoderProfile->userId);
if($topcoderRoles) {
$roleNames = array_column($topcoderRoles, 'roleName');
$lowerRoleNames = array_map('strtolower', $roleNames);
$cachedUser['Roles'] = $roleNames;
$cachedUser['IsAdmin'] = in_array("admin", $lowerRoleNames) || in_array("administrator", $lowerRoleNames);
}

$cachedUser['Roles'] = self::getTopcoderRoleNames($topcoderRoles);
$cachedUser['IsAdmin'] = self::isTopcoderAdmin($topcoderRoles);
$topcoderRating = self::loadTopcoderRating($username); //loaded by handle
if($topcoderRating) {
$cachedUser['Rating'] = $topcoderRating;
Expand Down Expand Up @@ -1815,7 +1820,8 @@ private static function getTopcoderUserFromTopcoderCache($topcoderHandle) {
}

/**
* Load Topcoder User Details from Topcoder API.
* Load Topcoder User Details by Topcoder handle from Topcoder API and add data in Topcoder User cache.
* Topcoder handles are used in mentions but Topcoder Users may not register in Vanilla.
* Data is cached if a cache is enabled
* @param $topcoderHandle
* @return array|void
Expand All @@ -1831,13 +1837,8 @@ private static function loadTopcoderUserDetailsByHandle($topcoderHandle) {
$cachedUser['TopcoderUserID'] = $topcoderProfile->userId;
$cachedUser['PhotoUrl'] = $topcoderProfile->photoURL;
$topcoderRoles = self::loadTopcoderRoles($topcoderProfile->userId);
if($topcoderRoles) {
$roleNames = array_column($topcoderRoles, 'roleName');
$lowerRoleNames = array_map('strtolower', $roleNames);
$cachedUser['Roles'] = $roleNames;
$cachedUser['IsAdmin'] = count(array_intersect($lowerRoleNames, ["Connect Manager", "admin", "administrator"])) > 0;
}

$cachedUser['Roles'] = self::getTopcoderRoleNames($topcoderRoles);
$cachedUser['IsAdmin'] = self::isTopcoderAdmin($topcoderRoles);
$topcoderRating = self::loadTopcoderRating($topcoderHandle); //loaded by handle
if($topcoderRating) {
$cachedUser['Rating'] = $topcoderRating;
Expand Down