From d762249a65a21f1921df4360d9e1c78b511c7bdb Mon Sep 17 00:00:00 2001
From: cc <cc@cnuer.cn>
Date: Sun, 18 Jun 2017 14:50:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Forum/Controller/IndexController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Forum/Controller/IndexController.php b/src/Forum/Controller/IndexController.php
index a4c059f345..2b9b86e2eb 100644
--- a/src/Forum/Controller/IndexController.php
+++ b/src/Forum/Controller/IndexController.php
@@ -13,6 +13,8 @@
 
 use Flarum\Api\Client as ApiClient;
 use Flarum\Core\User;
+use Flarum\Core\Discussion;
+use Flarum\Http\Exception\RouteNotFoundException;
 use Flarum\Forum\WebApp;
 use Illuminate\Contracts\Events\Dispatcher;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -58,6 +60,9 @@ protected function getView(Request $request)
         $sort = array_pull($queryParams, 'sort');
         $q = array_pull($queryParams, 'q');
         $page = array_pull($queryParams, 'page', 1);
+        $discussion = new Discussion();
+        $totledis = $discussion->count();
+        if(ceil($totledis / 20) < $page )throw new RouteNotFoundException;
 
         $params = [
             'sort' => $sort && isset($this->sortMap[$sort]) ? $this->sortMap[$sort] : '',

From af8f2292ef105e7de33024e3a90917700fbc0ee3 Mon Sep 17 00:00:00 2001
From: cc <cc@cnuer.cn>
Date: Mon, 19 Jun 2017 14:04:45 +0800
Subject: [PATCH 2/3] keywords

---
 js/admin/dist/app.js                   | 10 +++++++++-
 js/admin/src/components/BasicsPage.js  | 11 +++++++++++
 src/Api/Serializer/ForumSerializer.php |  1 +
 src/Http/WebApp/WebAppView.php         |  1 +
 views/app.blade.php                    |  1 +
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/js/admin/dist/app.js b/js/admin/dist/app.js
index fd7ff47688..bfaf314d07 100644
--- a/js/admin/dist/app.js
+++ b/js/admin/dist/app.js
@@ -18057,7 +18057,7 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
 
             this.loading = false;
 
-            this.fields = ['forum_title', 'forum_description', 'default_locale', 'show_language_selector', 'default_route', 'welcome_title', 'welcome_message'];
+            this.fields = ['forum_title', 'forum_keywords', 'forum_description', 'default_locale', 'show_language_selector', 'default_route', 'welcome_title', 'welcome_message'];
             this.values = {};
 
             var settings = app.data.settings;
@@ -18091,6 +18091,14 @@ System.register('flarum/components/BasicsPage', ['flarum/components/Page', 'flar
                     label: app.translator.trans('core.admin.basics.forum_title_heading'),
                     children: [m('input', { className: 'FormControl', value: this.values.forum_title(), oninput: m.withAttr('value', this.values.forum_title) })]
                   }),
+                  FieldSet.component({
+                    label: app.translator.trans('core.admin.basics.forum_keywords_heading'),
+                    children: [m(
+                      'div',
+                      { className: 'helpText' },
+                      app.translator.trans('core.admin.basics.forum_keywords_text')
+                    ), m('textarea', { className: 'FormControl', value: this.values.forum_keywords(), oninput: m.withAttr('value', this.values.forum_keywords) })]
+                  }),
                   FieldSet.component({
                     label: app.translator.trans('core.admin.basics.forum_description_heading'),
                     children: [m(
diff --git a/js/admin/src/components/BasicsPage.js b/js/admin/src/components/BasicsPage.js
index 90ea4b3f49..929739d394 100644
--- a/js/admin/src/components/BasicsPage.js
+++ b/js/admin/src/components/BasicsPage.js
@@ -15,6 +15,7 @@ export default class BasicsPage extends Page {
 
     this.fields = [
       'forum_title',
+      'forum_keywords',
       'forum_description',
       'default_locale',
       'show_language_selector',
@@ -48,6 +49,16 @@ export default class BasicsPage extends Page {
               ]
             })}
 
+            {FieldSet.component({
+              label: app.translator.trans('core.admin.basics.forum_keywords_heading'),
+              children: [
+                <div className="helpText">
+                  {app.translator.trans('core.admin.basics.forum_keywords_text')}
+                </div>,
+                <textarea className="FormControl" value={this.values.forum_keywords()} oninput={m.withAttr('value', this.values.forum_keywords)}/>
+              ]
+            })}
+
             {FieldSet.component({
               label: app.translator.trans('core.admin.basics.forum_description_heading'),
               children: [
diff --git a/src/Api/Serializer/ForumSerializer.php b/src/Api/Serializer/ForumSerializer.php
index 852ec08a6c..7047b20d33 100644
--- a/src/Api/Serializer/ForumSerializer.php
+++ b/src/Api/Serializer/ForumSerializer.php
@@ -64,6 +64,7 @@ protected function getDefaultAttributes($model)
     {
         $attributes = [
             'title' => $this->settings->get('forum_title'),
+            'keywords' => $this->settings->get('forum_keywords'),
             'description' => $this->settings->get('forum_description'),
             'showLanguageSelector' => (bool) $this->settings->get('show_language_selector', true),
             'baseUrl' => $url = $this->app->url(),
diff --git a/src/Http/WebApp/WebAppView.php b/src/Http/WebApp/WebAppView.php
index 070c751310..c3c594b937 100644
--- a/src/Http/WebApp/WebAppView.php
+++ b/src/Http/WebApp/WebAppView.php
@@ -290,6 +290,7 @@ public function render(Request $request)
         $view = $this->view->file(__DIR__.'/../../../views/app.blade.php');
 
         $view->title = $this->buildTitle(array_get($forum, 'data.attributes.title'));
+        $view->keywords = $this->keywords ?: array_get($forum, 'data.attributes.keywords');
         $view->description = $this->description ?: array_get($forum, 'data.attributes.description');
         $view->language = $this->language ?: $this->locales->getLocale();
         $view->direction = $this->direction ?: 'ltr';
diff --git a/views/app.blade.php b/views/app.blade.php
index 68974858ff..a123067ebe 100644
--- a/views/app.blade.php
+++ b/views/app.blade.php
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>{{ $title }}</title>
+    <meta name="keywords" content="{{ $keywords }}">
     <meta name="description" content="{{ $description }}">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
     <meta name="theme-color" content="{{ array_get($forum, 'attributes.themePrimaryColor') }}">

From 7ac6f076c421bc3884ca4a6d37b0087f38fe16d3 Mon Sep 17 00:00:00 2001
From: cc <cc@cnuer.cn>
Date: Mon, 19 Jun 2017 15:53:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Forum/Controller/IndexController.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Forum/Controller/IndexController.php b/src/Forum/Controller/IndexController.php
index 2b9b86e2eb..6073fdcc85 100644
--- a/src/Forum/Controller/IndexController.php
+++ b/src/Forum/Controller/IndexController.php
@@ -13,7 +13,6 @@
 
 use Flarum\Api\Client as ApiClient;
 use Flarum\Core\User;
-use Flarum\Core\Discussion;
 use Flarum\Http\Exception\RouteNotFoundException;
 use Flarum\Forum\WebApp;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -60,9 +59,6 @@ protected function getView(Request $request)
         $sort = array_pull($queryParams, 'sort');
         $q = array_pull($queryParams, 'q');
         $page = array_pull($queryParams, 'page', 1);
-        $discussion = new Discussion();
-        $totledis = $discussion->count();
-        if(ceil($totledis / 20) < $page )throw new RouteNotFoundException;
 
         $params = [
             'sort' => $sort && isset($this->sortMap[$sort]) ? $this->sortMap[$sort] : '',
@@ -71,6 +67,7 @@ protected function getView(Request $request)
         ];
 
         $document = $this->getDocument($request->getAttribute('actor'), $params);
+        if(empty($document->data)) throw new RouteNotFoundException;
 
         $view->document = $document;
         $view->content = app('view')->make('flarum.forum::index', compact('document', 'page', 'forum'));