Controllers/Cli/Rewards.php

@@ -92,15 +92,15 @@ class Rewards extends Cli\Controller implements Interfaces\CliControllerInterfac
  $reward = $manager->sync();
  $total = $total->add($reward->getAmount());
  $leaderboard[$user->guid] = ($reward->getAmount() / (10**18));
- if ($reward->getAmount() > 0) {
+ $amnt = (int) $reward->getAmount();
+ if ($amnt > 0) {
  Dispatcher::trigger('notification', 'reward', [
- 'to' => [$user->guid],
- 'from' => Core\Notification\Notification::SYSTEM_ENTITY,
+ 'to' => [$guid],
+ 'from' => $guid,
  'notification_view' => 'rewards_summary',
- 'params' => ['amount' => (string)BigNumber::_($reward->getAmount())],
+ 'params' => ['amount' => number_format($reward->getAmount() / (10**18), 3)],
  ]);
  }
- $amnt = (int) $reward->getAmount();
  echo "\n [$i][$guid]: synced past 48 hours. {$amnt}/$total";
  } catch (\Exception $e) {
  var_dump($e);

Controllers/api/v2/blockchain/contributions/overview.php

@@ -8,6 +8,7 @@
 
 namespace Minds\Controllers\api\v2\blockchain\contributions;
 
+use Minds\Core\Analytics\UserStates\RewardFactor;
 use Minds\Core\Session;
 use Minds\Interfaces;
 use Minds\Api\Factory;
@@ -22,20 +23,29 @@ class overview implements Interfaces\Api
  */
  public function get($pages)
  {
- $overview = new Contributions\Overview();
- $overview
- ->setUser(Session::getLoggedinUser())
- ->calculate();
+ if (Factory::isLoggedIn()) {
+ $user = Session::getLoggedinUser();
+ $overview = new Contributions\Overview();
+ $overview
+ ->setUser($user)
+ ->calculate();
 
- $response = [
- 'nextPayout' => $overview->getNextPayout(),
- 'currentReward' => $overview->getCurrentReward(),
- 'yourContribution' => $overview->getYourContribution(),
- 'totalNetworkContribution' => $overview->getTotalNetworkContribution(),
- 'yourShare' => $overview->getYourShare(),
- 'yourRewardFactor' => $overview->getYourRewardFactor()
- ];
- return Factory::response($response);
+ $rewardFactor = RewardFactor::getForUserState($user->getUserState());
+ $contributionValues = array_map(function($value) use ($rewardFactor) {
+ return $value * $rewardFactor;
+ }, Contributions\ContributionValues::$multipliers);
+
+ $response = [
+ 'nextPayout' => $overview->getNextPayout(),
+ 'currentReward' => $overview->getCurrentReward(),
+ 'yourContribution' => $overview->getYourContribution(),
+ 'totalNetworkContribution' => $overview->getTotalNetworkContribution(),
+ 'yourShare' => $overview->getYourShare(),
+ 'yourRewardFactor' => $overview->getYourRewardFactor(),
+ 'contributionValues' => $contributionValues
+ ];
+ return Factory::response($response);
+ }
  }
 
  /**