Controllers/Cli/User.php

@@ -50,4 +50,35 @@ class User extends Cli\Controller implements Interfaces\CliControllerInterface
  $this->out("Set feature flags for {$user->username}: " . implode(', ', $features));
  }
  }
+
+ /**
+ * Resets a users passwords.
+ * Requires username and password.
+ *
+ * Example call: php ./cli.php User password_reset --username=nemofin --password=password123
+ * @return void
+ */
+ public function password_reset()
+ {
+ try {
+ if (!$this->getOpt('username') || !$this->getOpt('password')) {
+ throw new Exceptions\CliException('Missing username / password');
+ }
+
+ $username = $this->getOpt('username');
+ $password = $this->getOpt('password');
+
+ $user = new Entities\User($username);
+ 
+ $user->password = Core\Security\Password::generate($user, $password);
+ $user->password_reset_code = "";
+ $user->override_password = true;
+ $user->save();
+
+ $this->out("Password changed successfuly for user ".$username);
+ } catch (Exception $e) {
+ $this->out("An error has occured");
+ $this->out($e);
+ }
+ }
 }

Controllers/api/v1/comments.php

@@ -347,15 +347,22 @@ class comments implements Interfaces\Api
 
  $comment = $manager->getByLuid($pages[0]);
 
- if ($comment && $comment->canEdit()) {
+ if (!$comment) {
+ return Factory::response([
+ 'status' => 'error',
+ 'message' => 'Comment not found',
+ ]);
+ }
+
+ if ($comment->canEdit()) {
  $manager->delete($comment);
  return Factory::response([]);
  }
  //check if owner of activity trying to remove
  $entity = Entities\Factory::build($comment->getEntityGuid());
- 
+
  if ($entity->owner_guid == Core\Session::getLoggedInUserGuid()) {
- $manager->delete($comment, [ 'force' => true ]);
+ $manager->delete($comment, ['force' => true]);
  return Factory::response([]);
  }
 

Controllers/api/v2/blockchain/wallet.php

@@ -25,6 +25,8 @@ class wallet implements Interfaces\Api
  */
  public function get($pages)
  {
+ Factory::isLoggedIn();
+
  /** @var abstractCacher $cache */
  $cache = Di::_()->get('Cache');
 

Controllers/api/v2/payments/stripe/transactions.php

@@ -28,7 +28,14 @@ class transactions implements Interfaces\Api
  'message' => 'There was an error returning the usd account',
  ]);
  }
- 
+
+ if (!$account) {
+ return Factory::response([
+ 'status' => 'error',
+ 'message' => 'Stripe account not found',
+ ]);
+ }
+
  $transactionsManger = new Stripe\Transactions\Manager();
  $transactions = $transactionsManger->getByAccount($account);
 

Core/Analytics/EntityCentric/ActiveUsersSynchroniser.php

@@ -18,13 +18,21 @@ class ActiveUsersSynchroniser
  $this->activeMetric = $activeMetric ?? new Active();
  }
 
+ /**
+ * @param int $from
+ * @return self
+ */
  public function setFrom($from): self
  {
  $this->from = $from;
  return $this;
  }
 
- public function toRecords()
+ /**
+ * Convert to records
+ * @return iterable
+ */
+ public function toRecords(): iterable
  {
  $date = (new DateTime())->setTimestamp($this->from);
  $now = new DateTime();

Core/Analytics/EntityCentric/EntityCentricRecord.php

@@ -10,17 +10,19 @@ use Minds\Traits\MagicAttributes;
 
 /**
  * Class EntityCentricRecord
- * @package Minds\Core\Analytics\Views
- * @method DownsampledView setResolution(int $year)
+ * @package Minds\Core\Analytics\EntityCentric
+ * @method EntityCentricRecord setResolution(int $year)
  * @method string getResolution()
- * @method DownsampledView setEntityUrn(string $entityUrn)
+ * @method EntityCentricRecord setEntityUrn(string $entityUrn)
  * @method string getEntityUrn()
- * @method DownsampledView setOwnerGuid(string $ownerGuid)
+ * @method EntityCentricRecord setOwnerGuid(string $ownerGuid)
  * @method string getOwnerGuid()
- * @method DownsampledView setTimestampMs(int $timestampMs)
+ * @method EntityCentricRecord setTimestampMs(int $timestampMs)
  * @method int getTimestampMs()
- * @method DownsampledView setViews(int $views)
- * @method int getViews()
+ * @method EntityCentricRecord setTimestamp(int $timestamp)
+ * @method int getTimestamp()
+ * @method EntityCentricRecord setSums(array $sums)
+ * @method int getSums()
  */
 class EntityCentricRecord
 {
@@ -29,6 +31,9 @@ class EntityCentricRecord
  /** @var string */
  private $resolution;
 
+ /** @var int */
+ protected $timestamp;
+
  /** @var int */
  protected $timestampMs;
 
@@ -45,7 +50,7 @@ class EntityCentricRecord
  * Increment views
  * @param string $metric
  * @param int $value
- * @return DownsampledView
+ * @return EntityCentricRecord
  */
  public function incrementSum($metric, $value = 1): EntityCentricRecord
  {

Core/Analytics/EntityCentric/Manager.php

@@ -33,6 +33,10 @@ class Manager
  $this->repository = $repository ?: new Repository();
  }
 
+ /**
+ * @param int $from
+ * @return self
+ */
  public function setFrom($from): self
  {
  $this->from = $from;
@@ -41,9 +45,9 @@ class Manager
 
  /**
  * Synchronise views from cassandra to elastic
- * @return void
+ * @return iterable
  */
- public function sync()
+ public function sync(): iterable
  {
  foreach (Manager::SYNCHRONISERS as $synchroniserClass) {
  $synchroniser = new $synchroniserClass;

Core/Analytics/EntityCentric/Repository.php

@@ -6,7 +6,6 @@
 
 namespace Minds\Core\Analytics\EntityCentric;
 
-use Minds\Core\Analytics\Views\DownsampledView;
 use DateTime;
 use DateTimeZone;
 use Exception;

Core/Analytics/EntityCentric/SignupsSynchroniser.php

@@ -18,13 +18,21 @@ class SignupsSynchroniser
  $this->signupMetric = $signupMetric ?? new Signup;
  }
 
+ /**
+ * @param int $from
+ * @return self
+ */
  public function setFrom($from): self
  {
  $this->from = $from;
  return $this;
  }
 
- public function toRecords()
+ /**
+ * Convert to records
+ * @return iterable
+ */
+ public function toRecords(): iterable
  {
  $date = (new DateTime())->setTimestamp($this->from);
  $now = new DateTime();

Core/Analytics/EntityCentric/ViewsSynchroniser.php

@@ -18,13 +18,21 @@ class ViewsSynchroniser
  $this->viewsRepository = $viewsRepository ?: new ViewsRepository();
  }
 
+ /**
+ * @param int $from
+ * @return self
+ */
  public function setFrom($from): self
  {
  $this->from = $from;
  return $this;
  }
 
- public function toRecords()
+ /**
+ * Convert to records
+ * @return iterable
+ */
+ public function toRecords(): iterable
  {
  $date = (new DateTime())->setTimestamp($this->from);
 

lib/users.php

@@ -950,14 +950,14 @@ function validate_password($password) {
 		$CONFIG->min_password_length = 6;
 	}
 
-	if (strlen($password) < $CONFIG->min_password_length) {
-		$msg = "Passwords should be at least " . $CONFIG->min_password_length . " characters long";
-		throw new RegistrationException($msg);
-	}
-
 	//Check for a uppercase character, numeric character,special character 
-	if (!preg_match('/[A-Z]/', $password) || !preg_match('/\d/', $password) || !preg_match('/[^a-zA-Z\d]/', $password) || preg_match("/\\s/", $password)) {
-		$msg = "Password must have more than 8 characters. Including uppercase, numbers, special characters (ie. !,#,@), and cannot have spaces.";
+	if (strlen($password) < $CONFIG->min_password_length 
+		|| !preg_match('/[A-Z]/', $password) 
+		|| !preg_match('/\d/', $password) 
+		|| !preg_match('/[^a-zA-Z\d]/', $password) 
+		|| preg_match("/\\s/", $password)
+	) {
+		$msg = "Password must have 8 characters or more. Including uppercase, numbers, special characters (ie. !,#,@), and cannot have spaces.";
 		throw new RegistrationException($msg);
 	}