Merge pull request #4203 from fiveai/fix-api-search-with-pagination

Fix API search with pagination when specifying page

.bowerrc

@@ -1,4 +0,0 @@
-{
-    "directory": "vendor/bower_components",
-    "interactive": false
-}

.env.example

@@ -9,10 +9,11 @@ DB_DATABASE=cachet
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 DB_PORT=null
+DB_PREFIX=null
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-QUEUE_DRIVER=database
+QUEUE_DRIVER=sync
 CACHET_EMOJI=false
 
 MAIL_DRIVER=smtp

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+/.github export-ignore
+/tests export-ignore

.github/ISSUE_TEMPLATE

@@ -0,0 +1,20 @@
+Before submitting your issue, please make sure that you've checked the checkboxes below.
+
+- [ ] I am running the [latest release](https://github.com/CachetHQ/Cachet/releases/latest) version of Cachet.
+- [ ] I am running at least PHP 5.5.9. *You can check this by running `php -v`.*
+- [ ] I have ran `rm -rf bootstrap/cache/*`.
+
+### Expected behaviour
+
+*Please describe what you're expecting to see happen.*
+
+### Actual behaviour
+
+*Please describe what you're actually seeing happen.*
+
+### Steps to reproduce
+
+*If your issue requires any specific steps to reproduce, please outline them here.*
+
+1. First step
+2. Second step

.travis.yml

@@ -1,21 +1,18 @@
 language: php
 
+sudo: false
+
+dist: trusty
+
 php:
   - 5.5.9
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
 
-sudo: false
+before_install: cp .env.example .env
 
-install:
-  - travis_retry composer install --no-interaction --no-scripts --prefer-source
+install: travis_retry composer install --no-interaction --no-scripts --prefer-source
 
-script:
-  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ] || [ "$TRAVIS_PULL_REQUEST" != false ]; then vendor/bin/phpunit; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
-
-after_script:
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
+script: vendor/bin/phpunit

README.md

@@ -1,13 +1,15 @@
 # Cachet
 
 [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/)
-[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
-[![Quality Score](https://img.shields.io/scrutinizer/g/CachetHQ/Cachet.svg?style=flat-square)](https://scrutinizer-ci.com/g/CachetHQ/Cachet)
+[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/2.3.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet)
 [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.png)](http://translate.cachethq.io/project/cachet)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet)
+[![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet)
 
 ![Screenshot](https://cachethq.io/img/main-interface.jpg)
 
+Cachet is a beautiful and powerful open source status page system.
+
 ## Features
 
 - List your services components
@@ -19,46 +21,86 @@
 - Metrics
 - Cross-database support: MySQL, PostgreSQL and SQLite
 - Subscriber notifications via Email
-- Two factor authentication, with Google Authenticator
-
-## Usage in production
-
-The `master` branch of this repository is a development branch and **should not** be used in production. Instead, please check out the latest tag release.
+- Two factor authentication using Google Authenticator
 
 ## Requirements
 
-- PHP 5.5.9+ or newer
+- PHP 5.5.9 - 7.1
+- Apache or Nginx server
 - [Composer](https://getcomposer.org)
 
-### Development Requirements
+## I'm looking to contribute to this awesome project!
 
-These extra dependencies are required to develop Cachet:
+Sweet, we're always looking for contributions that improve Cachet! It's easy to get started and you don't even need to know how to write a single line of code!
+
+### Contributing as a non-developer/non-designer
+
+We're always looking for new [translations](#translations).
+
+Of course bug reports, feature requests and [documentation](https://docs.cachethq.io) are always appreciated.
+
+### Contributing as a designer
+
+As Cachet gains new features, the design and ideas that were once a perfect fit need updating and in some cases designing from scratch. This is where you come in! Fancy giving Cachet a lick of paint? Sweet!
+
+You'll need to install Node.js, Bower and Gulp.
+
+To get started you can do the following:
+
+1. Install Node.js and our dev dependencies.
+2. Make your changes to the SCSS files in `./resources/assets/sass/`
+3. Run `gulp`
+
+If you're making a lot of changes, you'll find that running `gulp watch` will make life easier for you!
+
+### Contributing as a developer
+
+Built using [Laravel](https://laravel.com).
+
+We use these extra dependencies to develop Cachet:
 
 - Node.js
-- Bower
 - Gulp
+- Git
+
+Once cloned to your local machine, you'll need some demo data! Run `php artisan cachet:seed` to get the demo installation ready for action.
 
 ## Installation, Upgrades and Documentation
 
-You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io).
+Documentation is found at [https://docs.cachethq.io](https://docs.cachethq.io).
+
+Here are some useful quick links:
 
 - [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
 - [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
-- [Getting started with Vagrant](https://docs.cachethq.io/docs/get-started-with-vagrant)
 
 ### Demo Account
 
 To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following:
 
-- **Username:** test or test@test.com
-- **Password:** test123
+- **Username:** `test` or `test@test.com`
+- **Password:** `test123`
 
 The demo is reset every half hour.
 
+### Release Notes
+
+We list releases on the [Releases page](https://github.com/CachetHQ/Cachet/releases) of the [Cachet GitHub repository](https://github.com/CachetHQ/Cachet). On the Releases page, you can also find the release notes for each release.
+
 ## Translations
 
-A special thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world. If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).
+If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet).
+
+> Thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world!
+
+## Show your support
+
+Cachet is a BSD-3-licensed open source project.
+
+## Professional Installation Service
+
+We offer a professional installation service. To find out more, email us at [support@alt-three.com](mailto:support@alt-three.com?Cachet Installation)
 
 ## Security Vulnerabilities
 
-If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. All security vulnerabilities will be promptly addressed.
+If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. We handle all security vulnerabilities on a case-by-case basis.

VERSION

@@ -1 +1 @@
-2.1.2
+2.3.19-dev

app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php

@@ -11,6 +11,11 @@
 
 namespace CachetHQ\Cachet\Bus\Commands\ComponentGroup;
 
+/**
+ * This is the add component group command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class AddComponentGroupCommand
 {
     /**
@@ -30,7 +35,7 @@ final class AddComponentGroupCommand
     /**
      * Is the component group collapsed?
      *
-     * @var bool
+     * @var int
      */
     public $collapsed;
 
@@ -42,7 +47,7 @@ final class AddComponentGroupCommand
     public $rules = [
         'name'      => 'required|string',
         'order'     => 'int',
-        'collapsed' => 'bool',
+        'collapsed' => 'int|between:0,3',
     ];
 
     /**
@@ -50,7 +55,7 @@ final class AddComponentGroupCommand
      *
      * @param string $name
      * @param int    $order
-     * @param bool   $collapsed
+     * @param int    $collapsed
      *
      * @return void
      */

app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php

@@ -13,6 +13,11 @@ namespace CachetHQ\Cachet\Bus\Commands\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
+/**
+ * This is the update component group command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class UpdateComponentGroupCommand
 {
     /**
@@ -39,7 +44,7 @@ final class UpdateComponentGroupCommand
     /**
      * Is the component group collapsed?
      *
-     * @var bool
+     * @var int
      */
     public $collapsed;
 
@@ -51,7 +56,7 @@ final class UpdateComponentGroupCommand
     public $rules = [
         'name'      => 'string',
         'order'     => 'int',
-        'collapsed' => 'bool',
+        'collapsed' => 'int|between:0,3',
     ];
 
     /**
@@ -60,7 +65,7 @@ final class UpdateComponentGroupCommand
      * @param \CachetHQ\Cachet\Models\ComponentGroup $group
      * @param string                                 $name
      * @param int                                    $order
-     * @param bool                                   $collapsed
+     * @param int                                    $collapsed
      *
      * @return void
      */

app/Bus/Commands/Metric/AddMetricCommand.php

@@ -69,6 +69,20 @@ final class AddMetricCommand
      */
     public $default_view;
 
+    /**
+     * The threshold to buffer the metric points in.
+     *
+     * @var int
+     */
+    public $threshold;
+
+    /**
+     * The order of which to place the metric in.
+     *
+     * @var int
+     */
+    public $order;
+
     /**
      * The validation rules.
      *
@@ -84,6 +98,8 @@ final class AddMetricCommand
         'display_chart' => 'int',
         'places'        => 'int|between:0,4',
         'default_view'  => 'int|between:0,3',
+        'threshold'     => 'numeric|between:0,10',
+        'order'         => 'int',
     ];
 
     /**
@@ -97,10 +113,12 @@ final class AddMetricCommand
      * @param int    $display_chart
      * @param int    $places
      * @param int    $default_view
+     * @param int    $threshold
+     * @param int    $order
      *
      * @return void
      */
-    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
+    public function __construct($name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view, $threshold, $order = 0)
     {
         $this->name = $name;
         $this->suffix = $suffix;
@@ -110,5 +128,7 @@ final class AddMetricCommand
         $this->display_chart = $display_chart;
         $this->places = $places;
         $this->default_view = $default_view;
+        $this->threshold = $threshold;
+        $this->order = $order;
     }
 }

app/Bus/Commands/Metric/AddMetricPointCommand.php

@@ -42,7 +42,7 @@ final class AddMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 

app/Bus/Commands/Metric/UpdateMetricCommand.php

@@ -78,6 +78,20 @@ final class UpdateMetricCommand
      */
     public $default_view;
 
+    /**
+     * The threshold to buffer the metric points in.
+     *
+     * @var int
+     */
+    public $threshold;
+
+    /**
+     * The order of which to place the metric in.
+     *
+     * @var int|null
+     */
+    public $order;
+
     /**
      * The validation rules.
      *
@@ -93,6 +107,8 @@ final class UpdateMetricCommand
         'display_chart' => 'int',
         'places'        => 'numeric|between:0,4',
         'default_view'  => 'numeric|between:0,4',
+        'threshold'     => 'numeric|between:0,10',
+        'order'         => 'int',
     ];
 
     /**
@@ -107,10 +123,12 @@ final class UpdateMetricCommand
      * @param int                            $display_chart
      * @param int                            $places
      * @param int                            $default_view
+     * @param int                            $threshold
+     * @param int|null                       $order
      *
      * @return void
      */
-    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view)
+    public function __construct(Metric $metric, $name, $suffix, $description, $default_value, $calc_type, $display_chart, $places, $default_view, $threshold, $order = null)
     {
         $this->metric = $metric;
         $this->name = $name;
@@ -121,5 +139,7 @@ final class UpdateMetricCommand
         $this->display_chart = $display_chart;
         $this->places = $places;
         $this->default_view = $default_view;
+        $this->threshold = $threshold;
+        $this->order = $order;
     }
 }

app/Bus/Commands/Metric/UpdateMetricPointCommand.php

@@ -14,6 +14,11 @@ namespace CachetHQ\Cachet\Bus\Commands\Metric;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
 
+/**
+ * This is the update metric point command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 final class UpdateMetricPointCommand
 {
     /**
@@ -33,7 +38,7 @@ final class UpdateMetricPointCommand
     /**
      * The metric point value.
      *
-     * @var int
+     * @var float
      */
     public $value;
 
@@ -50,7 +55,7 @@ final class UpdateMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'int',
+        'value'      => 'numeric',
         'created_at' => 'string',
     ];
 
@@ -59,7 +64,7 @@ final class UpdateMetricPointCommand
      *
      * @param \CachetHQ\Cachet\Models\MetricPoint $point
      * @param \CachetHQ\Cachet\Models\Metric      $metric
-     * @param int                                 $value
+     * @param float                               $value
      * @param string                              $created_at
      *
      * @return void

app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php

@@ -33,7 +33,7 @@ final class SubscribeSubscriberCommand
     public $verified;
 
     /**
-     * The subscriptions that we want to add.
+     * The list of subscriptions to set the subscriber up with.
      *
      * @var array|null
      */
@@ -53,7 +53,7 @@ final class SubscribeSubscriberCommand
      *
      * @param string     $email
      * @param bool       $verified
-     * @param null|array $subscriptions
+     * @param array|null $subscriptions
      *
      * @return void
      */

app/Bus/Commands/Subscriber/UpdateSubscriberSubscriptionCommand.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Commands\Subscriber;
+
+use CachetHQ\Cachet\Models\Subscriber;
+
+/**
+ * This is the subscribe subscriber command.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
+final class UpdateSubscriberSubscriptionCommand
+{
+    /**
+     * The subscriber email.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    public $subscriber;
+
+    /**
+     * The subscriptions that we want to add.
+     *
+     * @var array|null
+     */
+    public $subscriptions;
+
+    /**
+     * Create a new subscribe subscriber command instance.
+     *
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     * @param null|array                         $subscriptions
+     *
+     * @return void
+     */
+    public function __construct($subscriber, $subscriptions = null)
+    {
+        $this->subscriber = $subscriber;
+        $this->subscriptions = $subscriptions;
+    }
+}

app/Bus/Exceptions/Subscriber/AlreadySubscribedException.php

@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Bus\Exceptions\Subscriber;
-
-use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
-use Exception;
-
-/**
- * This is the already subscribed exception class.
- *
- * @author Graham Campbell <graham@alt-three.com>
- * @author James Brooks <james@alt-three.com>
- */
-class AlreadySubscribedException extends Exception implements ExceptionInterface
-{
-    //
-}

app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php

@@ -18,8 +18,13 @@ use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use Twig_Loader_String;
-use TwigBridge\Facade\Twig;
+use TwigBridge\Bridge;
 
+/**
+ * This is the report incident command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class ReportIncidentCommandHandler
 {
     /**
@@ -29,16 +34,25 @@ class ReportIncidentCommandHandler
      */
     protected $dates;
 
+    /**
+     * The twig bridge instance.
+     *
+     * @var \TwigBridge\Bridge
+     */
+    protected $twig;
+
     /**
      * Create a new report incident command handler instance.
      *
      * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     * @param \TwigBridge\Bridge                 $twig
      *
      * @return void
      */
-    public function __construct(DateFactory $dates)
+    public function __construct(DateFactory $dates, Bridge $twig)
     {
         $this->dates = $dates;
+        $this->twig = $twig;
     }
 
     /**
@@ -56,7 +70,7 @@ class ReportIncidentCommandHandler
             'visible' => $command->visible,
         ];
 
-        if ($command->template) {
+        if (IncidentTemplate::where('slug', '=', $command->template)->first()) {
             $data['message'] = $this->parseIncidentTemplate($command->template, $command->template_vars);
         } else {
             $data['message'] = $command->message;
@@ -106,9 +120,9 @@ class ReportIncidentCommandHandler
             $vars = [];
         }
 
-        Twig::setLoader(new Twig_Loader_String());
+        $this->twig->setLoader(new Twig_Loader_String());
         $template = IncidentTemplate::forSlug($templateSlug)->first();
 
-        return Twig::render($template->template, $vars);
+        return $this->twig->render($template->template, $vars);
     }
 }

app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php

@@ -18,8 +18,13 @@ use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
 use Twig_Loader_String;
-use TwigBridge\Facade\Twig;
+use TwigBridge\Bridge;
 
+/**
+ * This is the update incident command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class UpdateIncidentCommandHandler
 {
     /**
@@ -29,16 +34,25 @@ class UpdateIncidentCommandHandler
      */
     protected $dates;
 
+    /**
+     * The twig bridge instance.
+     *
+     * @var \TwigBridge\Bridge
+     */
+    protected $twig;
+
     /**
      * Create a new update incident command handler instance.
      *
      * @param \CachetHQ\Cachet\Dates\DateFactory $dates
+     * @param \TwigBridge\Bridge                 $twig
      *
      * @return void
      */
-    public function __construct(DateFactory $dates)
+    public function __construct(DateFactory $dates, Bridge $twig)
     {
         $this->dates = $dates;
+        $this->twig = $twig;
     }
 
     /**
@@ -113,9 +127,9 @@ class UpdateIncidentCommandHandler
      */
     protected function parseIncidentTemplate($templateSlug, $vars)
     {
-        Twig::setLoader(new Twig_Loader_String());
+        $this->twig->setLoader(new Twig_Loader_String());
         $template = IncidentTemplate::forSlug($templateSlug)->first();
 
-        return Twig::render($template->template, $vars);
+        return $this->twig->render($template->template, $vars);
     }
 }

app/Bus/Handlers/Commands/Metric/AddMetricCommandHandler.php

@@ -35,6 +35,8 @@ class AddMetricCommandHandler
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
             'default_view'  => $command->default_view,
+            'threshold'     => $command->threshold,
+            'order'         => $command->order,
         ]);
 
         event(new MetricWasAddedEvent($metric));

app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php

@@ -15,6 +15,7 @@ use CachetHQ\Cachet\Bus\Commands\Metric\AddMetricPointCommand;
 use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasAddedEvent;
 use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Models\MetricPoint;
+use Carbon\Carbon;
 
 class AddMetricPointCommandHandler
 {
@@ -49,19 +50,35 @@ class AddMetricPointCommandHandler
         $metric = $command->metric;
         $createdAt = $command->created_at;
 
-        $data = [
-            'metric_id' => $metric->id,
-            'value'     => $command->value,
-        ];
+        // Do we have an existing point with the same value?
+        $point = $this->findOrCreatePoint($command);
 
-        if ($createdAt) {
-            $data['created_at'] = $this->dates->create('U', $createdAt)->format('Y-m-d H:i:s');
+        $point->increment('counter', 1);
+
+        event(new MetricPointWasAddedEvent($point));
+
+        return $point;
+    }
+
+    protected function findOrCreatePoint(AddMetricPointCommand $command)
+    {
+        $buffer = Carbon::now()->subMinutes($command->metric->threshold);
+        $point = MetricPoint::where('metric_id', $command->metric->id)->where('value', $command->value)->where('created_at', '>=', $buffer)->first();
+
+        if ($point) {
+            return $point;
         }
 
-        $metricPoint = MetricPoint::create($data);
+        $data = [
+            'metric_id' => $command->metric->id,
+            'value'     => $command->value,
+            'counter'   => 0,
+        ];
 
-        event(new MetricPointWasAddedEvent($metricPoint));
+        if ($command->created_at) {
+            $data['created_at'] = $this->dates->create('U', $command->created_at)->format('Y-m-d H:i:s');
+        }
 
-        return $metricPoint;
+        return MetricPoint::create($data);
     }
 }

app/Bus/Handlers/Commands/Metric/UpdateMetricCommandHandler.php

@@ -53,6 +53,8 @@ class UpdateMetricCommandHandler
             'display_chart' => $command->display_chart,
             'places'        => $command->places,
             'default_view'  => $command->default_view,
+            'threshold'     => $command->threshold,
+            'order'         => $command->order,
         ];
 
         return array_filter($params, function ($val) {

app/Bus/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php

@@ -51,7 +51,7 @@ class UpdateMetricPointCommandHandler
 
         $data = [
             'metric_id' => $metric->id,
-            'value'     => $command->value,
+            'value'     => (float) $command->value,
         ];
 
         if ($createdAt) {

app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php

@@ -14,8 +14,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasSubscribedEvent;
-use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
-use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
+use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
 
@@ -23,6 +22,8 @@ use CachetHQ\Cachet\Models\Subscription;
  * This is the subscribe subscriber command handler.
  *
  * @author James Brooks <james@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class SubscribeSubscriberCommandHandler
 {
@@ -31,37 +32,38 @@ class SubscribeSubscriberCommandHandler
      *
      * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand $command
      *
-     * @throws \CachetHQ\Cachet\Exceptions\AlreadySubscribedException
-     *
      * @return \CachetHQ\Cachet\Models\Subscriber
      */
     public function handle(SubscribeSubscriberCommand $command)
     {
-        if (Subscriber::where('email', $command->email)->first() && $command->subscriptions === null) {
-            throw new AlreadySubscribedException("Cannot subscribe {$command->email} because they're already subscribed.");
+        if ($subscriber = Subscriber::where('email', $command->email)->first()) {
+            return $subscriber;
         }
 
         $subscriber = Subscriber::firstOrCreate(['email' => $command->email]);
 
+        // Decide what to subscribe the subscriber to.
         if ($subscriptions = $command->subscriptions) {
-            foreach ($subscriptions as $subscription => $subscriptionValue) {
-                Subscription::firstOrCreate([
-                    'subscriber_id' => $subscriber->id,
-                    $subscription   => $subscriptionValue,
-                ]);
-            }
+            $components = Component::whereIn('id', $subscriptions)->get();
+        } else {
+            $components = Component::all();
         }
 
-        if ($subscriber->is_verified === false) {
-            if ($command->verified) {
-                dispatch(new VerifySubscriberCommand($subscriber));
-            } else {
-                event(new SubscriberHasSubscribedEvent($subscriber));
-            }
+        $components->map(function ($component) use ($subscriber) {
+            Subscription::create([
+                'subscriber_id' => $subscriber->id,
+                'component_id'  => $component->id,
+            ]);
+        });
+
+        if ($command->verified) {
+            dispatch(new VerifySubscriberCommand($subscriber));
         } else {
-            event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+            event(new SubscriberHasSubscribedEvent($subscriber));
         }
 
+        $subscriber->load('subscriptions');
+
         return $subscriber;
     }
 }

app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php

@@ -13,7 +13,6 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
-use CachetHQ\Cachet\Models\Subscriber;
 
 class UnsubscribeSubscriberCommandHandler
 {

app/Bus/Handlers/Commands/Subscriber/UpdateSubscriberSubscriptionCommandHandler.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
+
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand;
+use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUpdatedSubscriptionsEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscriber;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the subscribe subscriber command handler.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
+class UpdateSubscriberSubscriptionCommandHandler
+{
+    /**
+     * Handle the subscribe subscriber command.
+     *
+     * @param \CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand $command
+     *
+     * @return \CachetHQ\Cachet\Models\Subscriber
+     */
+    public function handle(UpdateSubscriberSubscriptionCommand $command)
+    {
+        $subscriber = $command->subscriber;
+        $subscriptions = $command->subscriptions ?: [];
+
+        $components = Component::all();
+
+        $updateSubscriptions = $components->filter(function ($item) use ($subscriptions) {
+            return in_array($item->id, $subscriptions);
+        });
+
+        $subscriber->global = ($updateSubscriptions->count() === $components->count());
+
+        $subscriber->subscriptions()->delete();
+
+        if (!$updateSubscriptions->isEmpty()) {
+            foreach ($updateSubscriptions as $subscription) {
+                Subscription::firstOrCreate([
+                    'subscriber_id' => $subscriber->id,
+                    'component_id'  => $subscription->id,
+                ]);
+            }
+        }
+
+        $subscriber->save();
+
+        event(new SubscriberHasUpdatedSubscriptionsEvent($subscriber));
+
+        return $subscriber;
+    }
+}

app/Bus/Handlers/Events/Component/CleanupComponentSubscriptionsHandler.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Handlers\Events\Component;
+
+use CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Subscription;
+
+/**
+ * This is the cleanup component subscriptions handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class CleanupComponentSubscriptionsHandler
+{
+    /**
+     * Handle the event.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent $event
+     *
+     * @return void
+     */
+    public function handle(ComponentWasRemovedEvent $event)
+    {
+        $component = $event->component;
+        $subscription = Subscription::forComponent($component->id);
+
+        // Cleanup the subscriptions.
+        $subscription->delete();
+    }
+}

app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php

@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Events\Component;
 
 use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
-use CachetHQ\Cachet\Models\Subscription;
+use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
 use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
@@ -27,16 +27,25 @@ class SendComponentUpdateEmailNotificationHandler
      */
     protected $mailer;
 
+    /**
+     * The subscriber instance.
+     *
+     * @var \CachetHQ\Cachet\Models\Subscriber
+     */
+    protected $subscriber;
+
     /**
      * Create a new send incident email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer $mailer
+     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */
-    public function __construct(MailQueue $mailer)
+    public function __construct(MailQueue $mailer, Subscriber $subscriber)
     {
         $this->mailer = $mailer;
+        $this->subscriber = $subscriber;
     }
 
     /**
@@ -48,7 +57,42 @@ class SendComponentUpdateEmailNotificationHandler
      */
     public function handle(ComponentWasUpdatedEvent $event)
     {
-        $component = AutoPresenter::decorate($event->component);
+        $component = $event->component;
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($component, $subscriber);
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($component, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Models\Component  $component
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(Component $component, Subscriber $subscriber)
+    {
+        $component = AutoPresenter::decorate($component);
 
         $mail = [
             'subject'                => trans('cachet.subscriber.email.component.subject'),
@@ -56,17 +100,14 @@ class SendComponentUpdateEmailNotificationHandler
             'component_human_status' => $component->human_status,
         ];
 
-        foreach (Subscription::isVerifiedForComponent($component->id)->with('subscriber')->get() as $subscription) {
-            $subscriber = $subscription->subscriber;
-            $mail['email'] = $subscriber->email;
-            $mail['unsubscribe_link'] = route('subscribe.unsubscribe', ['code' => $subscriber->verify_code, 'subscription' => $subscription->id]);
+        $mail['email'] = $subscriber->email;
+        $mail['manage_link'] = route('subscribe.manage', ['code' => $subscriber->verify_code]);
 
-            $this->mailer->queue([
-                'html' => 'emails.components.update-html',
-                'text' => 'emails.components.update-text',
-            ], $mail, function (Message $message) use ($mail) {
-                $message->to($mail['email'])->subject($mail['subject']);
-            });
-        }
+        $this->mailer->queue([
+            'html' => 'emails.components.update-html',
+            'text' => 'emails.components.update-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
     }
 }

app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -50,7 +50,7 @@ class SendIncidentEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentHasReportedEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent $event
      *
      * @return void
      */
@@ -60,31 +60,74 @@ class SendIncidentEmailNotificationHandler
             return false;
         }
 
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 0) {
+            return;
+        }
+
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
+
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+
+        if (!$event->incident->component) {
+            return;
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($event->incident->component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
+            });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+    }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\IncidentWasReportedEvent $event
+     * @param \CachetHQ\Cachet\Models\Subscriber                   $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(IncidentWasReportedEvent $event, $subscriber)
+    {
         $incident = AutoPresenter::decorate($event->incident);
         $component = AutoPresenter::decorate($event->incident->component);
 
-        // Only send emails for public incidents.
-        if ($event->incident->visible === 1) {
-            foreach ($this->subscriber->isVerified()->get() as $subscriber) {
-                $mail = [
-                    'email'            => $subscriber->email,
-                    'subject'          => 'New incident reported.',
-                    'has_component'    => ($event->incident->component) ? true : false,
-                    'component_name'   => $component ? $component->name : null,
-                    'status'           => $incident->human_status,
-                    'html_content'     => $incident->formattedMessage,
-                    'text_content'     => $incident->message,
-                    'token'            => $subscriber->token,
-                    'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
-                ];
+        $mail = [
+            'email'   => $subscriber->email,
+            'subject' => trans('cachet.subscriber.email.incident.subject', [
+                'status' => $incident->human_status,
+                'name'   => $incident->name,
+            ]),
+            'has_component'    => ($event->incident->component) ? true : false,
+            'component_name'   => $component ? $component->name : null,
+            'name'             => $incident->name,
+            'timestamp'        => $incident->created_at_formatted,
+            'status'           => $incident->human_status,
+            'html_content'     => $incident->formattedMessage,
+            'text_content'     => $incident->message,
+            'token'            => $subscriber->token,
+            'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
+            'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
+        ];
 
-                $this->mailer->queue([
-                    'html' => 'emails.incidents.new-html',
-                    'text' => 'emails.incidents.new-text',
-                ], $mail, function (Message $message) use ($mail) {
-                    $message->to($mail['email'])->subject($mail['subject']);
-                });
-            }
-        }
+        $this->mailer->queue([
+            'html' => 'emails.incidents.new-html',
+            'text' => 'emails.incidents.new-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
     }
 }

app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php

@@ -50,7 +50,7 @@ class SendMaintenanceEmailNotificationHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceHasScheduledEvent $event
+     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceWasScheduledEvent $event
      *
      * @return void
      */
@@ -60,26 +60,73 @@ class SendMaintenanceEmailNotificationHandler
             return false;
         }
 
-        $data = AutoPresenter::decorate($event->incident);
+        // Only send emails for public incidents.
+        if ($event->incident->visible === 0) {
+            return;
+        }
 
-        foreach ($this->subscriber->isVerified()->get() as $subscriber) {
-            $mail = [
-                'email'            => $subscriber->email,
-                'subject'          => 'Scheduled maintenance.',
-                'status'           => $data->human_status,
-                'html_content'     => $data->formattedMessage,
-                'text_content'     => $data->message,
-                'scheduled_at'     => $data->scheduled_at_formatted,
-                'token'            => $subscriber->token,
-                'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
-            ];
+        // First notify all global subscribers.
+        $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
 
-            $this->mailer->queue([
-                'html' => 'emails.incidents.maintenance-html',
-                'text' => 'emails.incidents.maintenance-text',
-            ], $mail, function (Message $message) use ($mail) {
-                $message->to($mail['email'])->subject($mail['subject']);
+        foreach ($globalSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
+        }
+
+        if (!$event->incident->component) {
+            return;
+        }
+
+        $notified = $globalSubscribers->pluck('id')->all();
+
+        // Notify the remaining component specific subscribers.
+        $componentSubscribers = $this->subscriber
+            ->isVerified()
+            ->forComponent($event->incident->component->id)
+            ->get()
+            ->reject(function ($subscriber) use ($notified) {
+                return in_array($subscriber->id, $notified);
             });
+
+        foreach ($componentSubscribers as $subscriber) {
+            $this->notify($event, $subscriber);
         }
     }
+
+    /**
+     * Send notification to subscriber.
+     *
+     * @param \CachetHQ\Cachet\Bus\Events\MaintenanceWasScheduledEvent $event
+     * @param \CachetHQ\Cachet\Models\Subscriber                       $subscriber
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function notify(MaintenanceWasScheduledEvent $event, $subscriber)
+    {
+        $incident = AutoPresenter::decorate($event->incident);
+        $component = AutoPresenter::decorate($event->incident->component);
+
+        $mail = [
+            'email'   => $subscriber->email,
+            'subject' => trans('cachet.subscriber.email.maintenance.subject', [
+                'name' => $incident->name,
+            ]),
+            'has_component'    => ($event->incident->component) ? true : false,
+            'component_name'   => $component ? $component->name : null,
+            'name'             => $incident->name,
+            'timestamp'        => $incident->scheduled_at_formatted,
+            'status'           => $incident->human_status,
+            'html_content'     => $incident->formattedMessage,
+            'text_content'     => $incident->message,
+            'token'            => $subscriber->token,
+            'manage_link'      => route('subscribe.manage', ['code' => $subscriber->verify_code]),
+            'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
+        ];
+
+        $this->mailer->queue([
+            'html' => 'emails.incidents.maintenance-html',
+            'text' => 'emails.incidents.maintenance-text',
+        ], $mail, function (Message $message) use ($mail) {
+            $message->to($mail['email'])->subject($mail['subject']);
+        });
+    }
 }

app/Bus/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php

@@ -46,9 +46,9 @@ class SendSubscriberVerificationEmailHandler
     public function handle(SubscriberHasSubscribedEvent $event)
     {
         $mail = [
-            'email'    => $event->subscriber->email,
-            'subject'  => 'Confirm your subscription.',
-            'link'     => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
+            'email'   => $event->subscriber->email,
+            'subject' => 'Confirm your subscription.',
+            'link'    => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
         ];
 
         $this->mailer->queue([

app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php

@@ -46,9 +46,9 @@ class SendInviteUserEmailHandler
     public function handle(UserWasInvitedEvent $event)
     {
         $mail = [
-            'email'    => $event->invite->email,
-            'subject'  => 'You have been invited.',
-            'link'     => route('signup.invite', ['code' => $event->invite->code]),
+            'email'   => $event->invite->email,
+            'subject' => 'You have been invited.',
+            'link'    => route('signup.invite', ['code' => $event->invite->code]),
         ];
 
         $this->mailer->queue([

app/Bus/Middleware/UseDatabaseTransactions.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * This is the use database transactions bus middleware class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UseDatabaseTransactions
+{
+    /**
+     * Handle the current command in the pipeline.
+     *
+     * @param mixed    $command
+     * @param \Closure $next
+     *
+     * @return bool
+     */
+    public function handle($command, Closure $next)
+    {
+        return DB::transaction(function () use ($command, $next) {
+            return $next($command);
+        });
+    }
+}

app/Composers/AppComposer.php

@@ -28,7 +28,7 @@ class AppComposer
     {
         $view->withAboutApp(Markdown::convertToHtml(Config::get('setting.app_about')));
         $view->withAppAnalytics(Config::get('setting.app_analytics'));
-        $view->withAppAnalyticsGoSquared(Config::get('setting.app_analytics_go_squared'));
+        $view->withAppAnalyticsGoSquared(Config::get('setting.app_analytics_gs'));
         $view->withAppAnalyticsPiwikUrl(Config::get('setting.app_analytics_piwik_url'));
         $view->withAppAnalyticsPiwikSiteId(Config::get('setting.app_analytics_piwik_site_id'));
         $view->withAppBanner(Config::get('setting.app_banner'));
@@ -39,14 +39,12 @@ class AppComposer
         $view->withAppLocale(Config::get('setting.app_locale'));
         $view->withAppStylesheet(Config::get('setting.stylesheet'));
         $view->withAppUrl(Config::get('app.url'));
-
-        $view->withAppName($name = Config::get('setting.app_name'));
+        $view->withAppHeader(Config::get('setting.header'));
+        $view->withAppFooter(Config::get('setting.footer'));
+        $view->withAppName(Config::get('setting.app_name'));
         $view->withShowSupport($support = Config::get('setting.show_support'));
-
-        if ($support) {
-            $view->withSiteTitle(Config::get('setting.app_name').' | Cachet');
-        } else {
-            $view->withSiteTitle(Config::get('setting.app_name'));
-        }
+        $view->withAutomaticLocalization(Config::get('setting.automatic_localization'));
+        $view->withSiteTitle(Config::get('setting.app_name'));
+        $view->withFontSubset(Config::get('langs.'.Config::get('app.locale').'.subset', 'latin'));
     }
 }

app/Composers/DashboardComposer.php

@@ -13,6 +13,8 @@ namespace CachetHQ\Cachet\Composers;
 
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\IncidentTemplate;
+use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\View\View;
 
 class DashboardComposer
@@ -27,6 +29,8 @@ class DashboardComposer
     public function compose(View $view)
     {
         $view->withIncidentCount(Incident::notScheduled()->count());
-        $view->withComponentCount(Component::all()->count());
+        $view->withIncidentTemplateCount(IncidentTemplate::count());
+        $view->withComponentCount(Component::count());
+        $view->withSubscriberCount(Subscriber::isVerified()->count());
     }
 }

app/Composers/MetricsComposer.php

@@ -12,29 +12,11 @@
 namespace CachetHQ\Cachet\Composers;
 
 use CachetHQ\Cachet\Models\Metric;
-use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Config;
 
 class MetricsComposer
 {
-    /**
-     * @var \CachetHQ\Cachet\Repositories\Metric\MetricRepository
-     */
-    protected $metricRepository;
-
-    /**
-     * Construct a new home controller instance.
-     *
-     * @param \CachetHQ\Cachet\Repositories\Metric\MetricRepository $metricRepository
-     *
-     * @return void
-     */
-    public function __construct(MetricRepository $metricRepository)
-    {
-        $this->metricRepository = $metricRepository;
-    }
-
     /**
      * Metrics view composer.
      *
@@ -45,22 +27,11 @@ class MetricsComposer
     public function compose(View $view)
     {
         $metrics = null;
-        $metricData = [];
         if ($displayMetrics = Config::get('setting.display_graphs')) {
-            $metrics = Metric::where('display_chart', 1)->orderBy('id')->get();
-
-            $metrics->map(function ($metric) use (&$metricData) {
-                $metricData[$metric->id] = [
-                    'last_hour' => $this->metricRepository->listPointsLastHour($metric),
-                    'today'     => $this->metricRepository->listPointsToday($metric),
-                    'week'      => $this->metricRepository->listPointsForWeek($metric),
-                    'month'     => $this->metricRepository->listPointsForMonth($metric),
-                ];
-            });
+            $metrics = Metric::displayable()->orderBy('order')->orderBy('id')->get();
         }
 
         $view->withDisplayMetrics($displayMetrics)
-            ->withMetrics($metrics)
-            ->withMetricData($metricData);
+            ->withMetrics($metrics);
     }
 }

app/Composers/StatusPageComposer.php

@@ -11,13 +11,38 @@
 
 namespace CachetHQ\Cachet\Composers;
 
+use CachetHQ\Cachet\Integrations\Core\System;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
 use Illuminate\Contracts\View\View;
 
+/**
+ * This is the status page composer.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class StatusPageComposer
 {
+    /**
+     * The system instance.
+     *
+     * @var \CachetHQ\Cachet\Integrations\Contracts\System
+     */
+    protected $system;
+
+    /**
+     * Create a new status page composer instance.
+     *
+     * @param \CachetHQ\Cachet\Integrations\Contracts\System $system
+     *
+     * @return void
+     */
+    public function __construct(System $system)
+    {
+        $this->system = $system;
+    }
+
     /**
      * Index page view composer.
      *
@@ -27,40 +52,7 @@ class StatusPageComposer
      */
     public function compose(View $view)
     {
-        $totalComponents = Component::enabled()->count();
-        $majorOutages = Component::enabled()->status(4)->count();
-        $isMajorOutage = $totalComponents ? ($majorOutages / $totalComponents) >= 0.5 : false;
-
-        // Default data
-        $withData = [
-            'system_status'  => 'info',
-            'system_message' => trans_choice('cachet.service.bad', $totalComponents),
-            'favicon'        => 'favicon-high-alert',
-        ];
-
-        if ($isMajorOutage) {
-            $withData = [
-                'system_status'  => 'danger',
-                'system_message' => trans_choice('cachet.service.major', $totalComponents),
-                'favicon'        => 'favicon-high-alert',
-            ];
-        } elseif (Component::enabled()->notStatus(1)->count() === 0) {
-            // If all our components are ok, do we have any non-fixed incidents?
-            $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get();
-            $incidentCount = $incidents->count();
-
-            if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {
-                $withData = [
-                    'system_status'  => 'success',
-                    'system_message' => trans_choice('cachet.service.good', $totalComponents),
-                    'favicon'        => 'favicon',
-                ];
-            }
-        } else {
-            if (Component::enabled()->whereIn('status', [2, 3])->count() > 0) {
-                $withData['favicon'] = 'favicon-medium-alert';
-            }
-        }
+        $status = $this->system->getStatus();
 
         // Scheduled maintenance code.
         $scheduledMaintenance = Incident::scheduled()->orderBy('scheduled_at')->get();
@@ -70,7 +62,7 @@ class StatusPageComposer
         $componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
         $ungroupedComponents = Component::enabled()->where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();
 
-        $view->with($withData)
+        $view->with($status)
             ->withComponentGroups($componentGroups)
             ->withUngroupedComponents($ungroupedComponents)
             ->withScheduledMaintenance($scheduledMaintenance);

app/Composers/TimezoneLocaleComposer.php

@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Composers;
 use DateTime;
 use DateTimeZone;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 
 class TimezoneLocaleComposer
@@ -32,7 +33,7 @@ class TimezoneLocaleComposer
         $langs = array_map(function ($lang) use ($enabledLangs) {
             $locale = basename($lang);
 
-            return [$locale => $enabledLangs[$locale]];
+            return [$locale => Arr::get($enabledLangs, $locale)];
         }, glob(base_path('resources/lang').'/*'));
 
         $langs = call_user_func_array('array_merge', $langs);

app/Console/Commands/DemoSeederCommand.php

@@ -14,11 +14,12 @@ namespace CachetHQ\Cachet\Console\Commands;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\IncidentTemplate;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
-use CachetHQ\Cachet\Models\Setting;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\User;
+use CachetHQ\Cachet\Settings\Repository;
 use DateInterval;
 use DateTime;
 use Illuminate\Console\Command;
@@ -48,6 +49,27 @@ class DemoSeederCommand extends Command
      */
     protected $description = 'Seeds Cachet with demo data.';
 
+    /**
+     * The settings repository.
+     *
+     * @var \CachetHQ\Cache\Settings\Repository
+     */
+    protected $settings;
+
+    /**
+     * Create a new demo seeder command instance.
+     *
+     * @param \CachetHQ\Cache\Settings\Repository $settings
+     *
+     * @return void
+     */
+    public function __construct(Repository $settings)
+    {
+        parent::__construct();
+
+        $this->settings = $settings;
+    }
+
     /**
      * Execute the console command.
      *
@@ -62,6 +84,7 @@ class DemoSeederCommand extends Command
         $this->seedComponentGroups();
         $this->seedComponents();
         $this->seedIncidents();
+        $this->seedIncidentTemplates();
         $this->seedMetricPoints();
         $this->seedMetrics();
         $this->seedSettings();
@@ -82,11 +105,11 @@ class DemoSeederCommand extends Command
             [
                 'name'      => 'Websites',
                 'order'     => 1,
-                'collapsed' => false,
+                'collapsed' => 0,
             ], [
                 'name'      => 'Alt Three',
                 'order'     => 2,
-                'collapsed' => true,
+                'collapsed' => 1,
             ],
         ];
 
@@ -157,7 +180,25 @@ class DemoSeederCommand extends Command
      */
     protected function seedIncidents()
     {
+        $incidentMessage = <<<'EINCIDENT'
+# Of course it does!
+
+What kind of web application doesn't these days?
+
+## Headers are fun aren't they
+
+It's _exactly_ why we need Markdown. For **emphasis** and such.
+EINCIDENT;
+
         $defaultIncidents = [
+            [
+                'name'         => 'Cachet supports Markdown!',
+                'message'      => $incidentMessage,
+                'status'       => 4,
+                'component_id' => 0,
+                'scheduled_at' => null,
+                'visible'      => 1,
+            ],
             [
                 'name'         => 'Awesome',
                 'message'      => ':+1: We totally nailed the fix.',
@@ -207,6 +248,16 @@ class DemoSeederCommand extends Command
         }
     }
 
+    /**
+     * Seed the incident templates table.
+     *
+     * @return void
+     */
+    protected function seedIncidentTemplates()
+    {
+        IncidentTemplate::truncate();
+    }
+
     /**
      * Seed the metric points table.
      *
@@ -263,47 +314,45 @@ class DemoSeederCommand extends Command
     {
         $defaultSettings = [
             [
-                'name'  => 'app_name',
+                'key'   => 'app_name',
                 'value' => 'Cachet Demo',
-            ],
-            [
-                'name'  => 'app_domain',
+            ], [
+                'key'   => 'app_domain',
                 'value' => 'https://demo.cachethq.io',
-            ],
-            [
-                'name'  => 'show_support',
+            ], [
+                'key'   => 'show_support',
                 'value' => '1',
-            ],
-            [
-                'name'  => 'app_locale',
+            ], [
+                'key'   => 'app_locale',
                 'value' => 'en',
-            ],
-            [
-                'name'  => 'app_timezone',
+            ], [
+                'key'   => 'app_timezone',
                 'value' => 'Europe/London',
-            ],
-            [
-                'name'  => 'app_incident_days',
+            ], [
+                'key'   => 'app_incident_days',
                 'value' => '7',
-            ],
-            [
-                'name'  => 'app_analytics',
+            ], [
+                'key'   => 'app_analytics',
                 'value' => 'UA-58442674-3',
-            ],
-            [
-                'name'  => 'app_analytics_gs',
+            ], [
+                'key'   => 'app_analytics_gs',
                 'value' => 'GSN-712462-P',
-            ],
-            [
-                'name'  => 'display_graphs',
+            ], [
+                'key'   => 'display_graphs',
                 'value' => '1',
+            ], [
+                'key'   => 'app_about',
+                'value' => 'This is the demo instance of [Cachet](https://cachethq.io?ref=demo). The open source status page system, for everyone. An [Alt Three](https://alt-three.com) product.',
+            ], [
+                'key'   => 'enable_subscribers',
+                'value' => '0',
             ],
         ];
 
-        Setting::truncate();
+        $this->settings->clear();
 
         foreach ($defaultSettings as $setting) {
-            Setting::create($setting);
+            $this->settings->set($setting['key'], $setting['value']);
         }
     }
 

app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+
+use Exception;
+use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
+
+class ThrottleDisplayer implements DisplayerInterface
+{
+    /**
+     * The request instance.
+     *
+     * @var \Illuminate\Http\Request
+     */
+    protected $request;
+
+    /**
+     * Create a new redirect displayer instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return void
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Get the error response associated with the given exception.
+     *
+     * @param \Exception $exception
+     * @param string     $id
+     * @param int        $code
+     * @param string[]   $headers
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function display(Exception $exception, $id, $code, array $headers)
+    {
+        return redirect()->route('auth.login')->withError(trans('forms.login.rate-limit'));
+    }
+
+    /**
+     * Get the supported content type.
+     *
+     * @return string
+     */
+    public function contentType()
+    {
+        return 'text/html';
+    }
+
+    /**
+     * Can we display the exception?
+     *
+     * @param \Exception $original
+     * @param \Exception $transformed
+     * @param int        $code
+     *
+     * @return bool
+     */
+    public function canDisplay(Exception $original, Exception $transformed, $code)
+    {
+        return $transformed instanceof TooManyRequestsHttpException && $this->request->is('auth*');
+    }
+
+    /**
+     * Do we provide verbose information about the exception?
+     *
+     * @return bool
+     */
+    public function isVerbose()
+    {
+        return false;
+    }
+}

app/Foundation/Providers/AppServiceProvider.php

@@ -12,10 +12,21 @@
 namespace CachetHQ\Cachet\Foundation\Providers;
 
 use AltThree\Bus\Dispatcher;
+use CachetHQ\Cachet\Bus\Middleware\UseDatabaseTransactions;
 use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Integrations\Credits;
+use CachetHQ\Cachet\Integrations\Feed;
+use CachetHQ\Cachet\Integrations\Releases;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 
+/**
+ * This is the app service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class AppServiceProvider extends ServiceProvider
 {
     /**
@@ -29,6 +40,8 @@ class AppServiceProvider extends ServiceProvider
             return Dispatcher::simpleMapping($command, 'CachetHQ\Cachet\Bus', 'CachetHQ\Cachet\Bus\Handlers');
         });
 
+        $dispatcher->pipeThrough([UseDatabaseTransactions::class]);
+
         Str::macro('canonicalize', function ($url) {
             return preg_replace('/([^\/])$/', '$1/', $url);
         });
@@ -42,6 +55,9 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerDateFactory();
+        $this->registerCredits();
+        $this->registerFeed();
+        $this->registerReleases();
     }
 
     /**
@@ -52,10 +68,53 @@ class AppServiceProvider extends ServiceProvider
     protected function registerDateFactory()
     {
         $this->app->singleton(DateFactory::class, function ($app) {
-            $appTimezone = $app->config->get('app.timezone');
-            $cacheTimezone = $app->config->get('cachet.timezone');
+            $appTimezone = $app['config']->get('app.timezone');
+            $cacheTimezone = $app['config']->get('cachet.timezone');
 
             return new DateFactory($appTimezone, $cacheTimezone);
         });
     }
+
+    /**
+     * Register the credits class.
+     *
+     * @return void
+     */
+    protected function registerCredits()
+    {
+        $this->app->singleton(Credits::class, function ($app) {
+            $cache = $app['cache.store'];
+
+            return new Credits($cache);
+        });
+    }
+
+    /**
+     * Register the feed class.
+     *
+     * @return void
+     */
+    protected function registerFeed()
+    {
+        $this->app->singleton(Feed::class, function ($app) {
+            $cache = $app['cache.store'];
+
+            return new Feed($cache);
+        });
+    }
+
+    /**
+     * Register the releases class.
+     *
+     * @return void
+     */
+    protected function registerReleases()
+    {
+        $this->app->singleton(Releases::class, function ($app) {
+            $cache = $app['cache.store'];
+            $token = $app['config']->get('services.github.token');
+
+            return new Releases($cache, $token);
+        });
+    }
 }

app/Foundation/Providers/ComposerServiceProvider.php

@@ -33,8 +33,8 @@ class ComposerServiceProvider extends ServiceProvider
         $factory->composer('*', AppComposer::class);
         $factory->composer('*', CurrentUserComposer::class);
         $factory->composer(['index'], MetricsComposer::class);
-        $factory->composer(['index', 'incident', 'subscribe', 'signup'], StatusPageComposer::class);
-        $factory->composer(['index', 'incident', 'subscribe', 'signup', 'dashboard.settings.theme'], ThemeComposer::class);
+        $factory->composer(['index', 'single-incident', 'subscribe', 'signup'], StatusPageComposer::class);
+        $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme', 'emails.*'], ThemeComposer::class);
         $factory->composer('dashboard.*', DashboardComposer::class);
         $factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class);
     }

app/Foundation/Providers/ConfigServiceProvider.php

@@ -11,11 +11,20 @@
 
 namespace CachetHQ\Cachet\Foundation\Providers;
 
-use CachetHQ\Cachet\Config\Repository;
 use CachetHQ\Cachet\Models\Setting as SettingModel;
+use CachetHQ\Cachet\Settings\Cache;
+use CachetHQ\Cachet\Settings\Repository;
 use Exception;
 use Illuminate\Support\ServiceProvider;
+use Jenssegers\Date\Date;
 
+/**
+ * This is the config service provider class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ */
 class ConfigServiceProvider extends ServiceProvider
 {
     /**
@@ -25,8 +34,26 @@ class ConfigServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $env = $this->app->environment();
+        $repo = $this->app->make(Repository::class);
+        $cache = $this->app->make(Cache::class);
+        $loaded = $cache->load($env);
+
+        $this->app->terminating(function () use ($repo, $cache) {
+            if ($repo->stale()) {
+                $cache->clear();
+            }
+        });
+
         try {
-            $this->app->config->set('setting', $this->app->setting->all());
+            if ($loaded === false) {
+                $loaded = $repo->all();
+                $cache->store($env, $loaded);
+            }
+
+            $settings = array_merge($this->app->config->get('setting'), $loaded);
+
+            $this->app->config->set('setting', $settings);
         } catch (Exception $e) {
             //
         }
@@ -35,9 +62,10 @@ class ConfigServiceProvider extends ServiceProvider
             $this->app->config->set('app.url', $appDomain);
         }
 
-        if ($appLocale = $this->app->config->get('setting.app.locale')) {
+        if ($appLocale = $this->app->config->get('setting.app_locale')) {
             $this->app->config->set('app.locale', $appLocale);
             $this->app->translator->setLocale($appLocale);
+            Date::setLocale($appLocale);
         }
 
         if ($appTimezone = $this->app->config->get('setting.app_timezone')) {
@@ -65,10 +93,12 @@ class ConfigServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('setting', function () {
-            return new Repository(new SettingModel());
+        $this->app->singleton(Cache::class, function ($app) {
+            return new Cache($app->files, $app->bootstrapPath().'/cachet');
         });
 
-        $this->app->alias('setting', Repository::class);
+        $this->app->singleton(Repository::class, function () {
+            return new Repository(new SettingModel());
+        });
     }
 }

app/Foundation/Providers/ConsoleServiceProvider.php

@@ -11,11 +11,28 @@
 
 namespace CachetHQ\Cachet\Foundation\Providers;
 
-use CachetHQ\Cachet\GitHub\Release;
+use CachetHQ\Cachet\Subscribers\CommandSubscriber;
 use Illuminate\Support\ServiceProvider;
 
-class GitHubServiceProvider extends ServiceProvider
+/**
+ * This is the console service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class ConsoleServiceProvider extends ServiceProvider
 {
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $subscriber = $this->app->make(CommandSubscriber::class);
+
+        $this->app->events->subscribe($subscriber);
+    }
+
     /**
      * Register the service provider.
      *
@@ -23,23 +40,6 @@ class GitHubServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->registerRelease();
-    }
-
-    /**
-     * Register the releases class.
-     *
-     * @return void
-     */
-    protected function registerRelease()
-    {
-        $this->app->singleton('cachet.release', function ($app) {
-            $cache = $app['cache.store'];
-            $config = $app['config'];
-
-            return new Release($cache, $config);
-        });
-
-        $this->app->alias('cachet.release', Release::class);
+        //
     }
 }

app/Foundation/Providers/EventServiceProvider.php

@@ -34,14 +34,20 @@ class EventServiceProvider extends ServiceProvider
             //
         ],
         'CachetHQ\Cachet\Bus\Events\Component\ComponentWasRemovedEvent' => [
-            //
+            'CachetHQ\Cachet\Bus\Handlers\Events\Component\CleanupComponentSubscriptionsHandler',
         ],
         'CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Component\SendComponentUpdateEmailNotificationHandler',
         ],
+        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasRemovedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',
         ],
+        'CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Bus\Events\Incident\MaintenanceWasScheduledEvent' => [
             'CachetHQ\Cachet\Bus\Handlers\Events\Incident\SendMaintenanceEmailNotificationHandler',
         ],

app/Foundation/Providers/IntegrationServiceProvider.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Foundation\Providers;
+
+use CachetHQ\Cachet\Integrations\Contracts\System as SystemContract;
+use CachetHQ\Cachet\Integrations\Core\System;
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * This is the integration service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class IntegrationServiceProvider extends ServiceProvider
+{
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->registerSystem();
+    }
+
+    /**
+     * Register the system class.
+     *
+     * @return void
+     */
+    protected function registerSystem()
+    {
+        $this->app->singleton(SystemContract::class, function (Container $app) {
+            return new System();
+        });
+    }
+}

app/Foundation/Providers/RepositoryServiceProvider.php

@@ -16,8 +16,15 @@ use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
 use CachetHQ\Cachet\Repositories\Metric\MySqlRepository as MetricMySqlRepository;
 use CachetHQ\Cachet\Repositories\Metric\PgSqlRepository as MetricPgSqlRepository;
 use CachetHQ\Cachet\Repositories\Metric\SqliteRepository as MetricSqliteRepository;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\ServiceProvider;
 
+/**
+ * This is the repository service provider.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
 class RepositoryServiceProvider extends ServiceProvider
 {
     /**
@@ -37,22 +44,21 @@ class RepositoryServiceProvider extends ServiceProvider
      */
     protected function registerMetricRepository()
     {
-        $this->app->singleton('cachet.metricrepository', function ($app) {
-            $dbDriver = $app['config']->get('database.default');
+        $this->app->singleton(MetricRepository::class, function (Container $app) {
+            $config = $app->make(ConfigRepository::class);
+            $driver = $config->get('database.default');
 
-            if ($dbDriver == 'mysql') {
-                $repository = new MetricMySqlRepository();
-            } elseif ($dbDriver == 'pgsql') {
-                $repository = new MetricPgSqlRepository();
-            } elseif ($dbDriver == 'sqlite') {
-                $repository = new MetricSqliteRepository();
+            if ($driver == 'mysql') {
+                $repository = new MetricMySqlRepository($config);
+            } elseif ($driver == 'pgsql') {
+                $repository = new MetricPgSqlRepository($config);
+            } elseif ($driver == 'sqlite') {
+                $repository = new MetricSqliteRepository($config);
             }
 
             $dates = $app->make(DateFactory::class);
 
             return new MetricRepository($repository, $dates);
         });
-
-        $this->app->alias('cachet.metricrepository', MetricRepository::class);
     }
 }

app/Foundation/Providers/RouteServiceProvider.php

@@ -17,7 +17,7 @@ use Illuminate\Routing\Router;
 class RouteServiceProvider extends ServiceProvider
 {
     /**
-     * This namespace is applied to the controller routes in your routes file.
+     * This namespace is applied to your controller routes.
      *
      * In addition, it is set as the URL generator's root namespace.
      *

app/GitHub/Release.php

@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\GitHub;
-
-use GuzzleHttp\Client;
-use Illuminate\Contracts\Cache\Repository as CacheRepository;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
-
-class Release
-{
-    /**
-     * The cache repository instance.
-     *
-     * @var \Illuminate\Contracts\Cache\Repository
-     */
-    protected $cache;
-
-    /**
-     * The config repository instance.
-     *
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * Creates a new release instance.
-     *
-     * @param \Illuminate\Contracts\Cache\Repository  $cache
-     * @param \Illuminate\Contracts\Config\Repository $config
-     *
-     * @return void
-     */
-    public function __construct(CacheRepository $cache, ConfigRepository $config)
-    {
-        $this->cache = $cache;
-        $this->config = $config;
-    }
-
-    /**
-     * Returns the latest GitHub release.
-     *
-     * @return string
-     */
-    public function latest()
-    {
-        $release = $this->cache->remember('version', 720, function () {
-            $headers = ['Accept' => 'application/vnd.github.v3+json'];
-
-            // We can re-use the Emoji token here, if we have it.
-            if ($token = $this->config->get('services.github.token')) {
-                $headers['OAUTH-TOKEN'] = $token;
-            }
-
-            return json_decode((new Client())->get('https://api.github.com/repos/cachethq/cachet/releases/latest', [
-                'headers' => $headers,
-            ])->getBody(), true);
-        });
-
-        return $release['tag_name'];
-    }
-}

app/Http/Controllers/Api/AbstractApiController.php

@@ -161,12 +161,6 @@ abstract class AbstractApiController extends Controller
 
         $items = $paginator->getCollection();
 
-        if ($sortBy = $request->get('sort')) {
-            $direction = $request->has('order') && $request->get('order') == 'desc';
-
-            $items = $items->sortBy($sortBy, SORT_REGULAR, $direction);
-        }
-
         return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($items->values()))->respond();
     }
 

app/Http/Controllers/Api/ComponentController.php

@@ -32,12 +32,22 @@ class ComponentController extends AbstractApiController
     public function getComponents()
     {
         if (app(Guard::class)->check()) {
-            $components = Component::whereRaw('1 = 1');
+            $components = Component::query();
         } else {
             $components = Component::enabled();
         }
 
-        return $this->paginator($components->paginate(Binput::get('per_page', 20)), Request::instance());
+        $components->search(Binput::except(['sort', 'order', 'per_page']));
+
+        if ($sortBy = Binput::get('sort')) {
+            $direction = Binput::has('order') && Binput::get('order') == 'desc';
+
+            $components->sort($sortBy, $direction);
+        }
+
+        $components = $components->paginate(Binput::get('per_page', 20));
+
+        return $this->paginator($components, Request::instance());
     }
 
     /**
@@ -78,7 +88,7 @@ class ComponentController extends AbstractApiController
             $tags = preg_split('/ ?, ?/', Binput::get('tags'));
 
             // For every tag, do we need to create it?
-            $componentTags = array_map(function ($taggable) use ($component) {
+            $componentTags = array_map(function ($taggable) {
                 return Tag::firstOrCreate([
                     'name' => $taggable,
                 ])->id;
@@ -118,7 +128,7 @@ class ComponentController extends AbstractApiController
             $tags = preg_split('/ ?, ?/', Binput::get('tags'));
 
             // For every tag, do we need to create it?
-            $componentTags = array_map(function ($taggable) use ($component) {
+            $componentTags = array_map(function ($taggable) {
                 return Tag::firstOrCreate(['name' => $taggable])->id;
             }, $tags);
 

app/Http/Controllers/Api/ComponentGroupController.php

@@ -20,6 +20,13 @@ use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
+/**
+ * This is the component group controller.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ */
 class ComponentGroupController extends AbstractApiController
 {
     /**
@@ -29,7 +36,17 @@ class ComponentGroupController extends AbstractApiController
      */
     public function getGroups()
     {
-        $groups = ComponentGroup::paginate(Binput::get('per_page', 20));
+        $groups = ComponentGroup::query();
+
+        $groups->search(Binput::except(['sort', 'order', 'per_page']));
+
+        if ($sortBy = Binput::get('sort')) {
+            $direction = Binput::has('order') && Binput::get('order') == 'desc';
+
+            $groups->sort($sortBy, $direction);
+        }
+
+        $groups = $groups->paginate(Binput::get('per_page', 20));
 
         return $this->paginator($groups, Request::instance());
     }
@@ -57,7 +74,7 @@ class ComponentGroupController extends AbstractApiController
             $group = dispatch(new AddComponentGroupCommand(
                 Binput::get('name'),
                 Binput::get('order', 0),
-                Binput::get('collapsed')
+                Binput::get('collapsed', 0)
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
@@ -79,7 +96,7 @@ class ComponentGroupController extends AbstractApiController
             $group = dispatch(new UpdateComponentGroupCommand(
                 $group,
                 Binput::get('name'),
-                Binput::get('order', 0),
+                Binput::get('order'),
                 Binput::get('collapsed')
             ));
         } catch (QueryException $e) {

app/Http/Controllers/Api/GeneralController.php

@@ -11,6 +11,14 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Api;
 
+use CachetHQ\Cachet\Integrations\Contracts\System;
+use CachetHQ\Cachet\Integrations\Releases;
+
+/**
+ * This is the general api controller.
+ *
+ * @author James Brooks <james@bluebaytravel.co.uk>
+ */
 class GeneralController extends AbstractApiController
 {
     /**
@@ -22,4 +30,34 @@ class GeneralController extends AbstractApiController
     {
         return $this->item('Pong!');
     }
+
+    /**
+     * Endpoint to show the Cachet version.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function version()
+    {
+        $latest = app(Releases::class)->latest();
+
+        return $this->setMetaData([
+            'on_latest' => version_compare(CACHET_VERSION, $latest['tag_name']) === 1,
+            'latest'    => $latest,
+        ])->item(CACHET_VERSION);
+    }
+
+    /**
+     * Get the system status message.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function status()
+    {
+        $system = app()->make(System::class)->getStatus();
+
+        return $this->item([
+            'status'  => $system['system_status'],
+            'message' => $system['system_message'],
+        ]);
+    }
 }

app/Http/Controllers/Api/IncidentController.php

@@ -32,7 +32,17 @@ class IncidentController extends AbstractApiController
     {
         $incidentVisibility = app(Guard::class)->check() ? 0 : 1;
 
-        $incidents = Incident::where('visible', '>=', $incidentVisibility)->paginate(Binput::get('per_page', 20));
+        $incidents = Incident::where('visible', '>=', $incidentVisibility);
+
+        $incidents->search(Binput::except(['sort', 'order', 'per_page']));
+
+        if ($sortBy = Binput::get('sort')) {
+            $direction = Binput::has('order') && Binput::get('order') == 'desc';
+
+            $incidents->sort($sortBy, $direction);
+        }
+
+        $incidents = $incidents->paginate(Binput::get('per_page', 20));
 
         return $this->paginator($incidents, Request::instance());
     }

app/Http/Controllers/Api/MetricController.php

@@ -29,7 +29,15 @@ class MetricController extends AbstractApiController
      */
     public function getMetrics()
     {
-        $metrics = Metric::paginate(Binput::get('per_page', 20));
+        $metrics = Metric::query();
+
+        if ($sortBy = Binput::get('sort')) {
+            $direction = Binput::has('order') && Binput::get('order') == 'desc';
+
+            $metrics->sort($sortBy, $direction);
+        }
+
+        $metrics = $metrics->paginate(Binput::get('per_page', 20));
 
         return $this->paginator($metrics, Request::instance());
     }
@@ -55,7 +63,9 @@ class MetricController extends AbstractApiController
      */
     public function getMetricPoints(Metric $metric)
     {
-        return $this->collection($metric->points);
+        $points = $metric->points()->paginate(Binput::get('per_page', 20));
+
+        return $this->paginator($points, Request::instance());
     }
 
     /**
@@ -72,9 +82,11 @@ class MetricController extends AbstractApiController
                 Binput::get('description'),
                 Binput::get('default_value'),
                 Binput::get('calc_type', 0),
-                Binput::get('display_chart'),
+                Binput::get('display_chart', true),
                 Binput::get('places', 2),
-                Binput::get('view', 1)
+                Binput::get('default_view', Binput::get('view', 1)),
+                Binput::get('threshold', 5),
+                Binput::get('order', 0)
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
@@ -99,10 +111,12 @@ class MetricController extends AbstractApiController
                 Binput::get('suffix'),
                 Binput::get('description'),
                 Binput::get('default_value'),
-                Binput::get('calc_type', 0),
+                Binput::get('calc_type'),
                 Binput::get('display_chart'),
-                Binput::get('places', 2),
-                Binput::get('view', 1)
+                Binput::get('places'),
+                Binput::get('default_view', Binput::get('view')),
+                Binput::get('threshold'),
+                Binput::get('order')
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();

app/Http/Controllers/Api/MetricPointController.php

@@ -48,8 +48,8 @@ class MetricPointController extends AbstractApiController
             $metricPoint = dispatch(new AddMetricPointCommand(
                 $metric,
                 Binput::get('value'),
-                Binput::get('timestamp'))
-            );
+                Binput::get('timestamp')
+            ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
         }

app/Http/Controllers/Api/SubscriberController.php

@@ -21,6 +21,12 @@ use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
+/**
+ * This is the subscriber controller class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class SubscriberController extends AbstractApiController
 {
     /**
@@ -43,7 +49,11 @@ class SubscriberController extends AbstractApiController
     public function postSubscribers()
     {
         try {
-            $subscriber = dispatch(new SubscribeSubscriberCommand(Binput::get('email'), Binput::get('verify', false), null));
+            $subscriber = dispatch(new SubscribeSubscriberCommand(
+                Binput::get('email'),
+                Binput::get('verify', false),
+                Binput::get('components', null)
+            ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
         }

app/Http/Controllers/AuthController.php

@@ -41,11 +41,11 @@ class AuthController extends Controller
      */
     public function postLogin()
     {
-        $loginData = Binput::only(['login', 'password']);
+        $loginData = Binput::only(['username', 'password']);
 
         // Login with username or email.
-        $loginKey = Str::contains($loginData['login'], '@') ? 'email' : 'username';
-        $loginData[$loginKey] = array_pull($loginData, 'login');
+        $loginKey = Str::contains($loginData['username'], '@') ? 'email' : 'username';
+        $loginData[$loginKey] = array_pull($loginData, 'username');
 
         // Validate login credentials.
         if (Auth::validate($loginData)) {

app/Http/Controllers/Dashboard/ApiController.php

@@ -11,34 +11,46 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
-use CachetHQ\Cachet\GitHub\Release;
+use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand;
+use CachetHQ\Cachet\Bus\Commands\ComponentGroup\UpdateComponentGroupCommand;
+use CachetHQ\Cachet\Http\Controllers\Api\AbstractApiController;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\IncidentTemplate;
-use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\Response;
+use Illuminate\Database\QueryException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-class ApiController extends Controller
+class ApiController extends AbstractApiController
 {
     /**
      * Updates a component with the entered info.
      *
      * @param \CachetHQ\Cachet\Models\Component $component
      *
-     * @throws \Exception
+     * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
      *
      * @return \CachetHQ\Cachet\Models\Component
      */
     public function postUpdateComponent(Component $component)
     {
-        if (!$component->update(Binput::except(['_token']))) {
-            throw new Exception(trans('dashboard.components.edit.failure'));
+        try {
+            dispatch(new UpdateComponentCommand(
+                $component,
+                $component->name,
+                $component->description,
+                Binput::get('status'),
+                $component->link,
+                $component->order,
+                $component->group_id,
+                $component->enabled
+            ));
+        } catch (QueryException $e) {
+            throw new BadRequestHttpException();
         }
 
-        return $component;
+        return $this->item($component);
     }
 
     /**
@@ -51,11 +63,25 @@ class ApiController extends Controller
         $componentData = Binput::get('ids');
 
         foreach ($componentData as $order => $componentId) {
-            // Ordering should be 1-based, data comes in 0-based
-            Component::find($componentId)->update(['order' => $order + 1]);
+            try {
+                $component = Component::find($componentId);
+
+                dispatch(new UpdateComponentCommand(
+                    $component,
+                    $component->name,
+                    $component->description,
+                    $component->status,
+                    $component->link,
+                    $order + 1,
+                    $component->group_id,
+                    $component->enabled
+                ));
+            } catch (QueryException $e) {
+                throw new BadRequestHttpException();
+            }
         }
 
-        return $componentData;
+        return $this->collection(Component::query()->orderBy('order')->get());
     }
 
     /**
@@ -68,10 +94,17 @@ class ApiController extends Controller
         $groupData = Binput::get('ids');
 
         foreach ($groupData as $order => $groupId) {
-            ComponentGroup::find($groupId)->update(['order' => $order + 1]);
+            $group = ComponentGroup::find($groupId);
+
+            dispatch(new UpdateComponentGroupCommand(
+                $group,
+                $group->name,
+                $order + 1,
+                $group->collapsed
+            ));
         }
 
-        return $groupData;
+        return $this->collection(ComponentGroup::query()->orderBy('order')->get());
     }
 
     /**
@@ -91,20 +124,4 @@ class ApiController extends Controller
 
         throw new ModelNotFoundException("Incident template for $templateSlug could not be found.");
     }
-
-    /**
-     * Checks if Cachet is up to date.
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function checkVersion()
-    {
-        $latest = app(Release::class)->latest();
-
-        return Response::json([
-            'cachet_version' => CACHET_VERSION,
-            'latest_version' => $latest,
-            'is_latest'      => version_compare(CACHET_VERSION, $latest) === 1,
-        ]);
-    }
 }

app/Http/Controllers/Dashboard/ComponentController.php

@@ -148,7 +148,7 @@ class ComponentController extends Controller
         $tags = preg_split('/ ?, ?/', $tags);
 
         // For every tag, do we need to create it?
-        $componentTags = array_map(function ($taggable) use ($component) {
+        $componentTags = array_map(function ($taggable) {
             return Tag::firstOrCreate(['name' => $taggable])->id;
         }, $tags);
 
@@ -201,7 +201,7 @@ class ComponentController extends Controller
         $tags = preg_split('/ ?, ?/', $tags);
 
         // For every tag, do we need to create it?
-        $componentTags = array_map(function ($taggable) use ($component) {
+        $componentTags = array_map(function ($taggable) {
             return Tag::firstOrCreate(['name' => $taggable])->id;
         }, $tags);
 
@@ -303,7 +303,7 @@ class ComponentController extends Controller
             $group = dispatch(new UpdateComponentGroupCommand(
                 $group,
                 Binput::get('name'),
-                Binput::get('order', 0),
+                $group->order,
                 Binput::get('collapsed')
             ));
         } catch (ValidationException $e) {

app/Http/Controllers/Dashboard/DashboardController.php

@@ -11,11 +11,14 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
+use CachetHQ\Cachet\Integrations\Feed;
 use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 use Jenssegers\Date\Date;
 
@@ -36,16 +39,36 @@ class DashboardController extends Controller
     protected $timeZone;
 
     /**
-     * Creates a new dashboard controller.
+     * The feed integration.
+     *
+     * @var \CachetHQ\Cachet\Integrations\Feed
+     */
+    protected $feed;
+
+    /**
+     * Creates a new dashboard controller instance.
+     *
+     * @param \CachetHQ\Cachet\Integrations\Feed $feed
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(Feed $feed)
     {
+        $this->feed = $feed;
         $this->startDate = new Date();
         $this->dateTimeZone = Config::get('cachet.timezone');
     }
 
+    /**
+     * Redirect /admin to /dashboard.
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function redirectAdmin()
+    {
+        return Redirect::route('dashboard.index');
+    }
+
     /**
      * Shows the dashboard view.
      *
@@ -56,12 +79,25 @@ class DashboardController extends Controller
         $components = Component::orderBy('order')->get();
         $incidents = $this->getIncidents();
         $subscribers = $this->getSubscribers();
+        $usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->pluck('group_id');
+        $componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
+        $ungroupedComponents = Component::enabled()->where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();
+
+        $entries = null;
+        if ($feed = $this->feed->latest()) {
+            if (is_object($feed)) {
+                $entries = array_slice($feed->channel->item, 0, 5);
+            }
+        }
 
         return View::make('dashboard.index')
             ->withPageTitle(trans('dashboard.dashboard'))
             ->withComponents($components)
             ->withIncidents($incidents)
-            ->withSubscribers($subscribers);
+            ->withSubscribers($subscribers)
+            ->withEntries($entries)
+            ->withComponentGroups($componentGroups)
+            ->withUngroupedComponents($ungroupedComponents);
     }
 
     /**

app/Http/Controllers/Dashboard/MetricController.php

@@ -31,7 +31,7 @@ class MetricController extends Controller
      */
     public function showMetrics()
     {
-        $metrics = Metric::orderBy('created_at', 'desc')->get();
+        $metrics = Metric::orderBy('order')->orderBy('id')->get();
 
         return View::make('dashboard.metrics.index')
             ->withPageTitle(trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'))
@@ -79,7 +79,8 @@ class MetricController extends Controller
                 $metricData['calc_type'],
                 $metricData['display_chart'],
                 $metricData['places'],
-                $metricData['default_view']
+                $metricData['default_view'],
+                $metricData['threshold']
             ));
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.metrics.add')
@@ -151,7 +152,8 @@ class MetricController extends Controller
                 Binput::get('calc_type', null, false),
                 Binput::get('display_chart', null, false),
                 Binput::get('places', null, false),
-                Binput::get('default_view', null, false)
+                Binput::get('default_view', null, false),
+                Binput::get('threshold', null, false)
             ));
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.metrics.edit', ['id' => $metric->id])

app/Http/Controllers/Dashboard/ScheduleController.php

@@ -95,10 +95,10 @@ class ScheduleController extends Controller
     {
         try {
             $incident = dispatch(new ReportMaintenanceCommand(
-                Binput::get('incident.name'),
-                Binput::get('incident.message'),
-                Binput::get('incident.notify'),
-                Binput::get('incident.scheduled_at')
+                Binput::get('name'),
+                Binput::get('message'),
+                Binput::get('notify'),
+                Binput::get('scheduled_at')
             ));
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.schedule.add')
@@ -140,7 +140,7 @@ class ScheduleController extends Controller
         $scheduleData = Binput::get('incident');
 
         // Parse the schedule date.
-        $scheduledAt = app(DateFactory::class)->createNormalized('d/m/Y H:i', $scheduleData['scheduled_at']);
+        $scheduledAt = app(DateFactory::class)->create('d/m/Y H:i', $scheduleData['scheduled_at']);
 
         if ($scheduledAt->isPast()) {
             $messageBag = new MessageBag();

app/Http/Controllers/Dashboard/SettingsController.php

@@ -11,7 +11,9 @@
 
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
+use CachetHQ\Cachet\Integrations\Credits;
 use CachetHQ\Cachet\Models\User;
+use CachetHQ\Cachet\Settings\Repository;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Routing\Controller;
@@ -20,6 +22,7 @@ use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
+use Illuminate\Support\Str;
 
 class SettingsController extends Controller
 {
@@ -56,6 +59,12 @@ class SettingsController extends Controller
                 'icon'   => 'ion-paintbucket',
                 'active' => false,
             ],
+            'customization' => [
+                'title'  => trans('dashboard.settings.customization.customization'),
+                'url'    => route('dashboard.settings.customization'),
+                'icon'   => 'ion-wand',
+                'active' => false,
+            ],
             'localization' => [
                 'title'  => trans('dashboard.settings.localization.localization'),
                 'url'    => route('dashboard.settings.localization'),
@@ -74,6 +83,12 @@ class SettingsController extends Controller
                 'icon'   => 'ion-stats-bars',
                 'active' => false,
             ],
+            'credits' => [
+                'title'  => trans('dashboard.settings.credits.credits'),
+                'url'    => route('dashboard.settings.credits'),
+                'icon'   => 'ion-ios-list',
+                'active' => false,
+            ],
             'about' => [
                 'title'  => CACHET_VERSION,
                 'url'    => 'javascript: void(0);',
@@ -137,6 +152,22 @@ class SettingsController extends Controller
             ->withSubMenu($this->subMenu);
     }
 
+    /**
+     * Shows the settings customization view.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showCustomizationView()
+    {
+        $this->subMenu['customization']['active'] = true;
+
+        Session::flash('redirect_to', $this->subMenu['customization']['url']);
+
+        return View::make('dashboard.settings.customization')
+            ->withPageTitle(trans('dashboard.settings.customization.customization').' - '.trans('dashboard.dashboard'))
+            ->withSubMenu($this->subMenu);
+    }
+
     /**
      * Shows the settings theme view.
      *
@@ -188,6 +219,30 @@ class SettingsController extends Controller
             ->withSubMenu($this->subMenu);
     }
 
+    /**
+     * Show the credits view.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showCreditsView()
+    {
+        $this->subMenu['credits']['active'] = true;
+
+        $credits = app(Credits::class)->latest();
+
+        $backers = $credits['backers'];
+        $contributors = $credits['contributors'];
+
+        shuffle($backers);
+        shuffle($contributors);
+
+        return View::make('dashboard.settings.credits')
+            ->withPageTitle(trans('dashboard.settings.credits.credits').' - '.trans('dashboard.dashboard'))
+            ->withBackers($backers)
+            ->withContributors($contributors)
+            ->withSubMenu($this->subMenu);
+    }
+
     /**
      * Updates the status page settings.
      *
@@ -195,42 +250,53 @@ class SettingsController extends Controller
      */
     public function postSettings()
     {
-        $redirectUrl = Session::get('redirect_to', route('dashboard.settings.setup'));
-
-        $setting = app('setting');
+        $setting = app(Repository::class);
 
         if (Binput::get('remove_banner') === '1') {
             $setting->set('app_banner', null);
         }
 
-        if (Binput::hasFile('app_banner')) {
-            $file = Binput::file('app_banner');
+        $parameters = Binput::all();
 
-            // Image Validation.
-            // Image size in bytes.
-            $maxSize = $file->getMaxFilesize();
-
-            if ($file->getSize() > $maxSize) {
-                return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
+        if (isset($parameters['header'])) {
+            if ($header = Binput::get('header', null, false, false)) {
+                $setting->set('header', $header);
+            } else {
+                $setting->delete('header');
             }
-
-            if (!$file->isValid() || $file->getError()) {
-                return Redirect::to($redirectUrl)->withErrors($file->getErrorMessage());
-            }
-
-            if (!starts_with($file->getMimeType(), 'image/')) {
-                return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.images-only'));
-            }
-
-            // Store the banner.
-            $setting->set('app_banner', base64_encode(file_get_contents($file->getRealPath())));
-
-            // Store the banner type.
-            $setting->set('app_banner_type', $file->getMimeType());
         }
 
+        if (isset($parameters['footer'])) {
+            if ($footer = Binput::get('footer', null, false, false)) {
+                $setting->set('footer', $footer);
+            } else {
+                $setting->delete('footer');
+            }
+        }
+
+        if (isset($parameters['stylesheet'])) {
+            if ($stylesheet = Binput::get('stylesheet', null, false, false)) {
+                $setting->set('stylesheet', $stylesheet);
+            } else {
+                $setting->delete('stylesheet');
+            }
+        }
+
+        if (Binput::hasFile('app_banner')) {
+            $this->handleUpdateBanner($setting);
+        }
+
+        $excludedParams = [
+            '_token',
+            'app_banner',
+            'remove_banner',
+            'header',
+            'footer',
+            'stylesheet',
+        ];
+
         try {
-            foreach (Binput::except(['app_banner', 'remove_banner', '_token']) as $settingName => $settingValue) {
+            foreach (Binput::except($excludedParams) as $settingName => $settingValue) {
                 if ($settingName === 'app_analytics_pi_url') {
                     $settingValue = rtrim($settingValue, '/');
                 }
@@ -238,13 +304,47 @@ class SettingsController extends Controller
                 $setting->set($settingName, $settingValue);
             }
         } catch (Exception $e) {
-            return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.edit.failure'));
+            return Redirect::back()->withErrors(trans('dashboard.settings.edit.failure'));
         }
 
         if (Binput::has('app_locale')) {
             Lang::setLocale(Binput::get('app_locale'));
         }
 
-        return Redirect::to($redirectUrl)->withSuccess(trans('dashboard.settings.edit.success'));
+        return Redirect::back()->withSuccess(trans('dashboard.settings.edit.success'));
+    }
+
+    /**
+     * Handle updating of the banner image.
+     *
+     * @param \CachetHQ\Cachet\Settings\Repository $setting
+     *
+     * @return void
+     */
+    protected function handleUpdateBanner(Repository $setting)
+    {
+        $file = Binput::file('app_banner');
+
+        // Image Validation.
+        // Image size in bytes.
+        $maxSize = $file->getMaxFilesize();
+
+        if ($file->getSize() > $maxSize) {
+            return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
+        }
+
+        if (!$file->isValid() || $file->getError()) {
+            return Redirect::to($redirectUrl)->withErrors($file->getErrorMessage());
+        }
+
+        if (!Str::startsWith($file->getMimeType(), 'image/')) {
+            return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.images-only'));
+        }
+
+        // Store the banner.
+        $setting->set('app_banner', base64_encode(file_get_contents($file->getRealPath())));
+
+        // Store the banner type.
+        $setting->set('app_banner_type', $file->getMimeType());
     }
 }

app/Http/Controllers/Dashboard/SubscriberController.php

@@ -53,7 +53,11 @@ class SubscriberController extends Controller
     public function createSubscriberAction()
     {
         try {
-            dispatch(new SubscribeSubscriberCommand(Binput::get('email')));
+            $subscribers = preg_split("/\r\n|\n|\r/", Binput::get('email'));
+
+            foreach ($subscribers as $subscriber) {
+                dispatch(new SubscribeSubscriberCommand($subscriber));
+            }
         } catch (ValidationException $e) {
             return Redirect::route('dashboard.subscribers.add')
                 ->withInput(Binput::all())

app/Http/Controllers/FeedController.php

@@ -79,7 +79,7 @@ class FeedController extends Controller
     private function feedAction(ComponentGroup &$group, $isRss)
     {
         if ($group->exists) {
-            $group->components->map(function ($component) {
+            $group->components->map(function ($component) use ($isRss) {
                 $component->incidents()->visible()->orderBy('created_at', 'desc')->get()->map(function ($incident) use ($isRss) {
                     $this->feedAddItem($incident, $isRss);
                 });

app/Http/Controllers/SetupController.php

@@ -12,6 +12,7 @@
 namespace CachetHQ\Cachet\Http\Controllers;
 
 use CachetHQ\Cachet\Models\User;
+use CachetHQ\Cachet\Settings\Repository;
 use Dotenv\Dotenv;
 use Dotenv\Exception\InvalidPathException;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -41,6 +42,22 @@ class SetupController extends Controller
         'redis'     => 'Redis',
     ];
 
+    /**
+     * Array of cache drivers.
+     *
+     * @var string[]
+     */
+    protected $mailDrivers = [
+        'smtp'     => 'SMTP',
+        'mail'     => 'Mail',
+        'sendmail' => 'Sendmail',
+        'mailgun'  => 'Mailgun',
+        'mandrill' => 'Mandrill',
+        // 'ses'       => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed
+        'sparkpost' => 'SparkPost',
+        'log'       => 'Log (Testing)',
+    ];
+
     /**
      * Array of step1 rules.
      *
@@ -72,6 +89,7 @@ class SetupController extends Controller
         $this->rulesStep1 = [
             'env.cache_driver'   => 'required|in:'.implode(',', array_keys($this->cacheDrivers)),
             'env.session_driver' => 'required|in:'.implode(',', array_keys($this->cacheDrivers)),
+            'env.mail_driver'    => 'required|in:'.implode(',', array_keys($this->mailDrivers)),
         ];
 
         $this->rulesStep2 = [
@@ -96,11 +114,6 @@ class SetupController extends Controller
      */
     public function getIndex()
     {
-        // If we've copied the .env.example file, then we should try and reset it.
-        if (strlen(Config::get('app.key')) !== 32) {
-            $this->keyGenerate();
-        }
-
         $supportedLanguages = Request::getLanguages();
         $userLanguage = Config::get('app.locale');
 
@@ -116,6 +129,7 @@ class SetupController extends Controller
         return View::make('setup')
             ->withPageTitle(trans('setup.setup'))
             ->withCacheDrivers($this->cacheDrivers)
+            ->withMailDrivers($this->mailDrivers)
             ->withUserLanguage($userLanguage)
             ->withAppUrl(Request::root());
     }
@@ -131,6 +145,14 @@ class SetupController extends Controller
 
         $v = Validator::make($postData, $this->rulesStep1);
 
+        $v->sometimes('env.mail_host', 'required', function ($input) {
+            return $input->mail_driver === 'smtp';
+        });
+
+        $v->sometimes(['env.mail_address', 'env.mail_username'], 'required', function ($input) {
+            return $input->mail_driver !== 'log';
+        });
+
         if ($v->passes()) {
             return Response::json(['status' => 1]);
         }
@@ -180,7 +202,7 @@ class SetupController extends Controller
 
             Auth::login($user);
 
-            $setting = app('setting');
+            $setting = app(Repository::class);
 
             $settings = array_pull($postData, 'settings');
 
@@ -228,33 +250,16 @@ class SetupController extends Controller
         try {
             (new Dotenv($dir, $file))->load();
 
+            $envKey = strtoupper($key);
+            $envValue = env($envKey) ?: 'null';
+
             file_put_contents($path, str_replace(
-                env(strtoupper($key)), $value, file_get_contents($path)
+                $envKey.'='.$envValue,
+                $envKey.'='.$value,
+                file_get_contents($path)
             ));
         } catch (InvalidPathException $e) {
             //
         }
     }
-
-    /**
-     * Generate the app.key value.
-     *
-     * @return void
-     */
-    protected function keyGenerate()
-    {
-        $key = str_random(32);
-
-        $dir = app()->environmentPath();
-        $file = app()->environmentFile();
-        $path = "{$dir}/{$file}";
-
-        (new Dotenv($dir, $file))->load();
-
-        file_put_contents($path, str_replace(
-            Config::get('app.key'), $key, file_get_contents($path)
-        ));
-
-        Config::set('app.key', $key);
-    }
 }

app/Http/Controllers/SignupController.php

@@ -47,7 +47,7 @@ class SignupController extends Controller
         return View::make('signup')
             ->withCode($invite->code)
             ->withUsername(Binput::old('username'))
-            ->withEmail(Binput::old('emai', $invite->email));
+            ->withEmail(Binput::old('email', $invite->email));
     }
 
     /**

app/Http/Controllers/StatusPageController.php

@@ -11,18 +11,42 @@
 
 namespace CachetHQ\Cachet\Http\Controllers;
 
+use AltThree\Badger\Facades\Badger;
 use CachetHQ\Cachet\Dates\DateFactory;
+use CachetHQ\Cachet\Http\Controllers\Api\AbstractApiController;
+use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\Metric;
+use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
 use Exception;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 use Jenssegers\Date\Date;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
 
-class StatusPageController extends Controller
+class StatusPageController extends AbstractApiController
 {
+    /**
+     * @var \CachetHQ\Cachet\Repositories\Metric\MetricRepository
+     */
+    protected $metricRepository;
+
+    /**
+     * Construct a new status page controller instance.
+     *
+     * @param \CachetHQ\Cachet\Repositories\Metric\MetricRepository $metricRepository
+     *
+     * @return void
+     */
+    public function __construct(MetricRepository $metricRepository)
+    {
+        $this->metricRepository = $metricRepository;
+    }
+
     /**
      * Displays the status page.
      *
@@ -97,7 +121,77 @@ class StatusPageController extends Controller
      */
     public function showIncident(Incident $incident)
     {
-        return View::make('incident')
+        return View::make('single-incident')
             ->withIncident($incident);
     }
+
+    /**
+     * Returns metrics in a readily formatted way.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getMetrics(Metric $metric)
+    {
+        $metricData = [];
+        $type = Binput::get('filter', 'last_hour');
+
+        switch ($type) {
+            case 'last_hour':
+                $metricData = $this->metricRepository->listPointsLastHour($metric);
+                break;
+            case 'today':
+                $metricData = $this->metricRepository->listPointsToday($metric);
+                break;
+            case 'week':
+                $metricData = $this->metricRepository->listPointsForWeek($metric);
+                break;
+            case 'month':
+                $metricData = $this->metricRepository->listPointsForMonth($metric);
+                break;
+        }
+
+        return $this->item([
+            'metric' => $metric->toArray(),
+            'items'  => $metricData,
+        ]);
+    }
+
+    /**
+     * Generates a Shield (badge) for the component.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showComponentBadge(Component $component)
+    {
+        $component = AutoPresenter::decorate($component);
+        $color = null;
+
+        switch ($component->status_color) {
+            case 'reds':
+                $color = Config::get('setting.style_reds', '#ff6f6f');
+                break;
+            case 'blues':
+                $color = Config::get('setting.style_blues', '#3498db');
+                break;
+            case 'greens':
+                $color = Config::get('setting.style_greens', '#7ED321');
+                break;
+            case 'yellows':
+                $color = Config::get('setting.style_yellows', '#F7CA18');
+                break;
+        }
+
+        $badge = Badger::generate(
+            $component->name,
+            $component->human_status,
+            substr($color, 1),
+            Binput::get('style', 'flat-square')
+        );
+
+        return Response::make($badge, 200, ['Content-Type' => 'image/svg+xml']);
+    }
 }

app/Http/Controllers/SubscribeController.php

@@ -15,8 +15,9 @@ use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand;
+use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand;
 use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand;
-use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException;
+use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -42,7 +43,7 @@ class SubscribeController extends Controller
      */
     public function showSubscribe()
     {
-        return View::make('subscribe')
+        return View::make('subscribe.subscribe')
             ->withAboutApp(Markdown::convertToHtml(Config::get('setting.app_about')));
     }
 
@@ -57,20 +58,22 @@ class SubscribeController extends Controller
         $subscriptions = Binput::get('subscriptions');
 
         try {
-            dispatch(new SubscribeSubscriberCommand($email, false, $subscriptions));
-        } catch (AlreadySubscribedException $e) {
-            return Redirect::route('subscribe.subscribe')
-                ->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
-                ->withErrors(trans('cachet.subscriber.email.already-subscribed', ['email' => $email]));
+            $verified = false;
+
+            $subscription = dispatch(new SubscribeSubscriberCommand($email, $verified));
         } catch (ValidationException $e) {
-            return Redirect::route('subscribe.subscribe')
+            return Redirect::route('status-page')
                 ->withInput(Binput::all())
-                ->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
+                ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
                 ->withErrors($e->getMessageBag());
         }
 
-        return Redirect::route('status-page')
-            ->withSuccess(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.subscribed')));
+        $message = $subscription->is_verified ?
+            trans('cachet.subscriber.email.already-subscribed', ['email' => $email]) :
+            trans('cachet.subscriber.email.subscribed');
+
+        return Redirect::route('subscribe.manage', $subscription->verify_code)
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), $message));
     }
 
     /**
@@ -86,16 +89,18 @@ class SubscribeController extends Controller
             throw new NotFoundHttpException();
         }
 
-        $subscriber = Subscriber::where('verify_code', '=', $code)->first();
+        $subscriber = Subscriber::where('verify_code', $code)->first();
 
-        if (!$subscriber || $subscriber->is_verified) {
+        if (!$subscriber) {
             throw new BadRequestHttpException();
         }
 
-        dispatch(new VerifySubscriberCommand($subscriber));
+        if (!$subscriber->is_verified) {
+            dispatch(new VerifySubscriberCommand($subscriber));
+        }
 
         return Redirect::route('status-page')
-            ->withSuccess(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.verified')));
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.verified')));
     }
 
     /**
@@ -125,6 +130,63 @@ class SubscribeController extends Controller
         }
 
         return Redirect::route('status-page')
-            ->withSuccess(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.unsubscribed')));
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.unsubscribed')));
+    }
+
+    /**
+     * Shows the subscription manager page.
+     *
+     * @param string|null $code
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showManage($code = null)
+    {
+        if ($code === null) {
+            throw new NotFoundHttpException();
+        }
+
+        $subscriber = Subscriber::where('verify_code', '=', $code)->first();
+
+        if (!$subscriber) {
+            throw new BadRequestHttpException();
+        }
+
+        return View::make('subscribe.manage')
+            ->withComponents(Component::all())
+            ->withSubscriber($subscriber)
+            ->withSubscriptions($subscriber->subscriptions->pluck('component_id')->all());
+    }
+
+    /**
+     * Updates the subscription manager for a subscriber.
+     *
+     * @param string|null $code
+     *
+     * @return \Illuminate\View\View
+     */
+    public function postManage($code = null)
+    {
+        if ($code === null) {
+            throw new NotFoundHttpException();
+        }
+
+        $subscriber = Subscriber::where('verify_code', '=', $code)->first();
+
+        if (!$subscriber) {
+            throw new BadRequestHttpException();
+        }
+
+        try {
+            dispatch(new UpdateSubscriberSubscriptionCommand($subscriber, Binput::get('subscriptions')));
+        } catch (ValidationException $e) {
+            return Redirect::route('subscribe.manage', $subscriber->verify_code)
+                ->withInput(Binput::all())
+                ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
+                ->withErrors($e->getMessageBag());
+        }
+
+        return Redirect::route('subscribe.manage', $subscriber->verify_code)
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('cachet.subscriber.email.subscribed')));
     }
 }

app/Http/Kernel.php

@@ -23,7 +23,6 @@ class Kernel extends HttpKernel
     protected $middleware = [
         'Fideloper\Proxy\TrustProxies',
         'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
-
     ];
 
     /**
@@ -40,6 +39,7 @@ class Kernel extends HttpKernel
             'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken',
         ],
         'api' => [
+            'Barryvdh\Cors\HandleCors',
             'CachetHQ\Cachet\Http\Middleware\Acceptable',
             'CachetHQ\Cachet\Http\Middleware\Timezone',
         ],
@@ -59,6 +59,6 @@ class Kernel extends HttpKernel
         'ready'       => 'CachetHQ\Cachet\Http\Middleware\ReadyForUse',
         'setup'       => 'CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted',
         'subscribers' => 'CachetHQ\Cachet\Http\Middleware\SubscribersConfigured',
-        'throttling'  => 'GrahamCampbell\Throttle\Http\Middleware\ThrottleMiddleware',
+        'throttle'    => 'AltThree\Throttle\ThrottlingMiddleware',
     ];
 }

app/Http/Middleware/Acceptable.php

@@ -28,7 +28,7 @@ class Acceptable
      */
     public function handle(Request $request, Closure $next, $type = null)
     {
-        if (!$request->accepts($type ?: 'accept:application/json')) {
+        if (!$request->accepts($type ?: 'application/json')) {
             throw new NotAcceptableHttpException();
         }
 

app/Http/Middleware/Localize.php

@@ -55,6 +55,10 @@ class Localize
      */
     public function handle(Request $request, Closure $next)
     {
+        if (!(bool) $this->config->get('setting.automatic_localization')) {
+            return $next($request);
+        }
+
         $supportedLanguages = $request->getLanguages();
         $userLanguage = $this->config->get('app.locale');
 

app/Http/Middleware/Timezone.php

@@ -25,7 +25,7 @@ class Timezone
     protected $config;
 
     /**
-     * Creates a new release instance.
+     * Creates a new timezone middleware instance.
      *
      * @param \Illuminate\Contracts\Config\Repository $config
      *

app/Http/Routes/ApiRoutes.php

@@ -29,9 +29,11 @@ class ApiRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['namespace' => 'Api', 'prefix' => 'api/v1', 'middleware' => ['api']], function ($router) {
-            $router->group(['middleware' => ['auth.api']], function ($router) {
+        $router->group(['namespace' => 'Api', 'prefix' => 'api/v1', 'middleware' => ['api']], function (Registrar $router) {
+            $router->group(['middleware' => ['auth.api']], function (Registrar $router) {
                 $router->get('ping', 'GeneralController@ping');
+                $router->get('version', 'GeneralController@version');
+                $router->get('status', 'GeneralController@status');
 
                 $router->get('components', 'ComponentController@getComponents');
                 $router->get('components/groups', 'ComponentGroupController@getGroups');
@@ -46,7 +48,7 @@ class ApiRoutes
                 $router->get('metrics/{metric}/points', 'MetricController@getMetricPoints');
             });
 
-            $router->group(['middleware' => ['auth.api:true']], function ($router) {
+            $router->group(['middleware' => ['auth.api:true']], function (Registrar $router) {
                 $router->get('subscribers', 'SubscriberController@getSubscribers');
 
                 $router->post('components', 'ComponentController@postComponents');

app/Http/Routes/AuthRoutes.php

@@ -29,7 +29,7 @@ class AuthRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['as' => 'auth.', 'middleware' => ['web', 'ready'], 'prefix' => 'auth'], function ($router) {
+        $router->group(['as' => 'auth.', 'middleware' => ['web', 'ready'], 'prefix' => 'auth'], function (Registrar $router) {
             $router->get('login', [
                 'middleware' => 'guest',
                 'as'         => 'login',
@@ -37,7 +37,7 @@ class AuthRoutes
             ]);
 
             $router->post('login', [
-                'middleware' => ['guest', 'throttling:10,10'],
+                'middleware' => ['guest', 'throttle:10,10'],
                 'uses'       => 'AuthController@postLogin',
             ]);
 
@@ -47,7 +47,7 @@ class AuthRoutes
             ]);
 
             $router->post('2fa', [
-                'middleware' => ['throttling:10,10'],
+                'middleware' => ['throttle:10,10'],
                 'uses'       => 'AuthController@postTwoFactor',
             ]);
 

app/Http/Routes/DashboardRoutes.php

@@ -29,202 +29,213 @@ class DashboardRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'auth'], 'prefix' => 'dashboard', 'namespace' => 'Dashboard', 'as' => 'dashboard.'], function ($router) {
-            $router->get('/', [
-                'as'   => 'index',
-                'uses' => 'DashboardController@showDashboard',
-            ]);
+        $router->group(['middleware' => ['web', 'auth'], 'namespace' => 'Dashboard'], function (Registrar $router) {
+            $router->get('admin', 'DashboardController@redirectAdmin');
 
-            $router->group(['as' => 'components.', 'prefix' => 'components'], function ($router) {
+            $router->group(['prefix' => 'dashboard', 'as' => 'dashboard.'], function (Registrar $router) {
                 $router->get('/', [
                     'as'   => 'index',
-                    'uses' => 'ComponentController@showComponents',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'ComponentController@showAddComponent',
-                ]);
-                $router->post('add', 'ComponentController@createComponentAction');
-                $router->get('groups', [
-                    'as'   => 'groups',
-                    'uses' => 'ComponentController@showComponentGroups',
-                ]);
-                $router->get('groups/add', [
-                    'as'   => 'groups.add',
-                    'uses' => 'ComponentController@showAddComponentGroup',
-                ]);
-                $router->get('groups/edit/{component_group}', [
-                    'as'   => 'groups.edit',
-                    'uses' => 'ComponentController@showEditComponentGroup',
-                ]);
-                $router->post('groups/edit/{component_group}', 'ComponentController@updateComponentGroupAction');
-                $router->delete('groups/{component_group}/delete', 'ComponentController@deleteComponentGroupAction');
-                $router->post('groups/add', 'ComponentController@postAddComponentGroup');
-                $router->get('{component}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'ComponentController@showEditComponent',
-                ]);
-                $router->delete('{component}/delete', 'ComponentController@deleteComponentAction');
-                $router->post('{component}/edit', 'ComponentController@updateComponentAction');
-            });
-
-            $router->group(['as' => 'incidents.', 'prefix' => 'incidents'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'IncidentController@showIncidents',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'IncidentController@showAddIncident',
-                ]);
-                $router->post('add', 'IncidentController@createIncidentAction');
-                $router->delete('{incident}/delete', [
-                    'as'   => 'delete',
-                    'uses' => 'IncidentController@deleteIncidentAction',
-                ]);
-                $router->get('{incident}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'IncidentController@showEditIncidentAction',
-                ]);
-                $router->post('{incident}/edit', 'IncidentController@editIncidentAction');
-            });
-
-            $router->group(['as' => 'schedule.', 'prefix' => 'schedule'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'ScheduleController@showIndex',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'ScheduleController@showAddSchedule',
-                ]);
-                $router->post('add', 'ScheduleController@addScheduleAction');
-                $router->get('{incident}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'ScheduleController@showEditSchedule',
-                ]);
-                $router->post('{incident}/edit', 'ScheduleController@editScheduleAction');
-                $router->delete('{incident}/delete', [
-                    'as'   => 'delete',
-                    'uses' => 'ScheduleController@deleteScheduleAction',
-                ]);
-            });
-
-            $router->group(['as' => 'templates.', 'prefix' => 'templates'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'IncidentController@showTemplates',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'IncidentController@showAddIncidentTemplate',
-                ]);
-                $router->post('add', 'IncidentController@createIncidentTemplateAction');
-                $router->get('{incident_template}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'IncidentController@showEditTemplateAction',
-                ]);
-                $router->post('{incident_template}/edit', 'IncidentController@editTemplateAction');
-                $router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction');
-            });
-
-            $router->group(['as'     => 'subscribers.', 'prefix' => 'subscribers'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'SubscriberController@showSubscribers',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'SubscriberController@showAddSubscriber',
-                ]);
-                $router->post('add', 'SubscriberController@createSubscriberAction');
-                $router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction');
-            });
-
-            $router->group(['as'  => 'metrics.', 'prefix' => 'metrics'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'MetricController@showMetrics',
-                ]);
-                $router->get('add', [
-                    'as'   => 'add',
-                    'uses' => 'MetricController@showAddMetric',
-                ]);
-                $router->post('add', 'MetricController@createMetricAction');
-                $router->delete('{metric}/delete', 'MetricController@deleteMetricAction');
-                $router->get('{metric}/edit', [
-                    'as'   => 'edit',
-                    'uses' => 'MetricController@showEditMetricAction',
-                ]);
-                $router->post('{metric}/edit', 'MetricController@editMetricAction');
-            });
-
-            $router->group(['as' => 'team.', 'prefix' => 'team'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'index',
-                    'uses' => 'TeamController@showTeamView',
+                    'uses' => 'DashboardController@showDashboard',
                 ]);
 
-                $router->group(['middleware' => 'admin'], function ($router) {
+                $router->group(['as' => 'components.', 'prefix' => 'components'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'ComponentController@showComponents',
+                    ]);
                     $router->get('add', [
                         'as'   => 'add',
-                        'uses' => 'TeamController@showAddTeamMemberView',
+                        'uses' => 'ComponentController@showAddComponent',
                     ]);
-                    $router->get('invite', [
-                        'as'   => 'invite',
-                        'uses' => 'TeamController@showInviteTeamMemberView',
+                    $router->post('add', 'ComponentController@createComponentAction');
+                    $router->get('groups', [
+                        'as'   => 'groups',
+                        'uses' => 'ComponentController@showComponentGroups',
                     ]);
-                    $router->get('{user}', 'TeamController@showTeamMemberView');
-                    $router->post('add', 'TeamController@postAddUser');
-                    $router->post('invite', 'TeamController@postInviteUser');
-                    $router->post('{user}', 'TeamController@postUpdateUser');
-                    $router->delete('{user}/delete', 'TeamController@deleteUser');
+                    $router->get('groups/add', [
+                        'as'   => 'groups.add',
+                        'uses' => 'ComponentController@showAddComponentGroup',
+                    ]);
+                    $router->get('groups/edit/{component_group}', [
+                        'as'   => 'groups.edit',
+                        'uses' => 'ComponentController@showEditComponentGroup',
+                    ]);
+                    $router->post('groups/edit/{component_group}', 'ComponentController@updateComponentGroupAction');
+                    $router->delete('groups/{component_group}/delete', 'ComponentController@deleteComponentGroupAction');
+                    $router->post('groups/add', 'ComponentController@postAddComponentGroup');
+                    $router->get('{component}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'ComponentController@showEditComponent',
+                    ]);
+                    $router->delete('{component}/delete', 'ComponentController@deleteComponentAction');
+                    $router->post('{component}/edit', 'ComponentController@updateComponentAction');
                 });
-            });
 
-            $router->group(['as' => 'settings.', 'prefix' => 'settings'], function ($router) {
-                $router->get('setup', [
-                    'as'   => 'setup',
-                    'uses' => 'SettingsController@showSetupView',
-                ]);
-                $router->get('analytics', [
-                    'as'   => 'analytics',
-                    'uses' => 'SettingsController@showAnalyticsView',
-                ]);
-                $router->get('localization', [
-                    'as'   => 'localization',
-                    'uses' => 'SettingsController@showLocalizationView',
-                ]);
-                $router->get('security', [
-                    'as'   => 'security',
-                    'uses' => 'SettingsController@showSecurityView',
-                ]);
-                $router->get('theme', [
-                    'as'   => 'theme',
-                    'uses' => 'SettingsController@showThemeView',
-                ]);
-                $router->get('stylesheet', [
-                    'as'   => 'stylesheet',
-                    'uses' => 'SettingsController@showStylesheetView',
-                ]);
-                $router->post('/', 'SettingsController@postSettings');
-            });
+                $router->group(['as' => 'incidents.', 'prefix' => 'incidents'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'IncidentController@showIncidents',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'IncidentController@showAddIncident',
+                    ]);
+                    $router->post('add', 'IncidentController@createIncidentAction');
+                    $router->delete('{incident}/delete', [
+                        'as'   => 'delete',
+                        'uses' => 'IncidentController@deleteIncidentAction',
+                    ]);
+                    $router->get('{incident}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'IncidentController@showEditIncidentAction',
+                    ]);
+                    $router->post('{incident}/edit', 'IncidentController@editIncidentAction');
+                });
 
-            $router->group(['prefix' => 'user'], function ($router) {
-                $router->get('/', [
-                    'as'   => 'user',
-                    'uses' => 'UserController@showUser',
-                ]);
-                $router->post('/', 'UserController@postUser');
-                $router->get('{user}/api/regen', 'UserController@regenerateApiKey');
-            });
+                $router->group(['as' => 'schedule.', 'prefix' => 'schedule'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'ScheduleController@showIndex',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'ScheduleController@showAddSchedule',
+                    ]);
+                    $router->post('add', 'ScheduleController@addScheduleAction');
+                    $router->get('{incident}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'ScheduleController@showEditSchedule',
+                    ]);
+                    $router->post('{incident}/edit', 'ScheduleController@editScheduleAction');
+                    $router->delete('{incident}/delete', [
+                        'as'   => 'delete',
+                        'uses' => 'ScheduleController@deleteScheduleAction',
+                    ]);
+                });
 
-            $router->group(['prefix' => 'api'], function ($router) {
-                $router->get('incidents/templates', 'ApiController@getIncidentTemplate');
-                $router->post('components/groups/order', 'ApiController@postUpdateComponentGroupOrder');
-                $router->post('components/order', 'ApiController@postUpdateComponentOrder');
-                $router->post('components/{component}', 'ApiController@postUpdateComponent');
-                $router->get('system/version', 'ApiController@checkVersion');
+                $router->group(['as' => 'templates.', 'prefix' => 'templates'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'IncidentController@showTemplates',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'IncidentController@showAddIncidentTemplate',
+                    ]);
+                    $router->post('add', 'IncidentController@createIncidentTemplateAction');
+                    $router->get('{incident_template}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'IncidentController@showEditTemplateAction',
+                    ]);
+                    $router->post('{incident_template}/edit', 'IncidentController@editTemplateAction');
+                    $router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction');
+                });
+
+                $router->group(['as' => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'SubscriberController@showSubscribers',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'SubscriberController@showAddSubscriber',
+                    ]);
+                    $router->post('add', 'SubscriberController@createSubscriberAction');
+                    $router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction');
+                });
+
+                $router->group(['as' => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'MetricController@showMetrics',
+                    ]);
+                    $router->get('add', [
+                        'as'   => 'add',
+                        'uses' => 'MetricController@showAddMetric',
+                    ]);
+                    $router->post('add', 'MetricController@createMetricAction');
+                    $router->delete('{metric}/delete', 'MetricController@deleteMetricAction');
+                    $router->get('{metric}/edit', [
+                        'as'   => 'edit',
+                        'uses' => 'MetricController@showEditMetricAction',
+                    ]);
+                    $router->post('{metric}/edit', 'MetricController@editMetricAction');
+                });
+
+                $router->group(['as' => 'team.', 'prefix' => 'team'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'index',
+                        'uses' => 'TeamController@showTeamView',
+                    ]);
+
+                    $router->group(['middleware' => 'admin'], function (Registrar $router) {
+                        $router->get('add', [
+                            'as'   => 'add',
+                            'uses' => 'TeamController@showAddTeamMemberView',
+                        ]);
+                        $router->get('invite', [
+                            'as'   => 'invite',
+                            'uses' => 'TeamController@showInviteTeamMemberView',
+                        ]);
+                        $router->get('{user}', ['as' => 'edit', 'uses' => 'TeamController@showTeamMemberView']);
+                        $router->post('add', 'TeamController@postAddUser');
+                        $router->post('invite', 'TeamController@postInviteUser');
+                        $router->post('{user}', 'TeamController@postUpdateUser');
+                        $router->delete('{user}/delete', 'TeamController@deleteUser');
+                    });
+                });
+
+                $router->group(['as' => 'settings.', 'prefix' => 'settings'], function (Registrar $router) {
+                    $router->get('setup', [
+                        'as'   => 'setup',
+                        'uses' => 'SettingsController@showSetupView',
+                    ]);
+                    $router->get('analytics', [
+                        'as'   => 'analytics',
+                        'uses' => 'SettingsController@showAnalyticsView',
+                    ]);
+                    $router->get('localization', [
+                        'as'   => 'localization',
+                        'uses' => 'SettingsController@showLocalizationView',
+                    ]);
+                    $router->get('security', [
+                        'as'   => 'security',
+                        'uses' => 'SettingsController@showSecurityView',
+                    ]);
+                    $router->get('theme', [
+                        'as'   => 'theme',
+                        'uses' => 'SettingsController@showThemeView',
+                    ]);
+                    $router->get('stylesheet', [
+                        'as'   => 'stylesheet',
+                        'uses' => 'SettingsController@showStylesheetView',
+                    ]);
+                    $router->get('customization', [
+                        'as'   => 'customization',
+                        'uses' => 'SettingsController@showCustomizationView',
+                    ]);
+                    $router->get('credits', [
+                        'as'   => 'credits',
+                        'uses' => 'SettingsController@showCreditsView',
+                    ]);
+                    $router->post('/', 'SettingsController@postSettings');
+                });
+
+                $router->group(['prefix' => 'user'], function (Registrar $router) {
+                    $router->get('/', [
+                        'as'   => 'user',
+                        'uses' => 'UserController@showUser',
+                    ]);
+                    $router->post('/', 'UserController@postUser');
+                    $router->get('{user}/api/regen', 'UserController@regenerateApiKey');
+                });
+
+                $router->group(['prefix' => 'api'], function (Registrar $router) {
+                    $router->get('incidents/templates', 'ApiController@getIncidentTemplate');
+                    $router->post('components/groups/order', 'ApiController@postUpdateComponentGroupOrder');
+                    $router->post('components/order', 'ApiController@postUpdateComponentOrder');
+                    $router->post('components/{component}', 'ApiController@postUpdateComponent');
+                });
             });
         });
     }

app/Http/Routes/FeedRoutes.php

@@ -29,7 +29,7 @@ class FeedRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'ready']], function ($router) {
+        $router->group(['middleware' => ['web', 'ready']], function (Registrar $router) {
             $router->get('/atom/{component_group?}', [
                 'as'   => 'feed.atom',
                 'uses' => 'FeedController@atomAction',

app/Http/Routes/SetupRoutes.php

@@ -17,6 +17,7 @@ use Illuminate\Contracts\Routing\Registrar;
  * This is the setup routes class.
  *
  * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class SetupRoutes
 {
@@ -29,8 +30,11 @@ class SetupRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'setup']], function ($router) {
-            $router->controller('setup', 'SetupController');
+        $router->group(['middleware' => ['web', 'setup']], function (Registrar $router) {
+            $router->get('setup', 'SetupController@getIndex');
+            $router->post('setup/step1', 'SetupController@postStep1');
+            $router->post('setup/step2', 'SetupController@postStep2');
+            $router->post('setup/step3', 'SetupController@postStep3');
         });
     }
 }

app/Http/Routes/SignupRoutes.php

@@ -29,7 +29,7 @@ class SignupRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'ready', 'guest'], 'as' => 'signup.'], function ($router) {
+        $router->group(['middleware' => ['web', 'ready', 'guest'], 'as' => 'signup.'], function (Registrar $router) {
             $router->get('signup/invite/{code}', [
                 'as'   => 'invite',
                 'uses' => 'SignupController@getSignup',

app/Http/Routes/StatusPageRoutes.php

@@ -29,7 +29,7 @@ class StatusPageRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'ready', 'localize']], function ($router) {
+        $router->group(['middleware' => ['web', 'ready', 'localize']], function (Registrar $router) {
             $router->get('/', [
                 'as'   => 'status-page',
                 'uses' => 'StatusPageController@showIndex',
@@ -39,6 +39,13 @@ class StatusPageRoutes
                 'as'   => 'incident',
                 'uses' => 'StatusPageController@showIncident',
             ]);
+
+            $router->get('metrics/{metric}', [
+                'as'   => 'metrics',
+                'uses' => 'StatusPageController@getMetrics',
+            ]);
+
+            $router->get('component/{component}/shield', 'StatusPageController@showComponentBadge');
         });
     }
 }

app/Http/Routes/SubscribeRoutes.php

@@ -29,17 +29,25 @@ class SubscribeRoutes
      */
     public function map(Registrar $router)
     {
-        $router->group(['middleware' => ['web', 'ready', 'localize'], 'as' => 'subscribe.'], function ($router) {
-            $router->group(['middleware' => ['subscribers']], function ($router) {
-                $router->get('subscribe', [
-                    'as'   => 'subscribe',
-                    'uses' => 'SubscribeController@showSubscribe',
-                ]);
+        $router->group(['middleware' => ['web', 'ready', 'localize', 'subscribers'], 'as' => 'subscribe.'], function (Registrar $router) {
+            $router->get('subscribe', [
+                'as'   => 'subscribe',
+                'uses' => 'SubscribeController@showSubscribe',
+            ]);
 
-                $router->post('subscribe', [
-                    'uses' => 'SubscribeController@postSubscribe',
-                ]);
-            });
+            $router->post('subscribe', [
+                'uses' => 'SubscribeController@postSubscribe',
+            ]);
+
+            $router->get('subscribe/manage/{code}', [
+                'as'   => 'manage',
+                'uses' => 'SubscribeController@showManage',
+            ]);
+
+            $router->post('subscribe/manage/{code}', [
+                'as'   => 'manage',
+                'uses' => 'SubscribeController@postManage',
+            ]);
 
             $router->get('subscribe/verify/{code}', [
                 'as'   => 'verify',

app/Integrations/Contracts/System.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations\Contracts;
+
+/**
+ * This is the system interface.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+interface System
+{
+    /**
+     * Get the entire system status.
+     *
+     * @return array
+     */
+    public function getStatus();
+}

app/Integrations/Core/System.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations\Core;
+
+use CachetHQ\Cachet\Integrations\Contracts\System as SystemContract;
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Incident;
+
+/**
+ * This is the core system class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class System implements SystemContract
+{
+    /**
+     * Get the entire system status.
+     *
+     * @return array
+     */
+    public function getStatus()
+    {
+        $enabledScope = Component::enabled();
+        $totalComponents = Component::enabled()->count();
+        $majorOutages = Component::enabled()->status(4)->count();
+        $isMajorOutage = $totalComponents ? ($majorOutages / $totalComponents) >= 0.5 : false;
+
+        // Default data
+        $status = [
+            'system_status'  => 'info',
+            'system_message' => trans_choice('cachet.service.bad', $totalComponents),
+            'favicon'        => 'favicon-high-alert',
+        ];
+
+        if ($isMajorOutage) {
+            $status = [
+                'system_status'  => 'danger',
+                'system_message' => trans_choice('cachet.service.major', $totalComponents),
+                'favicon'        => 'favicon-high-alert',
+            ];
+        } elseif (Component::enabled()->notStatus(1)->count() === 0) {
+            // If all our components are ok, do we have any non-fixed incidents?
+            $incidents = Incident::notScheduled()->orderBy('created_at', 'desc')->get()->filter(function ($incident) {
+                return $incident->status > 0;
+            });
+            $incidentCount = $incidents->count();
+
+            if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {
+                $status = [
+                    'system_status'  => 'success',
+                    'system_message' => trans_choice('cachet.service.good', $totalComponents),
+                    'favicon'        => 'favicon',
+                ];
+            }
+        } elseif (Component::enabled()->whereIn('status', [2, 3])->count() > 0) {
+            $status['favicon'] = 'favicon-medium-alert';
+        }
+
+        return $status;
+    }
+}

app/Integrations/Credits.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations;
+
+use Exception;
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;
+
+class Credits
+{
+    /**
+     * The default url.
+     *
+     * @var string
+     */
+    const URL = 'https://cachethq.io/credits';
+
+    /**
+     * The failed status indicator.
+     *
+     * @var int
+     */
+    const FAILED = 1;
+
+    /**
+     * The cache repository instance.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * The url to use.
+     *
+     * @var string|null
+     */
+    protected $url;
+
+    /**
+     * Creates a new credits instance.
+     *
+     * @param \Illuminate\Contracts\Cache\Repository $cache
+     * @param string|null                            $url
+     *
+     * @return void
+     */
+    public function __construct(Repository $cache, $url = null)
+    {
+        $this->cache = $cache;
+        $this->url = $url ?: static::URL;
+    }
+
+    /**
+     * Returns the latest credits.
+     *
+     * @return array|null
+     */
+    public function latest()
+    {
+        $result = $this->cache->remember('credits', 2880, function () {
+            try {
+                return json_decode((new Client())->get($this->url, [
+                    'headers' => ['Accept' => 'application/json', 'User-Agent' => defined('CACHET_VERSION') ? 'cachet/'.constant('CACHET_VERSION') : 'cachet'],
+                ])->getBody(), true);
+            } catch (Exception $e) {
+                return self::FAILED;
+            }
+        });
+
+        return $result === self::FAILED ? null : $result;
+    }
+}

app/Integrations/Feed.php

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations;
+
+use Exception;
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;
+
+/**
+ * This is the feed class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class Feed
+{
+    /**
+     * The default url.
+     *
+     * @var string
+     */
+    const URL = 'https://blog.alt-three.com/tag/cachet/rss';
+
+    /**
+     * The failed status indicator.
+     *
+     * @var int
+     */
+    const FAILED = 1;
+
+    /**
+     * The cache repository instance.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * The url to use.
+     *
+     * @var string|null
+     */
+    protected $url;
+
+    /**
+     * Creates a new feed instance.
+     *
+     * @param \Illuminate\Contracts\Cache\Repository $cache
+     * @param string|null                            $url
+     *
+     * @return void
+     */
+    public function __construct(Repository $cache, $url = null)
+    {
+        $this->cache = $cache;
+        $this->url = $url ?: static::URL;
+    }
+
+    /**
+     * Returns the latest entries.
+     *
+     * @return array|null
+     */
+    public function latest()
+    {
+        $result = $this->cache->remember('feeds', 720, function () {
+            try {
+                $xml = simplexml_load_string((new Client())->get($this->url, [
+                    'headers' => ['Accept' => 'application/rss+xml', 'User-Agent' => defined('CACHET_VERSION') ? 'cachet/'.constant('CACHET_VERSION') : 'cachet'],
+                ])->getBody()->getContents(), null, LIBXML_NOCDATA);
+
+                return json_decode(json_encode($xml));
+            } catch (Exception $e) {
+                return self::FAILED;
+            }
+        });
+
+        return $result === self::FAILED ? null : $result;
+    }
+}

app/Integrations/Releases.php

@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Integrations;
+
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Cache\Repository;
+
+class Releases
+{
+    /**
+     * The default url.
+     *
+     * @var string
+     */
+    const URL = 'https://api.github.com/repos/cachethq/cachet/releases/latest';
+
+    /**
+     * The failed status indicator.
+     *
+     * @var int
+     */
+    const FAILED = 1;
+
+    /**
+     * The cache repository instance.
+     *
+     * @var \Illuminate\Contracts\Cache\Repository
+     */
+    protected $cache;
+
+    /**
+     * The github authentication token.
+     *
+     * @var string|null
+     */
+    protected $token;
+
+    /**
+     * The url to use.
+     *
+     * @var string|null
+     */
+    protected $url;
+
+    /**
+     * Creates a new releases instance.
+     *
+     * @param \Illuminate\Contracts\Cache\Repository $cache
+     * @param string|null                            $token
+     * @param string|null                            $url
+     *
+     * @return void
+     */
+    public function __construct(Repository $cache, $token = null, $url = null)
+    {
+        $this->cache = $cache;
+        $this->token = $token;
+        $this->url = $url ?: static::URL;
+    }
+
+    /**
+     * Returns the latest release.
+     *
+     * @return string
+     */
+    public function latest()
+    {
+        $release = $this->cache->remember('release.latest', 720, function () {
+            $headers = ['Accept' => 'application/vnd.github.v3+json', 'User-Agent' => defined('CACHET_VERSION') ? 'cachet/'.constant('CACHET_VERSION') : 'cachet'];
+
+            if ($this->token) {
+                $headers['OAUTH-TOKEN'] = $this->token;
+            }
+
+            return json_decode((new Client())->get($this->url, [
+                'headers' => $headers,
+            ])->getBody(), true);
+        });
+
+        return [
+            'tag_name' => $release['tag_name'],
+            'prelease' => $release['prerelease'],
+            'draft'    => $release['draft'],
+        ];
+    }
+}

app/Models/Component.php

@@ -12,6 +12,8 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\SearchableTrait;
+use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\ComponentPresenter;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -20,7 +22,10 @@ use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Component extends Model implements HasPresenter
 {
-    use SoftDeletes, ValidatingTrait;
+    use SearchableTrait;
+    use SoftDeletes;
+    use SortableTrait;
+    use ValidatingTrait;
 
     /**
      * List of attributes that have default values.
@@ -76,6 +81,34 @@ class Component extends Model implements HasPresenter
         'link'   => 'url',
     ];
 
+    /**
+     * The searchable fields.
+     *
+     * @var string[]
+     */
+    protected $searchable = [
+        'id',
+        'name',
+        'status',
+        'order',
+        'group_id',
+        'enabled',
+    ];
+
+    /**
+     * The sortable fields.
+     *
+     * @var string[]
+     */
+    protected $sortable = [
+        'id',
+        'name',
+        'status',
+        'order',
+        'group_id',
+        'enabled',
+    ];
+
     /**
      * Components can belong to a group.
      *

app/Models/ComponentGroup.php

@@ -12,14 +12,28 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\SearchableTrait;
+use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\ComponentGroupPresenter;
 use Illuminate\Database\Eloquent\Model;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
 class ComponentGroup extends Model implements HasPresenter
 {
+    use SearchableTrait;
+    use SortableTrait;
     use ValidatingTrait;
 
+    /**
+     * The model's attributes.
+     *
+     * @var string
+     */
+    protected $attributes = [
+        'order'     => 0,
+        'collapsed' => 0,
+    ];
+
     /**
      * The attributes that should be casted to native types.
      *
@@ -28,7 +42,7 @@ class ComponentGroup extends Model implements HasPresenter
     protected $casts = [
         'name'      => 'string',
         'order'     => 'int',
-        'collapsed' => 'bool',
+        'collapsed' => 'int',
     ];
 
     /**
@@ -46,7 +60,31 @@ class ComponentGroup extends Model implements HasPresenter
     public $rules = [
         'name'      => 'required|string',
         'order'     => 'int',
-        'collapsed' => 'bool',
+        'collapsed' => 'int',
+    ];
+
+    /**
+     * The searchable fields.
+     *
+     * @var string[]
+     */
+    protected $searchable = [
+        'id',
+        'name',
+        'order',
+        'collapsed',
+    ];
+
+    /**
+     * The sortable fields.
+     *
+     * @var string[]
+     */
+    protected $sortable = [
+        'id',
+        'name',
+        'order',
+        'collapsed',
     ];
 
     /**
@@ -66,6 +104,16 @@ class ComponentGroup extends Model implements HasPresenter
         return $this->hasMany(Component::class, 'group_id', 'id');
     }
 
+    /**
+     * Get the incidents relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
+     */
+    public function incidents()
+    {
+        return $this->hasManyThrough(Incident::class, Component::class, 'id', 'component_id');
+    }
+
     /**
      * Return all of the enabled components.
      *
@@ -73,7 +121,7 @@ class ComponentGroup extends Model implements HasPresenter
      */
     public function enabled_components()
     {
-        return $this->components()->enabled();
+        return $this->components()->enabled()->orderBy('order');
     }
 
     /**

app/Models/Incident.php

@@ -12,15 +12,21 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\SearchableTrait;
+use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\IncidentPresenter;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Incident extends Model implements HasPresenter
 {
-    use SoftDeletes, ValidatingTrait;
+    use SearchableTrait;
+    use SoftDeletes;
+    use SortableTrait;
+    use ValidatingTrait;
 
     /**
      * The attributes that should be casted to native types.
@@ -62,6 +68,32 @@ class Incident extends Model implements HasPresenter
         'message'      => 'required',
     ];
 
+    /**
+     * The searchable fields.
+     *
+     * @var string[]
+     */
+    protected $searchable = [
+        'id',
+        'component_id',
+        'name',
+        'status',
+        'visible',
+    ];
+
+    /**
+     * The sortable fields.
+     *
+     * @var string[]
+     */
+    protected $sortable = [
+        'id',
+        'name',
+        'status',
+        'visible',
+        'message',
+    ];
+
     /**
      * Finds all visible incidents.
      *
@@ -69,7 +101,7 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
+    public function scopeVisible(Builder $query)
     {
         return $query->where('visible', 1);
     }
@@ -81,9 +113,9 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeScheduled($query)
+    public function scopeScheduled(Builder $query)
     {
-        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now());
+        return $query->where('status', 0)->where('scheduled_at', '>=', Carbon::now()->toDateTimeString());
     }
 
     /**
@@ -93,10 +125,12 @@ class Incident extends Model implements HasPresenter
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeNotScheduled($query)
+    public function scopeNotScheduled(Builder $query)
     {
-        return $query->where(function ($query) {
-            return $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now());
+        return $query->where('status', '>', 0)->orWhere(function ($query) {
+            $query->where('status', 0)->where(function ($query) {
+                $query->whereNull('scheduled_at')->orWhere('scheduled_at', '<=', Carbon::now()->toDateTimeString());
+            });
         });
     }
 

app/Models/Metric.php

@@ -12,12 +12,15 @@
 namespace CachetHQ\Cachet\Models;
 
 use AltThree\Validator\ValidatingTrait;
+use CachetHQ\Cachet\Models\Traits\SortableTrait;
 use CachetHQ\Cachet\Presenters\MetricPresenter;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Metric extends Model implements HasPresenter
 {
+    use SortableTrait;
     use ValidatingTrait;
 
     /**
@@ -46,6 +49,8 @@ class Metric extends Model implements HasPresenter
         'calc_type'     => 0,
         'places'        => 2,
         'default_view'  => 1,
+        'threshold'     => 5,
+        'order'         => 0,
     ];
 
     /**
@@ -60,6 +65,8 @@ class Metric extends Model implements HasPresenter
         'calc_type'     => 'int',
         'places'        => 'int',
         'default_view'  => 'int',
+        'threshold'     => 'int',
+        'order'         => 'int',
     ];
 
     /**
@@ -76,6 +83,8 @@ class Metric extends Model implements HasPresenter
         'calc_type',
         'places',
         'default_view',
+        'threshold',
+        'order',
     ];
 
     /**
@@ -90,6 +99,22 @@ class Metric extends Model implements HasPresenter
         'default_value' => 'numeric',
         'places'        => 'numeric|between:0,4',
         'default_view'  => 'numeric|between:0,3',
+        'threshold'     => 'numeric|between:0,10',
+        'threshold'     => 'int',
+    ];
+
+    /**
+     * The sortable fields.
+     *
+     * @var string[]
+     */
+    protected $sortable = [
+        'id',
+        'name',
+        'display_chart',
+        'default_value',
+        'calc_type',
+        'order',
     ];
 
     /**
@@ -102,6 +127,18 @@ class Metric extends Model implements HasPresenter
         return $this->hasMany(MetricPoint::class, 'metric_id', 'id');
     }
 
+    /**
+     * Scope metrics to those of which are displayable.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeDisplayable(Builder $query)
+    {
+        return $query->where('display_chart', 1);
+    }
+
     /**
      * Determines whether a chart should be shown.
      *

app/Models/MetricPoint.php

@@ -20,6 +20,16 @@ class MetricPoint extends Model implements HasPresenter
 {
     use ValidatingTrait;
 
+    /**
+     * The model's attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'value'   => 0,
+        'counter' => 1,
+    ];
+
     /**
      * The attributes that should be casted to native types.
      *
@@ -27,7 +37,8 @@ class MetricPoint extends Model implements HasPresenter
      */
     protected $casts = [
         'metric_id' => 'int',
-        'value'     => 'int',
+        'value'     => 'float',
+        'counter'   => 'int',
     ];
 
     /**
@@ -35,7 +46,12 @@ class MetricPoint extends Model implements HasPresenter
      *
      * @var string[]
      */
-    protected $fillable = ['metric_id', 'value', 'created_at'];
+    protected $fillable = [
+        'metric_id',
+        'value',
+        'counter',
+        'created_at',
+    ];
 
     /**
      * The validation rules.
@@ -53,7 +69,25 @@ class MetricPoint extends Model implements HasPresenter
      */
     public function metric()
     {
-        return $this->belongsTo(Metric::class, 'id', 'metric_id');
+        return $this->belongsTo(Metric::class);
+    }
+
+    /**
+     * Override the value attribute.
+     *
+     * @param mixed $value
+     *
+     * @return float
+     */
+    public function getActiveValueAttribute($value)
+    {
+        if ($this->metric->calc_type === Metric::CALC_SUM) {
+            return round((float) $value * $this->counter, $this->metric->places);
+        } elseif ($this->metric->calc_type === Metric::CALC_AVG) {
+            return round((float) $value * $this->counter, $this->metric->places);
+        }
+
+        return round((float) $value, $this->metric->places);
     }
 
     /**

app/Models/Subscriber.php

@@ -30,6 +30,7 @@ class Subscriber extends Model implements HasPresenter
         'email'       => 'string',
         'verify_code' => 'string',
         'verified_at' => 'date',
+        'global'      => 'bool',
     ];
 
     /**
@@ -48,6 +49,13 @@ class Subscriber extends Model implements HasPresenter
         'email' => 'required|email',
     ];
 
+    /**
+     * The relations to eager load on every query.
+     *
+     * @var string[]
+     */
+    protected $with = ['subscriptions'];
+
     /**
      * Overrides the models boot method.
      */
@@ -84,6 +92,33 @@ class Subscriber extends Model implements HasPresenter
         return $query->whereNotNull('verified_at');
     }
 
+    /**
+     * Scope global subscribers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsGlobal(Builder $query)
+    {
+        return $query->where('global', true);
+    }
+
+    /**
+     * Finds all verified subscriptions for a component.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param int                                   $component_id
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeForComponent(Builder $query, $component_id)
+    {
+        return $query->select('subscribers.*')
+            ->join('subscriptions', 'subscribers.id', '=', 'subscriptions.subscriber_id')
+            ->where('subscriptions.component_id', $component_id);
+    }
+
     /**
      * Determines if the subscriber is verified.
      *

app/Models/Subscription.php

@@ -107,7 +107,10 @@ class Subscription extends Model
     {
         return $query->select('subscriptions.*')
             ->join('subscribers', 'subscriptions.subscriber_id', '=', 'subscribers.id')
-            ->where('component_id', $component_id)
+            ->where(function ($query) {
+                $query->where('subscriptions.component_id', $component_id)
+                    ->orWhere('subscribers.global');
+            })
             ->whereNotNull('subscribers.verified_at');
     }
 }

app/Models/Traits/SearchableTrait.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Models\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+
+/**
+ * This is the searchable trait.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+trait SearchableTrait
+{
+    /**
+     * Adds a search scope.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param array                                 $search
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSearch(Builder $query, array $search = [])
+    {
+        if (empty($search)) {
+            return $query;
+        }
+
+        $allowed_search = array_intersect_key($search, array_flip($this->searchable));
+        if (!$allowed_search) {
+            return $query;
+        }
+
+        return $query->where($allowed_search);
+    }
+}

app/Models/Traits/SortableTrait.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Models\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+
+/**
+ * This is the sortable trait.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+trait SortableTrait
+{
+    /**
+     * Adds a sort scope.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string                                $column
+     * @param string                                $direction
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSort(Builder $query, $column, $direction)
+    {
+        if (!in_array($column, $this->sortable)) {
+            return $query;
+        }
+
+        return $query->orderBy($column, $direction);
+    }
+}

app/Models/User.php

@@ -22,7 +22,9 @@ use Illuminate\Support\Facades\Hash;
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {
-    use Authenticatable, CanResetPassword, ValidatingTrait;
+    use Authenticatable;
+    use CanResetPassword;
+    use ValidatingTrait;
 
     /**
      * The admin level of user.
@@ -116,7 +118,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getGravatarAttribute($size = 200)
     {
-        return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5($this->email), $size);
+        return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), $size);
     }
 
     /**

app/Presenters/ComponentGroupPresenter.php

@@ -63,7 +63,25 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable
      */
     public function collapse_class()
     {
-        return $this->wrappedObject->collapsed ? 'ion-ios-plus-outline' : 'ion-ios-minus-outline';
+        return $this->is_collapsed() ? 'ion-ios-plus-outline' : 'ion-ios-minus-outline';
+    }
+
+    /**
+     * Determine if the group should be collapsed.
+     *
+     * @return bool
+     */
+    public function is_collapsed()
+    {
+        if ($this->wrappedObject->collapsed === 0) {
+            return false;
+        } elseif ($this->wrappedObject->collapsed === 1) {
+            return true;
+        }
+
+        return $this->wrappedObject->components->filter(function ($component) {
+            return $component->status > 1;
+        })->count() === 0;
     }
 
     /**

app/Presenters/ComponentPresenter.php

@@ -11,8 +11,10 @@
 
 namespace CachetHQ\Cachet\Presenters;
 
+use CachetHQ\Cachet\Dates\DateFactory;
 use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Facades\Config;
 use McCool\LaravelAutoPresenter\BasePresenter;
 
 class ComponentPresenter extends BasePresenter implements Arrayable
@@ -44,6 +46,26 @@ class ComponentPresenter extends BasePresenter implements Arrayable
         return trans('cachet.components.status.'.$this->wrappedObject->status);
     }
 
+    /**
+     * Find all tag names for the component names.
+     *
+     * @return array
+     */
+    public function tags()
+    {
+        return $this->wrappedObject->tags->pluck('name', 'slug');
+    }
+
+    /**
+     * Present formatted date time.
+     *
+     * @return string
+     */
+    public function updated_at_formatted()
+    {
+        return ucfirst(app(DateFactory::class)->make($this->wrappedObject->updated_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s')));
+    }
+
     /**
      * Convert the presenter instance to an array.
      *
@@ -55,6 +77,7 @@ class ComponentPresenter extends BasePresenter implements Arrayable
             'created_at'  => $this->created_at(),
             'updated_at'  => $this->updated_at(),
             'status_name' => $this->human_status(),
+            'tags'        => $this->tags(),
         ]);
     }
 }

app/Presenters/MetricPointPresenter.php

@@ -19,6 +19,16 @@ class MetricPointPresenter extends BasePresenter implements Arrayable
 {
     use TimestampsTrait;
 
+    /**
+     * Show the actual calculated value; as per (value * counter).
+     *
+     * @return int
+     */
+    public function calculated_value()
+    {
+        return $this->wrappedObject->value * $this->wrappedObject->counter;
+    }
+
     /**
      * Convert the presenter instance to an array.
      *
@@ -27,8 +37,9 @@ class MetricPointPresenter extends BasePresenter implements Arrayable
     public function toArray()
     {
         return array_merge($this->wrappedObject->toArray(), [
-            'created_at' => $this->created_at(),
-            'updated_at' => $this->updated_at(),
+            'created_at'       => $this->created_at(),
+            'updated_at'       => $this->updated_at(),
+            'calculated_value' => $this->calculated_value(),
         ]);
     }
 }

app/Presenters/MetricPresenter.php

@@ -34,6 +34,16 @@ class MetricPresenter extends BasePresenter implements Arrayable
         }
     }
 
+    /**
+     * Determines the metric view filter name, used in the API.
+     *
+     * @return string
+     */
+    public function default_view_name()
+    {
+        return trans('cachet.metrics.filter.'.$this->trans_string_name());
+    }
+
     /**
      * Determines the metric translation view filter name.
      *
@@ -57,8 +67,9 @@ class MetricPresenter extends BasePresenter implements Arrayable
     public function toArray()
     {
         return array_merge($this->wrappedObject->toArray(), [
-            'created_at' => $this->created_at(),
-            'updated_at' => $this->updated_at(),
+            'created_at'        => $this->created_at(),
+            'updated_at'        => $this->updated_at(),
+            'default_view_name' => $this->default_view_name(),
         ]);
     }
 }