.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
  - build
  - test
  - prepare
- - staging
+ - review
  - deploy
 
 cache:
@@ -49,48 +49,46 @@ prepare:runners:
  - docker build -t $CI_REGISTRY_IMAGE/runners:$CI_BUILD_REF -f containers/php-runners/Dockerfile .
  - docker push $CI_REGISTRY_IMAGE/runners:$CI_BUILD_REF
 
-staging:start:
- stage: staging
+review:start:
+ stage: review
  image: minds/helm-eks:latest
  script:
  - aws eks update-kubeconfig --name=sandbox
- - STAGING_SUBDOMAIN=$(echo $CI_COMMIT_MESSAGE | sed -n 's/.* -subdomain=\([^ ]*\).*/\1/p')
- - echo "Subdomain will be setup at $STAGING_SUBDOMAIN"
  - git clone --branch=sandbox-wip https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
  - "helm upgrade \
  --install \
  --reuse-values \
  --set phpfpm.image.repository=$CI_REGISTRY_IMAGE/fpm \
  --set phpfpm.image.tag=$CI_BUILD_REF \
- --set domain=$STAGING_SUBDOMAIN.$STAGING_DOMAIN \
- --set elasticsearch.clusterName=$STAGING_SUBDOMAIN-elasticsearch \
+ --set runners.image.repository=$CI_REGISTRY_IMAGE/runners \
+ --set runners.image.tag=$CI_BUILD_REF \
+ --set domain=$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN \
+ --set elasticsearch.clusterName=$CI_BUILD_REF_SLUG-elasticsearch \
  --wait \
- $STAGING_SUBDOMAIN \
+ $CI_BUILD_REF_SLUG \
  ./helm-charts/minds"
- only:
- variables:
- - $CI_COMMIT_MESSAGE =~ /-subdomain/
  environment:
- name: staging
+ name: review/$CI_COMMIT_REF_NAME
+ url: https://$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+ on_stop: review:stop
  except: 
  refs:
  - master
  - test/gitlab-ci
 
-staging:stop:
- stage: staging
+review:stop:
+ stage: review
  image: minds/helm-eks:latest
  script:
  - aws eks update-kubeconfig --name=sandbox
- - STAGING_SUBDOMAIN=$(echo $CI_COMMIT_MESSAGE | sed -n 's/.* -subdomain=\([^ ]*\).*/\1/p')
- - echo "TODO tear down $STAGING_SUBDOMAIN"
- - helm del --purge $STAGING_SUBDOMAIN
- when: manual
- only:
- variables:
- - $CI_COMMIT_MESSAGE =~ /-subdomain/
+ - helm del --purge $CI_BUILD_REF_SLUG
  environment:
- name: staging
+ name: review/$CI_COMMIT_REF_NAME
+ url: https://$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+ action: stop
+ variables:
+ GIT_STRATEGY: none
+ when: manual
  except: 
  refs:
  - master

Core/Email/Batches/MissedSinceLogin.php

@@ -94,11 +94,11 @@ class MissedSinceLogin implements EmailBatchInterface
  ->setValue(true)
  ->setOffset($this->offset);
 
- $blogs = $this->getTrendingBlogs();
+ //$blogs = $this->getTrendingBlogs();
 
  $i = 0;
  foreach ($iterator as $user) {
- $user = new \Minds\Entities\User('ottman');
+ $user = new \Minds\Entities\User('mark');
  ++$i;
  echo "\n[$i]: $user->guid ($iterator->offset)";
 
@@ -107,13 +107,13 @@ class MissedSinceLogin implements EmailBatchInterface
  // return true;
  //}
 
- $campaign = new Campaigns\WithBlogs();
+ $campaign = new Campaigns\MissedSinceLogin();
 
  $campaign
  ->setUser($user)
- //->setTemplateKey($this->templatePath)
- //->setSubject($this->subject)
- ->setBlogs($blogs)
+ ->setTemplateKey($this->templatePath)
+ ->setSubject($this->subject)
+ //->setBlogs($blogs)
  ->send();
 
  echo ' sent';

Core/Email/Campaigns/MissedSinceLogin.php

@@ -64,6 +64,7 @@ class MissedSinceLogin extends EmailCampaign
  $this->template->setTemplate('default.tpl');
 
  $this->template->setBody("./Templates/$this->templateKey.tpl");
+ $this->template->toggleMarkdown(true);
 
  $this->template->set('user', $this->user);
  $this->template->set('username', $this->user->username);
@@ -75,7 +76,6 @@ class MissedSinceLogin extends EmailCampaign
 
  $this->template->set('entities', $this->entities);
 
- $this->user = new \Minds\Entities\User('jack');
  $message = new Message();
  $message->setTo($this->user)
  ->setMessageId(implode('-',

Core/Email/Campaigns/Templates/token-balance.md.tpl

+Please login to check your token balance. Remember, 1 token = 1,000 extra views on the content of your choice by using [Boost](https://www.minds.com/boost?__e_ct_guid=<?= $vars['guid']?>&campaign=<?= $vars['campaign']?>&topic=<?= $vars['topic'] ?>&validator=<?= $vars['validator']?>). You can also send tokens to your favourite channels to support them.
+
+| |
+|:--:|
+| [![Read More](https://cdn-assets.minds.com/emails/view-balance.png){=150x}](https://ndl.minds.com/wallet/tokens/transactions?__e_ct_guid=<?= $vars['guid']?>&campaign=<?= $vars['campaign']?>&topic=<?= $vars['topic'] ?>&validator=<?= $vars['validator']?>){=50x} |
+| |
+
+Thank you for your contribution!

Core/Email/Verify/Manager.php

@@ -30,6 +30,8 @@ class Manager
  'uber-mail.com',
  'mailmetal.com',
  'email-24x7.com',
+ 'getsimpleemail.com',
+ 'mailsoul.com',
  ];
 
  public function __construct($service = null, $spamBlocksManager = null)

Core/Notification/Counters.php

@@ -50,6 +50,10 @@ class Counters
  */
  public function getCount(array $options = [])
  {
+ // return Helpers\Counters::get($this->user, 'notifications:count', false);
+
+ // TODO: Remove below once settled
+
  $query = "SELECT uuid, read_timestamp FROM notifications
  WHERE to_guid = ?
  ORDER BY created_timestamp DESC
@@ -86,7 +90,7 @@ class Counters
  */
  public function increaseCounter()
  {
- //Helpers\Counters::increment($this->user, 'notifications:count');
+ Helpers\Counters::increment($this->user, 'notifications:count');
  }
 
  /**
@@ -96,6 +100,10 @@ class Counters
  */
  public function resetCounter()
  {
+ Helpers\Counters::clear($this->user, 'notifications:count');
+
+ // TODO: Remove below once settled
+
  $query = "BEGIN;
  UPDATE notifications
  SET read_timestamp = NOW()