twisterarmy
/
cloud-server
mirror of https://github.com/twisterarmy/cloud-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix data obtain from the memory cache

main
ghost 3 years ago
parent
5422104b46
commit
e9474b1214
2 changed files with 119 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      src/application/controller/api/user/avatar.php
  2. 125
      src/application/controller/api/user/profile.php

107
src/application/controller/api/user/avatar.php
Unescape View File

@ -28,73 +28,76 @@ if (isset($_SESSION['userName'])) {
'avatar' => $mcAvatar 'avatar' => $mcAvatar
]; ];
/* } else {
* Step 2: try to obtain avatar from DHT
*
* */
} else if ($dhtAvatarRevisions = $_twister->getDHTAvatarRevisions($userName)) {
// Add DHT version if not exists
foreach ((array) $dhtAvatarRevisions as $dhtAvatarRevision) {
if (!$_modelAvatar->versionExists($userId,
$dhtAvatarRevision['height'],
$dhtAvatarRevision['seq'])) {
$_modelAvatar->add($userId, /*
$dhtAvatarRevision['height'], * Step 2: try to obtain avatar from DHT
$dhtAvatarRevision['seq'], *
$dhtAvatarRevision['time'], * */
$dhtAvatarRevision['data']); if ($dhtAvatarRevisions = $_twister->getDHTAvatarRevisions($userName)) {
// Add DHT version if not exists
foreach ((array) $dhtAvatarRevisions as $dhtAvatarRevision) {
if (!$_modelAvatar->versionExists($userId,
$dhtAvatarRevision['height'],
$dhtAvatarRevision['seq'])) {
$_modelAvatar->add($userId,
$dhtAvatarRevision['height'],
$dhtAvatarRevision['seq'],
$dhtAvatarRevision['time'],
$dhtAvatarRevision['data']);
}
} }
} }
}
/* /*
* Step 3: Select latest version available from DB revisions * Step 3: Select latest version available from DB revisions
* *
* */ * */
$dbAvatarRevision = $_modelAvatar->get($userId); $dbAvatarRevision = $_modelAvatar->get($userId);
if ($dbAvatarRevision && Valid::base64image($dbAvatarRevision['data'])) { if ($dbAvatarRevision && Valid::base64image($dbAvatarRevision['data'])) {
// Response // Response
$response = [ $response = [
'success' => true, 'success' => true,
'message' => _('Avatar successfully received from DHT/DB'), 'message' => _('Avatar successfully received from DHT/DB'),
'avatar' => $dbAvatarRevision['data'] // format 'avatar' => $dbAvatarRevision['data'] // format
]; ];
// Save request into the cache pool // Save request into the cache pool
$_memcache->set('api.user.avatar.' . $userName, $dbAvatarRevision['data'], MEMCACHE_COMPRESS, MEMCACHE_DHT_AVATAR_TIMEOUT); $_memcache->set('api.user.avatar.' . $userName, $dbAvatarRevision['data'], MEMCACHE_COMPRESS, MEMCACHE_DHT_AVATAR_TIMEOUT);
// Cache, DHT, DB not contain any the avatar details about user requested, // Cache, DHT, DB not contain any the avatar details about user requested,
// Generate and return identity icon // Generate and return identity icon
} else { } else {
// Generate identity icon // Generate identity icon
$fileName = md5($userName); $fileName = md5($userName);
$filePath = PROJECT_DIR . '/cache/image/' . $fileName . '.jpeg'; $filePath = PROJECT_DIR . '/cache/image/' . $fileName . '.jpeg';
// Identity icons supports file cache // Identity icons supports file cache
if (!file_exists($filePath)) { if (!file_exists($filePath)) {
$icon = new Icon(); $icon = new Icon();
$image = $icon->generateImageResource($fileName, 42, 42, false); $image = $icon->generateImageResource($fileName, 42, 42, false);
file_put_contents($filePath, $image); file_put_contents($filePath, $image);
} }
$identityIcon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents($filePath)); $identityIcon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents($filePath));
$response = [ $response = [
'success' => true, 'success' => true,
'message' => _('Could not receive any avatar details, generated identity icon'), 'message' => _('Could not receive any avatar details, generated identity icon'),
'avatar' => $identityIcon 'avatar' => $identityIcon
]; ];
// Save identity icon into the cache pool // Save identity icon into the cache pool
$_memcache->set('api.user.avatar.' . $userName, $identityIcon, MEMCACHE_COMPRESS, MEMCACHE_DHT_AVATAR_TIMEOUT); $_memcache->set('api.user.avatar.' . $userName, $identityIcon, MEMCACHE_COMPRESS, MEMCACHE_DHT_AVATAR_TIMEOUT);
}
} }
// User not found in the local database registry // User not found in the local database registry

125
src/application/controller/api/user/profile.php
Unescape View File

@ -28,70 +28,73 @@ if (isset($_SESSION['userName'])) {
'profile' => $mcProfile 'profile' => $mcProfile
]; ];
/* } else {
* Step 2: try to obtain profile from DHT
* /*
* */ * Step 2: try to obtain profile from DHT
} else if ($dhtProfileRevisions = $_twister->getDHTProfileRevisions($userName)) { *
* */
// Add DHT version if not exists if ($dhtProfileRevisions = $_twister->getDHTProfileRevisions($userName)) {
foreach ((array) $dhtProfileRevisions as $dhtProfileRevision) {
// Add DHT version if not exists
// Save revision into the database if not exists foreach ((array) $dhtProfileRevisions as $dhtProfileRevision) {
if (!$_modelProfile->versionExists($userId,
$dhtProfileRevision['height'], // Save revision into the database if not exists
$dhtProfileRevision['seq'])) { if (!$_modelProfile->versionExists($userId,
$dhtProfileRevision['height'],
$_modelProfile->add($userId, $dhtProfileRevision['seq'])) {
$dhtProfileRevision['height'],
$dhtProfileRevision['seq'], $_modelProfile->add($userId,
$dhtProfileRevision['time'], $dhtProfileRevision['height'],
$dhtProfileRevision['seq'],
$dhtProfileRevision['fullName'], $dhtProfileRevision['time'],
$dhtProfileRevision['bio'],
$dhtProfileRevision['location'], $dhtProfileRevision['fullName'],
$dhtProfileRevision['url'], $dhtProfileRevision['bio'],
$dhtProfileRevision['bitMessage'], $dhtProfileRevision['location'],
$dhtProfileRevision['tox']); $dhtProfileRevision['url'],
$dhtProfileRevision['bitMessage'],
$dhtProfileRevision['tox']);
}
} }
} }
}
/*
* Step 3: Select latest version available from DB revisions
*
* */
if ($dbProfileRevision = $_modelProfile->get($userId)) {
// Format output
$profile = [
'userName' => $userName,
'fullName' => Format::text($dbProfileRevision['fullName']),
'location' => Format::text($dbProfileRevision['location']),
'url' => Format::text($dbProfileRevision['url']),
'bitMessage' => Format::text($dbProfileRevision['bitMessage']),
'tox' => Format::text($dbProfileRevision['tox']),
'bio' => Format::text($dbProfileRevision['bio']),
];
// Save request into the cache pool /*
$_memcache->set('api.user.profile.' . $userName, $profile, MEMCACHE_COMPRESS, MEMCACHE_DHT_PROFILE_TIMEOUT); * Step 3: Select latest version available from DB revisions
*
// Response * */
$response = [ if ($dbProfileRevision = $_modelProfile->get($userId)) {
'success' => true,
'message' => _('Profile successfully received from DHT/DB'), // Format output
'profile' => $profile $profile = [
]; 'userName' => $userName,
'fullName' => Format::text($dbProfileRevision['fullName']),
// Cache, DHT, DB not contain any the details about user requested 'location' => Format::text($dbProfileRevision['location']),
} else { 'url' => Format::text($dbProfileRevision['url']),
'bitMessage' => Format::text($dbProfileRevision['bitMessage']),
$response = [ 'tox' => Format::text($dbProfileRevision['tox']),
'success' => false, 'bio' => Format::text($dbProfileRevision['bio']),
'message' => _('Could not receive any profile details'), ];
'profile' => []
]; // Save request into the cache pool
$_memcache->set('api.user.profile.' . $userName, $profile, MEMCACHE_COMPRESS, MEMCACHE_DHT_PROFILE_TIMEOUT);
// Response
$response = [
'success' => true,
'message' => _('Profile successfully received from DHT/DB'),
'profile' => $profile
];
// Cache, DHT, DB not contain any the details about user requested
} else {
$response = [
'success' => false,
'message' => _('Could not receive any profile details'),
'profile' => []
];
}
} }
// User not found in the local database registry // User not found in the local database registry

Write Preview
Loading…
Cancel
Save