Skip to content

Issues 475-2, 558 #88

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 2 commits into from
Apr 12, 2021
Merged

Issues 475-2, 558 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ba45b8
Issues-475: Fixed voting url for guest
atelomycterus Apr 12, 2021
b6d8087
Issues-558: Updated expiry time for topcoder data
atelomycterus Apr 12, 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
90 changes: 84 additions & 6 deletions Topcoder/class.topcoder.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ class TopcoderPlugin extends Gdn_Plugin {
const CACHE_TOPCODER_KEY_TOPCODER_ROLE_RESOURCES = 'topcoder.roleresources';
const CACHE_TOPCODER_KEY_TOPCODER_CHALLENGE_RESOURCES = 'topcoder.challenge.{ChallengeID}.resources';

const CACHE_DEFAULT_EXPIRY_TIME = 60*60*3; //The default expiration time in Memcached is in seconds, 10800 = 3 hours
const CACHE_TOPCODER_PROFILE_EXPIRY_TIME = 60*60*24*7; // 1 week
const CACHE_ONE_DAY_EXPIRY_TIME = 60*60*24; // 1 day

const ROLE_TYPE_TOPCODER = 'topcoder';
const ROLE_TOPCODER_CONNECT_ADMIN = 'Connect Admin';
const ROLE_TOPCODER_ADMINISTRATOR = 'administrator';
Expand Down Expand Up @@ -679,6 +683,21 @@ public function base_afterSignIn_handler($sender, $args) {
}
self::log('base_afterSignIn_handler', ['Session Permissions' => Gdn::session()->getPermissionsArray()]);

if(Gdn_Cache::activeEnabled()) {
$currentUser = Gdn::session()->User;
$lastVisit = val('DateLastActive', $currentUser, false);
if ($lastVisit) {
$seconds = now() - Gdn_Format::toTimestamp($lastVisit);
if ($seconds > self::CACHE_ONE_DAY_EXPIRY_TIME) { // Update the current User once a day
// remove from Topcoder cache by UserID and Topcoder handle
self::removeTopcoderUserFromCache($currentUser->UserID);
self::removeUserFromTopcoderCache($currentUser->Name);
// update cache
self::getTopcoderUserFromTopcoderCache($currentUser->Name);
self::getTopcoderUserFromCache($currentUser->UserID);
}
}
}
}

/**
Expand Down Expand Up @@ -1362,7 +1381,7 @@ public function getRoleResources() {
private static function topcoderRoleResourcesCache($roleResources) {
return Gdn::cache()->store(self::CACHE_TOPCODER_KEY_TOPCODER_ROLE_RESOURCES,
$roleResources, [
Gdn_Cache::FEATURE_EXPIRY => 3600
Gdn_Cache::FEATURE_EXPIRY => self::CACHE_ONE_DAY_EXPIRY_TIME
]);
}

Expand Down Expand Up @@ -1426,9 +1445,20 @@ public function getChallengeResources($challengeId) {
return $challengeResources;
}

$expirationTime = self::CACHE_DEFAULT_EXPIRY_TIME;
$challenge = self::loadChallenge($challengeId);
if($challenge && count($challenge) > 0) {
// Set expiration time for Challenge roles
$endDate = strtotime($challenge[0]->endDate);
$startDate = strtotime($challenge[0]->startDate);
// $duration = $endDate > -1 && $startDate > -1 ? $endDate - $startDate: 0;
// archived
$isEnded = $endDate > -1 && now() - $endDate > 0;
$expirationTime = $isEnded ? self::CACHE_DEFAULT_EXPIRY_TIME: self::CACHE_ONE_DAY_EXPIRY_TIME;
}
$challengeResources = self::loadChallengeResources($challengeId);
if(Gdn_Cache::activeEnabled() && $challengeResources) {
self::topcoderChallengeResourcesCache( $challengeId, $challengeResources);
self::topcoderChallengeResourcesCache( $challengeId, $challengeResources, $expirationTime);
}
return $challengeResources;
}
Expand All @@ -1454,10 +1484,10 @@ private static function getChallengeResourcesFromCache($challengeID) {
return $challengeResources;
}

private static function topcoderChallengeResourcesCache($challengeID, $challengeResources) {
private static function topcoderChallengeResourcesCache($challengeID, $challengeResources, $expirationTime = self::CACHE_DEFAULT_EXPIRY_TIME) {
$challengeKey = formatString(self::CACHE_TOPCODER_KEY_TOPCODER_CHALLENGE_RESOURCES, ['ChallengeID' => $challengeID]);
return Gdn::cache()->store($challengeKey , $challengeResources, [
Gdn_Cache::FEATURE_EXPIRY => 3600
Gdn_Cache::FEATURE_EXPIRY => $expirationTime
]);
}

Expand Down Expand Up @@ -1490,6 +1520,35 @@ private static function loadChallengeResources($challengeId) {
return null;
}

/**
* Load Topcoder Challenge by Challenge ID
* @param $challengeId
* @return mixed|null
*/
private static function loadChallenge($challengeId) {
$token = TopcoderPlugin::getM2MToken();
if ($token) {
$challengeURI = c('Plugins.Topcoder.ChallengeApiURI', '/v5/challenges/');
$topcoderChallengeApiUrl = c('Plugins.Topcoder.BaseApiURL') . $challengeURI;
$options = array('http' => array(
'method' => 'GET',
'header' => 'Authorization: Bearer ' .$token
));
$context = stream_context_create($options);
$data = file_get_contents($topcoderChallengeApiUrl . '?challengeId=' . $challengeId, false, $context);
if ($data === false) {
// Handle errors (e.g. 404 and others)
self::log('Couldn\'t get challenge: no token', ['headers'=> json_encode($http_response_header)]);
logMessage(__FILE__, __LINE__, 'TopcoderPlugin', 'loadChallenge', "Couldn't load Topcoder challenge".json_encode($http_response_header));
return null;
}

return json_decode($data);
}
self::log('Couldn\'t load challenge: no token', []);
return null;
}

/**
* Get a Topcoder Roles
*
Expand Down Expand Up @@ -1795,7 +1854,7 @@ private static function topcoderUserCache($userFields) {
$userID = val('UserID', $userFields);
$userKey = formatString(self::CACHE_KEY_TOPCODER_PROFILE, ['UserID' => $userID]);
$cached = $cached & Gdn::cache()->store($userKey, $userFields, [
Gdn_Cache::FEATURE_EXPIRY => 3600
Gdn_Cache::FEATURE_EXPIRY => self::CACHE_TOPCODER_PROFILE_EXPIRY_TIME
]);
return $cached;
}
Expand Down Expand Up @@ -1826,7 +1885,26 @@ public static function getTopcoderUserByHandle($topcoderHandle) {
return $topcoderUser;
}

private static function removeTopcoderUserFromCache($userID) {
if(!Gdn_Cache::activeEnabled()) {
return false;
}

$handleKey = formatString(self::CACHE_KEY_TOPCODER_PROFILE, ['UserID' => $userID]);
return Gdn::cache()->remove($handleKey);
}

// This cache includes Topcoder which might not exist in Vanilla
private static function removeUserFromTopcoderCache($topcoderHandle) {
if (!Gdn_Cache::activeEnabled()) {
return false;
}

$handleKey = formatString(self::CACHE_TOPCODER_KEY_TOPCODER_PROFILE, ['Handle' => $topcoderHandle]);
return Gdn::cache()->remove($handleKey);
}

// This cache includes Topcoder which might not exist in Vanilla
private static function getTopcoderUserFromTopcoderCache($topcoderHandle) {
if(!Gdn_Cache::activeEnabled()) {
return false;
Expand Down Expand Up @@ -1887,7 +1965,7 @@ private static function topcoderUserTopcoderCache($userFields) {
$handle = val('Handle', $userFields);
$userKey = formatString(self::CACHE_TOPCODER_KEY_TOPCODER_PROFILE, ['Handle' => $handle]);
$cached = $cached & Gdn::cache()->store($userKey, $userFields, [
Gdn_Cache::FEATURE_EXPIRY => 3600
Gdn_Cache::FEATURE_EXPIRY => self::CACHE_TOPCODER_PROFILE_EXPIRY_TIME
]);
return $cached;
}
Expand Down
10 changes: 8 additions & 2 deletions Voting/class.voting.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ function formattedPScore($score)
}

if (!function_exists('generateVoterBox')) {
function generateVoterBox($id, $VoteType, $pScore, $nScore, $currentUserVote)
{
function generateVoterBox($id, $VoteType, $pScore, $nScore, $currentUserVote) {

$cssClassVoteUp = 'SpriteVoteUp';
$cssClassVoteDown = 'SpriteVoteDown';
if($currentUserVote > 0) {
Expand All @@ -359,6 +359,12 @@ function generateVoterBox($id, $VoteType, $pScore, $nScore, $currentUserVote)
$voterBoxID = 'Voter_' . $VoteType . '_' . $id;
$voteUpUrl = '/discussion/vote' . strtolower($VoteType) . '/' . $id . '/voteup/' . Gdn::session()->TransientKey() . '/';
$voteDownUrl = '/discussion/vote' . strtolower($VoteType) . '/' . $id . '/votedown/' . Gdn::session()->TransientKey() . '/';

if (!Gdn::session()->IsValid()) {
$voteUpUrl = Gdn::Authenticator()->SignInUrl(Gdn::controller()->SelfUrl);
$voteDownUrl = Gdn::Authenticator()->SignInUrl(Gdn::controller()->SelfUrl);
}

$result = '<span id="' . $voterBoxID . '" class="Voter">';
$result .= Anchor(Wrap('', 'span', array('class' => 'icon ' . $cssClassVoteUp, 'rel' => 'nofollow')), $voteUpUrl, 'VoteUp');
$counts = formattedPScore($pScore);
Expand Down