Add comment

Move shared classes in search and filter namespaces to a new query namespace

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: ['7.2', '7.3', '7.4', '8.0']
         service: ['mysql:5.7', mariadb]
         prefix: ['', flarum_]
 
@@ -33,6 +33,12 @@ jobs:
           - php: 7.3
             service: mariadb
             prefix: flarum_
+          - php: 8.0
+            service: 'mysql:5.7'
+            prefix: flarum_
+          - php: 8.0
+            service: mariadb
+            prefix: flarum_
 
     services:
       mysql:
@@ -45,13 +51,22 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Select PHP version
-        run: sudo update-alternatives --set php $(which php${{ matrix.php }})
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
+          tools: phpunit, composer:v2
 
+      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
+      # which isn't supported prior to PHP7.4
+      # When we drop support for PHP7.3, we should remove this from the setup.
       - name: Create MySQL Database
         run: |
           sudo systemctl start mysql
           mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
+          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306
 
       - name: Install Composer dependencies
         run: composer install

.gitignore

@@ -7,3 +7,4 @@ Thumbs.db
 /tests/integration/tmp
 .vagrant
 .idea/*
+.vscode

CHANGELOG.md

@@ -1,5 +1,73 @@
 # Changelog
 
+## [0.1.0-beta.15](https://github.com/flarum/core/compare/v0.1.0-beta.14.1...v0.1.0-beta.15)
+
+### Added
+
+- Slug drivers support (https://github.com/flarum/core/pull/2456).
+- Notification type extender (https://github.com/flarum/core/pull/2424).
+- Validation extender (https://github.com/flarum/core/pull/2102).
+- Post extender (https://github.com/flarum/core/pull/2101).
+- Notification channel extender (https://github.com/flarum/core/pull/2432).
+- Service provider extender (https://github.com/flarum/core/pull/2437).
+- API serializer extender (https://github.com/flarum/core/pull/2438).
+- User preferences extender (https://github.com/flarum/core/pull/2463).
+- Settings extender (https://github.com/flarum/core/pull/2452).
+- ApiController extender (https://github.com/flarum/core/pull/2451).
+- Model visibility extender (https://github.com/flarum/core/pull/2460).
+- Policy extender (https://github.com/flarum/core/pull/2461).
+
+### Changed
+
+- Time helpers converted to Typescript (https://github.com/flarum/core/pull/2391).
+- Improved the formatter extender (https://github.com/flarum/core/pull/2098).
+- Improve wording on installer when facing file permission issues (https://github.com/flarum/core/pull/2435).
+- Background color of checkbox toggles improved for better usability (https://github.com/flarum/core/pull/2443).
+- Route resolving refactored (https://github.com/flarum/core/pull/2425).
+- Administration panel UX refactored (https://github.com/flarum/core/pull/2409).
+- Floodgate moved to middleware and extender added (https://github.com/flarum/core/pull/2170).
+- DRY up image uploading logic (https://github.com/flarum/core/pull/2477).
+- Process isolation on testing (https://github.com/flarum/core/commit/984f751c718c89501cc09857bc271efa2c7eea8c).
+- Forum and admin javascript exports namespaced (https://github.com/flarum/core/pull/2488).
+
+### Fixed
+
+- Web updater does not take into account subfolder installations (https://github.com/flarum/core/pull/2426).
+- Callables handling in extenders failed (https://github.com/flarum/core/pull/2423).
+- Scrolling on mobile from PostSteam changes didn't work correctly (https://github.com/flarum/core/pull/2385).
+- Side pane covers part of the discussion page due to `app.discussions` being empty (https://github.com/flarum/core/commit/102e76b084bf47fdfb4c73f95e1fbb322537f7aa).
+- Change email modal keeps showing the previous error message even on success (https://github.com/flarum/core/pull/2467).
+- Comment count not updated when discussions are deleted (https://github.com/flarum/core/pull/2472).
+- `goToIndex` in PostStream does not trigger an xhr to retrieve new data (https://github.com/flarum/core/commit/09e2736cbcc267594b660beabbd001d9030f9880).
+- On refresh the post number is reduced by one (https://github.com/flarum/core/pull/2476).
+- Queue worker would instantiate a new Queue factory, not the bound one (https://github.com/flarum/core/pull/2481).
+- Header accidentally has a border bottom (https://github.com/flarum/core/pull/2489).
+- Namespace mentioned in docblock is incorrect (https://github.com/flarum/core/pull/2494).
+- Scrolling inside longer discussions (especially Firefox) skips posts (https://github.com/flarum/core/commit/210a6b3e253d7917bd1eacd3ed8d2f95073ae99d).
+- Uploading avatars that are jpg/jpeg fails with a validation error (https://github.com/flarum/core/pull/2497).
+
+### Removed
+
+- MomentJS alias (https://github.com/flarum/core/pull/2428).
+- Deprecated user events `GetDisplayName` and `PrepareUserGroups` (https://github.com/flarum/core/pull/2428).
+- AssertPermissionTrait (https://github.com/flarum/core/pull/2428).
+- Path related helpers and methods in Application (https://github.com/flarum/core/pull/2428).
+- Backward compatibility layers from the frontend rewrite (https://github.com/flarum/core/pull/2428).
+
+### Deprecated
+
+- `CheckingForFlooding` (https://github.com/flarum/core/commit/8e25bcb68f86cc992c46dfa70368419fe9f936ac).
+
+## [0.1.0-beta.14.1](https://github.com/flarum/core/compare/v0.1.0-beta.14...v0.1.0-beta.14.1)
+
+### Fixed
+
+- SuperTextarea component is not exported.
+- Symfony dependencies do not match those depended on by Laravel (https://github.com/flarum/core/pull/2407).
+- Scripts from textformatter aren't executed (https://github.com/flarum/core/pull/2415)
+- Sub path installations have no page title.
+- Losing focus of Composer area when coming from fullscreen.
+
 ## [0.1.0-beta.14](https://github.com/flarum/core/compare/v0.1.0-beta.13...v0.1.0-beta.14)
 
 ### Added

composer.json

@@ -6,31 +6,9 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Franz Liedke",
-            "email": "franz@develophp.org"
-        },
-        {
-            "name": "Daniël Klabbers",
-            "email": "daniel@klabbers.email",
-            "homepage": "https://luceos.com"
-        },
-        {
-            "name": "David Sevilla Martin",
-            "email": "me+flarum@datitisev.me",
-            "homepage": "https://datitisev.me"
-        },
-        {
-            "name": "Clark Winkelmann",
-            "email": "clark.winkelmann@gmail.com",
-            "homepage": "https://clarkwinkelmann.com"
-        },
-        {
-            "name": "Matthew Kilgore",
-            "email": "matthew@kilgore.dev"
-        },
-        {
-          "name": "Alexander (Sasha) Skvortsov",
-          "email": "askvortsov@flarum.org"
+            "name": "Flarum",
+            "email": "info@flarum.org",
+            "homepage": "https://flarum.org/team"
         }
     ],
     "support": {
@@ -42,9 +20,9 @@
         "php": ">=7.2",
         "axy/sourcemap": "^0.1.4",
         "components/font-awesome": "^5.14.0",
-        "dflydev/fig-cookies": "^2.0.1",
+        "dflydev/fig-cookies": "^3.0.0",
         "doctrine/dbal": "^2.7",
-        "franzl/whoops-middleware": "^0.4.0",
+        "franzl/whoops-middleware": "^2.0.0",
         "illuminate/bus": "^6.0",
         "illuminate/cache": "^6.0",
         "illuminate/config": "^6.0",
@@ -61,14 +39,14 @@
         "illuminate/validation": "^6.0",
         "illuminate/view": "^6.0",
         "intervention/image": "^2.5.0",
-        "laminas/laminas-diactoros": "^1.8.4",
-        "laminas/laminas-httphandlerrunner": "^1.0",
-        "laminas/laminas-stratigility": "^3.0",
+        "laminas/laminas-diactoros": "^2.4.1",
+        "laminas/laminas-httphandlerrunner": "^1.2.0",
+        "laminas/laminas-stratigility": "^3.2.2",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^1.1",
-        "middlewares/base-path-router": "^0.2.1",
-        "middlewares/request-handler": "^1.2",
+        "middlewares/base-path": "^2.0.1",
+        "middlewares/base-path-router": "^2.0.1",
+        "middlewares/request-handler": "^2.0.1",
         "monolog/monolog": "^1.16.0",
         "nesbot/carbon": "^2.0",
         "nikic/fast-route": "^0.6",
@@ -79,14 +57,15 @@
         "symfony/config": "^4.3.4",
         "symfony/console": "^4.3.4",
         "symfony/event-dispatcher": "^4.3.4",
+        "symfony/mime": "^5.2.0",
         "symfony/translation": "^4.3.4",
         "symfony/yaml": "^4.3.4",
         "tobscure/json-api": "^0.3.0",
         "wikimedia/less.php": "^3.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^7.0"
+        "mockery/mockery": "^1.3.3",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

js/package.json

@@ -13,10 +13,10 @@
     "jquery": "^3.5.1",
     "jquery.hotkeys": "^0.1.0",
     "lodash-es": "^4.17.14",
-    "m.attrs.bidi": "github:tobscure/m.attrs.bidi",
     "mithril": "^2.0.4",
     "punycode": "^2.1.1",
     "spin.js": "^3.1.0",
+    "textarea-caret": "^3.1.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
     "webpack-merge": "^4.1.4"

js/src/admin/AdminApplication.js

@@ -1,27 +1,18 @@
 import HeaderPrimary from './components/HeaderPrimary';
 import HeaderSecondary from './components/HeaderSecondary';
 import routes from './routes';
-import ExtensionPage from './components/ExtensionPage';
 import Application from '../common/Application';
 import Navigation from '../common/components/Navigation';
 import AdminNav from './components/AdminNav';
 import ExtensionData from './utils/ExtensionData';
 
 export default class AdminApplication extends Application {
-  // Deprecated as of beta 15
-  extensionSettings = {};
-
   extensionData = new ExtensionData();
 
   extensionCategories = {
-    discussion: 70,
-    moderation: 60,
-    feature: 50,
-    formatting: 40,
-    theme: 30,
-    authentication: 20,
+    feature: 30,
+    theme: 20,
     language: 10,
-    other: 0,
   };
 
   history = {
@@ -61,14 +52,6 @@ export default class AdminApplication extends Application {
     m.mount(document.getElementById('header-primary'), HeaderPrimary);
     m.mount(document.getElementById('header-secondary'), HeaderSecondary);
     m.mount(document.getElementById('admin-navigation'), AdminNav);
-
-    // If an extension has just been enabled, then we will run its settings
-    // callback.
-    const enabled = localStorage.getItem('enabledExtension');
-    if (enabled && this.extensionSettings[enabled] && typeof this.extensionSettings[enabled] === 'function') {
-      this.extensionSettings[enabled]();
-      localStorage.removeItem('enabledExtension');
-    }
   }
 
   getRequiredPermissions(permission) {

js/src/admin/compat.js

@@ -8,6 +8,7 @@ import SettingDropdown from './components/SettingDropdown';
 import EditCustomFooterModal from './components/EditCustomFooterModal';
 import SessionDropdown from './components/SessionDropdown';
 import HeaderPrimary from './components/HeaderPrimary';
+import AdminPage from './components/AdminPage';
 import AppearancePage from './components/AppearancePage';
 import StatusWidget from './components/StatusWidget';
 import ExtensionsWidget from './components/ExtensionsWidget';
@@ -16,8 +17,8 @@ import SettingsModal from './components/SettingsModal';
 import DashboardWidget from './components/DashboardWidget';
 import ExtensionPage from './components/ExtensionPage';
 import ExtensionLinkButton from './components/ExtensionLinkButton';
-import AdminLinkButton from './components/AdminLinkButton';
 import PermissionGrid from './components/PermissionGrid';
+import ExtensionPermissionGrid from './components/ExtensionPermissionGrid';
 import MailPage from './components/MailPage';
 import UploadImageButton from './components/UploadImageButton';
 import LoadingModal from './components/LoadingModal';
@@ -42,6 +43,7 @@ export default Object.assign(compat, {
   'components/EditCustomFooterModal': EditCustomFooterModal,
   'components/SessionDropdown': SessionDropdown,
   'components/HeaderPrimary': HeaderPrimary,
+  'components/AdminPage': AdminPage,
   'components/AppearancePage': AppearancePage,
   'components/StatusWidget': StatusWidget,
   'components/ExtensionsWidget': ExtensionsWidget,
@@ -50,8 +52,8 @@ export default Object.assign(compat, {
   'components/DashboardWidget': DashboardWidget,
   'components/ExtensionPage': ExtensionPage,
   'components/ExtensionLinkButton': ExtensionLinkButton,
-  'components/AdminLinkButton': AdminLinkButton,
   'components/PermissionGrid': PermissionGrid,
+  'components/ExtensionPermissionGrid': ExtensionPermissionGrid,
   'components/MailPage': MailPage,
   'components/UploadImageButton': UploadImageButton,
   'components/LoadingModal': LoadingModal,

js/src/admin/components/AddExtensionModal.js

@@ -1,32 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import Modal from '../../common/components/Modal';
-
-export default class AddExtensionModal extends Modal {
-  className() {
-    return 'AddExtensionModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('core.admin.add_extension.title');
-  }
-
-  content() {
-    return (
-      <div className="Modal-body">
-        <p>{app.translator.trans('core.admin.add_extension.temporary_text')}</p>
-        <p>
-          {app.translator.trans('core.admin.add_extension.install_text', { a: <a href="https://discuss.flarum.org/t/extensions" target="_blank" /> })}
-        </p>
-        <p>{app.translator.trans('core.admin.add_extension.developer_text', { a: <a href="http://flarum.org/docs/extend" target="_blank" /> })}</p>
-      </div>
-    );
-  }
-}

js/src/admin/components/AdminLinkButton.js

@@ -1,16 +0,0 @@
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import LinkButton from '../../common/components/LinkButton';
-
-export default class AdminLinkButton extends LinkButton {
-  getButtonContent(children) {
-    return [...super.getButtonContent(children), <div className="AdminLinkButton-description">{this.attrs.description}</div>];
-  }
-}

js/src/admin/components/AdminNav.js

@@ -21,6 +21,34 @@ export default class AdminNav extends Component {
     );
   }
 
+  oncreate(vnode) {
+    super.oncreate(vnode);
+
+    this.scrollToActive();
+  }
+
+  onupdate() {
+    this.scrollToActive();
+  }
+
+  scrollToActive() {
+    const children = $('.Dropdown-menu').children('.active');
+    const nav = $('#admin-navigation');
+    const time = app.previous.type ? 250 : 0;
+
+    if (
+      children.length > 0 &&
+      (children[0].offsetTop > nav.scrollTop() + nav.outerHeight() || children[0].offsetTop + children[0].offsetHeight < nav.scrollTop())
+    ) {
+      nav.animate(
+        {
+          scrollTop: children[0].offsetTop - nav.height() / 2,
+        },
+        time
+      );
+    }
+  }
+
   /**
    * Build an item list of main links to show in the admin navigation.
    *
@@ -29,6 +57,8 @@ export default class AdminNav extends Component {
   items() {
     const items = new ItemList();
 
+    items.add('category-core', <h4 className="ExtensionListTitle">{app.translator.trans('core.admin.nav.categories.core')}</h4>);
+
     items.add(
       'dashboard',
       <LinkButton href={app.route('dashboard')} icon="far fa-chart-bar" title={app.translator.trans('core.admin.nav.dashboard_title')}>
@@ -88,7 +118,7 @@ export default class AdminNav extends Component {
     Object.keys(categorizedExtensions).map((category) => {
       if (!this.query()) {
         items.add(
-          category,
+          `category-${category}`,
           <h4 className="ExtensionListTitle">{app.translator.trans(`core.admin.nav.categories.${category}`)}</h4>,
           categories[category]
         );
@@ -100,7 +130,7 @@ export default class AdminNav extends Component {
 
         if (!query || title.toUpperCase().includes(query) || extension.description.toUpperCase().includes(query)) {
           items.add(
-            extension.id,
+            `extension-${extension.id}`,
             <ExtensionLinkButton
               href={app.route('extension', { id: extension.id })}
               extensionId={extension.id}

js/src/admin/components/AdminPage.js

@@ -0,0 +1,174 @@
+import Page from '../../common/components/Page';
+import Button from '../../common/components/Button';
+import Switch from '../../common/components/Switch';
+import Select from '../../common/components/Select';
+import classList from '../../common/utils/classList';
+import Stream from '../../common/utils/Stream';
+import saveSettings from '../utils/saveSettings';
+import AdminHeader from './AdminHeader';
+
+export default class AdminPage extends Page {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.settings = {};
+
+    this.loading = false;
+  }
+
+  view() {
+    const className = classList(['AdminPage', this.headerInfo().className]);
+
+    return (
+      <div className={className}>
+        {this.header()}
+        <div className="container">{this.content()}</div>
+      </div>
+    );
+  }
+
+  content() {
+    return '';
+  }
+
+  submitButton() {
+    return (
+      <Button onclick={this.saveSettings.bind(this)} className="Button Button--primary" loading={this.loading} disabled={!this.isChanged()}>
+        {app.translator.trans('core.admin.settings.submit_button')}
+      </Button>
+    );
+  }
+
+  header() {
+    const headerInfo = this.headerInfo();
+
+    return (
+      <AdminHeader icon={headerInfo.icon} description={headerInfo.description} className={headerInfo.className + '-header'}>
+        {headerInfo.title}
+      </AdminHeader>
+    );
+  }
+
+  headerInfo() {
+    return {
+      className: '',
+      icon: '',
+      title: '',
+      description: '',
+    };
+  }
+
+  /**
+   * buildSettingComponent takes a settings object and turns it into a component.
+   * Depending on the type of input, you can set the type to 'bool', 'select', or
+   * any standard <input> type. Any values inside the 'extra' object will be added
+   * to the component as an attribute.
+   *
+   * Alternatively, you can pass a callback that will be executed in ExtensionPage's
+   * context to include custom JSX elements.
+   *
+   * @example
+   *
+   * {
+   *    setting: 'acme.checkbox',
+   *    label: app.translator.trans('acme.admin.setting_label'),
+   *    type: 'bool',
+   *    help: app.translator.trans('acme.admin.setting_help'),
+   *    className: 'Setting-item'
+   * }
+   *
+   * @example
+   *
+   * {
+   *    setting: 'acme.select',
+   *    label: app.translator.trans('acme.admin.setting_label'),
+   *    type: 'select',
+   *    options: {
+   *      'option1': 'Option 1 label',
+   *      'option2': 'Option 2 label',
+   *    },
+   *    default: 'option1',
+   * }
+   *
+   * @param setting
+   * @returns {JSX.Element}
+   */
+  buildSettingComponent(entry) {
+    if (typeof entry === 'function') {
+      return entry.call(this);
+    }
+
+    const setting = entry.setting;
+    const help = entry.help;
+    delete entry.help;
+
+    const value = this.setting([setting])();
+    if (['bool', 'checkbox', 'switch', 'boolean'].includes(entry.type)) {
+      return (
+        <div className="Form-group">
+          <Switch state={!!value && value !== '0'} onchange={this.settings[setting]} {...entry}>
+            {entry.label}
+          </Switch>
+          <div className="helpText">{help}</div>
+        </div>
+      );
+    } else if (['select', 'dropdown', 'selectdropdown'].includes(entry.type)) {
+      return (
+        <div className="Form-group">
+          <label>{entry.label}</label>
+          <div className="helpText">{help}</div>
+          <Select value={value || entry.default} options={entry.options} buttonClassName="Button" onchange={this.settings[setting]} {...entry} />
+        </div>
+      );
+    } else {
+      entry.className = classList(['FormControl', entry.className]);
+      return (
+        <div className="Form-group">
+          {entry.label ? <label>{entry.label}</label> : ''}
+          <div className="helpText">{help}</div>
+          <input type={entry.type} bidi={this.setting(setting)} {...entry} />
+        </div>
+      );
+    }
+  }
+
+  onsaved() {
+    this.loading = false;
+
+    app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.settings.saved_message'));
+  }
+
+  setting(key, fallback = '') {
+    this.settings[key] = this.settings[key] || Stream(app.data.settings[key] || fallback);
+
+    return this.settings[key];
+  }
+
+  dirty() {
+    const dirty = {};
+
+    Object.keys(this.settings).forEach((key) => {
+      const value = this.settings[key]();
+
+      if (value !== app.data.settings[key]) {
+        dirty[key] = value;
+      }
+    });
+
+    return dirty;
+  }
+
+  isChanged() {
+    return Object.keys(this.dirty()).length;
+  }
+
+  saveSettings(e) {
+    e.preventDefault();
+
+    app.alerts.clear();
+
+    this.loading = true;
+
+    return saveSettings(this.dirty()).then(this.onsaved.bind(this));
+  }
+}

js/src/admin/components/AppearancePage.js

@@ -1,141 +1,120 @@
-import Page from '../../common/components/Page';
 import Button from '../../common/components/Button';
-import Switch from '../../common/components/Switch';
-import Stream from '../../common/utils/Stream';
 import EditCustomCssModal from './EditCustomCssModal';
 import EditCustomHeaderModal from './EditCustomHeaderModal';
 import EditCustomFooterModal from './EditCustomFooterModal';
 import UploadImageButton from './UploadImageButton';
-import saveSettings from '../utils/saveSettings';
-import AdminHeader from './AdminHeader';
+import AdminPage from './AdminPage';
 
-export default class AppearancePage extends Page {
-  oninit(vnode) {
-    super.oninit(vnode);
-
-    this.primaryColor = Stream(app.data.settings.theme_primary_color);
-    this.secondaryColor = Stream(app.data.settings.theme_secondary_color);
-    this.darkMode = Stream(app.data.settings.theme_dark_mode);
-    this.coloredHeader = Stream(app.data.settings.theme_colored_header);
+export default class AppearancePage extends AdminPage {
+  headerInfo() {
+    return {
+      className: 'AppearancePage',
+      icon: 'fas fa-paint-brush',
+      title: app.translator.trans('core.admin.appearance.title'),
+      description: app.translator.trans('core.admin.appearance.description'),
+    };
   }
 
-  view() {
-    return (
-      <div className="AppearancePage">
-        <AdminHeader
-          icon="fas fa-paint-brush"
-          description={app.translator.trans('core.admin.appearance.description')}
-          className="AppearancePage-header"
-        >
-          {app.translator.trans('core.admin.appearance.title')}
-        </AdminHeader>
-        <div className="container">
-          <form onsubmit={this.onsubmit.bind(this)}>
-            <fieldset className="AppearancePage-colors">
-              <legend>{app.translator.trans('core.admin.appearance.colors_heading')}</legend>
-              <div className="helpText">{app.translator.trans('core.admin.appearance.colors_text')}</div>
+  content() {
+    return [
+      <div className="Form">
+        <fieldset className="AppearancePage-colors">
+          <legend>{app.translator.trans('core.admin.appearance.colors_heading')}</legend>
+          <div className="helpText">{app.translator.trans('core.admin.appearance.colors_text')}</div>
 
-              <div className="AppearancePage-colors-input">
-                <input className="FormControl" type="text" placeholder="#aaaaaa" bidi={this.primaryColor} />
-                <input className="FormControl" type="text" placeholder="#aaaaaa" bidi={this.secondaryColor} />
-              </div>
+          <div className="AppearancePage-colors-input">
+            {this.buildSettingComponent({
+              type: 'text',
+              setting: 'theme_primary_color',
+              placeholder: '#aaaaaa',
+            })}
+            {this.buildSettingComponent({
+              type: 'text',
+              setting: 'theme_secondary_color',
+              placeholder: '#aaaaaa',
+            })}
+          </div>
 
-              {Switch.component(
-                {
-                  state: this.darkMode(),
-                  onchange: this.darkMode,
-                },
-                app.translator.trans('core.admin.appearance.dark_mode_label')
-              )}
+          {this.buildSettingComponent({
+            type: 'switch',
+            setting: 'theme_dark_mode',
+            label: app.translator.trans('core.admin.appearance.dark_mode_label'),
+          })}
 
-              {Switch.component(
-                {
-                  state: this.coloredHeader(),
-                  onchange: this.coloredHeader,
-                },
-                app.translator.trans('core.admin.appearance.colored_header_label')
-              )}
+          {this.buildSettingComponent({
+            type: 'switch',
+            setting: 'theme_colored_header',
+            label: app.translator.trans('core.admin.appearance.colored_header_label'),
+          })}
 
-              {Button.component(
-                {
-                  className: 'Button Button--primary',
-                  type: 'submit',
-                  loading: this.loading,
-                },
-                app.translator.trans('core.admin.appearance.submit_button')
-              )}
-            </fieldset>
-          </form>
+          {this.submitButton()}
+        </fieldset>
+      </div>,
 
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.logo_heading')}</legend>
-            <div className="helpText">{app.translator.trans('core.admin.appearance.logo_text')}</div>
-            <UploadImageButton name="logo" />
-          </fieldset>
+      <fieldset>
+        <legend>{app.translator.trans('core.admin.appearance.logo_heading')}</legend>
+        <div className="helpText">{app.translator.trans('core.admin.appearance.logo_text')}</div>
+        <UploadImageButton name="logo" />
+      </fieldset>,
 
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.favicon_heading')}</legend>
-            <div className="helpText">{app.translator.trans('core.admin.appearance.favicon_text')}</div>
-            <UploadImageButton name="favicon" />
-          </fieldset>
+      <fieldset>
+        <legend>{app.translator.trans('core.admin.appearance.favicon_heading')}</legend>
+        <div className="helpText">{app.translator.trans('core.admin.appearance.favicon_text')}</div>
+        <UploadImageButton name="favicon" />
+      </fieldset>,
 
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.custom_header_heading')}</legend>
-            <div className="helpText">{app.translator.trans('core.admin.appearance.custom_header_text')}</div>
-            {Button.component(
-              {
-                className: 'Button',
-                onclick: () => app.modal.show(EditCustomHeaderModal),
-              },
-              app.translator.trans('core.admin.appearance.edit_header_button')
-            )}
-          </fieldset>
+      <fieldset>
+        <legend>{app.translator.trans('core.admin.appearance.custom_header_heading')}</legend>
+        <div className="helpText">{app.translator.trans('core.admin.appearance.custom_header_text')}</div>
+        {Button.component(
+          {
+            className: 'Button',
+            onclick: () => app.modal.show(EditCustomHeaderModal),
+          },
+          app.translator.trans('core.admin.appearance.edit_header_button')
+        )}
+      </fieldset>,
 
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.custom_footer_heading')}</legend>
-            <div className="helpText">{app.translator.trans('core.admin.appearance.custom_footer_text')}</div>
-            {Button.component(
-              {
-                className: 'Button',
-                onclick: () => app.modal.show(EditCustomFooterModal),
-              },
-              app.translator.trans('core.admin.appearance.edit_footer_button')
-            )}
-          </fieldset>
+      <fieldset>
+        <legend>{app.translator.trans('core.admin.appearance.custom_footer_heading')}</legend>
+        <div className="helpText">{app.translator.trans('core.admin.appearance.custom_footer_text')}</div>
+        {Button.component(
+          {
+            className: 'Button',
+            onclick: () => app.modal.show(EditCustomFooterModal),
+          },
+          app.translator.trans('core.admin.appearance.edit_footer_button')
+        )}
+      </fieldset>,
 
-          <fieldset>
-            <legend>{app.translator.trans('core.admin.appearance.custom_styles_heading')}</legend>
-            <div className="helpText">{app.translator.trans('core.admin.appearance.custom_styles_text')}</div>
-            {Button.component(
-              {
-                className: 'Button',
-                onclick: () => app.modal.show(EditCustomCssModal),
-              },
-              app.translator.trans('core.admin.appearance.edit_css_button')
-            )}
-          </fieldset>
-        </div>
-      </div>
-    );
+      <fieldset>
+        <legend>{app.translator.trans('core.admin.appearance.custom_styles_heading')}</legend>
+        <div className="helpText">{app.translator.trans('core.admin.appearance.custom_styles_text')}</div>
+        {Button.component(
+          {
+            className: 'Button',
+            onclick: () => app.modal.show(EditCustomCssModal),
+          },
+          app.translator.trans('core.admin.appearance.edit_css_button')
+        )}
+      </fieldset>,
+    ];
   }
 
-  onsubmit(e) {
+  onsaved() {
+    window.location.reload();
+  }
+
+  saveSettings(e) {
     e.preventDefault();
 
     const hex = /^#[0-9a-f]{3}([0-9a-f]{3})?$/i;
 
-    if (!hex.test(this.primaryColor()) || !hex.test(this.secondaryColor())) {
+    if (!hex.test(this.settings['theme_primary_color']()) || !hex.test(this.settings['theme_secondary_color']())) {
       alert(app.translator.trans('core.admin.appearance.enter_hex_message'));
       return;
     }
 
-    this.loading = true;
-
-    saveSettings({
-      theme_primary_color: this.primaryColor(),
-      theme_secondary_color: this.secondaryColor(),
-      theme_dark_mode: this.darkMode(),
-      theme_colored_header: this.coloredHeader(),
-    }).then(() => window.location.reload());
+    super.saveSettings(e);
   }
 }

js/src/admin/components/BasicsPage.js

@@ -1,31 +1,11 @@
-import Page from '../../common/components/Page';
 import FieldSet from '../../common/components/FieldSet';
-import Select from '../../common/components/Select';
-import Button from '../../common/components/Button';
-import saveSettings from '../utils/saveSettings';
 import ItemList from '../../common/utils/ItemList';
-import Switch from '../../common/components/Switch';
-import Stream from '../../common/utils/Stream';
-import withAttr from '../../common/utils/withAttr';
-import AdminHeader from './AdminHeader';
+import AdminPage from './AdminPage';
 
-export default class BasicsPage extends Page {
+export default class BasicsPage extends AdminPage {
   oninit(vnode) {
     super.oninit(vnode);
 
-    this.loading = false;
-
-    this.fields = [
-      'forum_title',
-      'forum_description',
-      'default_locale',
-      'show_language_selector',
-      'default_route',
-      'welcome_title',
-      'welcome_message',
-      'display_name_driver',
-    ];
-
     this.localeOptions = {};
     const locales = app.data.locales;
     for (const i in locales) {
@@ -40,157 +20,99 @@ export default class BasicsPage extends Page {
 
     this.slugDriverOptions = {};
     Object.keys(app.data.slugDrivers).forEach((model) => {
-      this.fields.push(`slug_driver_${model}`);
       this.slugDriverOptions[model] = {};
 
       app.data.slugDrivers[model].forEach((option) => {
         this.slugDriverOptions[model][option] = option;
       });
     });
-
-    this.values = {};
-
-    const settings = app.data.settings;
-    this.fields.forEach((key) => (this.values[key] = Stream(settings[key])));
-
-    if (!this.values.display_name_driver() && displayNameDrivers.includes('username')) this.values.display_name_driver('username');
-
-    Object.keys(app.data.slugDrivers).forEach((model) => {
-      if (!this.values[`slug_driver_${model}`]() && 'default' in this.slugDriverOptions[model]) {
-        this.values[`slug_driver_${model}`]('default');
-      }
-    });
-
-    if (typeof this.values.show_language_selector() !== 'number') this.values.show_language_selector(1);
   }
 
-  view() {
-    return (
-      <div className="BasicsPage">
-        <AdminHeader icon="fas fa-pencil-alt" description={app.translator.trans('core.admin.basics.description')} className="BasicsPage-header">
-          {app.translator.trans('core.admin.basics.title')}
-        </AdminHeader>
-        <div className="container">
-          <form onsubmit={this.onsubmit.bind(this)}>
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.basics.forum_title_heading'),
-              },
-              [<input className="FormControl" bidi={this.values.forum_title} />]
-            )}
+  headerInfo() {
+    return {
+      className: 'BasicsPage',
+      icon: 'fas fa-pencil-alt',
+      title: app.translator.trans('core.admin.basics.title'),
+      description: app.translator.trans('core.admin.basics.description'),
+    };
+  }
 
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.basics.forum_description_heading'),
-              },
-              [
-                <div className="helpText">{app.translator.trans('core.admin.basics.forum_description_text')}</div>,
-                <textarea className="FormControl" bidi={this.values.forum_description} />,
-              ]
-            )}
+  content() {
+    return [
+      <div className="Form">
+        {this.buildSettingComponent({
+          type: 'text',
+          setting: 'forum_title',
+          label: app.translator.trans('core.admin.basics.forum_title_heading'),
+        })}
+        {this.buildSettingComponent({
+          type: 'text',
+          setting: 'forum_description',
+          label: app.translator.trans('core.admin.basics.forum_description_heading'),
+          help: app.translator.trans('core.admin.basics.forum_description_text'),
+        })}
 
-            {Object.keys(this.localeOptions).length > 1
-              ? FieldSet.component(
-                  {
-                    label: app.translator.trans('core.admin.basics.default_language_heading'),
-                  },
-                  [
-                    Select.component({
-                      options: this.localeOptions,
-                      value: this.values.default_locale(),
-                      onchange: this.values.default_locale,
-                    }),
-                    Switch.component(
-                      {
-                        state: this.values.show_language_selector(),
-                        onchange: this.values.show_language_selector,
-                      },
-                      app.translator.trans('core.admin.basics.show_language_selector_label')
-                    ),
-                  ]
-                )
-              : ''}
+        {Object.keys(this.localeOptions).length > 1
+          ? [
+              this.buildSettingComponent({
+                type: 'select',
+                setting: 'default_locale',
+                options: this.localeOptions,
+                label: app.translator.trans('core.admin.basics.default_language_heading'),
+              }),
+              this.buildSettingComponent({
+                type: 'switch',
+                setting: 'show_language_selector',
+                label: app.translator.trans('core.admin.basics.show_language_selector_label'),
+              }),
+            ]
+          : ''}
 
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.basics.home_page_heading'),
-                className: 'BasicsPage-homePage',
-              },
-              [
-                <div className="helpText">{app.translator.trans('core.admin.basics.home_page_text')}</div>,
-                this.homePageItems()
-                  .toArray()
-                  .map(({ path, label }) => (
-                    <label className="checkbox">
-                      <input
-                        type="radio"
-                        name="homePage"
-                        value={path}
-                        checked={this.values.default_route() === path}
-                        onclick={withAttr('value', this.values.default_route)}
-                      />
-                      {label}
-                    </label>
-                  )),
-              ]
-            )}
+        <FieldSet className="BasicsPage-homePage Form-group" label={app.translator.trans('core.admin.basics.home_page_heading')}>
+          <div className="helpText">{app.translator.trans('core.admin.basics.home_page_text')}</div>
+          {this.homePageItems()
+            .toArray()
+            .map(({ path, label }) => (
+              <label className="checkbox">
+                <input type="radio" name="homePage" value={path} bidi={this.setting('default_route')} />
+                {label}
+              </label>
+            ))}
+        </FieldSet>
 
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.basics.welcome_banner_heading'),
-                className: 'BasicsPage-welcomeBanner',
-              },
-              [
-                <div className="helpText">{app.translator.trans('core.admin.basics.welcome_banner_text')}</div>,
-                <div className="BasicsPage-welcomeBanner-input">
-                  <input className="FormControl" bidi={this.values.welcome_title} />
-                  <textarea className="FormControl" bidi={this.values.welcome_message} />
-                </div>,
-              ]
-            )}
-
-            {Object.keys(this.displayNameOptions).length > 1 ? (
-              <FieldSet label={app.translator.trans('core.admin.basics.display_name_heading')}>
-                <div className="helpText">{app.translator.trans('core.admin.basics.display_name_text')}</div>
-                <Select
-                  options={this.displayNameOptions}
-                  value={this.values.display_name_driver()}
-                  onchange={this.values.display_name_driver}
-                ></Select>
-              </FieldSet>
-            ) : (
-              ''
-            )}
-
-            {Object.keys(this.slugDriverOptions).map((model) => {
-              const options = this.slugDriverOptions[model];
-              if (Object.keys(options).length > 1) {
-                return (
-                  <FieldSet label={app.translator.trans('core.admin.basics.slug_driver_heading', { model })}>
-                    <div className="helpText">{app.translator.trans('core.admin.basics.slug_driver_text', { model })}</div>
-                    <Select options={options} value={this.values[`slug_driver_${model}`]()} onchange={this.values[`slug_driver_${model}`]}></Select>
-                  </FieldSet>
-                );
-              }
-            })}
-
-            {Button.component(
-              {
-                type: 'submit',
-                className: 'Button Button--primary',
-                loading: this.loading,
-                disabled: !this.changed(),
-              },
-              app.translator.trans('core.admin.basics.submit_button')
-            )}
-          </form>
+        <div className="Form-group BasicsPage-welcomeBanner-input">
+          <label>{app.translator.trans('core.admin.basics.welcome_banner_heading')}</label>
+          <div className="helpText">{app.translator.trans('core.admin.basics.welcome_banner_text')}</div>
+          <input type="text" className="FormControl" bidi={this.setting('welcome_title')} />
+          <textarea className="FormControl" bidi={this.setting('welcome_message')} />
         </div>
-      </div>
-    );
-  }
 
-  changed() {
-    return this.fields.some((key) => this.values[key]() !== app.data.settings[key]);
+        {Object.keys(this.displayNameOptions).length > 1
+          ? this.buildSettingComponent({
+              type: 'select',
+              setting: 'display_name_driver',
+              options: this.displayNameOptions,
+              label: app.translator.trans('core.admin.basics.display_name_heading'),
+              help: app.translator.trans('core.admin.basics.display_name_text'),
+            })
+          : ''}
+
+        {Object.keys(this.slugDriverOptions).map((model) => {
+          const options = this.slugDriverOptions[model];
+          if (Object.keys(options).length > 1) {
+            return this.buildSettingComponent({
+              type: 'select',
+              setting: `slug_driver_${model}`,
+              options,
+              label: app.translator.trans('core.admin.basics.slug_driver_heading', { model }),
+              help: app.translator.trans('core.admin.basics.slug_driver_text', { model }),
+            });
+          }
+        })}
+
+        {this.submitButton()}
+      </div>,
+    ];
   }
 
   /**
@@ -210,27 +132,4 @@ export default class BasicsPage extends Page {
 
     return items;
   }
-
-  onsubmit(e) {
-    e.preventDefault();
-
-    if (this.loading) return;
-
-    this.loading = true;
-    app.alerts.dismiss(this.successAlert);
-
-    const settings = {};
-
-    this.fields.forEach((key) => (settings[key] = this.values[key]()));
-
-    saveSettings(settings)
-      .then(() => {
-        this.successAlert = app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.basics.saved_message'));
-      })
-      .catch(() => {})
-      .then(() => {
-        this.loading = false;
-        m.redraw();
-      });
-  }
 }

js/src/admin/components/DashboardPage.js

@@ -1,20 +1,20 @@
-import Page from '../../common/components/Page';
 import StatusWidget from './StatusWidget';
 import ExtensionsWidget from './ExtensionsWidget';
-import AdminHeader from './AdminHeader';
 import ItemList from '../../common/utils/ItemList';
-import listItems from '../../common/helpers/listItems';
+import AdminPage from './AdminPage';
 
-export default class DashboardPage extends Page {
-  view() {
-    return (
-      <div className="DashboardPage">
-        <AdminHeader icon="fas fa-chart-bar" description={app.translator.trans('core.admin.dashboard.description')} className="DashboardPage-header">
-          {app.translator.trans('core.admin.dashboard.title')}
-        </AdminHeader>
-        <div className="container">{this.availableWidgets().toArray()}</div>
-      </div>
-    );
+export default class DashboardPage extends AdminPage {
+  headerInfo() {
+    return {
+      className: 'DashboardPage',
+      icon: 'fas fa-chart-bar',
+      title: app.translator.trans('core.admin.dashboard.title'),
+      description: app.translator.trans('core.admin.dashboard.description'),
+    };
+  }
+
+  content() {
+    return this.availableWidgets().toArray();
   }
 
   availableWidgets() {

js/src/admin/components/ExtensionPage.js

@@ -1,28 +1,22 @@
 import Button from '../../common/components/Button';
 import Link from '../../common/components/Link';
 import LinkButton from '../../common/components/LinkButton';
-import Page from '../../common/components/Page';
-import Select from '../../common/components/Select';
 import Switch from '../../common/components/Switch';
 import icon from '../../common/helpers/icon';
 import punctuateSeries from '../../common/helpers/punctuateSeries';
 import listItems from '../../common/helpers/listItems';
 import ItemList from '../../common/utils/ItemList';
-import Stream from '../../common/utils/Stream';
 import LoadingModal from './LoadingModal';
 import ExtensionPermissionGrid from './ExtensionPermissionGrid';
-import saveSettings from '../utils/saveSettings';
-import ExtensionData from '../utils/ExtensionData';
 import isExtensionEnabled from '../utils/isExtensionEnabled';
+import AdminPage from './AdminPage';
 
-export default class ExtensionPage extends Page {
+export default class ExtensionPage extends AdminPage {
   oninit(vnode) {
     super.oninit(vnode);
 
-    this.loading = false;
     this.extension = app.data.extensions[this.attrs.id];
     this.changingState = false;
-    this.settings = {};
 
     this.infoFields = {
       discuss: 'fas fa-comment-alt',
@@ -30,26 +24,29 @@ export default class ExtensionPage extends Page {
       support: 'fas fa-life-ring',
       website: 'fas fa-link',
       donate: 'fas fa-donate',
+      source: 'fas fa-code',
     };
 
-    // Backwards compatibility layer will be removed in
-    // Beta 16
-    if (app.extensionSettings[this.extension.id]) {
-      app.extensionData[this.extension.id] = app.extensionSettings[this.extension.id];
+    if (!this.extension) {
+      return m.route.set(app.route('dashboard'));
     }
   }
 
   className() {
+    if (!this.extension) return '';
+
     return this.extension.id + '-Page';
   }
 
   view() {
+    if (!this.extension) return null;
+
     return (
       <div className={'ExtensionPage ' + this.className()}>
         {this.header()}
         {!this.isEnabled() ? (
           <div className="container">
-            <h2 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.enable_to_see')}</h2>
+            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.enable_to_see')}</h3>
           </div>
         ) : (
           <div className="ExtensionPage-body">{this.sections().toArray()}</div>
@@ -59,6 +56,8 @@ export default class ExtensionPage extends Page {
   }
 
   header() {
+    const isEnabled = this.isEnabled();
+
     return [
       <div className="ExtensionPage-header">
         <div className="container">
@@ -75,10 +74,12 @@ export default class ExtensionPage extends Page {
           </div>
           <div className="helpText">{this.extension.description}</div>
           <div className="ExtensionPage-headerItems">
-            <Switch state={this.isEnabled()} onchange={this.toggle.bind(this, this.extension.id)}>
-              {this.isEnabled(this.extension.id)
-                ? app.translator.trans('core.admin.extension.enabled')
-                : app.translator.trans('core.admin.extension.disabled')}
+            <Switch
+              state={this.changingState ? !isEnabled : isEnabled}
+              loading={this.changingState}
+              onchange={this.toggle.bind(this, this.extension.id)}
+            >
+              {isEnabled ? app.translator.trans('core.admin.extension.enabled') : app.translator.trans('core.admin.extension.disabled')}
             </Switch>
             <aside className="ExtensionInfo">
               <ul>{listItems(this.infoItems().toArray())}</ul>
@@ -105,7 +106,7 @@ export default class ExtensionPage extends Page {
           {app.extensionData.extensionHasPermissions(this.extension.id) ? (
             ExtensionPermissionGrid.component({ extensionId: this.extension.id })
           ) : (
-            <h2 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_permissions')}</h2>
+            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_permissions')}</h3>
           )}
         </div>
       </div>,
@@ -120,17 +121,13 @@ export default class ExtensionPage extends Page {
     return (
       <div className="ExtensionPage-settings">
         <div className="container">
-          {typeof app.extensionData[this.extension.id] === 'function' ? (
-            <Button onclick={app.extensionData[this.extension.id].bind(this)} className="Button Button--primary">
-              {app.translator.trans('core.admin.extension.open_modal')}
-            </Button>
-          ) : settings ? (
+          {settings ? (
             <div className="Form">
               {settings.map(this.buildSettingComponent.bind(this))}
               <div className="Form-group">{this.submitButton()}</div>
             </div>
           ) : (
-            <h2 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_settings')}</h2>
+            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_settings')}</h3>
           )}
         </div>
       </div>
@@ -170,17 +167,15 @@ export default class ExtensionPage extends Page {
   infoItems() {
     const items = new ItemList();
 
-    if (this.extension.authors) {
+    const links = this.extension.links;
+
+    if (links.authors.length) {
       let authors = [];
 
-      Object.keys(this.extension.authors).map((author, i) => {
-        const link = this.extension.authors[author].homepage
-          ? this.extension.authors[author].homepage
-          : 'mailto:' + this.extension.authors[author].email;
-
+      links.authors.map((author) => {
         authors.push(
-          <Link href={link} external={true} target="_blank">
-            {this.extension.authors[author].name}
+          <Link href={author.link} external={true} target="_blank">
+            {author.name}
           </Link>
         );
       });
@@ -188,103 +183,20 @@ export default class ExtensionPage extends Page {
       items.add('authors', [icon('fas fa-user'), <span>{punctuateSeries(authors)}</span>]);
     }
 
-    const infoData = {};
-
-    if (this.extension.source || this.extension.support) {
-      infoData.source = {
-        icon: 'fas fa-code',
-        href: this.extension.source ? this.extension.source.url : this.extension.support.source,
-      };
-    }
-
     Object.keys(this.infoFields).map((field) => {
-      const info = this.extension.extra['flarum-extension'].info;
-
-      if (info && info[field]) {
-        infoData[field] = {
-          icon: this.infoFields[field],
-          href: info[field],
-        };
+      if (links[field]) {
+        items.add(
+          field,
+          <LinkButton href={links[field]} icon={this.infoFields[field]} external={true} target="_blank">
+            {app.translator.trans(`core.admin.extension.info_links.${field}`)}
+          </LinkButton>
+        );
       }
     });
 
-    Object.entries(infoData).map(([field, value]) => {
-      items.add(
-        field,
-        <LinkButton href={value.href} icon={value.icon} external={true} target="_blank">
-          {app.translator.trans(`core.admin.extension.info_links.${field}`)}
-        </LinkButton>
-      );
-    });
-
     return items;
   }
 
-  submitButton() {
-    return (
-      <Button onclick={this.saveSettings.bind(this)} className="Button Button--primary" loading={this.loading} disabled={!this.isChanged()}>
-        {app.translator.trans('core.admin.settings.submit_button')}
-      </Button>
-    );
-  }
-
-  /**
-   * getSetting takes a settings object and turns it into a component.
-   * Depending on the type of input, you can set the type to 'bool', 'select', or
-   * any standard <input> type.
-   *
-   * @example
-   *
-   * {
-   *    setting: 'acme.checkbox',
-   *    label: app.translator.trans('acme.admin.setting_label'),
-   *    type: 'bool'
-   * }
-   *
-   * @example
-   *
-   * {
-   *    setting: 'acme.select',
-   *    label: app.translator.trans('acme.admin.setting_label'),
-   *    type: 'select',
-   *    options: {
-   *      'option1': 'Option 1 label',
-   *      'option2': 'Option 2 label',
-   *    },
-   *    default: 'option1',
-   * }
-   *
-   * @param setting
-   * @returns {JSX.Element}
-   */
-  buildSettingComponent(entry) {
-    const setting = entry.setting;
-    const value = this.setting([setting])();
-    if (['bool', 'checkbox', 'switch', 'boolean'].includes(entry.type)) {
-      return (
-        <div className="Form-group">
-          <Switch state={!!value && value !== '0'} onchange={this.settings[setting]}>
-            {entry.label}
-          </Switch>
-        </div>
-      );
-    } else if (['select', 'dropdown', 'selectdropdown'].includes(entry.type)) {
-      return (
-        <div className="Form-group">
-          <label>{entry.label}</label>
-          <Select value={value || entry.default} options={entry.options} buttonClassName="Button" onchange={this.settings[setting]} />
-        </div>
-      );
-    } else {
-      return (
-        <div className="Form-group">
-          <label>{entry.label}</label>
-          <input type={entry.type} className="FormControl" bidi={this.setting(setting)} />
-        </div>
-      );
-    }
-  }
-
   toggle() {
     const enabled = this.isEnabled();
 
@@ -305,50 +217,8 @@ export default class ExtensionPage extends Page {
     app.modal.show(LoadingModal);
   }
 
-  dirty() {
-    const dirty = {};
-
-    Object.keys(this.settings).forEach((key) => {
-      const value = this.settings[key]();
-
-      if (value !== app.data.settings[key]) {
-        dirty[key] = value;
-      }
-    });
-
-    return dirty;
-  }
-
-  isChanged() {
-    return Object.keys(this.dirty()).length;
-  }
-
-  saveSettings(e) {
-    e.preventDefault();
-
-    app.alerts.clear();
-
-    this.loading = true;
-
-    saveSettings(this.dirty()).then(this.onsaved.bind(this));
-  }
-
-  onsaved() {
-    this.loading = false;
-
-    app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.extension.saved_message'));
-  }
-
-  setting(key, fallback = '') {
-    this.settings[key] = this.settings[key] || Stream(app.data.settings[key] || fallback);
-
-    return this.settings[key];
-  }
-
   isEnabled() {
-    let isEnabled = isExtensionEnabled(this.extension.id);
-
-    return this.changingState ? !isEnabled : isEnabled;
+    return isExtensionEnabled(this.extension.id);
   }
 
   onerror(e) {
@@ -359,6 +229,8 @@ export default class ExtensionPage extends Page {
       app.modal.close();
     }, 300); // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.
 
+    this.changingState = false;
+
     if (e.status !== 409) {
       throw e;
     }

js/src/admin/components/ExtensionPermissionGrid.js

@@ -1,4 +1,5 @@
 import PermissionGrid from './PermissionGrid';
+import Button from '../../common/components/Button';
 import ItemList from '../../common/utils/ItemList';
 
 export default class ExtensionPermissionGrid extends PermissionGrid {
@@ -36,4 +37,17 @@ export default class ExtensionPermissionGrid extends PermissionGrid {
   moderateItems() {
     return app.extensionData.getExtensionPermissions(this.extensionId, 'moderate') || new ItemList();
   }
+
+  scopeControlItems() {
+    const items = new ItemList();
+
+    items.add(
+      'configureScopes',
+      <Button className="Button Button--text" onclick={() => m.route.set(app.route('permissions'))}>
+        {app.translator.trans('core.admin.extension.configure_scopes')}
+      </Button>
+    );
+
+    return items;
+  }
 }

js/src/admin/components/ExtensionsWidget.js

@@ -5,44 +5,47 @@ import Link from '../../common/components/Link';
 import icon from '../../common/helpers/icon';
 
 export default class ExtensionsWidget extends DashboardWidget {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.categorizedExtensions = getCategorizedExtensions();
+  }
+
   className() {
     return 'ExtensionsWidget';
   }
 
   content() {
-    const categorizedExtensions = getCategorizedExtensions();
     const categories = app.extensionCategories;
 
     return (
       <div className="ExtensionsWidget-list">
-        <div className="container">
-          {Object.keys(categories).map((category) => {
-            if (categorizedExtensions[category]) {
-              return (
-                <div className="ExtensionList-Category">
-                  <h4 className="ExtensionList-Label">{app.translator.trans(`core.admin.nav.categories.${category}`)}</h4>
-                  <ul className="ExtensionList">
-                    {categorizedExtensions[category].map((extension) => {
-                      return (
-                        <li className={'ExtensionListItem ' + (!isExtensionEnabled(extension.id) ? 'disabled' : '')}>
-                          <Link href={app.route('extension', { id: extension.id })}>
-                            <div className="ExtensionListItem-content">
-                              <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
-                                {extension.icon ? icon(extension.icon.name) : ''}
-                              </span>
-                              <span className="ExtensionListItem-title">{extension.extra['flarum-extension'].title}</span>
-                            </div>
-                          </Link>
-                        </li>
-                      );
-                    })}
-                  </ul>
-                </div>
-              );
-            }
-          })}
-        </div>
+        {Object.keys(categories).map((category) => (this.categorizedExtensions[category] ? this.extensionCategory(category) : ''))}
       </div>
     );
   }
+
+  extensionCategory(category) {
+    return (
+      <div className="ExtensionList-Category">
+        <h4 className="ExtensionList-Label">{app.translator.trans(`core.admin.nav.categories.${category}`)}</h4>
+        <ul className="ExtensionList">{this.categorizedExtensions[category].map((extension) => this.extensionWidget(extension))}</ul>
+      </div>
+    );
+  }
+
+  extensionWidget(extension) {
+    return (
+      <li className={'ExtensionListItem ' + (!isExtensionEnabled(extension.id) ? 'disabled' : '')}>
+        <Link href={app.route('extension', { id: extension.id })}>
+          <div className="ExtensionListItem-content">
+            <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
+              {extension.icon ? icon(extension.icon.name) : ''}
+            </span>
+            <span className="ExtensionListItem-title">{extension.extra['flarum-extension'].title}</span>
+          </div>
+        </Link>
+      </li>
+    );
+  }
 }

js/src/admin/components/MailPage.js

@@ -1,34 +1,31 @@
-import Page from '../../common/components/Page';
 import FieldSet from '../../common/components/FieldSet';
 import Button from '../../common/components/Button';
 import Alert from '../../common/components/Alert';
-import Select from '../../common/components/Select';
 import LoadingIndicator from '../../common/components/LoadingIndicator';
-import saveSettings from '../utils/saveSettings';
-import Stream from '../../common/utils/Stream';
-import icon from '../../common/helpers/icon';
-import AdminHeader from './AdminHeader';
+import AdminPage from './AdminPage';
 
-export default class MailPage extends Page {
+export default class MailPage extends AdminPage {
   oninit(vnode) {
     super.oninit(vnode);
 
-    this.saving = false;
     this.sendingTest = false;
     this.refresh();
   }
 
+  headerInfo() {
+    return {
+      className: 'MailPage',
+      icon: 'fas fa-envelope',
+      title: app.translator.trans('core.admin.email.title'),
+      description: app.translator.trans('core.admin.email.description'),
+    };
+  }
+
   refresh() {
     this.loading = true;
 
-    this.driverFields = {};
-    this.fields = ['mail_driver', 'mail_from'];
-    this.values = {};
     this.status = { sending: false, errors: {} };
 
-    const settings = app.data.settings;
-    this.fields.forEach((key) => (this.values[key] = Stream(settings[key])));
-
     app
       .request({
         method: 'GET',
@@ -39,150 +36,78 @@ export default class MailPage extends Page {
         this.status.sending = response['data']['attributes']['sending'];
         this.status.errors = response['data']['attributes']['errors'];
 
-        for (const driver in this.driverFields) {
-          for (const field in this.driverFields[driver]) {
-            this.fields.push(field);
-            this.values[field] = Stream(settings[field]);
-          }
-        }
-
         this.loading = false;
         m.redraw();
       });
   }
 
-  view() {
-    if (this.loading || this.saving) {
-      return (
-        <div className="MailPage">
-          <div className="container">
-            <LoadingIndicator />
-          </div>
-        </div>
-      );
+  content() {
+    if (this.loading) {
+      return <LoadingIndicator />;
     }
 
-    const fields = this.driverFields[this.values.mail_driver()];
+    const fields = this.driverFields[this.setting('mail_driver')()];
     const fieldKeys = Object.keys(fields);
 
     return (
-      <div className="MailPage">
-        <AdminHeader icon="fas fa-envelope" description={app.translator.trans('core.admin.email.description')} className="MailPage-header">
-          {app.translator.trans('core.admin.email.title')}
-        </AdminHeader>
-        <div className="container">
-          <form onsubmit={this.onsubmit.bind(this)}>
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.email.addresses_heading'),
-                className: 'MailPage-MailSettings',
-              },
-              [
-                <div className="MailPage-MailSettings-input">
-                  <label>
-                    {app.translator.trans('core.admin.email.from_label')}
-                    <input className="FormControl" bidi={this.values.mail_from} />
-                  </label>
-                </div>,
-              ]
-            )}
+      <div className="Form">
+        {this.buildSettingComponent({
+          type: 'text',
+          setting: 'mail_from',
+          label: app.translator.trans('core.admin.email.addresses_heading'),
+          className: 'MailPage-MailSettings',
+        })}
+        {this.buildSettingComponent({
+          type: 'select',
+          setting: 'mail_driver',
+          options: Object.keys(this.driverFields).reduce((memo, val) => ({ ...memo, [val]: val }), {}),
+          label: app.translator.trans('core.admin.email.driver_heading'),
+          className: 'MailPage-MailSettings',
+        })}
+        {this.status.sending ||
+          Alert.component(
+            {
+              dismissible: false,
+            },
+            app.translator.trans('core.admin.email.not_sending_message')
+          )}
 
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.email.driver_heading'),
-                className: 'MailPage-MailSettings',
-              },
-              [
-                <div className="MailPage-MailSettings-input">
-                  <label>
-                    {app.translator.trans('core.admin.email.driver_label')}
-                    <Select
-                      value={this.values.mail_driver()}
-                      options={Object.keys(this.driverFields).reduce((memo, val) => ({ ...memo, [val]: val }), {})}
-                      onchange={this.values.mail_driver}
-                    />
-                  </label>
-                </div>,
-              ]
-            )}
+        {fieldKeys.length > 0 && (
+          <FieldSet label={app.translator.trans(`core.admin.email.${this.setting('mail_driver')()}_heading`)} className="MailPage-MailSettings">
+            <div className="MailPage-MailSettings-input">
+              {fieldKeys.map((field) => {
+                const fieldInfo = fields[field];
 
-            {this.status.sending ||
-              Alert.component(
-                {
-                  dismissible: false,
-                },
-                app.translator.trans('core.admin.email.not_sending_message')
-              )}
+                return [
+                  this.buildSettingComponent({
+                    type: typeof this.setting(field)() === 'string' ? 'text' : 'select',
+                    label: app.translator.trans(`core.admin.email.${field}_label`),
+                    setting: field,
+                    options: fieldInfo,
+                  }),
+                  this.status.errors[field] && <p className="ValidationError">{this.status.errors[field]}</p>,
+                ];
+              })}
+            </div>
+          </FieldSet>
+        )}
+        {this.submitButton()}
 
-            {fieldKeys.length > 0 &&
-              FieldSet.component(
-                {
-                  label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
-                  className: 'MailPage-MailSettings',
-                },
-                [
-                  <div className="MailPage-MailSettings-input">
-                    {fieldKeys.map((field) => [
-                      <label>
-                        {app.translator.trans(`core.admin.email.${field}_label`)}
-                        {this.renderField(field)}
-                      </label>,
-                      this.status.errors[field] && <p className="ValidationError">{this.status.errors[field]}</p>,
-                    ])}
-                  </div>,
-                ]
-              )}
-
-            <FieldSet>
-              {Button.component(
-                {
-                  type: 'submit',
-                  className: 'Button Button--primary',
-                  disabled: !this.changed(),
-                },
-                app.translator.trans('core.admin.email.submit_button')
-              )}
-            </FieldSet>
-
-            {FieldSet.component(
-              {
-                label: app.translator.trans('core.admin.email.send_test_mail_heading'),
-                className: 'MailPage-MailSettings',
-              },
-              [
-                <div className="helpText">{app.translator.trans('core.admin.email.send_test_mail_text', { email: app.session.user.email() })}</div>,
-                Button.component(
-                  {
-                    className: 'Button Button--primary',
-                    disabled: this.sendingTest || this.changed(),
-                    onclick: () => this.sendTestEmail(),
-                  },
-                  app.translator.trans('core.admin.email.send_test_mail_button')
-                ),
-              ]
-            )}
-          </form>
-        </div>
+        <FieldSet label={app.translator.trans('core.admin.email.send_test_mail_heading')} className="MailPage-MailSettings">
+          <div className="helpText">{app.translator.trans('core.admin.email.send_test_mail_text', { email: app.session.user.email() })}</div>
+          {Button.component(
+            {
+              className: 'Button Button--primary',
+              disabled: this.sendingTest || this.isChanged(),
+              onclick: () => this.sendTestEmail(),
+            },
+            app.translator.trans('core.admin.email.send_test_mail_button')
+          )}
+        </FieldSet>
       </div>
     );
   }
 
-  renderField(name) {
-    const driver = this.values.mail_driver();
-    const field = this.driverFields[driver][name];
-    const prop = this.values[name];
-
-    if (typeof field === 'string') {
-      return <input className="FormControl" bidi={prop} />;
-    } else {
-      return <Select value={prop()} options={field} onchange={prop} />;
-    }
-  }
-
-  changed() {
-    return this.fields.some((key) => this.values[key]() !== app.data.settings[key]);
-  }
-
   sendTestEmail() {
     if (this.saving || this.sendingTest) return;
 
@@ -205,26 +130,7 @@ export default class MailPage extends Page {
       });
   }
 
-  onsubmit(e) {
-    e.preventDefault();
-
-    if (this.saving || this.sendingTest) return;
-
-    this.saving = true;
-    app.alerts.dismiss(this.successAlert);
-
-    const settings = {};
-
-    this.fields.forEach((key) => (settings[key] = this.values[key]()));
-
-    saveSettings(settings)
-      .then(() => {
-        this.successAlert = app.alerts.show({ type: 'success' }, app.translator.trans('core.admin.basics.saved_message'));
-      })
-      .catch(() => {})
-      .then(() => {
-        this.saving = false;
-        this.refresh();
-      });
+  saveSettings(e) {
+    super.saveSettings(e).then(this.refresh());
   }
 }

js/src/admin/components/PermissionGrid.js

@@ -327,9 +327,29 @@ export default class PermissionGrid extends Component {
     );
 
     items.add(
-      'userEdit',
+      'userEditCredentials',
       {
         icon: 'fas fa-user-cog',
+        label: app.translator.trans('core.admin.permissions.edit_users_credentials_label'),
+        permission: 'user.editCredentials',
+      },
+      60
+    );
+
+    items.add(
+      'userEditGroups',
+      {
+        icon: 'fas fa-users-cog',
+        label: app.translator.trans('core.admin.permissions.edit_users_groups_label'),
+        permission: 'user.editGroups',
+      },
+      60
+    );
+
+    items.add(
+      'userEdit',
+      {
+        icon: 'fas fa-address-card',
         label: app.translator.trans('core.admin.permissions.edit_users_label'),
         permission: 'user.edit',
       },

js/src/admin/components/PermissionsPage.js

@@ -1,44 +1,43 @@
-import Page from '../../common/components/Page';
 import GroupBadge from '../../common/components/GroupBadge';
 import EditGroupModal from './EditGroupModal';
 import Group from '../../common/models/Group';
 import icon from '../../common/helpers/icon';
 import PermissionGrid from './PermissionGrid';
-import AdminHeader from './AdminHeader';
+import AdminPage from './AdminPage';
 
-export default class PermissionsPage extends Page {
-  view() {
-    return (
-      <div className="PermissionsPage">
-        <AdminHeader icon="fas fa-key" description={app.translator.trans('core.admin.permissions.description')} className="PermissionsPage-header">
-          {app.translator.trans('core.admin.permissions.title')}
-        </AdminHeader>
-        <div className="PermissionsPage-groups">
-          <div className="container">
-            {app.store
-              .all('groups')
-              .filter((group) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
-              .map((group) => (
-                <button className="Button Group" onclick={() => app.modal.show(EditGroupModal, { group })}>
-                  {GroupBadge.component({
-                    group,
-                    className: 'Group-icon',
-                    label: null,
-                  })}
-                  <span className="Group-name">{group.namePlural()}</span>
-                </button>
-              ))}
-            <button className="Button Group Group--add" onclick={() => app.modal.show(EditGroupModal)}>
-              {icon('fas fa-plus', { className: 'Group-icon' })}
-              <span className="Group-name">{app.translator.trans('core.admin.permissions.new_group_button')}</span>
+export default class PermissionsPage extends AdminPage {
+  headerInfo() {
+    return {
+      className: 'PermissionsPage',
+      icon: 'fas fa-key',
+      title: app.translator.trans('core.admin.permissions.title'),
+      description: app.translator.trans('core.admin.permissions.description'),
+    };
+  }
+
+  content() {
+    return [
+      <div className="PermissionsPage-groups">
+        {app.store
+          .all('groups')
+          .filter((group) => [Group.GUEST_ID, Group.MEMBER_ID].indexOf(group.id()) === -1)
+          .map((group) => (
+            <button className="Button Group" onclick={() => app.modal.show(EditGroupModal, { group })}>
+              {GroupBadge.component({
+                group,
+                className: 'Group-icon',
+                label: null,
+              })}
+              <span className="Group-name">{group.namePlural()}</span>
             </button>
-          </div>
-        </div>
+          ))}
+        <button className="Button Group Group--add" onclick={() => app.modal.show(EditGroupModal)}>
+          {icon('fas fa-plus', { className: 'Group-icon' })}
+          <span className="Group-name">{app.translator.trans('core.admin.permissions.new_group_button')}</span>
+        </button>
+      </div>,
 
-        <div className="PermissionsPage-permissions">
-          <div className="container">{PermissionGrid.component()}</div>
-        </div>
-      </div>
-    );
+      <div className="PermissionsPage-permissions">{PermissionGrid.component()}</div>,
+    ];
   }
 }

js/src/admin/index.js

@@ -10,8 +10,9 @@ export { app };
 // Export public API
 
 // Export compat API
-import compat from './compat';
+import compatObj from './compat';
+import proxifyCompat from '../common/utils/proxifyCompat';
 
-compat.app = app;
+compatObj.app = app;
 
-export { compat };
+export const compat = proxifyCompat(compatObj, 'admin');

js/src/admin/utils/ExtensionData.js

@@ -26,6 +26,8 @@ export default class ExtensionData {
   /**
    * This function registers your settings with Flarum
    *
+   * It takes either a settings object or a callback.
+   *
    * @example
    *
    * .registerSetting({
@@ -42,6 +44,14 @@ export default class ExtensionData {
   registerSetting(content, priority = 0) {
     this.data[this.currentExtension].settings = this.data[this.currentExtension].settings || new ItemList();
 
+    // Callbacks can be passed in instead of settings to display custom content.
+    // By default, they will be added with the `null` key, since they don't have a `.setting` attr.
+    // To support multiple such items for one extension, we assign a random ID.
+    // 36 is arbitrary length, but makes collisions very unlikely.
+    if (typeof content === 'function') {
+      content.setting = Math.random().toString(36);
+    }
+
     this.data[this.currentExtension].settings.add(content.setting, content, priority);
 
     return this;

js/src/admin/utils/getCategorizedExtensions.js

@@ -15,9 +15,9 @@ export default function getCategorizedExtensions() {
 
       extensions[category].push(extension);
     } else {
-      extensions.other = extensions.other || [];
+      extensions.feature = extensions.feature || [];
 
-      extensions.other.push(extension);
+      extensions.feature.push(extension);
     }
   });
 

js/src/common/Application.js

@@ -270,7 +270,7 @@ export default class Application {
 
   updateTitle() {
     const count = this.titleCount ? `(${this.titleCount}) ` : '';
-    const pageTitleWithSeparator = this.title && m.route.get() !== '/' ? this.title + ' - ' : '';
+    const pageTitleWithSeparator = this.title && m.route.get() !== this.forum.attribute('basePath') + '/' ? this.title + ' - ' : '';
     const title = this.forum.attribute('title');
     document.title = count + pageTitleWithSeparator + title;
   }

js/src/common/Component.ts

@@ -1,8 +1,5 @@
 import * as Mithril from 'mithril';
 
-let deprecatedPropsWarned = false;
-let deprecatedInitPropsWarned = false;
-
 export interface ComponentAttrs extends Mithril.Attributes {}
 
 /**
@@ -131,38 +128,5 @@ export default abstract class Component<T extends ComponentAttrs = ComponentAttr
    *
    * This can be used to assign default values for missing, optional attrs.
    */
-  protected static initAttrs<T>(attrs: T): void {
-    // Deprecated, part of Mithril 2 BC layer
-    if ('initProps' in this && !deprecatedInitPropsWarned) {
-      deprecatedInitPropsWarned = true;
-      console.warn('initProps is deprecated, please use initAttrs instead.');
-      (this as any).initProps(attrs);
-    }
-  }
-
-  // BEGIN DEPRECATED MITHRIL 2 BC LAYER
-
-  /**
-   * The attributes passed into the component.
-   *
-   * @see https://mithril.js.org/components.html#passing-data-to-components
-   *
-   * @deprecated, use attrs instead.
-   */
-  get props() {
-    if (!deprecatedPropsWarned) {
-      deprecatedPropsWarned = true;
-      console.warn('this.props is deprecated, please use this.attrs instead.');
-    }
-    return this.attrs;
-  }
-  set props(props) {
-    if (!deprecatedPropsWarned) {
-      deprecatedPropsWarned = true;
-      console.warn('this.props is deprecated, please use this.attrs instead.');
-    }
-    this.attrs = props;
-  }
-
-  // END DEPRECATED MITHRIL 2 BC LAYER
+  protected static initAttrs<T>(attrs: T): void {}
 }

js/src/common/compat.js

@@ -19,8 +19,8 @@ import extract from './utils/extract';
 import ScrollListener from './utils/ScrollListener';
 import stringToColor from './utils/stringToColor';
 import subclassOf from './utils/subclassOf';
-import SuperTextarea from './utils/SuperTextarea';
 import patchMithril from './utils/patchMithril';
+import proxifyCompat from './utils/proxifyCompat';
 import classList from './utils/classList';
 import extractText from './utils/extractText';
 import formatNumber from './utils/formatNumber';
@@ -91,9 +91,9 @@ export default {
   'utils/stringToColor': stringToColor,
   'utils/Stream': Stream,
   'utils/subclassOf': subclassOf,
-  'utils/SuperTextarea': SuperTextarea,
   'utils/setRouteWithForcedRefresh': setRouteWithForcedRefresh,
   'utils/patchMithril': patchMithril,
+  'utils/proxifyCompat': proxifyCompat,
   'utils/classList': classList,
   'utils/extractText': extractText,
   'utils/formatNumber': formatNumber,

js/src/common/components/Page.js

@@ -29,6 +29,13 @@ export default class Page extends Component {
      * @type {Boolean}
      */
     this.scrollTopOnCreate = true;
+
+    /**
+     * Whether the browser should restore scroll state on refreshes.
+     *
+     * @type {Boolean}
+     */
+    this.useBrowserScrollRestoration = true;
   }
 
   oncreate(vnode) {
@@ -41,6 +48,10 @@ export default class Page extends Component {
     if (this.scrollTopOnCreate) {
       $(window).scrollTop(0);
     }
+
+    if ('scrollRestoration' in history) {
+      history.scrollRestoration = this.useBrowserScrollRestoration ? 'auto' : 'manual';
+    }
   }
 
   onremove() {

js/src/common/helpers/highlight.tsx

@@ -1,16 +1,16 @@
+import * as Mithril from 'mithril';
 import { truncate } from '../utils/string';
 
 /**
  * The `highlight` helper searches for a word phrase in a string, and wraps
  * matches with the <mark> tag.
  *
- * @param {String} string The string to highlight.
- * @param {String|RegExp} phrase The word or words to highlight.
- * @param {Integer} [length] The number of characters to truncate the string to.
+ * @param string The string to highlight.
+ * @param phrase The word or words to highlight.
+ * @param [length] The number of characters to truncate the string to.
  *     The string will be truncated surrounding the first match.
- * @return {Object}
  */
-export default function highlight(string, phrase, length) {
+export default function highlight(string: string, phrase: string | RegExp, length?: number): Mithril.Vnode<any, any> | string {
   if (!phrase && !length) return string;
 
   // Convert the word phrase into a global regular expression (if it isn't

js/src/common/index.js

@@ -1,7 +1,6 @@
 import 'expose-loader?$!expose-loader?jQuery!jquery';
 import 'expose-loader?m!mithril';
-import 'expose-loader?moment!expose-loader?dayjs!dayjs';
-import 'expose-loader?m.bidi!m.attrs.bidi';
+import 'expose-loader?dayjs!dayjs';
 import 'bootstrap/js/affix';
 import 'bootstrap/js/dropdown';
 import 'bootstrap/js/modal';

js/src/common/models/User.js

@@ -30,6 +30,8 @@ Object.assign(User.prototype, {
   commentCount: Model.attribute('commentCount'),
 
   canEdit: Model.attribute('canEdit'),
+  canEditCredentials: Model.attribute('canEditCredentials'),
+  canEditGroups: Model.attribute('canEditGroups'),
   canDelete: Model.attribute('canDelete'),
 
   avatarColor: null,

js/src/common/utils/SuperTextarea.js

@@ -1,109 +0,0 @@
-/**
- * A textarea wrapper with powerful helpers for text manipulation.
- *
- * This wraps a <textarea> DOM element and allows directly manipulating its text
- * contents and cursor positions.
- *
- * I apologize for the pretentious name. :)
- */
-export default class SuperTextarea {
-  /**
-   * @param {HTMLTextAreaElement} textarea
-   */
-  constructor(textarea) {
-    this.el = textarea;
-    this.$ = $(textarea);
-  }
-
-  /**
-   * Set the value of the text editor.
-   *
-   * @param {String} value
-   */
-  setValue(value) {
-    this.$.val(value).trigger('input');
-
-    this.el.dispatchEvent(new CustomEvent('input', { bubbles: true, cancelable: true }));
-  }
-
-  /**
-   * Focus the textarea and place the cursor at the given index.
-   *
-   * @param {number} position
-   */
-  moveCursorTo(position) {
-    this.setSelectionRange(position, position);
-  }
-
-  /**
-   * Get the selected range of the textarea.
-   *
-   * @return {Array}
-   */
-  getSelectionRange() {
-    return [this.el.selectionStart, this.el.selectionEnd];
-  }
-
-  /**
-   * Insert content into the textarea at the position of the cursor.
-   *
-   * @param {String} text
-   */
-  insertAtCursor(text) {
-    this.insertAt(this.el.selectionStart, text);
-  }
-
-  /**
-   * Insert content into the textarea at the given position.
-   *
-   * @param {number} pos
-   * @param {String} text
-   */
-  insertAt(pos, text) {
-    this.insertBetween(pos, pos, text);
-  }
-
-  /**
-   * Insert content into the textarea between the given positions.
-   *
-   * If the start and end positions are different, any text between them will be
-   * overwritten.
-   *
-   * @param start
-   * @param end
-   * @param text
-   */
-  insertBetween(start, end, text) {
-    const value = this.el.value;
-
-    const before = value.slice(0, start);
-    const after = value.slice(end);
-
-    this.setValue(`${before}${text}${after}`);
-
-    // Move the textarea cursor to the end of the content we just inserted.
-    this.moveCursorTo(start + text.length);
-  }
-
-  /**
-   * Replace existing content from the start to the current cursor position.
-   *
-   * @param start
-   * @param text
-   */
-  replaceBeforeCursor(start, text) {
-    this.insertBetween(start, this.el.selectionStart, text);
-  }
-
-  /**
-   * Set the selected range of the textarea.
-   *
-   * @param {number} start
-   * @param {number} end
-   * @private
-   */
-  setSelectionRange(start, end) {
-    this.el.setSelectionRange(start, end);
-    this.$.focus();
-  }
-}

js/src/common/utils/bidi.js

@@ -0,0 +1,50 @@
+function bidi(node, prop) {
+  var type = node.tag === 'select' ? (node.attrs.multi ? 'multi' : 'select') : node.attrs.type;
+
+  // Setup: bind listeners
+  if (type === 'multi') {
+    node.attrs.onchange = function () {
+      prop(
+        [].slice.call(this.selectedOptions, function (x) {
+          return x.value;
+        })
+      );
+    };
+  } else if (type === 'select') {
+    node.attrs.onchange = function (e) {
+      prop(this.selectedOptions[0].value);
+    };
+  } else if (type === 'checkbox') {
+    node.attrs.onchange = function (e) {
+      prop(this.checked);
+    };
+  } else {
+    node.attrs.onchange = node.attrs.oninput = function (e) {
+      prop(this.value);
+    };
+  }
+
+  if (node.tag === 'select') {
+    node.children.forEach(function (option) {
+      if (option.attrs.value === prop() || option.children[0] === prop()) {
+        option.attrs.selected = true;
+      }
+    });
+  } else if (type === 'checkbox') {
+    node.attrs.checked = prop();
+  } else if (type === 'radio') {
+    node.attrs.checked = prop() === node.attrs.value;
+  } else {
+    node.attrs.value = prop();
+  }
+
+  node.attrs.bidi = null;
+
+  return node;
+}
+
+bidi.view = function (ctrl, node, prop) {
+  return bidi(node, node.attrs.bidi);
+};
+
+export default bidi;

js/src/common/utils/patchMithril.js

@@ -1,8 +1,4 @@
-import withAttr from './withAttr';
-import Stream from './Stream';
-
-let deprecatedMPropWarned = false;
-let deprecatedMWithAttrWarned = false;
+import bidi from './bidi';
 
 export default function patchMithril(global) {
   const defaultMithril = global.m;
@@ -14,7 +10,7 @@ export default function patchMithril(global) {
 
     // Allows the use of the bidi attr.
     if (node.attrs.bidi) {
-      modifiedMithril.bidi(node, node.attrs.bidi);
+      bidi(node, node.attrs.bidi);
     }
 
     return node;
@@ -22,23 +18,5 @@ export default function patchMithril(global) {
 
   Object.keys(defaultMithril).forEach((key) => (modifiedMithril[key] = defaultMithril[key]));
 
-  // BEGIN DEPRECATED MITHRIL 2 BC LAYER
-  modifiedMithril.prop = function (...args) {
-    if (!deprecatedMPropWarned) {
-      deprecatedMPropWarned = true;
-      console.warn('m.prop() is deprecated, please use the Stream util (flarum/utils/Streams) instead.');
-    }
-    return Stream.bind(this)(...args);
-  };
-
-  modifiedMithril.withAttr = function (...args) {
-    if (!deprecatedMWithAttrWarned) {
-      deprecatedMWithAttrWarned = true;
-      console.warn("m.withAttr() is deprecated, please use flarum's withAttr util (flarum/utils/withAttr) instead.");
-    }
-    return withAttr.bind(this)(...args);
-  };
-  // END DEPRECATED MITHRIL 2 BC LAYER
-
   global.m = modifiedMithril;
 }

js/src/common/utils/proxifyCompat.ts

@@ -0,0 +1,10 @@
+export default (compat: { [key: string]: any }, namespace: string) => {
+  // regex to replace common/ and NAMESPACE/ for core & core extensions
+  // e.g. admin/utils/extract --> utils/extract
+  // e.g. tags/common/utils/sortTags --> tags/utils/sortTags
+  const regex = new RegExp(`(\\w+\\/)?(${namespace}|common)\\/`);
+
+  return new Proxy(compat, {
+    get: (obj, prop: string) => obj[prop] || obj[prop.replace(regex, '$1')],
+  });
+};

js/src/forum/ForumApplication.js

@@ -90,11 +90,6 @@ export default class ForumApplication extends Application {
      * @type {DiscussionListState}
      */
     this.discussions = new DiscussionListState({}, this);
-
-    /**
-     * @deprecated beta 14, remove in beta 15.
-     */
-    this.cache.discussionList = this.discussions;
   }
 
   /**

js/src/forum/compat.js

@@ -16,6 +16,7 @@ import PostStreamState from './states/PostStreamState';
 import SearchState from './states/SearchState';
 import AffixedSidebar from './components/AffixedSidebar';
 import DiscussionPage from './components/DiscussionPage';
+import DiscussionListPane from './components/DiscussionListPane';
 import LogInModal from './components/LogInModal';
 import ComposerBody from './components/ComposerBody';
 import ForgotPasswordModal from './components/ForgotPasswordModal';
@@ -72,6 +73,7 @@ import DiscussionListItem from './components/DiscussionListItem';
 import LoadingPost from './components/LoadingPost';
 import PostsUserPage from './components/PostsUserPage';
 import DiscussionPageResolver from './resolvers/DiscussionPageResolver';
+import BasicEditorDriver from './utils/BasicEditorDriver';
 import routes from './routes';
 import ForumApplication from './ForumApplication';
 
@@ -84,6 +86,8 @@ export default Object.assign(compat, {
   'utils/alertEmailConfirmation': alertEmailConfirmation,
   'utils/UserControls': UserControls,
   'utils/Pane': Pane,
+  'utils/BasicEditorDriver': BasicEditorDriver,
+  'utils/SuperTextarea': BasicEditorDriver, // @deprecated beta 16, remove beta 17
   'states/ComposerState': ComposerState,
   'states/DiscussionListState': DiscussionListState,
   'states/GlobalSearchState': GlobalSearchState,
@@ -92,6 +96,7 @@ export default Object.assign(compat, {
   'states/SearchState': SearchState,
   'components/AffixedSidebar': AffixedSidebar,
   'components/DiscussionPage': DiscussionPage,
+  'components/DiscussionListPane': DiscussionListPane,
   'components/LogInModal': LogInModal,
   'components/ComposerBody': ComposerBody,
   'components/ForgotPasswordModal': ForgotPasswordModal,

js/src/forum/components/ChangeEmailModal.js

@@ -106,9 +106,8 @@ export default class ChangeEmailModal extends Modal {
       return;
     }
 
-    const oldEmail = app.session.user.email();
-
     this.loading = true;
+    this.alertAttrs = null;
 
     app.session.user
       .save(
@@ -118,7 +117,9 @@ export default class ChangeEmailModal extends Modal {
           meta: { password: this.password() },
         }
       )
-      .then(() => (this.success = true))
+      .then(() => {
+        this.success = true;
+      })
       .catch(() => {})
       .then(this.loaded.bind(this));
   }

js/src/forum/components/Composer.js

@@ -76,13 +76,13 @@ export default class Composer extends Component {
 
     // Whenever any of the inputs inside the composer are have focus, we want to
     // add a class to the composer to draw attention to it.
-    this.$().on('focus blur', ':input', (e) => {
+    this.$().on('focus blur', ':input,.TextEditor-editorContainer', (e) => {
       this.active = e.type === 'focusin';
       m.redraw();
     });
 
     // When the escape key is pressed on any inputs, close the composer.
-    this.$().on('keydown', ':input', 'esc', () => this.state.close());
+    this.$().on('keydown', ':input,.TextEditor-editorContainer', 'esc', () => this.state.close());
 
     this.handlers = {};
 
@@ -157,7 +157,7 @@ export default class Composer extends Component {
    * Draw focus to the first focusable content element (the text editor).
    */
   focus() {
-    this.$('.Composer-content :input:enabled:visible:first').focus();
+    this.$('.Composer-content :input:enabled:visible, .TextEditor-editor').first().focus();
   }
 
   /**
@@ -199,7 +199,7 @@ export default class Composer extends Component {
    */
   animatePositionChange() {
     // When exiting full-screen mode: focus content
-    if (this.prevPosition === ComposerState.Position.FULLSCREEN) {
+    if (this.prevPosition === ComposerState.Position.FULLSCREEN && this.state.position === ComposerState.Position.NORMAL) {
       this.focus();
       return;
     }
@@ -265,7 +265,7 @@ export default class Composer extends Component {
     this.animateHeightChange().then(() => this.focus());
 
     if (app.screen() === 'phone') {
-      this.$().css('top', $(window).scrollTop());
+      this.$().css('top', 0);
       this.showBackdrop();
     }
   }

js/src/forum/components/ComposerBody.js

@@ -44,12 +44,6 @@ export default class ComposerBody extends Component {
     }
 
     this.composer.fields.content(this.attrs.originalContent || '');
-
-    /**
-     * @deprecated BC layer, remove in Beta 15.
-     */
-    this.content = this.composer.fields.content;
-    this.editor = this.composer;
   }
 
   view() {

js/src/forum/components/DiscussionListItem.js

@@ -121,6 +121,8 @@ export default class DiscussionListItem extends Component {
           </Link>
 
           <span
+            tabindex="0"
+            role="button"
             className="DiscussionListItem-count"
             onclick={this.markAsRead.bind(this)}
             title={showUnread ? app.translator.trans('core.forum.discussion_list.mark_as_read_tooltip') : ''}

js/src/forum/components/DiscussionListPane.js

@@ -1,5 +1,6 @@
 import DiscussionList from './DiscussionList';
 import Component from '../../common/Component';
+import DiscussionPage from './DiscussionPage';
 
 const hotEdge = (e) => {
   if (e.pageX < 10) app.pane.show();
@@ -36,23 +37,31 @@ export default class DiscussionListPane extends Component {
 
     $(document).on('mousemove', hotEdge);
 
-    // If the discussion we are viewing is listed in the discussion list, then
-    // we will make sure it is visible in the viewport – if it is not we will
-    // scroll the list down to it.
-    const $discussion = $list.find('.DiscussionListItem.active');
-    if ($discussion.length) {
-      const listTop = $list.offset().top;
-      const listBottom = listTop + $list.outerHeight();
-      const discussionTop = $discussion.offset().top;
-      const discussionBottom = discussionTop + $discussion.outerHeight();
+    // When coming from another discussion, scroll to the previous postition
+    // to prevent the discussion list jumping around.
+    if (app.previous.matches(DiscussionPage)) {
+      const top = app.cache.discussionListPaneScrollTop || 0;
+      $list.scrollTop(top);
+    } else {
+      // If the discussion we are viewing is listed in the discussion list, then
+      // we will make sure it is visible in the viewport – if it is not we will
+      // scroll the list down to it.
+      const $discussion = $list.find('.DiscussionListItem.active');
+      if ($discussion.length) {
+        const listTop = $list.offset().top;
+        const listBottom = listTop + $list.outerHeight();
+        const discussionTop = $discussion.offset().top;
+        const discussionBottom = discussionTop + $discussion.outerHeight();
 
-      if (discussionTop < listTop || discussionBottom > listBottom) {
-        $list.scrollTop($list.scrollTop() - listTop + discussionTop);
+        if (discussionTop < listTop || discussionBottom > listBottom) {
+          $list.scrollTop($list.scrollTop() - listTop + discussionTop);
+        }
       }
     }
   }
 
-  onremove() {
+  onremove(vnode) {
+    app.cache.discussionListPaneScrollTop = $(vnode.dom).scrollTop();
     $(document).off('mousemove', hotEdge);
   }
 

js/src/forum/components/DiscussionPage.js

@@ -18,6 +18,8 @@ export default class DiscussionPage extends Page {
   oninit(vnode) {
     super.oninit(vnode);
 
+    this.useBrowserScrollRestoration = false;
+
     /**
      * The discussion that is being viewed.
      *

js/src/forum/components/EditUserModal.js

@@ -37,9 +37,10 @@ export default class EditUserModal extends Modal {
   }
 
   content() {
+    const fields = this.fields().toArray();
     return (
       <div className="Modal-body">
-        <div className="Form">{this.fields().toArray()}</div>
+        {fields.length > 1 ? <div className="Form">{this.fields().toArray()}</div> : app.translator.trans('core.forum.edit_user.nothing_available')}
       </div>
     );
   }
@@ -47,96 +48,112 @@ export default class EditUserModal extends Modal {
   fields() {
     const items = new ItemList();
 
-    items.add(
-      'username',
-      <div className="Form-group">
-        <label>{app.translator.trans('core.forum.edit_user.username_heading')}</label>
-        <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.username_label'))} bidi={this.username} />
-      </div>,
-      40
-    );
-
-    if (app.session.user !== this.attrs.user) {
+    if (app.session.user.canEditCredentials()) {
       items.add(
-        'email',
+        'username',
         <div className="Form-group">
-          <label>{app.translator.trans('core.forum.edit_user.email_heading')}</label>
-          <div>
-            <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.email_label'))} bidi={this.email} />
-          </div>
-          {!this.isEmailConfirmed() ? (
-            <div>
-              {Button.component(
-                {
-                  className: 'Button Button--block',
-                  loading: this.loading,
-                  onclick: this.activate.bind(this),
-                },
-                app.translator.trans('core.forum.edit_user.activate_button')
-              )}
-            </div>
-          ) : (
-            ''
-          )}
+          <label>{app.translator.trans('core.forum.edit_user.username_heading')}</label>
+          <input
+            className="FormControl"
+            placeholder={extractText(app.translator.trans('core.forum.edit_user.username_label'))}
+            bidi={this.username}
+            disabled={this.nonAdminEditingAdmin()}
+          />
         </div>,
-        30
+        40
       );
 
-      items.add(
-        'password',
-        <div className="Form-group">
-          <label>{app.translator.trans('core.forum.edit_user.password_heading')}</label>
-          <div>
-            <label className="checkbox">
-              <input
-                type="checkbox"
-                onchange={(e) => {
-                  this.setPassword(e.target.checked);
-                  m.redraw.sync();
-                  if (e.target.checked) this.$('[name=password]').select();
-                  e.redraw = false;
-                }}
-              />
-              {app.translator.trans('core.forum.edit_user.set_password_label')}
-            </label>
-            {this.setPassword() ? (
+      if (app.session.user !== this.attrs.user) {
+        items.add(
+          'email',
+          <div className="Form-group">
+            <label>{app.translator.trans('core.forum.edit_user.email_heading')}</label>
+            <div>
               <input
                 className="FormControl"
-                type="password"
-                name="password"
-                placeholder={extractText(app.translator.trans('core.forum.edit_user.password_label'))}
-                bidi={this.password}
+                placeholder={extractText(app.translator.trans('core.forum.edit_user.email_label'))}
+                bidi={this.email}
+                disabled={this.nonAdminEditingAdmin()}
               />
+            </div>
+            {!this.isEmailConfirmed() && this.userIsAdmin(app.session.user) ? (
+              <div>
+                {Button.component(
+                  {
+                    className: 'Button Button--block',
+                    loading: this.loading,
+                    onclick: this.activate.bind(this),
+                  },
+                  app.translator.trans('core.forum.edit_user.activate_button')
+                )}
+              </div>
             ) : (
               ''
             )}
-          </div>
-        </div>,
-        20
-      );
-    }
+          </div>,
+          30
+        );
 
-    items.add(
-      'groups',
-      <div className="Form-group EditUserModal-groups">
-        <label>{app.translator.trans('core.forum.edit_user.groups_heading')}</label>
-        <div>
-          {Object.keys(this.groups)
-            .map((id) => app.store.getById('groups', id))
-            .map((group) => (
+        items.add(
+          'password',
+          <div className="Form-group">
+            <label>{app.translator.trans('core.forum.edit_user.password_heading')}</label>
+            <div>
               <label className="checkbox">
                 <input
                   type="checkbox"
-                  bidi={this.groups[group.id()]}
-                  disabled={this.attrs.user.id() === '1' && group.id() === Group.ADMINISTRATOR_ID}
+                  onchange={(e) => {
+                    this.setPassword(e.target.checked);
+                    m.redraw.sync();
+                    if (e.target.checked) this.$('[name=password]').select();
+                    e.redraw = false;
+                  }}
+                  disabled={this.nonAdminEditingAdmin()}
                 />
-                {GroupBadge.component({ group, label: '' })} {group.nameSingular()}
+                {app.translator.trans('core.forum.edit_user.set_password_label')}
               </label>
-            ))}
-        </div>
-      </div>,
-      10
-    );
+              {this.setPassword() ? (
+                <input
+                  className="FormControl"
+                  type="password"
+                  name="password"
+                  placeholder={extractText(app.translator.trans('core.forum.edit_user.password_label'))}
+                  bidi={this.password}
+                  disabled={this.nonAdminEditingAdmin()}
+                />
+              ) : (
+                ''
+              )}
+            </div>
+          </div>,
+          20
+        );
+      }
+    }
+
+    if (app.session.user.canEditGroups()) {
+      items.add(
+        'groups',
+        <div className="Form-group EditUserModal-groups">
+          <label>{app.translator.trans('core.forum.edit_user.groups_heading')}</label>
+          <div>
+            {Object.keys(this.groups)
+              .map((id) => app.store.getById('groups', id))
+              .map((group) => (
+                <label className="checkbox">
+                  <input
+                    type="checkbox"
+                    bidi={this.groups[group.id()]}
+                    disabled={group.id() === Group.ADMINISTRATOR_ID && (this.attrs.user === app.session.user || !this.userIsAdmin(app.session.user))}
+                  />
+                  {GroupBadge.component({ group, label: '' })} {group.nameSingular()}
+                </label>
+              ))}
+          </div>
+        </div>,
+        10
+      );
+    }
 
     items.add(
       'submit',
@@ -176,21 +193,26 @@ export default class EditUserModal extends Modal {
   }
 
   data() {
-    const groups = Object.keys(this.groups)
-      .filter((id) => this.groups[id]())
-      .map((id) => app.store.getById('groups', id));
-
     const data = {
-      username: this.username(),
-      relationships: { groups },
+      relationships: {},
     };
 
-    if (app.session.user !== this.attrs.user) {
-      data.email = this.email();
+    if (this.attrs.user.canEditCredentials() && !this.nonAdminEditingAdmin()) {
+      data.username = this.username();
+
+      if (app.session.user !== this.attrs.user) {
+        data.email = this.email();
+      }
+
+      if (this.setPassword()) {
+        data.password = this.password();
+      }
     }
 
-    if (this.setPassword()) {
-      data.password = this.password();
+    if (this.attrs.user.canEditGroups()) {
+      data.relationships.groups = Object.keys(this.groups)
+        .filter((id) => this.groups[id]())
+        .map((id) => app.store.getById('groups', id));
     }
 
     return data;
@@ -209,4 +231,15 @@ export default class EditUserModal extends Modal {
         m.redraw();
       });
   }
+
+  nonAdminEditingAdmin() {
+    return this.userIsAdmin(this.attrs.user) && !this.userIsAdmin(app.session.user);
+  }
+
+  /**
+   * @internal @protected
+   */
+  userIsAdmin(user) {
+    return user.groups().some((g) => g.id() === Group.ADMINISTRATOR_ID);
+  }
 }

js/src/forum/components/NotificationList.js

@@ -99,7 +99,9 @@ export default class NotificationList extends Component {
     super.oncreate(vnode);
 
     this.$notifications = this.$('.NotificationList-content');
-    this.$scrollParent = this.$notifications.css('overflow') === 'auto' ? this.$notifications : $(window);
+
+    // If we are on the notifications page, the window will be scrolling and not the $notifications element.
+    this.$scrollParent = this.inPanel() ? this.$notifications : $(window);
 
     this.boundScrollHandler = this.scrollHandler.bind(this);
     this.$scrollParent.on('scroll', this.boundScrollHandler);
@@ -112,14 +114,24 @@ export default class NotificationList extends Component {
   scrollHandler() {
     const state = this.attrs.state;
 
-    const scrollTop = this.$scrollParent.scrollTop();
-    const viewportHeight = this.$scrollParent.height();
+    // Whole-page scroll events are listened to on `window`, but we need to get the actual
+    // scrollHeight, scrollTop, and clientHeight from the document element.
+    const scrollParent = this.inPanel() ? this.$scrollParent[0] : document.documentElement;
 
-    const contentTop = this.$scrollParent === this.$notifications ? 0 : this.$notifications.offset().top;
-    const contentHeight = this.$notifications[0].scrollHeight;
+    // On very short screens, the scrollHeight + scrollTop might not reach the clientHeight
+    // by a fraction of a pixel, so we compensate for that.
+    const atBottom = Math.abs(scrollParent.scrollHeight - scrollParent.scrollTop - scrollParent.clientHeight) <= 1;
 
-    if (state.hasMoreResults() && !state.isLoading() && scrollTop + viewportHeight >= contentTop + contentHeight) {
+    if (state.hasMoreResults() && !state.isLoading() && atBottom) {
       state.loadMore();
     }
   }
+
+  /**
+   * If the NotificationList component isn't in a panel (e.g. on NotificationPage when mobile),
+   * we need to listen to scroll events on the window, and get scroll state from the body.
+   */
+  inPanel() {
+    return this.$notifications.css('overflow') === 'auto';
+  }
 }

js/src/forum/components/PostStream.js

@@ -142,13 +142,29 @@ export default class PostStream extends Component {
   }
 
   /**
-   * When the window is scrolled, check if either extreme of the post stream is
-   * in the viewport, and if so, trigger loading the next/previous page.
    *
    * @param {Integer} top
    */
   onscroll(top = window.pageYOffset) {
-    if (this.stream.paused) return;
+    if (this.stream.paused || this.stream.pagesLoading) return;
+
+    this.updateScrubber(top);
+
+    this.loadPostsIfNeeded(top);
+
+    // Throttle calculation of our position (start/end numbers of posts in the
+    // viewport) to 100ms.
+    clearTimeout(this.calculatePositionTimeout);
+    this.calculatePositionTimeout = setTimeout(this.calculatePosition.bind(this, top), 100);
+  }
+
+  /**
+   * Check if either extreme of the post stream is in the viewport,
+   * and if so, trigger loading the next/previous page.
+   *
+   * @param {Integer} top
+   */
+  loadPostsIfNeeded(top = window.pageYOffset) {
     const marginTop = this.getMarginTop();
     const viewportHeight = $(window).height() - marginTop;
     const viewportTop = top + marginTop;
@@ -169,13 +185,6 @@ export default class PostStream extends Component {
         this.stream.loadNext();
       }
     }
-
-    // Throttle calculation of our position (start/end numbers of posts in the
-    // viewport) to 100ms.
-    clearTimeout(this.calculatePositionTimeout);
-    this.calculatePositionTimeout = setTimeout(this.calculatePosition.bind(this, top), 100);
-
-    this.updateScrubber(top);
   }
 
   updateScrubber(top = window.pageYOffset) {
@@ -396,6 +405,8 @@ export default class PostStream extends Component {
 
       this.calculatePosition();
       this.stream.paused = false;
+      // Check if we need to load more posts after scrolling.
+      this.loadPostsIfNeeded();
     });
   }
 

js/src/forum/components/PostStreamScrubber.js

@@ -1,4 +1,5 @@
 import Component from '../../common/Component';
+import Button from '../../common/components/Button';
 import icon from '../../common/helpers/icon';
 import formatNumber from '../../common/utils/formatNumber';
 import ScrollListener from '../../common/utils/ScrollListener';
@@ -19,6 +20,8 @@ export default class PostStreamScrubber extends Component {
     this.stream = this.attrs.stream;
     this.handlers = {};
 
+    this.pendingMoveIndex = null;
+
     this.scrollListener = new ScrollListener(this.updateScrubberValues.bind(this, { fromScroll: true, forceHeightChange: true }));
   }
 
@@ -31,8 +34,17 @@ export default class PostStreamScrubber extends Component {
       count: <span className="Scrubber-count">{formatNumber(count)}</span>,
     });
 
+    const index = this.stream.index;
+    const previousIndex = this.stream.previousIndex;
+
+    // We want to make sure the back button isn't crammed in.
+    // If the previous post index is less than 5% from the last/first post,
+    // or if the previous post index is less than 25% from the current post, we will
+    // hide the button. Additionally, this hides the button on very short screens.
+    const showBackButton = previousIndex > count / 20 && previousIndex < count - count / 20 && 100 * Math.abs((index - previousIndex) / count) > 25;
+
     const unreadCount = this.stream.discussion.unreadCount();
-    const unreadPercent = count ? Math.min(count - this.stream.index, unreadCount) / count : 0;
+    const unreadPercent = count ? Math.min(count - index, unreadCount) / count : 0;
 
     function styleUnread(vnode) {
       const $element = $(vnode.dom);
@@ -65,6 +77,18 @@ export default class PostStreamScrubber extends Component {
             </a>
 
             <div className="Scrubber-scrollbar">
+              {showBackButton ? (
+                <a
+                  style={'top: ' + this.percentPerPost().index * this.stream.previousIndex + '%'}
+                  className="Scrubber-back"
+                  onclick={this.returnToLastPosition.bind(this)}
+                  title={app.translator.trans('core.forum.post_scrubber.back_title')}
+                >
+                  {icon('fas fa-chevron-left')}
+                </a>
+              ) : (
+                ''
+              )}
               <div className="Scrubber-before" />
               <div className="Scrubber-handle">
                 <div className="Scrubber-bar" />
@@ -89,6 +113,16 @@ export default class PostStreamScrubber extends Component {
     );
   }
 
+  returnToLastPosition(e) {
+    // Don't fire the scrubber click event as well
+    e.stopPropagation();
+
+    this.stream.goToIndex(Math.floor(this.stream.previousIndex));
+    this.updateScrubberValues({ animate: true });
+
+    this.$().removeClass('open');
+  }
+
   onupdate() {
     if (this.stream.forceUpdateScrubber) {
       this.stream.forceUpdateScrubber = false;
@@ -157,7 +191,7 @@ export default class PostStreamScrubber extends Component {
    * @param {Boolean} animate
    */
   updateScrubberValues(options = {}) {
-    const index = this.stream.index;
+    const index = this.pendingMoveIndex || this.stream.index;
     const count = this.stream.count();
     const visible = this.stream.visible || 1;
     const percentPerPost = this.percentPerPost();
@@ -248,7 +282,7 @@ export default class PostStreamScrubber extends Component {
     const deltaIndex = deltaPercent / this.percentPerPost().index || 0;
     const newIndex = Math.min(this.indexStart + deltaIndex, this.stream.count() - 1);
 
-    this.stream.index = Math.max(0, newIndex);
+    this.pendingMoveIndex = Math.max(0, newIndex);
     this.updateScrubberValues();
   }
 
@@ -265,15 +299,17 @@ export default class PostStreamScrubber extends Component {
 
     // If the index we've landed on is in a gap, then tell the stream-
     // content that we want to load those posts.
-    const intIndex = Math.floor(this.stream.index);
+    const intIndex = Math.floor(this.pendingMoveIndex);
     this.stream.goToIndex(intIndex);
+    this.pendingMoveIndex = null;
   }
 
   onclick(e) {
     // Calculate the index which we want to jump to based on the click position.
 
     // 1. Get the offset of the click from the top of the scrollbar, as a
-    //    percentage of the scrollbar's height.
+    //    percentage of the scrollbar's height. Save current location for the
+    //    back button.
     const $scrollbar = this.$('.Scrubber-scrollbar');
     const offsetPixels = (e.pageY || e.originalEvent.touches[0].pageY) - $scrollbar.offset().top + $('body').scrollTop();
     let offsetPercent = (offsetPixels / $scrollbar.outerHeight()) * 100;

js/src/forum/components/ReplyPlaceholder.js

@@ -5,6 +5,7 @@ import avatar from '../../common/helpers/avatar';
 import username from '../../common/helpers/username';
 import DiscussionControls from '../utils/DiscussionControls';
 import ComposerPostPreview from './ComposerPostPreview';
+import listItems from '../../common/helpers/listItems';
 
 /**
  * The `ReplyPlaceholder` component displays a placeholder for a reply, which,
@@ -25,6 +26,7 @@ export default class ReplyPlaceholder extends Component {
                 {avatar(app.session.user, { className: 'PostUser-avatar' })}
                 {username(app.session.user)}
               </h3>
+              <ul className="PostUser-badges badges">{listItems(app.session.user.badges().toArray())}</ul>
             </div>
           </header>
           <ComposerPostPreview className="Post-body" composer={app.composer} surround={this.anchorPreview.bind(this)} />

js/src/forum/components/TextEditor.js

@@ -1,9 +1,10 @@
 import Component from '../../common/Component';
 import ItemList from '../../common/utils/ItemList';
-import SuperTextarea from '../../common/utils/SuperTextarea';
 import listItems from '../../common/helpers/listItems';
 import Button from '../../common/components/Button';
 
+import BasicEditorDriver from '../utils/BasicEditorDriver';
+
 /**
  * The `TextEditor` component displays a textarea with controls, including a
  * submit button.
@@ -22,25 +23,22 @@ export default class TextEditor extends Component {
     super.oninit(vnode);
 
     /**
-     * The value of the textarea.
+     * The value of the editor.
      *
      * @type {String}
      */
     this.value = this.attrs.value || '';
+
+    /**
+     * Whether the editor is disabled.
+     */
+    this.disabled = !!this.attrs.disabled;
   }
 
   view() {
     return (
       <div className="TextEditor">
-        <textarea
-          className="FormControl Composer-flexible"
-          oninput={(e) => {
-            this.oninput(e.target.value, e);
-          }}
-          placeholder={this.attrs.placeholder || ''}
-          disabled={!!this.attrs.disabled}
-          value={this.value}
-        />
+        <div className="TextEditor-editorContainer"></div>
 
         <ul className="TextEditor-controls Composer-footer">
           {listItems(this.controlItems().toArray())}
@@ -53,15 +51,35 @@ export default class TextEditor extends Component {
   oncreate(vnode) {
     super.oncreate(vnode);
 
-    const handler = () => {
-      this.onsubmit();
-      m.redraw();
+    this.attrs.composer.editor = this.buildEditor(this.$('.TextEditor-editorContainer')[0]);
+  }
+
+  onupdate() {
+    const newDisabled = !!this.attrs.disabled;
+
+    if (this.disabled !== newDisabled) {
+      this.disabled = newDisabled;
+      this.attrs.composer.editor.disabled(newDisabled);
+    }
+  }
+
+  buildEditorParams() {
+    return {
+      classNames: ['FormControl', 'Composer-flexible', 'TextEditor-editor'],
+      disabled: this.disabled,
+      placeholder: this.attrs.placeholder || '',
+      value: this.value,
+      oninput: this.oninput.bind(this),
+      inputListeners: [],
+      onsubmit: () => {
+        this.onsubmit();
+        m.redraw();
+      },
     };
+  }
 
-    this.$('textarea').bind('keydown', 'meta+return', handler);
-    this.$('textarea').bind('keydown', 'ctrl+return', handler);
-
-    this.attrs.composer.editor = new SuperTextarea(this.$('textarea')[0]);
+  buildEditor(dom) {
+    return new BasicEditorDriver(dom, this.buildEditorParams());
   }
 
   /**
@@ -115,12 +133,10 @@ export default class TextEditor extends Component {
    *
    * @param {String} value
    */
-  oninput(value, e) {
+  oninput(value) {
     this.value = value;
 
     this.attrs.onchange(this.value);
-
-    e.redraw = false;
   }
 
   /**

js/src/forum/index.js

@@ -15,8 +15,9 @@ export { app };
 // export { IndexPage, DicsussionList } from './components';
 
 // Export compat API
-import compat from './compat';
+import compatObj from './compat';
+import proxifyCompat from '../common/utils/proxifyCompat';
 
-compat.app = app;
+compatObj.app = app;
 
-export { compat };
+export const compat = proxifyCompat(compatObj, 'forum');

js/src/forum/states/ComposerState.js

@@ -1,6 +1,7 @@
 import subclassOf from '../../common/utils/subclassOf';
 import Stream from '../../common/utils/Stream';
 import ReplyComposer from '../components/ReplyComposer';
+import EditorDriverInterface from '../utils/EditorDriverInterface';
 
 class ComposerState {
   constructor() {
@@ -29,16 +30,11 @@ class ComposerState {
     /**
      * A reference to the text editor that allows text manipulation.
      *
-     * @type {SuperTextArea|null}
+     * @type {EditorDriverInterface|null}
      */
     this.editor = null;
 
     this.clear();
-
-    /**
-     * @deprecated BC layer, remove in Beta 15.
-     */
-    this.component = this;
   }
 
   /**
@@ -71,18 +67,16 @@ class ComposerState {
   clear() {
     this.position = ComposerState.Position.HIDDEN;
     this.body = { attrs: {} };
-    this.editor = null;
     this.onExit = null;
 
     this.fields = {
       content: Stream(''),
     };
 
-    /**
-     * @deprecated BC layer, remove in Beta 15.
-     */
-    this.content = this.fields.content;
-    this.value = this.fields.content;
+    if (this.editor) {
+      this.editor.destroy();
+    }
+    this.editor = null;
   }
 
   /**

js/src/forum/states/PostStreamState.js

@@ -1,3 +1,4 @@
+import { throttle } from 'lodash-es';
 import anchorScroll from '../../common/utils/anchorScroll';
 
 class PostStreamState {
@@ -21,6 +22,7 @@ class PostStreamState {
     this.pagesLoading = 0;
 
     this.index = 0;
+    this.previousIndex = 0;
     this.number = 1;
 
     /**
@@ -49,6 +51,9 @@ class PostStreamState {
      */
     this.forceUpdateScrubber = false;
 
+    this.loadNext = throttle(this._loadNext, 300);
+    this.loadPrevious = throttle(this._loadPrevious, 300);
+
     this.show(includedPosts);
   }
 
@@ -133,6 +138,7 @@ class PostStreamState {
     this.needsScroll = true;
     this.targetPost = { index };
     this.animateScroll = !noAnimation;
+    this.previousIndex = index === this.previousIndex ? index : this.index;
     this.index = index;
 
     m.redraw();
@@ -172,7 +178,7 @@ class PostStreamState {
    * @return {Promise}
    */
   loadNearIndex(index) {
-    if (index >= this.visibleStart && index <= this.visibleEnd) {
+    if (index >= this.visibleStart && index < this.visibleEnd) {
       return Promise.resolve();
     }
 
@@ -187,7 +193,7 @@ class PostStreamState {
   /**
    * Load the next page of posts.
    */
-  loadNext() {
+  _loadNext() {
     const start = this.visibleEnd;
     const end = (this.visibleEnd = this.sanitizeIndex(this.visibleEnd + this.constructor.loadCount));
 
@@ -210,7 +216,7 @@ class PostStreamState {
   /**
    * Load the previous page of posts.
    */
-  loadPrevious() {
+  _loadPrevious() {
     const end = this.visibleStart;
     const start = (this.visibleStart = this.sanitizeIndex(this.visibleStart - this.constructor.loadCount));
 
@@ -238,23 +244,26 @@ class PostStreamState {
    * @param {Boolean} backwards
    */
   loadPage(start, end, backwards = false) {
-    m.redraw();
+    this.pagesLoading++;
+
+    const redraw = () => {
+      if (start < this.visibleStart || end > this.visibleEnd) return;
+
+      const anchorIndex = backwards ? this.visibleEnd - 1 : this.visibleStart;
+      anchorScroll(`.PostStream-item[data-index="${anchorIndex}"]`, m.redraw.sync);
+    };
+    redraw();
 
     this.loadPageTimeouts[start] = setTimeout(
       () => {
         this.loadRange(start, end).then(() => {
-          if (start >= this.visibleStart && end <= this.visibleEnd) {
-            const anchorIndex = backwards ? this.visibleEnd - 1 : this.visibleStart;
-            anchorScroll(`.PostStream-item[data-index="${anchorIndex}"]`, () => m.redraw.sync());
-          }
+          redraw();
           this.pagesLoading--;
         });
         this.loadPageTimeouts[start] = null;
       },
-      this.pagesLoading ? 1000 : 0
+      this.pagesLoading - 1 ? 1000 : 0
     );
-
-    this.pagesLoading++;
   }
 
   /**

js/src/forum/utils/BasicEditorDriver.ts

@@ -0,0 +1,124 @@
+import getCaretCoordinates from 'textarea-caret';
+import EditorDriverInterface, { EditorDriverParams } from './EditorDriverInterface';
+
+export default class BasicEditorDriver implements EditorDriverInterface {
+  el: HTMLTextAreaElement;
+
+  constructor(dom: HTMLElement, params: EditorDriverParams) {
+    this.el = document.createElement('textarea');
+
+    this.build(dom, params);
+  }
+
+  build(dom: HTMLElement, params: EditorDriverParams) {
+    this.el.className = params.classNames.join(' ');
+    this.el.disabled = params.disabled;
+    this.el.placeholder = params.placeholder;
+    this.el.value = params.value;
+
+    const callInputListeners = (e) => {
+      params.inputListeners.forEach((listener) => {
+        listener();
+      });
+
+      e.redraw = false;
+    };
+
+    this.el.oninput = (e) => {
+      params.oninput(this.el.value);
+      callInputListeners(e);
+    };
+
+    this.el.onclick = callInputListeners;
+    this.el.onkeyup = callInputListeners;
+
+    this.el.addEventListener('keydown', function (e) {
+      if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
+        params.onsubmit();
+      }
+    });
+
+    dom.append(this.el);
+  }
+
+  protected setValue(value: string) {
+    $(this.el).val(value).trigger('input');
+
+    this.el.dispatchEvent(new CustomEvent('input', { bubbles: true, cancelable: true }));
+  }
+
+  moveCursorTo(position: number) {
+    this.setSelectionRange(position, position);
+  }
+
+  getSelectionRange(): Array<number> {
+    return [this.el.selectionStart, this.el.selectionEnd];
+  }
+
+  getLastNChars(n: number): string {
+    const value = this.el.value;
+
+    return value.slice(Math.max(0, this.el.selectionStart - n), this.el.selectionStart);
+  }
+
+  insertAtCursor(text: string) {
+    this.insertAt(this.el.selectionStart, text);
+  }
+
+  insertAt(pos: number, text: string) {
+    this.insertBetween(pos, pos, text);
+  }
+
+  insertBetween(start: number, end: number, text: string) {
+    const value = this.el.value;
+
+    const before = value.slice(0, start);
+    const after = value.slice(end);
+
+    this.setValue(`${before}${text}${after}`);
+
+    // Move the textarea cursor to the end of the content we just inserted.
+    this.moveCursorTo(start + text.length);
+  }
+
+  replaceBeforeCursor(start: number, text: string) {
+    this.insertBetween(start, this.el.selectionStart, text);
+  }
+
+  protected setSelectionRange(start: number, end: number) {
+    this.el.setSelectionRange(start, end);
+    this.focus();
+  }
+
+  getCaretCoordinates(position: number) {
+    const relCoords = getCaretCoordinates(this.el, position);
+
+    return {
+      top: relCoords.top - this.el.scrollTop,
+      left: relCoords.left,
+    };
+  }
+
+  // DOM Interactions
+
+  /**
+   * Set the disabled status of the editor.
+   */
+  disabled(disabled: boolean) {
+    this.el.disabled = disabled;
+  }
+
+  /**
+   * Focus on the editor.
+   */
+  focus() {
+    this.el.focus();
+  }
+
+  /**
+   * Destroy the editor
+   */
+  destroy() {
+    this.el.remove();
+  }
+}

js/src/forum/utils/EditorDriverInterface.ts

@@ -0,0 +1,105 @@
+export interface EditorDriverParams {
+  /**
+   * An array of HTML class names to apply to the editor's main DOM element.
+   */
+  classNames: string[];
+
+  /**
+   * Whether the editor should be initially disabled.
+   */
+  disabled: boolean;
+
+  /**
+   * An optional placeholder for the editor.
+   */
+  placeholder: string;
+
+  /**
+   * An optional initial value for the editor.
+   */
+  value: string;
+
+  /**
+   * This is separate from inputListeners since the full serialized content will be passed to it.
+   * It is considered private API, and should not be used/modified by extensions not implementing
+   * EditorDriverInterface.
+   */
+  oninput: Function;
+
+  /**
+   * Each of these functions will be called on click, input, and keyup.
+   * No arguments will be passed.
+   */
+  inputListeners: Function[];
+
+  /**
+   * This function will be called if submission is triggered programmatically via keybind.
+   * No arguments should be passed.
+   */
+  onsubmit: Function;
+}
+
+export default interface EditorDriverInterface {
+  /**
+   * Focus the editor and place the cursor at the given position.
+   */
+  moveCursorTo(position: number): void;
+
+  /**
+   * Get the selected range of the editor.
+   */
+  getSelectionRange(): Array<number>;
+
+  /**
+   * Get the last N characters from the current "text block".
+   *
+   * A textarea-based driver would just return the last N characters,
+   * but more advanced implementations might restrict to the current block.
+   *
+   * This is useful for monitoring recent user input to trigger autocomplete.
+   */
+  getLastNChars(n: number): string;
+
+  /**
+   * Insert content into the editor at the position of the cursor.
+   */
+  insertAtCursor(text: string, escape: boolean): void;
+
+  /**
+   * Insert content into the editor at the given position.
+   */
+  insertAt(pos: number, text: string, escape: boolean): void;
+
+  /**
+   * Insert content into the editor between the given positions.
+   *
+   * If the start and end positions are different, any text between them will be
+   * overwritten.
+   */
+  insertBetween(start: number, end: number, text: string, escape: boolean): void;
+
+  /**
+   * Replace existing content from the start to the current cursor position.
+   */
+  replaceBeforeCursor(start: number, text: string, escape: boolean): void;
+
+  /**
+   * Get left and top coordinates of the caret relative to the editor viewport.
+   */
+  getCaretCoordinates(position: number): { left: number; top: number };
+
+  /**
+   * Set the disabled status of the editor.
+   */
+  disabled(disabled: boolean): void;
+
+  /**
+   * Focus on the editor.
+   */
+  focus(): void;
+
+  /**
+   * Destroy the editor
+   */
+  destroy(): void;
+}

js/src/forum/utils/UserControls.js

@@ -57,7 +57,7 @@ export default {
   moderationControls(user) {
     const items = new ItemList();
 
-    if (user.canEdit()) {
+    if (user.canEdit() || user.canEditCredentials() || user.canEditGroups()) {
       items.add(
         'edit',
         <Button icon="fas fa-pencil-alt" onclick={this.editAction.bind(this, user)}>

js/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
   "files": ["shims.d.ts"],
   "compilerOptions": {
     "allowUmdGlobalAccess": true,

less/admin/AdminHeader.less

@@ -11,6 +11,7 @@
 
   .AdminHeader-description {
     margin: 0;
+    color: @control-color;
   }
 
   .icon {

less/admin/AdminNav.less

@@ -41,16 +41,13 @@
 }
 
 @media @tablet {
-  .item-search{
-    display: none;
-  }
-
-  .ExtensionItem, .item-search {
-    display: none !important;
-  }
-
-  .ExtensionListTitle {
-    display: none !important;
+  .AdminNav {
+    .item-search,
+    li[class^="item-category"],
+    li[class^="item-extension"],
+    .AdminLinkButton-description {
+      display: none !important;
+    }
   }
 }
 
@@ -80,7 +77,7 @@
 }
 
 
-@media @desktop, @desktop-hd {
+@media @desktop-up {
   .App-nav {
     position: absolute;
     top: @header-height;
@@ -107,36 +104,47 @@
         margin-bottom: 20px;
       }
 
+      .item-category-core {
+        > .ExtensionListTitle {
+          margin-top: 10px;
+        }
+      }
+
       > li {
         > a {
           padding: 10px 10px 10px 45px;
           display: block;
           text-decoration: none;
         }
+
         > a,
         > a:hover,
         &.active > a {
           color: @text-color;
         }
+
         > a:hover {
           background: @control-bg;
         }
+
         &.active > a {
-          background: @primary-color;
+          background: @control-color;
           font-weight: normal;
+          color: @body-bg;
 
           .Button-label,
           .Button-icon {
-            color: @body-bg;
             font-weight: bold;
           }
         }
+
         .Button-icon {
           float: left;
           font-size: 13px !important;
           margin-left: -25px !important;
           margin-top: 4px !important;
         }
+
         .Button-label {
           padding-left: 5px;
           font-size: 14px;
@@ -152,7 +160,7 @@
         .ExtensionListTitle {
           color: @muted-color;
           text-transform: uppercase;
-          margin: 25px 0 15px 15px;
+          margin: 25px 0 8px 15px;
         }
 
         .ExtensionIcon {
@@ -180,6 +188,11 @@
 
 }
 
+.AdminLinkButton-description {
+  white-space: normal;
+  padding-left: 5px;
+}
+
 .ExtensionListItem-Dot {
   height: 10px;
   width: 10px;
@@ -193,7 +206,7 @@
 .ExtensionNavButton {
   .Button-label {
     display: inline-block;
-    max-width: calc(100% - 18px);
+    max-width: ~"calc(100% - 18px)";
     overflow: hidden;
     text-overflow: ellipsis;
     vertical-align: middle;
@@ -205,5 +218,6 @@
   background-color: #2ECC40;
 }
 .ExtensionListItem-Dot.disabled {
-  background-color: #FF4136;
+  border: 2px solid #FF4136;
+  box-sizing: border-box;
 }

less/admin/AppearancePage.less

@@ -1,4 +1,5 @@
 .AppearancePage {
+  padding-bottom: 30px;
 
   @media @desktop-up {
     .container {
@@ -14,8 +15,16 @@
 .AppearancePage-colors-input {
   overflow: hidden;
 
+  .Form-group {
+    display: inline-block;
+  }
+
+  .Form-group:last-child {
+    margin-bottom: 24px !important;
+    margin-left: 10px;
+  }
+
   input {
-    width: 49%;
     float: left;
 
     &:first-child {
@@ -23,7 +32,7 @@
     }
   }
 }
-.AppearancePage-colors-input,
+
 .AppearancePage-colors .Checkbox {
   margin-bottom: 15px;
 }

less/admin/BasicsPage.less

@@ -1,4 +1,5 @@
 .BasicsPage {
+  padding-bottom: 30px;
 
   @media @desktop-up {
     .container {
@@ -7,26 +8,27 @@
     }
   }
 
-  fieldset {
+  .Form-group {
     margin-bottom: 20px;
+  }
 
-    > ul {
-      list-style: none;
-      margin: 0;
-      padding: 0;
-    }
+  ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
   }
 }
 
 .BasicsPage-welcomeBanner-input {
-  :first-child {
+  input {
     margin-bottom: 1px;
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
     font-weight: bold;
   }
-  :last-child {
+  textarea {
     border-top-right-radius: 0;
     border-top-left-radius: 0;
+    margin-bottom: 10px;
   }
 }

less/admin/DashboardPage.less

@@ -2,6 +2,7 @@
   background: @body-bg;
   color: @control-color;
   min-height: 100vh;
+  padding-bottom: 30px;
 }
 
 .Widget {
@@ -10,17 +11,21 @@
   border-radius: @border-radius;
   padding: 20px;
   margin-bottom: 20px;
+
+  .Button {
+    .Button--color(@control-color, @body-bg)
+  }
 }
 
 .StatusWidget {
   color: @muted-color;
 
-  > ul {
+  >ul {
     margin: 0;
     padding: 0;
     list-style-type: none;
 
-    > li {
+    >li {
       display: inline-block;
       margin-right: 30px;
       vertical-align: middle;
@@ -31,6 +36,7 @@
         overflow: hidden;
         text-overflow: ellipsis;
       }
+
       &.item-tools {
         float: right;
         margin-right: 0;

less/admin/ExtensionPage.less

@@ -1,5 +1,4 @@
 .ExtensionPage {
-  min-height: 110vh;
 
   .ExtensionPage-header {
     .ExtensionTitle {
@@ -119,6 +118,11 @@
     }
   }
 
+  .ExtensionPage-settings, .ExtensionPage-permissions {
+    .ExtensionPage-subHeader {
+      margin: 5px 0px;
+    }
+  }
 
   .ExtensionPage-settings {
     margin-top: 20px;
@@ -132,17 +136,18 @@
   .ExtensionPage-subHeader {
     color: @muted-color;
     font-weight: normal;
-    text-align: center;
   }
 
 
   .ExtensionPage-permissions {
 
-    @media @phone {
-      > .container {
-        overflow-x: scroll;
-        padding-bottom: 20px;
-      }
+    .PermissionGrid-removeScope {
+      display: none;
+    }
+
+    > .container {
+      overflow-x: auto;
+      padding-bottom: 25vh;
     }
 
     .ExtensionPage-permissions-header {

less/admin/ExtensionWidget.less

@@ -4,80 +4,78 @@
 }
 
 .ExtensionsWidget-list {
-  > .container {
-    padding: 0;
-    background-color: @body-bg;
+  padding: 0;
+  background-color: @body-bg;
 
-    .ExtensionList-Category {
-      background: @control-bg;
-      padding: 20px 0 20px 20px;
-      margin-bottom: 20px;
-      border-radius: @border-radius;
+  .ExtensionGroup {
+    margin-bottom: 20px;
 
-      .ExtensionList-Label {
-        margin-top: 0;
-        color: @muted-color;
-      }
-    }
-
-    .ExtensionGroup {
-      margin-bottom: 20px;
-
-      h3 {
-        color: @muted-color;
-        text-transform: uppercase;
-        font-size: 12px;
-        margin: 0 0 10px;
-      }
-    }
-
-    .ExtensionList {
-      padding: 0;
-      list-style: none;
-      display: grid;
-      grid-gap: 10px;
-      grid-template-columns: repeat(auto-fit, 90px);
-      margin-bottom: 0;
-
-      > li {
-        text-align: left;
-        position: relative;
-        display: block;
-      }
-    }
-  }
-
-  .ExtensionListItem.disabled {
-    .ExtensionListItem-title {
-      opacity: 0.5;
+    h3 {
       color: @muted-color;
-    }
-
-    .ExtensionListItem-icon {
-      opacity: 0.5;
+      text-transform: uppercase;
+      font-size: 12px;
+      margin: 0 0 10px;
     }
   }
 
-  .ExtensionListItem {
-    transition: .15s ease-in-out;
+  .ExtensionList {
+    padding: 0;
+    list-style: none;
+    display: grid;
+    grid-gap: 10px;
+    grid-template-columns: repeat(auto-fit, 90px);
+    margin-bottom: 0;
 
-    &:hover {
-      transform: scale(1.05);
-    }
-
-    .ExtensionListItem-title {
+    > li {
+      text-align: left;
+      position: relative;
       display: block;
-      text-align: center;
-      margin-top: 5px;
-      color: @text-color;
-    }
-
-    a:hover {
-      text-decoration: none;
     }
   }
 }
 
+.ExtensionList-Category {
+  background: @control-bg;
+  padding: 20px 0 20px 20px;
+  margin-bottom: 20px;
+  border-radius: @border-radius;
+}
+
+.ExtensionList-Label {
+  margin-top: 0;
+  color: @muted-color;
+}
+
+.ExtensionListItem.disabled {
+  .ExtensionListItem-title {
+    opacity: 0.5;
+    color: @muted-color;
+  }
+
+  .ExtensionListItem-icon {
+    opacity: 0.5;
+  }
+}
+
+.ExtensionListItem {
+  transition: .15s ease-in-out;
+
+  &:hover {
+    transform: scale(1.05);
+  }
+
+  a:hover {
+    text-decoration: none;
+  }
+}
+
+.ExtensionListItem-title {
+  display: block;
+  text-align: center;
+  margin-top: 5px;
+  color: @text-color;
+}
+
 .ExtensionIcon {
   width: 90px;
   height: 90px;

less/admin/MailPage.less

@@ -1,4 +1,5 @@
 .MailPage {
+  padding-bottom: 30px;
 
   @media @desktop-up {
     .container {
@@ -7,11 +8,11 @@
     }
   }
 
-  fieldset, .Alert {
+  button, .Alert {
     margin-bottom: 20px;
   }
 
-  fieldset > ul {
+  ul {
     list-style: none;
     margin: 0;
     padding: 0;

less/admin/PermissionsPage.less

@@ -1,11 +1,9 @@
 .PermissionsPage-groups {
   background: @control-bg;
   border-radius: @border-radius;
-  max-width: calc(~'100% - 60px');
   display: block;
-  margin-left: 30px;
   overflow-x: auto;
-  padding: 8px 0 8px;
+  padding: 10px;
 }
 .Group {
   width: 90px;
@@ -117,7 +115,7 @@
 }
 .PermissionGrid-section {
   td, th {
-    padding-top: 20px;
+    padding-top: 10px;
   }
 }
 .PermissionGrid-child {

less/common/App.less

@@ -231,7 +231,8 @@
     .header-background();
     padding: 8px;
     position: absolute;
-   
+    border-bottom: 0;
+
     .affix & {
       position: fixed;
     }

less/common/FormControl.less

@@ -32,7 +32,7 @@
 
   &[disabled],
   fieldset[disabled] & {
-    cursor: disallowed;
+    cursor: not-allowed;
   }
 
   textarea& {

less/common/mixins/header-background.less

@@ -6,7 +6,6 @@
   right: 0;
   z-index: @zindex-header;
   border-bottom: 1px solid @control-bg;
-  .translate3d(0, 0, 0);
   .transition(~"box-shadow 0.2s, -webkit-transform 0.2s");
 
   @media @phone {

less/forum/Composer.less

@@ -114,9 +114,10 @@
     background: @body-bg;
 
     &:not(.minimized) {
-      position: absolute;
+      position: fixed;
       top: 0;
       height: 350px !important;
+      max-height: 100%;
       padding-top: @header-height-phone;
 
       &:before {
@@ -219,7 +220,6 @@
   .Composer {
     border-radius: @border-radius @border-radius 0 0;
     background: fade(@body-bg, 95%);
-    transform: translateZ(0); // Fix for Chrome bug where a transparent white background is actually gray
     position: relative;
     height: 300px;
     .transition(~"background 0.2s, box-shadow 0.2s");
@@ -293,7 +293,7 @@
     }
   }
   .ComposerBody-editor {
-    .fullScreen & textarea {
+    .fullScreen & .TextEditor-editor {
       font-size: 16px;
     }
   }
@@ -323,7 +323,7 @@
 // ------------------------------------
 // Text Editor
 
-.TextEditor textarea {
+.TextEditor .TextEditor-editor {
   border-radius: 0;
   padding: 0 0 10px;
   border: 0;

less/forum/DiscussionListItem.less

@@ -110,6 +110,11 @@
   }
 }
 
+@media (any-hover: none) { 
+  .DiscussionListItem-controls > .Dropdown-toggle { 
+    display: none;
+  } 
+}
 
 @media @phone {
   .DiscussionListItem-controls {

less/forum/Scrubber.less

@@ -22,6 +22,12 @@
 .Scrubber-before, .Scrubber-after {
   border-left: 1px solid @control-bg;
 }
+.Scrubber-back {
+  position: absolute;
+  left: 12.5px;
+  z-index: 1;
+  color: @muted-color;
+}
 .Scrubber-unread {
   position: absolute;
   border-left: 1px solid lighten(@muted-color, 10%);

locale/core.yml

@@ -0,0 +1,653 @@
+core:
+
+  ##
+  # UNIQUE KEYS - The following keys are used in only one location each.
+  ##
+
+  # Translations in this namespace are used by the admin interface.
+  admin:
+
+    # These translations are used in the Appearance page.
+    appearance:
+      colored_header_label: Colored Header
+      colors_heading: Colors
+      colors_text: "Choose two colors to theme your forum with. The first will be used as a highlight color, while the second will be used to style background elements."
+      custom_footer_heading: Custom Footer
+      custom_footer_text: => core.ref.custom_footer_text
+      custom_header_heading: Custom Header
+      custom_header_text: => core.ref.custom_header_text
+      custom_styles_heading: Custom Styles
+      custom_styles_text: Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's default styles.
+      dark_mode_label: Dark Mode
+      description: "Customize your forum's colors, logos, and other variables."
+      edit_css_button: Edit Custom CSS
+      edit_footer_button: => core.ref.custom_footer_title
+      edit_header_button: => core.ref.custom_header_title
+      enter_hex_message: Please enter a hexadecimal color code.
+      favicon_heading: Favicon
+      favicon_text: Upload an image to be displayed as the forum's shortcut icon.
+      logo_heading: Logo
+      logo_text: Upload an image to be displayed in place of the forum title.
+      title: Appearance
+
+    # These translations are used in the Basics page.
+    basics:
+      all_discussions_label: => core.ref.all_discussions
+      default_language_heading: Default Language
+      description: "Set your forum title, language, and other basic settings."
+      display_name_heading: User Display Name
+      display_name_text: Select the driver that should be used for users' display names. By default, the username is shown.
+      forum_description_heading: Forum Description
+      forum_description_text: Enter a short sentence or two that describes your community. This will appear in the meta tag and show up in search engines.
+      forum_title_heading: Forum Title
+      home_page_heading: Home Page
+      home_page_text: Choose the page which users will first see when they visit your forum.
+      show_language_selector_label: Show language selector
+      slug_driver_heading: "Slug Driver: {model}"
+      slug_driver_text: Select a driver to be used for slugging this model.
+      title: Basics
+      welcome_banner_heading: Welcome Banner
+      welcome_banner_text: Configure the text that displays in the banner on the All Discussions page. Use this to welcome guests to your forum.
+
+    # These translations are used in the Dashboard page.
+    dashboard:
+      clear_cache_button: Clear Cache
+      description: Your forum at a glance.
+      title: Dashboard
+      tools_button: Tools
+
+    # These translations are used in the Edit Custom CSS modal dialog.
+    edit_css:
+      customize_text: "Customize your forum's appearance by adding your own LESS/CSS code to be applied on top of Flarum's <a>default styles</a>."
+      submit_button: => core.ref.save_changes
+      title: Edit Custom CSS
+
+    # These translations are used in the Edit Custom Footer modal dialog.
+    edit_footer:
+      customize_text: => core.ref.custom_footer_text
+      submit_button: => core.ref.save_changes
+      title: => core.ref.custom_footer_title
+
+    # These translations are used in the Edit Group modal dialog.
+    edit_group:
+      color_label: => core.ref.color
+      delete_button: Delete Group
+      delete_confirmation: "Are you sure you want to delete this group? The group members will NOT be deleted."
+      hide_label: Hide on forum
+      icon_label: => core.ref.icon
+      icon_text: => core.ref.icon_text
+      name_label: Name
+      plural_placeholder: Plural (e.g. Mods)
+      singular_placeholder: Singular (e.g. Mod)
+      submit_button: => core.ref.save_changes
+      title: Create Group
+
+    # These translations are used in the Edit Custom Header modal dialog.
+    edit_header:
+      customize_text: => core.ref.custom_header_text
+      submit_button: => core.ref.save_changes
+      title: => core.ref.custom_header_title
+
+    # These translations are used in the email page of the admin interface.
+    email:
+      addresses_heading: Addresses
+      description: "Configure the driver, settings and addresses your forum will use to send email."
+      driver_heading: Choose a Driver
+      driver_label: Driver
+      from_label: Sender
+      mail_encryption_label: Encryption
+      mail_host_label: Host
+      mail_mailgun_domain_label: Domain
+      mail_mailgun_region_label: Region
+      mail_mailgun_secret_label: Secret key
+      mail_password_label: => core.ref.password
+      mail_port_label: Port
+      mail_username_label: => core.ref.username
+      mailgun_heading: Mailgun Settings
+      not_sending_message: Flarum currently does not send emails. This can be due to the selected driver, or errors in its configuration.
+      send_test_mail_button: Send
+      send_test_mail_heading: Send Test Mail
+      send_test_mail_success: "Test mail sent successfully!"
+      send_test_mail_text: "This will send an email using the above configuration to your email, {email}."
+      smtp_heading: SMTP Settings
+      title: => core.ref.email
+
+    # These translations are used on default extension pages.
+    extension:
+      configure_scopes: Configure Scopes
+      confirm_uninstall: Uninstalling will remove all database entries and assets related to the extension. Are you sure you want to continue?
+      disabled: Disabled
+      enable_to_see: Enable the extension to view and change settings.
+      enabled: Enabled
+      info_links:
+        discuss: Discuss
+        documentation: Documentation
+        donate: Donate
+        source: Source
+        support: Support
+        website: Website
+      no_permissions: This extension has no permissions.
+      no_settings: This extension has no settings.
+      open_modal: Open Settings
+      permissions_title: Permissions
+      uninstall_button: Uninstall
+
+    # These translations are used in the secondary header.
+    header:
+      get_help: Get Help
+      log_out_button: => core.ref.log_out
+
+    # These translations are used in the modal dialog displayed when loading extensions.
+    loading:
+      title: Please Wait...
+
+    # These translations are used in the navigation bar.
+    nav:
+      appearance_button: => core.admin.appearance.title
+      appearance_title: => core.admin.appearance.description
+      basics_button: => core.admin.basics.title
+      basics_title: => core.admin.basics.description
+      categories:
+        authentication: Authentication
+        core: Core Configuration
+        discussion: Discussion
+        feature: Features
+        formatting: Formatting
+        language: Languages
+        moderation: Moderation
+        other: Other Extensions
+        theme: Themes
+      dashboard_button: => core.admin.dashboard.title
+      dashboard_title: => core.admin.dashboard.description
+      email_button: => core.ref.email
+      email_title: => core.admin.email.description
+      permissions_button: => core.admin.permissions.title
+      permissions_title: => core.admin.permissions.description
+      search_placeholder: Search Extensions
+
+    # These translations are used in the Permissions page of the admin interface.
+    permissions:
+      allow_post_editing_label: Allow post editing
+      allow_renaming_label: Allow renaming
+      create_heading: Create
+      delete_discussions_forever_label: Delete discussions forever
+      delete_discussions_label: Delete discussions
+      delete_posts_forever_label: Delete posts forever
+      delete_posts_label: Delete posts
+      description: Configure who can see and do what.
+      edit_posts_label: Edit posts
+      edit_users_label: Edit user attributes
+      edit_users_credentials_label: Edit user credentials
+      edit_users_groups_label: Edit user groups
+      global_heading: Global
+      moderate_heading: Moderate
+      new_group_button: New Group
+      participate_heading: Participate
+      post_without_throttle_label: Reply multiple times without waiting
+      read_heading: Read
+      rename_discussions_label: Rename discussions
+      reply_to_discussions_label: Reply to discussions
+      sign_up_label: Sign up
+      start_discussions_label: Start discussions
+      title: Permissions
+      view_discussions_label: View discussions
+      view_hidden_groups_label: View hidden group badges
+      view_last_seen_at_label: Always view user last seen time
+      view_post_ips_label: View post IP addresses
+      view_user_list_label: View user list
+
+    # These translations are used in the dropdown menus on the Permissions page.
+    permissions_controls:
+      allow_indefinitely_button: Indefinitely
+      allow_some_minutes_button: "For {count} minute|For {count} minutes"
+      allow_ten_minutes_button: For 10 minutes
+      allow_until_reply_button: Until next reply
+      everyone_button: Everyone
+      members_button: => core.group.members
+      signup_closed_button: Closed
+      signup_open_button: Open
+
+    # These translations are used generically in setting fields.
+    settings:
+      saved_message: Your changes were saved.
+      submit_button: => core.ref.save_changes
+
+    # These translations are used in image upload buttons.
+    upload_image:
+      remove_button: => core.ref.remove
+      upload_button: Choose an Image...
+
+  # Translations in this namespace are used by the forum user interface.
+  forum:
+
+    # These translations are used in the Change Email modal dialog.
+    change_email:
+      confirm_password_placeholder: => core.ref.confirm_password
+      confirmation_message: => core.ref.confirmation_email_sent
+      dismiss_button: => core.ref.okay
+      incorrect_password_message: The password you entered is incorrect.
+      submit_button: => core.ref.save_changes
+      title: => core.ref.change_email
+
+    # These translations are used in the Change Password modal dialog.
+    change_password:
+      send_button: Send Password Reset Email
+      text: Click the button below and check your email for a link to change your password.
+      title: => core.ref.change_password
+
+    # These translations are used by the composer controls.
+    composer:
+      close_tooltip: Close
+      exit_full_screen_tooltip: Exit Full Screen
+      full_screen_tooltip: Full Screen
+      minimize_tooltip: Minimize
+      preview_tooltip: Preview
+
+    # These translations are used by the composer when starting a discussion.
+    composer_discussion:
+      body_placeholder: Write a Post...
+      discard_confirmation: "You have not posted your discussion. Do you wish to discard it?"
+      submit_button: Post Discussion
+      title: => core.ref.start_a_discussion
+      title_placeholder: Discussion Title
+
+    # These translations are used by the composer when editing a post.
+    composer_edit:
+      discard_confirmation: "You have not saved your changes. Do you wish to discard them?"
+      edited_message: Your edit was made.
+      post_link: "Post #{number} in {discussion}"
+      submit_button: => core.ref.save_changes
+      view_button: => core.ref.view
+
+    # These translations are used by the composer when replying to a discussion.
+    composer_reply:
+      body_placeholder: => core.ref.write_a_reply
+      discard_confirmation: "You have not posted your reply. Do you wish to discard it?"
+      posted_message: Your reply was posted.
+      submit_button: Post Reply
+      view_button: => core.ref.view
+
+    # These translations are used by the discussion control buttons.
+    discussion_controls:
+      cannot_reply_button: Can't Reply
+      cannot_reply_text: You don't have permission to reply to this discussion.
+      delete_button: => core.ref.delete
+      delete_confirmation: "Are you sure you want to delete this discussion?"
+      delete_forever_button: => core.ref.delete_forever
+      log_in_to_reply_button: Log In to Reply
+      rename_button: => core.ref.rename
+      reply_button: => core.ref.reply
+      restore_button: => core.ref.restore
+
+    # These translations are used in the discussion list.
+    discussion_list:
+      empty_text: It looks as though there are no discussions here.
+      load_more_button: => core.ref.load_more
+      mark_as_read_tooltip: Mark as Read
+      replied_text: "{username} replied {ago}"
+      started_text: "{username} started {ago}"
+
+    # These translations are used in the Edit User modal dialog (admin function).
+    edit_user:
+      activate_button: Activate User
+      email_heading: => core.ref.email
+      email_label: => core.ref.email
+      groups_heading: Groups
+      nothing_available: There is nothing available for you to edit at this time.
+      password_heading: => core.ref.password
+      password_label: => core.ref.password
+      set_password_label: Set new password
+      submit_button: => core.ref.save_changes
+      title: Edit User
+      username_heading: => core.ref.username
+      username_label: => core.ref.username
+
+    # These translations are used in the Forgot Password modal dialog.
+    forgot_password:
+      dismiss_button: => core.ref.okay
+      email_placeholder: => core.ref.email
+      email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two.
+      not_found_message: There is no user registered with that email address.
+      submit_button: Recover Password
+      text: Enter your email address and we will send you a link to reset your password.
+      title: Forgot Password
+
+    # These translations are used in the header and session dropdown menu.
+    header:
+      admin_button: Administration
+      back_to_index_tooltip: Back to Discussion List
+      log_in_link: => core.ref.log_in
+      log_out_button: => core.ref.log_out
+      profile_button: Profile
+      search_placeholder: Search Forum
+      settings_button: => core.ref.settings
+      sign_up_link: => core.ref.sign_up
+
+    # These translations are used on the index page, peripheral to the discussion list.
+    index:
+      all_discussions_link: => core.ref.all_discussions
+      cannot_start_discussion_button: Can't Start Discussion
+      mark_all_as_read_confirmation: "Are you sure you want to mark all discussions as read?"
+      mark_all_as_read_tooltip: => core.ref.mark_all_as_read
+      meta_title_text: => core.ref.all_discussions
+      refresh_tooltip: Refresh
+      start_discussion_button: => core.ref.start_a_discussion
+
+    # These translations are used by the sorting control above the discussion list.
+    index_sort:
+      latest_button: Latest
+      newest_button: Newest
+      oldest_button: Oldest
+      relevance_button: Relevance
+      top_button: Top
+
+    # These translations are used in the Log In modal dialog.
+    log_in:
+      forgot_password_link: "Forgot password?"
+      invalid_login_message: Your login details were incorrect.
+      password_placeholder: => core.ref.password
+      remember_me_label: Remember Me
+      sign_up_text: "Don't have an account? <a>Sign Up</a>"
+      submit_button: => core.ref.log_in
+      title: => core.ref.log_in
+      username_or_email_placeholder: Username or Email
+
+    # These translations are used by the Notifications dropdown, a.k.a. "the bell".
+    notifications:
+      discussion_renamed_text: "{username} changed the title"
+      empty_text: No Notifications
+      mark_all_as_read_tooltip: => core.ref.mark_all_as_read
+      mark_as_read_tooltip: Mark as Read
+      title: => core.ref.notifications
+      tooltip: => core.ref.notifications
+
+    # These translations are used by tooltips displayed for individual posts.
+    post:
+      edited_text: Edited
+      edited_tooltip: "{username} edited {ago}"
+      number_tooltip: "Post #{number}"
+
+    # These translations are used by the post control buttons.
+    post_controls:
+      delete_button: => core.ref.delete
+      delete_confirmation: "Are you sure you want to delete this post forever? This action cannot be undone."
+      delete_forever_button: => core.ref.delete_forever
+      edit_button: => core.ref.edit
+      hide_confirmation: "Are you sure you want to delete this post?"
+      restore_button: => core.ref.restore
+
+    # These translations are used in the scrubber to the right of the post stream.
+    post_scrubber:
+      now_link: Now
+      original_post_link: Original Post
+      unread_text: "{count} unread"
+      viewing_text: "{index} of {count} post|{index} of {count} posts"
+
+    # These translations are displayed between posts in the post stream.
+    post_stream:
+      discussion_renamed_old_tooltip: 'The old title was: "{old}"'
+      discussion_renamed_text: "{username} changed the title to {new}."
+      load_more_button: => core.ref.load_more
+      reply_placeholder: => core.ref.write_a_reply
+      time_lapsed_text: "{period} later"
+
+    # These translations are used by the rename discussion modal.
+    rename_discussion:
+      submit_button: => core.ref.rename
+      title: Rename Discussion
+
+    # These translations are used by the search results dropdown list.
+    search:
+      all_discussions_button: 'Search all discussions for "{query}"'
+      discussions_heading: => core.ref.discussions
+      users_heading: => core.ref.users
+
+    # These translations are used in the Settings page.
+    settings:
+      account_heading: Account
+      change_email_button: => core.ref.change_email
+      change_password_button: => core.ref.change_password
+      notifications_heading: => core.ref.notifications
+      notify_by_email_heading: => core.ref.email
+      notify_by_web_heading: Web
+      notify_discussion_renamed_label: Someone renames a discussion I started
+      privacy_disclose_online_label: Allow others to see when I am online
+      privacy_heading: Privacy
+      title: => core.ref.settings
+
+    # These translations are used in the Sign Up modal dialog.
+    sign_up:
+      dismiss_button: => core.ref.okay
+      email_placeholder: => core.ref.email
+      log_in_text: "Already have an account? <a>Log In</a>"
+      password_placeholder: => core.ref.password
+      submit_button: => core.ref.sign_up
+      title: => core.ref.sign_up
+      username_placeholder: => core.ref.username
+      welcome_text: "Welcome, {username}!"
+
+    # These translations are used in the user profile page and profile popup.
+    user:
+      avatar_remove_button: => core.ref.remove
+      avatar_upload_button: Upload
+      avatar_upload_tooltip: Upload a new avatar
+      discussions_link: => core.ref.discussions
+      in_discussion_text: "In {discussion}"
+      joined_date_text: "Joined {ago}"
+      online_text: Online
+      posts_empty_text: It looks like there are no posts here.
+      posts_link: => core.ref.posts
+      posts_load_more_button: => core.ref.load_more
+      settings_link: => core.ref.settings
+
+    # These translations are found on the user profile page (admin function).
+    user_controls:
+      button: Controls
+      delete_button: => core.ref.delete
+      delete_confirmation: "Are you sure you want to delete this user? The user's posts will NOT be deleted."
+      delete_error_message: "Deletion of user <i>{username} ({email})</i> failed"
+      delete_success_message: "User <i>{username} ({email})</i> was deleted"
+      edit_button: => core.ref.edit
+
+    # These translations are used in the alert that is shown when a new user has not confirmed their email address.
+    user_email_confirmation:
+      alert_message: => core.ref.confirmation_email_sent
+      resend_button: Resend Confirmation Email
+      sent_message: Sent
+
+  # Translations in this namespace are used by the forum and admin interfaces.
+  lib:
+
+    # These translations are displayed as tooltips for discussion badges.
+    badge:
+      hidden_tooltip: Hidden
+
+    # These translations are displayed as error messages.
+    error:
+      dependent_extensions_message: "Cannot disable {extension} until the following dependent extensions are disabled: {extensions}"
+      generic_message: "Oops! Something went wrong. Please reload the page and try again."
+      missing_dependencies_message: "Cannot enable {extension} until the following dependencies are enabled: {extensions}"
+      not_found_message: The requested resource was not found.
+      permission_denied_message: You do not have permission to do that.
+      rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds.
+
+    # These translations are used as suffixes when abbreviating numbers.
+    number_suffix:
+      kilo_text: K
+      mega_text: M
+
+    # These translations are used to punctuate a series of items.
+    series:
+      glue_text: ", "
+      three_text: "{first}, {second}, and {third}"
+      two_text: "{first} and {second}"
+
+    # These translations are used to modify usernames.
+    username:
+      deleted_text: "[deleted]"
+
+  # Translations in this namespace are used in views other than Flarum's normal JS client.
+  views:
+
+    # Translations in this namespace are displayed by the basic HTML content loader.
+    content:
+      javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled.
+      load_error_message: Something went wrong while trying to load the full version of this site. Try hard-refreshing this page to fix the error.
+      loading_text: Loading...
+
+    # Translations in this namespace are displayed in the basic HTML discussion view.
+    discussion:
+      next_page_button: => core.ref.next_page
+      previous_page_button: => core.ref.previous_page
+
+    # Translations in this namespace are displayed when Flarum encounters an error.
+    error:
+      csrf_token_mismatch: You have been inactive for too long.
+      csrf_token_mismatch_return_link: Go back, to try again
+      invalid_confirmation_token: This confirmation link has already been used or is invalid.
+      not_authenticated: You do not have permission to access this page. Try again after logging in.
+      not_found: The page you requested could not be found.
+      not_found_return_link: "Return to {forum}"
+      permission_denied: You do not have permission to access this page.
+      unknown: An error occurred while trying to load this page.
+
+    # Translations in this namespace are displayed by the basic HTML discussion index.
+    index:
+      all_discussions_heading: => core.ref.all_discussions
+      next_page_button: => core.ref.next_page
+      previous_page_button: => core.ref.previous_page
+
+    # Translations in this namespace are displayed by the Log Out confirmation interface.
+    log_out:
+      log_out_button: => core.ref.log_out
+      log_out_confirmation: "Are you sure you want to log out of {forum}?"
+      title: => core.ref.log_out
+
+    # Translations in this namespace are displayed by the Reset Password interface.
+    reset_password:
+      confirm_password_label: Confirm New Password
+      new_password_label: New Password
+      submit_button: => core.ref.save_changes
+      title: => core.ref.reset_your_password
+
+  # Translations in this namespace are used in messages output by the API.
+  api:
+    invalid_username_message: "The username may only contain letters, numbers, and dashes."
+
+  # Translations in this namespace are used in emails sent by the forum.
+  email:
+
+    # These translations are used in emails sent when users register new accounts.
+    activate_account:
+      subject: Activate Your New Account
+      body: |
+        Hey {username}!
+
+        Someone (hopefully you!) has signed up to {forum} with this email address.
+
+        If this was you, simply click the following link and your account will be activated:
+        {url}
+
+        If you did not sign up, please ignore this email.
+
+    # These translations are used in emails sent when users change their email address.
+    confirm_email:
+      subject: Confirm Your New Email Address
+      body: |
+        Hey {username}!
+
+        Someone (hopefully you!) has changed their email address on {forum} to this one.
+
+        If this was you, simply click the following link and your email will be confirmed:
+        {url}
+
+        If this was not you, please ignore this email.
+
+    # These translations are used in emails sent when users ask to reset their passwords.
+    reset_password:
+      subject: => core.ref.reset_your_password
+      body: |
+        Hey {username}!
+
+        Someone (hopefully you!) has submitted a forgotten password request for your account on {forum}.
+
+        If this was you, click the following link to reset your password:
+        {url}
+
+        If you do not wish to change your password, just ignore this email and nothing will happen.
+
+    # These translations are used when testing mailing configuration
+    send_test:
+      subject: Flarum Email Test
+      body: |
+        Hey {username}!
+
+        This is a test email to confirm that your Flarum email configuration is working properly.
+
+        If this was you, this email means that your configuration works!
+
+        If this was not you, please ignore this email.
+
+  ##
+  # REUSED TRANSLATIONS - These keys should not be used directly in code!
+  ##
+
+  # Translations in this namespace are referenced by two or more unique keys.
+  ref:
+    all_discussions: All Discussions
+    change_email: Change Email
+    change_password: Change Password
+    color: Color                                 # Referenced by flarum-tags.yml
+    confirm_password: Confirm Password
+    confirmation_email_sent: "We've sent a confirmation email to {email}. If it doesn't arrive soon, check your spam folder."
+    custom_footer_text: Add HTML to be displayed at the very bottom of the page.
+    custom_footer_title: Edit Custom Footer
+    custom_header_text: "Add HTML to be displayed at the very top of the page, above Flarum's own header."
+    custom_header_title: Edit Custom Header
+    delete: Delete
+    delete_forever: Delete Forever
+    discussions: Discussions                     # Referenced by flarum-statistics.yml
+    edit: Edit
+    email: Email
+    icon: Icon
+    icon_text: "Enter the name of any <a>FontAwesome</a> icon class, <em>including</em> the <code>fas fa-</code> prefix."
+    load_more: Load More
+    log_in: Log In
+    log_out: Log Out
+    mark_all_as_read: Mark All as Read
+    next_page: Next Page
+    notifications: Notifications
+    okay: OK                                     # Referenced by flarum-tags.yml
+    password: Password
+    posts: Posts                                 # Referenced by flarum-statistics.yml
+    previous_page: Previous Page
+    remove: Remove
+    rename: Rename
+    reply: Reply                                 # Referenced by flarum-mentions.yml
+    reset_your_password: Reset Your Password
+    restore: Restore
+    save_changes: Save Changes                   # Referenced by flarum-suspend.yml, flarum-tags.yml
+    settings: Settings
+    sign_up: Sign Up
+    some_others: "{count} other|{count} others"  # Referenced by flarum-likes.yml, flarum-mentions.yml
+    start_a_discussion: Start a Discussion
+    username: Username
+    users: Users                                 # Referenced by flarum-statistics.yml
+    view: View
+    write_a_reply: Write a Reply...
+    you: You                                     # Referenced by flarum-likes.yml, flarum-mentions.yml
+
+  ##
+  # GROUP NAMES - These keys are translated at the back end.
+  ##
+
+  # Translations in this namespace are used to translate default group names.
+  group:
+    admin: Admin
+    admins: Admins
+    guest: Guest
+    guests: Guests
+    member: Member
+    members: Members
+    mod: Mod
+    mods: Mods

locale/validation.yml

@@ -0,0 +1,108 @@
+validation:
+  accepted: "The :attribute must be accepted."
+  active_url: "The :attribute is not a valid URL."
+  after: "The :attribute must be a date after :date."
+  after_or_equal: "The :attribute must be a date after or equal to :date."
+  alpha: "The :attribute may only contain letters."
+  alpha_dash: "The :attribute may only contain letters, numbers, dashes and underscores."
+  alpha_num: "The :attribute may only contain letters and numbers."
+  array: "The :attribute must be an array."
+  before: "The :attribute must be a date before :date."
+  before_or_equal: "The :attribute must be a date before or equal to :date."
+  between:
+    numeric: "The :attribute must be between :min and :max."
+    file: "The :attribute must be between :min and :max kilobytes."
+    string: "The :attribute must be between :min and :max characters."
+    array: "The :attribute must have between :min and :max items."
+  boolean: "The :attribute field must be true or false."
+  confirmed: "The :attribute confirmation does not match."
+  date: "The :attribute is not a valid date."
+  date_equals: "The :attribute must be a date equal to :date."
+  date_format: "The :attribute does not match the format :format."
+  different: "The :attribute and :other must be different."
+  digits: "The :attribute must be :digits digits."
+  digits_between: "The :attribute must be between :min and :max digits."
+  dimensions: "The :attribute has invalid image dimensions."
+  distinct: "The :attribute field has a duplicate value."
+  email: "The :attribute must be a valid email address."
+  ends_with: "The :attribute must end with one of the following: :values."
+  exists: "The selected :attribute is invalid."
+  file: "The :attribute must be a file."
+  filled: "The :attribute field must have a value."
+  gt:
+    numeric: "The :attribute must be greater than :value."
+    file: "The :attribute must be greater than :value kilobytes."
+    string: "The :attribute must be greater than :value characters."
+    array: "The :attribute must have more than :value items."
+  gte:
+    numeric: "The :attribute must be greater than or equal :value."
+    file: "The :attribute must be greater than or equal :value kilobytes."
+    string: "The :attribute must be greater than or equal :value characters."
+    array: "The :attribute must have :value items or more."
+  image: "The :attribute must be an image."
+  in: "The selected :attribute is invalid."
+  in_array: "The :attribute field does not exist in :other."
+  integer: "The :attribute must be an integer."
+  ip: "The :attribute must be a valid IP address."
+  ipv4: "The :attribute must be a valid IPv4 address."
+  ipv6: "The :attribute must be a valid IPv6 address."
+  json: "The :attribute must be a valid JSON string."
+  lt:
+    numeric: "The :attribute must be less than :value."
+    file: "The :attribute must be less than :value kilobytes."
+    string: "The :attribute must be less than :value characters."
+    array: "The :attribute must have less than :value items."
+  lte:
+    numeric: "The :attribute must be less than or equal :value."
+    file: "The :attribute must be less than or equal :value kilobytes."
+    string: "The :attribute must be less than or equal :value characters."
+    array: "The :attribute must not have more than :value items."
+  max:
+    numeric: "The :attribute may not be greater than :max."
+    file: "The :attribute may not be greater than :max kilobytes."
+    string: "The :attribute may not be greater than :max characters."
+    array: "The :attribute may not have more than :max items."
+  mimes: "The :attribute must be a file of type: :values."
+  mimetypes: "The :attribute must be a file of type: :values."
+  min:
+    numeric: "The :attribute must be at least :min."
+    file: "The :attribute must be at least :min kilobytes."
+    string: "The :attribute must be at least :min characters."
+    array: "The :attribute must have at least :min items."
+  not_in: "The selected :attribute is invalid."
+  not_regex: "The :attribute format is invalid."
+  numeric: "The :attribute must be a number."
+  password: "The password is incorrect."
+  present: "The :attribute field must be present."
+  regex: "The :attribute format is invalid."
+  required: "The :attribute field is required."
+  required_if: "The :attribute field is required when :other is :value."
+  required_unless: "The :attribute field is required unless :other is in :values."
+  required_with: "The :attribute field is required when :values is present."
+  required_with_all: "The :attribute field is required when :values are present."
+  required_without: "The :attribute field is required when :values is not present."
+  required_without_all: "The :attribute field is required when none of :values are present."
+  same: "The :attribute and :other must match."
+  size:
+    numeric: "The :attribute must be :size."
+    file: "The :attribute must be :size kilobytes."
+    string: "The :attribute must be :size characters."
+    array: "The :attribute must contain :size items."
+  starts_with: "The :attribute must start with one of the following: :values."
+  string: "The :attribute must be a string."
+  timezone: "The :attribute must be a valid zone."
+  unique: "The :attribute has already been taken."
+  uploaded: "The :attribute failed to upload."
+  url: "The :attribute format is invalid."
+  uuid: "The :attribute must be a valid UUID."
+
+  attributes:
+    username: username
+    password: password
+    email: email
+    title: title
+    content: content
+    name_singular: singular name
+    name_plural: plural name
+    tag_count_primary: number of primary tags
+    tag_count_secondary: number of secondary tags

src/Api/ApiServiceProvider.php

@@ -13,7 +13,6 @@ use Flarum\Api\Controller\AbstractSerializeController;
 use Flarum\Api\Serializer\AbstractSerializer;
 use Flarum\Api\Serializer\BasicDiscussionSerializer;
 use Flarum\Api\Serializer\NotificationSerializer;
-use Flarum\Event\ConfigureNotificationTypes;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\ErrorHandling\JsonApiFormatter;
 use Flarum\Foundation\ErrorHandling\Registry;
@@ -42,6 +41,20 @@ class ApiServiceProvider extends AbstractServiceProvider
             return $routes;
         });
 
+        $this->app->singleton('flarum.api.throttlers', function () {
+            return [
+                'bypassThrottlingAttribute' => function ($request) {
+                    if ($request->getAttribute('bypassThrottling')) {
+                        return false;
+                    }
+                }
+            ];
+        });
+
+        $this->app->bind(Middleware\ThrottleApi::class, function ($app) {
+            return new Middleware\ThrottleApi($app->make('flarum.api.throttlers'));
+        });
+
         $this->app->singleton('flarum.api.middleware', function () {
             return [
                 'flarum.api.error_handler',
@@ -53,7 +66,8 @@ class ApiServiceProvider extends AbstractServiceProvider
                 HttpMiddleware\AuthenticateWithHeader::class,
                 HttpMiddleware\SetLocale::class,
                 'flarum.api.route_resolver',
-                HttpMiddleware\CheckCsrfToken::class
+                HttpMiddleware\CheckCsrfToken::class,
+                Middleware\ThrottleApi::class
             ];
         });
 
@@ -96,10 +110,8 @@ class ApiServiceProvider extends AbstractServiceProvider
         $this->setNotificationSerializers();
 
         AbstractSerializeController::setContainer($this->app);
-        AbstractSerializeController::setEventDispatcher($events = $this->app->make('events'));
 
         AbstractSerializer::setContainer($this->app);
-        AbstractSerializer::setEventDispatcher($events);
     }
 
     /**
@@ -107,14 +119,8 @@ class ApiServiceProvider extends AbstractServiceProvider
      */
     protected function setNotificationSerializers()
     {
-        $blueprints = [];
         $serializers = $this->app->make('flarum.api.notification_serializers');
 
-        // Deprecated in beta 15, remove in beta 16
-        $this->app->make('events')->dispatch(
-            new ConfigureNotificationTypes($blueprints, $serializers)
-        );
-
         foreach ($serializers as $type => $serializer) {
             NotificationSerializer::setSubjectSerializer($type, $serializer);
         }

src/Api/Controller/AbstractSerializeController.php

@@ -9,11 +9,8 @@
 
 namespace Flarum\Api\Controller;
 
-use Flarum\Api\Event\WillGetData;
-use Flarum\Api\Event\WillSerializeData;
 use Flarum\Api\JsonApiResponse;
 use Illuminate\Contracts\Container\Container;
-use Illuminate\Contracts\Events\Dispatcher;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -78,9 +75,14 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
     protected static $container;
 
     /**
-     * @var Dispatcher
+     * @var array
      */
-    protected static $events;
+    protected static $beforeDataCallbacks = [];
+
+    /**
+     * @var array
+     */
+    protected static $beforeSerializationCallbacks = [];
 
     /**
      * {@inheritdoc}
@@ -89,15 +91,23 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
     {
         $document = new Document;
 
-        static::$events->dispatch(
-            new WillGetData($this)
-        );
+        foreach (array_reverse(array_merge([static::class], class_parents($this))) as $class) {
+            if (isset(static::$beforeDataCallbacks[$class])) {
+                foreach (static::$beforeDataCallbacks[$class] as $callback) {
+                    $callback($this);
+                }
+            }
+        }
 
         $data = $this->data($request, $document);
 
-        static::$events->dispatch(
-            new WillSerializeData($this, $data, $request, $document)
-        );
+        foreach (array_reverse(array_merge([static::class], class_parents($this))) as $class) {
+            if (isset(static::$beforeSerializationCallbacks[$class])) {
+                foreach (static::$beforeSerializationCallbacks[$class] as $callback) {
+                    $callback($this, $data, $request, $document);
+                }
+            }
+        }
 
         $serializer = static::$container->make($this->serializer);
         $serializer->setRequest($request);
@@ -198,19 +208,103 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
     }
 
     /**
-     * @return Dispatcher
+     * Set the serializer that will serialize data for the endpoint.
+     *
+     * @param string $serializer
      */
-    public static function getEventDispatcher()
+    public function setSerializer(string $serializer)
     {
-        return static::$events;
+        $this->serializer = $serializer;
     }
 
     /**
-     * @param Dispatcher $events
+     * Include the given relationship by default.
+     *
+     * @param string|array $name
      */
-    public static function setEventDispatcher(Dispatcher $events)
+    public function addInclude($name)
     {
-        static::$events = $events;
+        $this->include = array_merge($this->include, (array) $name);
+    }
+
+    /**
+     * Don't include the given relationship by default.
+     *
+     * @param string|array $name
+     */
+    public function removeInclude($name)
+    {
+        $this->include = array_diff($this->include, (array) $name);
+    }
+
+    /**
+     * Make the given relationship available for inclusion.
+     *
+     * @param string|array $name
+     */
+    public function addOptionalInclude($name)
+    {
+        $this->optionalInclude = array_merge($this->optionalInclude, (array) $name);
+    }
+
+    /**
+     * Don't allow the given relationship to be included.
+     *
+     * @param string|array $name
+     */
+    public function removeOptionalInclude($name)
+    {
+        $this->optionalInclude = array_diff($this->optionalInclude, (array) $name);
+    }
+
+    /**
+     * Set the default number of results.
+     *
+     * @param int $limit
+     */
+    public function setLimit(int $limit)
+    {
+        $this->limit = $limit;
+    }
+
+    /**
+     * Set the maximum number of results.
+     *
+     * @param int $max
+     */
+    public function setMaxLimit(int $max)
+    {
+        $this->maxLimit = $max;
+    }
+
+    /**
+     * Allow sorting results by the given field.
+     *
+     * @param string|array $field
+     */
+    public function addSortField($field)
+    {
+        $this->sortFields = array_merge($this->sortFields, (array) $field);
+    }
+
+    /**
+     * Disallow sorting results by the given field.
+     *
+     * @param string|array $field
+     */
+    public function removeSortField($field)
+    {
+        $this->sortFields = array_diff($this->sortFields, (array) $field);
+    }
+
+    /**
+     * Set the default sort order for the results.
+     *
+     * @param array $sort
+     */
+    public function setSort(array $sort)
+    {
+        $this->sort = $sort;
     }
 
     /**
@@ -228,4 +322,30 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
     {
         static::$container = $container;
     }
+
+    /**
+     * @param string $controllerClass
+     * @param callable $callback
+     */
+    public static function addDataPreparationCallback(string $controllerClass, callable $callback)
+    {
+        if (! isset(static::$beforeDataCallbacks[$controllerClass])) {
+            static::$beforeDataCallbacks[$controllerClass] = [];
+        }
+
+        static::$beforeDataCallbacks[$controllerClass][] = $callback;
+    }
+
+    /**
+     * @param string $controllerClass
+     * @param callable $callback
+     */
+    public static function addSerializationPreparationCallback(string $controllerClass, callable $callback)
+    {
+        if (! isset(static::$beforeSerializationCallbacks[$controllerClass])) {
+            static::$beforeSerializationCallbacks[$controllerClass] = [];
+        }
+
+        static::$beforeSerializationCallbacks[$controllerClass][] = $callback;
+    }
 }

src/Api/Controller/CreateDiscussionController.php

@@ -12,7 +12,6 @@ namespace Flarum\Api\Controller;
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Discussion\Command\ReadDiscussion;
 use Flarum\Discussion\Command\StartDiscussion;
-use Flarum\Post\Floodgate;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
@@ -41,19 +40,12 @@ class CreateDiscussionController extends AbstractCreateController
      */
     protected $bus;
 
-    /**
-     * @var Floodgate
-     */
-    protected $floodgate;
-
     /**
      * @param Dispatcher $bus
-     * @param Floodgate $floodgate
      */
-    public function __construct(Dispatcher $bus, Floodgate $floodgate)
+    public function __construct(Dispatcher $bus)
     {
         $this->bus = $bus;
-        $this->floodgate = $floodgate;
     }
 
     /**
@@ -62,11 +54,7 @@ class CreateDiscussionController extends AbstractCreateController
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
-        $ipAddress = Arr::get($request->getServerParams(), 'REMOTE_ADDR', '127.0.0.1');
-
-        if (! $request->getAttribute('bypassFloodgate')) {
-            $this->floodgate->assertNotFlooding($actor);
-        }
+        $ipAddress = $request->getAttribute('ipAddress');
 
         $discussion = $this->bus->dispatch(
             new StartDiscussion($actor, Arr::get($request->getParsedBody(), 'data', []), $ipAddress)

src/Api/Controller/CreatePostController.php

@@ -12,7 +12,6 @@ namespace Flarum\Api\Controller;
 use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Discussion\Command\ReadDiscussion;
 use Flarum\Post\Command\PostReply;
-use Flarum\Post\Floodgate;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
@@ -40,19 +39,12 @@ class CreatePostController extends AbstractCreateController
      */
     protected $bus;
 
-    /**
-     * @var \Flarum\Post\Floodgate
-     */
-    protected $floodgate;
-
     /**
      * @param Dispatcher $bus
-     * @param \Flarum\Post\Floodgate $floodgate
      */
-    public function __construct(Dispatcher $bus, Floodgate $floodgate)
+    public function __construct(Dispatcher $bus)
     {
         $this->bus = $bus;
-        $this->floodgate = $floodgate;
     }
 
     /**
@@ -63,11 +55,7 @@ class CreatePostController extends AbstractCreateController
         $actor = $request->getAttribute('actor');
         $data = Arr::get($request->getParsedBody(), 'data', []);
         $discussionId = Arr::get($data, 'relationships.discussion.data.id');
-        $ipAddress = Arr::get($request->getServerParams(), 'REMOTE_ADDR', '127.0.0.1');
-
-        if (! $request->getAttribute('bypassFloodgate')) {
-            $this->floodgate->assertNotFlooding($actor);
-        }
+        $ipAddress = $request->getAttribute('ipAddress');
 
         $post = $this->bus->dispatch(
             new PostReply($discussionId, $actor, $data, $ipAddress)

src/Api/Controller/ListDiscussionsController.php

@@ -11,10 +11,10 @@ namespace Flarum\Api\Controller;
 
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Discussion\Discussion;
+use Flarum\Discussion\Filter\DiscussionFilterer;
 use Flarum\Discussion\Search\DiscussionSearcher;
 use Flarum\Http\UrlGenerator;
-use Flarum\Search\SearchCriteria;
-use Illuminate\Support\Arr;
+use Flarum\Query\QueryCriteria;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
@@ -43,11 +43,21 @@ class ListDiscussionsController extends AbstractListController
         'lastPost'
     ];
 
+    /**
+     * {@inheritDoc}
+     */
+    public $sort = ['lastPostedAt' => 'desc'];
+
     /**
      * {@inheritdoc}
      */
     public $sortFields = ['lastPostedAt', 'commentCount', 'createdAt'];
 
+    /**
+     * @var DiscussionFilterer
+     */
+    protected $filterer;
+
     /**
      * @var DiscussionSearcher
      */
@@ -59,11 +69,13 @@ class ListDiscussionsController extends AbstractListController
     protected $url;
 
     /**
+     * @param DiscussionFilterer $filterer
      * @param DiscussionSearcher $searcher
      * @param UrlGenerator $url
      */
-    public function __construct(DiscussionSearcher $searcher, UrlGenerator $url)
+    public function __construct(DiscussionFilterer $filterer, DiscussionSearcher $searcher, UrlGenerator $url)
     {
+        $this->filterer = $filterer;
         $this->searcher = $searcher;
         $this->url = $url;
     }
@@ -74,16 +86,19 @@ class ListDiscussionsController extends AbstractListController
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
-        $query = Arr::get($this->extractFilter($request), 'q');
+        $filters = $this->extractFilter($request);
         $sort = $this->extractSort($request);
 
-        $criteria = new SearchCriteria($actor, $query, $sort);
-
         $limit = $this->extractLimit($request);
         $offset = $this->extractOffset($request);
-        $load = array_merge($this->extractInclude($request), ['state']);
+        $include = array_merge($this->extractInclude($request), ['state']);
 
-        $results = $this->searcher->search($criteria, $limit, $offset);
+        $criteria = new QueryCriteria($actor, $filters, $sort);
+        if (array_key_exists('q', $filters)) {
+            $results = $this->searcher->search($criteria, $limit, $offset);
+        } else {
+            $results = $this->filterer->filter($criteria, $limit, $offset);
+        }
 
         $document->addPaginationLinks(
             $this->url->to('api')->route('discussions.index'),
@@ -95,9 +110,9 @@ class ListDiscussionsController extends AbstractListController
 
         Discussion::setStateUser($actor);
 
-        $results = $results->getResults()->load($load);
+        $results = $results->getResults()->load($include);
 
-        if ($relations = array_intersect($load, ['firstPost', 'lastPost'])) {
+        if ($relations = array_intersect($include, ['firstPost', 'lastPost'])) {
             foreach ($results as $discussion) {
                 foreach ($relations as $relation) {
                     if ($discussion->$relation) {

src/Api/Controller/ListPostsController.php

@@ -10,11 +10,11 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Api\Serializer\PostSerializer;
-use Flarum\Event\ConfigurePostsQuery;
+use Flarum\Http\UrlGenerator;
+use Flarum\Post\Filter\PostFilterer;
 use Flarum\Post\PostRepository;
-use Illuminate\Database\Eloquent\Builder;
+use Flarum\Query\QueryCriteria;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
@@ -43,16 +43,30 @@ class ListPostsController extends AbstractListController
     public $sortFields = ['createdAt'];
 
     /**
-     * @var \Flarum\Post\PostRepository
+     * @var PostFilterer
+     */
+    protected $filterer;
+
+    /**
+     * @var PostRepository
      */
     protected $posts;
 
     /**
-     * @param \Flarum\Post\PostRepository $posts
+     * @var UrlGenerator
      */
-    public function __construct(PostRepository $posts)
+    protected $url;
+
+    /**
+     * @param PostFilterer $filterer
+     * @param PostRepository $posts
+     * @param UrlGenerator $url
+     */
+    public function __construct(PostFilterer $filterer, PostRepository $posts, UrlGenerator $url)
     {
+        $this->filterer = $filterer;
         $this->posts = $posts;
+        $this->url = $url;
     }
 
     /**
@@ -61,18 +75,25 @@ class ListPostsController extends AbstractListController
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
-        $filter = $this->extractFilter($request);
+
+        $filters = $this->extractFilter($request);
+        $sort = $this->extractSort($request);
+
+        $limit = $this->extractLimit($request);
+        $offset = $this->extractOffset($request);
         $include = $this->extractInclude($request);
 
-        if ($postIds = Arr::get($filter, 'id')) {
-            $postIds = explode(',', $postIds);
-        } else {
-            $postIds = $this->getPostIds($request);
-        }
+        $results = $this->filterer->filter(new QueryCriteria($actor, $filters, $sort), $limit, $offset);
 
-        $posts = $this->posts->findByIds($postIds, $actor);
+        $document->addPaginationLinks(
+            $this->url->to('api')->route('posts.index'),
+            $request->getQueryParams(),
+            $offset,
+            $limit,
+            $results->areMoreResults() ? null : 0
+        );
 
-        return $posts->load($include);
+        return $results->getResults()->load($include);
     }
 
     /**
@@ -100,55 +121,4 @@ class ListPostsController extends AbstractListController
 
         return parent::extractOffset($request);
     }
-
-    /**
-     * @param ServerRequestInterface $request
-     * @return array
-     * @throws InvalidParameterException
-     */
-    private function getPostIds(ServerRequestInterface $request)
-    {
-        $actor = $request->getAttribute('actor');
-        $filter = $this->extractFilter($request);
-        $sort = $this->extractSort($request);
-        $limit = $this->extractLimit($request);
-        $offset = $this->extractOffset($request);
-
-        $query = $this->posts->query()->whereVisibleTo($actor);
-
-        $this->applyFilters($query, $filter);
-
-        $query->skip($offset)->take($limit);
-
-        foreach ((array) $sort as $field => $order) {
-            $query->orderBy(Str::snake($field), $order);
-        }
-
-        return $query->pluck('id')->all();
-    }
-
-    /**
-     * @param Builder $query
-     * @param array $filter
-     */
-    private function applyFilters(Builder $query, array $filter)
-    {
-        if ($discussionId = Arr::get($filter, 'discussion')) {
-            $query->where('discussion_id', $discussionId);
-        }
-
-        if ($number = Arr::get($filter, 'number')) {
-            $query->where('number', $number);
-        }
-
-        if ($userId = Arr::get($filter, 'user')) {
-            $query->where('user_id', $userId);
-        }
-
-        if ($type = Arr::get($filter, 'type')) {
-            $query->where('type', $type);
-        }
-
-        event(new ConfigurePostsQuery($query, $filter));
-    }
 }

src/Api/Controller/ListUsersController.php

@@ -11,9 +11,9 @@ namespace Flarum\Api\Controller;
 
 use Flarum\Api\Serializer\UserSerializer;
 use Flarum\Http\UrlGenerator;
-use Flarum\Search\SearchCriteria;
+use Flarum\Query\QueryCriteria;
+use Flarum\User\Filter\UserFilterer;
 use Flarum\User\Search\UserSearcher;
-use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
@@ -40,6 +40,11 @@ class ListUsersController extends AbstractListController
         'joinedAt'
     ];
 
+    /**
+     * @var UserFilterer
+     */
+    protected $filterer;
+
     /**
      * @var UserSearcher
      */
@@ -51,11 +56,13 @@ class ListUsersController extends AbstractListController
     protected $url;
 
     /**
+     * @param UserFilterer $filterer
      * @param UserSearcher $searcher
      * @param UrlGenerator $url
      */
-    public function __construct(UserSearcher $searcher, UrlGenerator $url)
+    public function __construct(UserFilterer $filterer, UserSearcher $searcher, UrlGenerator $url)
     {
+        $this->filterer = $filterer;
         $this->searcher = $searcher;
         $this->url = $url;
     }
@@ -69,16 +76,26 @@ class ListUsersController extends AbstractListController
 
         $actor->assertCan('viewUserList');
 
-        $query = Arr::get($this->extractFilter($request), 'q');
-        $sort = $this->extractSort($request);
+        if (! $actor->hasPermission('user.viewLastSeenAt')) {
+            // If a user cannot see everyone's last online date, we prevent them from sorting by it
+            // Otherwise this sort field would defeat the privacy setting discloseOnline
+            // We use remove instead of add so that extensions can still completely disable the sort using the extender
+            $this->removeSortField('lastSeenAt');
+        }
 
-        $criteria = new SearchCriteria($actor, $query, $sort);
+        $filters = $this->extractFilter($request);
+        $sort = $this->extractSort($request);
 
         $limit = $this->extractLimit($request);
         $offset = $this->extractOffset($request);
-        $load = $this->extractInclude($request);
+        $include = $this->extractInclude($request);
 
-        $results = $this->searcher->search($criteria, $limit, $offset, $load);
+        $criteria = new QueryCriteria($actor, $filters, $sort);
+        if (array_key_exists('q', $filters)) {
+            $results = $this->searcher->search($criteria, $limit, $offset);
+        } else {
+            $results = $this->filterer->filter($criteria, $limit, $offset);
+        }
 
         $document->addPaginationLinks(
             $this->url->to('api')->route('users.index'),
@@ -88,6 +105,6 @@ class ListUsersController extends AbstractListController
             $results->areMoreResults() ? null : 0
         );
 
-        return $results->getResults();
+        return $results->getResults()->load($include);
     }
 }

src/Api/Controller/ShowDiscussionController.php

@@ -32,16 +32,16 @@ class ShowDiscussionController extends AbstractShowController
      */
     protected $posts;
 
-    /**
-     * {@inheritdoc}
-     */
-    public $serializer = DiscussionSerializer::class;
-
     /**
      * @var SlugManager
      */
     protected $slugManager;
 
+    /**
+     * {@inheritdoc}
+     */
+    public $serializer = DiscussionSerializer::class;
+
     /**
      * {@inheritdoc}
      */
@@ -67,12 +67,13 @@ class ShowDiscussionController extends AbstractShowController
     /**
      * @param \Flarum\Discussion\DiscussionRepository $discussions
      * @param \Flarum\Post\PostRepository $posts
+     * @param \Flarum\Http\SlugManager $slugManager
      */
-    public function __construct(SlugManager $slugManager, DiscussionRepository $discussions, PostRepository $posts)
+    public function __construct(DiscussionRepository $discussions, PostRepository $posts, SlugManager $slugManager)
     {
-        $this->slugManager = $slugManager;
         $this->discussions = $discussions;
         $this->posts = $posts;
+        $this->slugManager = $slugManager;
     }
 
     /**

src/Api/Controller/UploadFaviconController.php

@@ -9,69 +9,36 @@
 
 namespace Flarum\Api\Controller;
 
-use Flarum\Settings\SettingsRepositoryInterface;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
+use Intervention\Image\Image;
 use Intervention\Image\ImageManager;
-use League\Flysystem\FilesystemInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Tobscure\JsonApi\Document;
+use Psr\Http\Message\UploadedFileInterface;
 
-class UploadFaviconController extends ShowForumController
+class UploadFaviconController extends UploadImageController
 {
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
+    protected $filePathSettingKey = 'favicon_path';
 
-    /**
-     * @var FilesystemInterface
-     */
-    protected $uploadDir;
-
-    /**
-     * @param SettingsRepositoryInterface $settings
-     * @param FilesystemInterface $uploadDir
-     */
-    public function __construct(SettingsRepositoryInterface $settings, FilesystemInterface $uploadDir)
-    {
-        $this->settings = $settings;
-        $this->uploadDir = $uploadDir;
-    }
+    protected $filenamePrefix = 'favicon';
 
     /**
      * {@inheritdoc}
      */
-    public function data(ServerRequestInterface $request, Document $document)
+    protected function makeImage(UploadedFileInterface $file): Image
     {
-        $request->getAttribute('actor')->assertAdmin();
+        $this->fileExtension = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION);
 
-        $file = Arr::get($request->getUploadedFiles(), 'favicon');
-        $extension = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION);
-
-        if ($extension === 'ico') {
-            $image = $file->getStream();
+        if ($this->fileExtension === 'ico') {
+            $encodedImage = $file->getStream();
         } else {
-            $manager = new ImageManager;
+            $manager = new ImageManager();
 
-            $image = $manager->make($file->getStream())->resize(64, 64, function ($constraint) {
+            $encodedImage = $manager->make($file->getStream())->resize(64, 64, function ($constraint) {
                 $constraint->aspectRatio();
                 $constraint->upsize();
             })->encode('png');
 
-            $extension = 'png';
+            $this->fileExtension = 'png';
         }
 
-        if (($path = $this->settings->get('favicon_path')) && $this->uploadDir->has($path)) {
-            $this->uploadDir->delete($path);
-        }
-
-        $uploadName = 'favicon-'.Str::lower(Str::random(8)).'.'.$extension;
-
-        $this->uploadDir->write($uploadName, $image);
-
-        $this->settings->set('favicon_path', $uploadName);
-
-        return parent::data($request, $document);
+        return $encodedImage;
     }
 }

src/Api/Controller/UploadImageController.php

@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Api\Controller;
+
+use Flarum\Settings\SettingsRepositoryInterface;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Intervention\Image\Image;
+use League\Flysystem\FilesystemInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Tobscure\JsonApi\Document;
+
+abstract class UploadImageController extends ShowForumController
+{
+    /**
+     * @var SettingsRepositoryInterface
+     */
+    protected $settings;
+
+    /**
+     * @var FilesystemInterface
+     */
+    protected $uploadDir;
+
+    /**
+     * @var string
+     */
+    protected $fileExtension = 'png';
+
+    /**
+     * @var string
+     */
+    protected $filePathSettingKey = '';
+
+    /**
+     * @var string
+     */
+    protected $filenamePrefix = '';
+
+    /**
+     * @param SettingsRepositoryInterface $settings
+     * @param FilesystemInterface $uploadDir
+     */
+    public function __construct(SettingsRepositoryInterface $settings, FilesystemInterface $uploadDir)
+    {
+        $this->settings = $settings;
+        $this->uploadDir = $uploadDir;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function data(ServerRequestInterface $request, Document $document)
+    {
+        $request->getAttribute('actor')->assertAdmin();
+
+        $file = Arr::get($request->getUploadedFiles(), $this->filenamePrefix);
+
+        $encodedImage = $this->makeImage($file);
+
+        if (($path = $this->settings->get($this->filePathSettingKey)) && $this->uploadDir->has($path)) {
+            $this->uploadDir->delete($path);
+        }
+
+        $uploadName = $this->filenamePrefix.'-'.Str::lower(Str::random(8)).'.'.$this->fileExtension;
+
+        $this->uploadDir->write($uploadName, $encodedImage);
+
+        $this->settings->set($this->filePathSettingKey, $uploadName);
+
+        return parent::data($request, $document);
+    }
+
+    /**
+     * @param UploadedFileInterface $file
+     * @return Image
+     */
+    abstract protected function makeImage(UploadedFileInterface $file): Image;
+}

src/Api/Controller/UploadLogoController.php

@@ -9,61 +9,27 @@
 
 namespace Flarum\Api\Controller;
 
-use Flarum\Settings\SettingsRepositoryInterface;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
+use Intervention\Image\Image;
 use Intervention\Image\ImageManager;
-use League\Flysystem\FilesystemInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Tobscure\JsonApi\Document;
+use Psr\Http\Message\UploadedFileInterface;
 
-class UploadLogoController extends ShowForumController
+class UploadLogoController extends UploadImageController
 {
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
+    protected $filePathSettingKey = 'logo_path';
 
-    /**
-     * @var FilesystemInterface
-     */
-    protected $uploadDir;
-
-    /**
-     * @param SettingsRepositoryInterface $settings
-     * @param FilesystemInterface $uploadDir
-     */
-    public function __construct(SettingsRepositoryInterface $settings, FilesystemInterface $uploadDir)
-    {
-        $this->settings = $settings;
-        $this->uploadDir = $uploadDir;
-    }
+    protected $filenamePrefix = 'logo';
 
     /**
      * {@inheritdoc}
      */
-    public function data(ServerRequestInterface $request, Document $document)
+    protected function makeImage(UploadedFileInterface $file): Image
     {
-        $request->getAttribute('actor')->assertAdmin();
-
-        $file = Arr::get($request->getUploadedFiles(), 'logo');
-
-        $manager = new ImageManager;
+        $manager = new ImageManager();
 
         $encodedImage = $manager->make($file->getStream())->heighten(60, function ($constraint) {
             $constraint->upsize();
         })->encode('png');
 
-        if (($path = $this->settings->get('logo_path')) && $this->uploadDir->has($path)) {
-            $this->uploadDir->delete($path);
-        }
-
-        $uploadName = 'logo-'.Str::lower(Str::random(8)).'.png';
-
-        $this->uploadDir->write($uploadName, $encodedImage);
-
-        $this->settings->set('logo_path', $uploadName);
-
-        return parent::data($request, $document);
+        return $encodedImage;
     }
 }

src/Api/Event/Serializing.php

@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Api\Event;
-
-use DateTime;
-use Flarum\Api\Serializer\AbstractSerializer;
-
-/**
- * Prepare API attributes.
- *
- * This event is fired when a serializer is constructing an array of resource
- * attributes for API output.
- */
-class Serializing
-{
-    /**
-     * The class doing the serializing.
-     *
-     * @var AbstractSerializer
-     */
-    public $serializer;
-
-    /**
-     * The model being serialized.
-     *
-     * @var object
-     */
-    public $model;
-
-    /**
-     * The serialized attributes of the resource.
-     *
-     * @var array
-     */
-    public $attributes;
-
-    /**
-     * @var \Flarum\User\User
-     */
-    public $actor;
-
-    /**
-     * @param AbstractSerializer $serializer The class doing the serializing.
-     * @param object|array $model The model being serialized.
-     * @param array $attributes The serialized attributes of the resource.
-     */
-    public function __construct(AbstractSerializer $serializer, $model, array &$attributes)
-    {
-        $this->serializer = $serializer;
-        $this->model = $model;
-        $this->attributes = &$attributes;
-        $this->actor = $serializer->getActor();
-    }
-
-    /**
-     * @param string $serializer
-     * @return bool
-     */
-    public function isSerializer($serializer)
-    {
-        return $this->serializer instanceof $serializer;
-    }
-
-    /**
-     * @param DateTime|null $date
-     * @return string|null
-     */
-    public function formatDate(DateTime $date = null)
-    {
-        if ($date) {
-            return $date->format(DateTime::RFC3339);
-        }
-    }
-}

src/Api/Event/WillGetData.php

@@ -1,138 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Api\Event;
-
-use Flarum\Api\Controller\AbstractSerializeController;
-use Illuminate\Support\Arr;
-
-class WillGetData
-{
-    /**
-     * @var AbstractSerializeController
-     */
-    public $controller;
-
-    /**
-     * @param AbstractSerializeController $controller
-     */
-    public function __construct(AbstractSerializeController $controller)
-    {
-        $this->controller = $controller;
-    }
-
-    /**
-     * @param string $controller
-     * @return bool
-     */
-    public function isController($controller)
-    {
-        return $this->controller instanceof $controller;
-    }
-
-    /**
-     * Set the serializer that will serialize data for the endpoint.
-     *
-     * @param string $serializer
-     */
-    public function setSerializer($serializer)
-    {
-        $this->controller->serializer = $serializer;
-    }
-
-    /**
-     * Include the given relationship by default.
-     *
-     * @param string|array $name
-     */
-    public function addInclude($name)
-    {
-        $this->controller->include = array_merge($this->controller->include, (array) $name);
-    }
-
-    /**
-     * Don't include the given relationship by default.
-     *
-     * @param string $name
-     */
-    public function removeInclude($name)
-    {
-        Arr::forget($this->controller->include, $name);
-    }
-
-    /**
-     * Make the given relationship available for inclusion.
-     *
-     * @param string $name
-     */
-    public function addOptionalInclude($name)
-    {
-        $this->controller->optionalInclude[] = $name;
-    }
-
-    /**
-     * Don't allow the given relationship to be included.
-     *
-     * @param string $name
-     */
-    public function removeOptionalInclude($name)
-    {
-        Arr::forget($this->controller->optionalInclude, $name);
-    }
-
-    /**
-     * Set the default number of results.
-     *
-     * @param int $limit
-     */
-    public function setLimit($limit)
-    {
-        $this->controller->limit = $limit;
-    }
-
-    /**
-     * Set the maximum number of results.
-     *
-     * @param int $max
-     */
-    public function setMaxLimit($max)
-    {
-        $this->controller->maxLimit = $max;
-    }
-
-    /**
-     * Allow sorting results by the given field.
-     *
-     * @param string $field
-     */
-    public function addSortField($field)
-    {
-        $this->controller->sortFields[] = $field;
-    }
-
-    /**
-     * Disallow sorting results by the given field.
-     *
-     * @param string $field
-     */
-    public function removeSortField($field)
-    {
-        Arr::forget($this->controller->sortFields, $field);
-    }
-
-    /**
-     * Set the default sort order for the results.
-     *
-     * @param array $sort
-     */
-    public function setSort(array $sort)
-    {
-        $this->controller->sort = $sort;
-    }
-}

src/Api/Event/WillSerializeData.php

@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Api\Event;
-
-use Flarum\Api\Controller\AbstractSerializeController;
-use Psr\Http\Message\ServerRequestInterface;
-use Tobscure\JsonApi\Document;
-
-class WillSerializeData
-{
-    /**
-     * @var AbstractSerializeController
-     */
-    public $controller;
-
-    /**
-     * @var mixed
-     */
-    public $data;
-
-    /**
-     * @var ServerRequestInterface
-     */
-    public $request;
-
-    /**
-     * @var Document
-     */
-    public $document;
-
-    /**
-     * @var \Flarum\User\User
-     */
-    public $actor;
-
-    /**
-     * @param AbstractSerializeController $controller
-     * @param mixed $data
-     * @param ServerRequestInterface $request
-     * @param Document $document
-     */
-    public function __construct(
-        AbstractSerializeController $controller,
-        &$data,
-        ServerRequestInterface $request,
-        Document $document
-    ) {
-        $this->controller = $controller;
-        $this->data = &$data;
-        $this->request = $request;
-        $this->document = $document;
-        $this->actor = $request->getAttribute('actor');
-    }
-
-    /**
-     * @param string $controller
-     * @return bool
-     */
-    public function isController($controller)
-    {
-        return $this->controller instanceof $controller;
-    }
-}

src/Api/Middleware/ThrottleApi.php

@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Api\Middleware;
+
+use Flarum\Post\Exception\FloodingException;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface as Middleware;
+use Psr\Http\Server\RequestHandlerInterface as Handler;
+
+class ThrottleApi implements Middleware
+{
+    protected $throttlers;
+
+    public function __construct(array $throttlers)
+    {
+        $this->throttlers = $throttlers;
+    }
+
+    public function process(Request $request, Handler $handler): Response
+    {
+        if ($this->throttle($request)) {
+            throw new FloodingException;
+        }
+
+        return $handler->handle($request);
+    }
+
+    /**
+     * @return bool
+     */
+    public function throttle(Request $request): bool
+    {
+        $throttle = false;
+        foreach ($this->throttlers as $throttler) {
+            $result = $throttler($request);
+
+            // Explicitly returning false overrides all throttling.
+            // Explicitly returning true marks the request to be throttled.
+            // Anything else is ignored.
+            if ($result === false) {
+                return false;
+            } elseif ($result === true) {
+                $throttle = true;
+            }
+        }
+
+        return $throttle;
+    }
+}

src/Api/Serializer/AbstractSerializer.php

@@ -11,11 +11,9 @@ namespace Flarum\Api\Serializer;
 
 use Closure;
 use DateTime;
-use Flarum\Api\Event\Serializing;
-use Flarum\Event\GetApiRelationship;
 use Flarum\User\User;
 use Illuminate\Contracts\Container\Container;
-use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use LogicException;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -37,16 +35,21 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
      */
     protected $actor;
 
-    /**
-     * @var Dispatcher
-     */
-    protected static $dispatcher;
-
     /**
      * @var Container
      */
     protected static $container;
 
+    /**
+     * @var callable[]
+     */
+    protected static $attributeMutators = [];
+
+    /**
+     * @var array
+     */
+    protected static $customRelations = [];
+
     /**
      * @return Request
      */
@@ -83,9 +86,16 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
 
         $attributes = $this->getDefaultAttributes($model);
 
-        static::$dispatcher->dispatch(
-            new Serializing($this, $model, $attributes)
-        );
+        foreach (array_reverse(array_merge([static::class], class_parents($this))) as $class) {
+            if (isset(static::$attributeMutators[$class])) {
+                foreach (static::$attributeMutators[$class] as $callback) {
+                    $attributes = array_merge(
+                        $attributes,
+                        $callback($this, $model, $attributes)
+                    );
+                }
+            }
+        }
 
         return $attributes;
     }
@@ -102,7 +112,7 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
      * @param DateTime|null $date
      * @return string|null
      */
-    protected function formatDate(DateTime $date = null)
+    public function formatDate(DateTime $date = null)
     {
         if ($date) {
             return $date->format(DateTime::RFC3339);
@@ -130,17 +140,21 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
      */
     protected function getCustomRelationship($model, $name)
     {
-        $relationship = static::$dispatcher->until(
-            new GetApiRelationship($this, $name, $model)
-        );
+        foreach (array_merge([static::class], class_parents($this)) as $class) {
+            $callback = Arr::get(static::$customRelations, "$class.$name");
 
-        if ($relationship && ! ($relationship instanceof Relationship)) {
-            throw new LogicException(
-                'GetApiRelationship handler must return an instance of '.Relationship::class
-            );
+            if (is_callable($callback)) {
+                $relationship = $callback($this, $model);
+
+                if (isset($relationship) && ! ($relationship instanceof Relationship)) {
+                    throw new LogicException(
+                        'GetApiRelationship handler must return an instance of '.Relationship::class
+                    );
+                }
+
+                return $relationship;
+            }
         }
-
-        return $relationship;
     }
 
     /**
@@ -249,22 +263,6 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
         return $serializer;
     }
 
-    /**
-     * @return Dispatcher
-     */
-    public static function getEventDispatcher()
-    {
-        return static::$dispatcher;
-    }
-
-    /**
-     * @param Dispatcher $dispatcher
-     */
-    public static function setEventDispatcher(Dispatcher $dispatcher)
-    {
-        static::$dispatcher = $dispatcher;
-    }
-
     /**
      * @return Container
      */
@@ -280,4 +278,27 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
     {
         static::$container = $container;
     }
+
+    /**
+     * @param string $serializerClass
+     * @param callable $callback
+     */
+    public static function addAttributeMutator(string $serializerClass, callable $callback)
+    {
+        if (! isset(static::$attributeMutators[$serializerClass])) {
+            static::$attributeMutators[$serializerClass] = [];
+        }
+
+        static::$attributeMutators[$serializerClass][] = $callback;
+    }
+
+    /**
+     * @param string $serializerClass
+     * @param string $relation
+     * @param callable $callback
+     */
+    public static function setRelationship(string $serializerClass, string $relation, callable $callback)
+    {
+        static::$customRelations[$serializerClass][$relation] = $callback;
+    }
 }

src/Api/Serializer/UserSerializer.php

@@ -19,14 +19,14 @@ class UserSerializer extends BasicUserSerializer
     {
         $attributes = parent::getDefaultAttributes($user);
 
-        $canEdit = $this->actor->can('edit', $user);
-
         $attributes += [
-            'joinTime'         => $this->formatDate($user->joined_at),
-            'discussionCount'  => (int) $user->discussion_count,
-            'commentCount'     => (int) $user->comment_count,
-            'canEdit'          => $canEdit,
-            'canDelete'        => $this->actor->can('delete', $user),
+            'joinTime'           => $this->formatDate($user->joined_at),
+            'discussionCount'    => (int) $user->discussion_count,
+            'commentCount'       => (int) $user->comment_count,
+            'canEdit'            => $this->actor->can('edit', $user),
+            'canEditCredentials' => $this->actor->can('editCredentials', $user),
+            'canEditGroups'      => $this->actor->can('editGroups', $user),
+            'canDelete'          => $this->actor->can('delete', $user),
         ];
 
         if ($user->getPreference('discloseOnline') || $this->actor->can('viewLastSeenAt', $user)) {
@@ -35,7 +35,7 @@ class UserSerializer extends BasicUserSerializer
             ];
         }
 
-        if ($canEdit || $this->actor->id === $user->id) {
+        if ($attributes['canEditCredentials'] || $this->actor->id === $user->id) {
             $attributes += [
                 'isEmailConfirmed' => (bool) $user->is_email_confirmed,
                 'email'            => $user->email

src/Database/DatabaseServiceProvider.php

@@ -9,7 +9,10 @@
 
 namespace Flarum\Database;
 
+use Flarum\Discussion\Discussion;
+use Flarum\Event\GetModelIsPrivate;
 use Flarum\Foundation\AbstractServiceProvider;
+use Flarum\Post\Post;
 use Illuminate\Database\Capsule\Manager;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\ConnectionResolverInterface;
@@ -58,6 +61,15 @@ class DatabaseServiceProvider extends AbstractServiceProvider
         $this->app->singleton(MigrationRepositoryInterface::class, function ($app) {
             return new DatabaseMigrationRepository($app['flarum.db'], 'migrations');
         });
+
+        $this->app->singleton('flarum.database.model_private_checkers', function () {
+            // Discussion and Post are explicitly listed here to trigger the deprecated
+            // event-based model privacy system. They should be removed in beta 17.
+            return [
+                Discussion::class => [],
+                Post::class => []
+            ];
+        });
     }
 
     /**
@@ -67,5 +79,24 @@ class DatabaseServiceProvider extends AbstractServiceProvider
     {
         AbstractModel::setConnectionResolver($this->app->make(ConnectionResolverInterface::class));
         AbstractModel::setEventDispatcher($this->app->make('events'));
+
+        foreach ($this->app->make('flarum.database.model_private_checkers') as $modelClass => $checkers) {
+            $modelClass::saving(function ($instance) use ($checkers) {
+                foreach ($checkers as $checker) {
+                    if ($checker($instance) === true) {
+                        $instance->is_private = true;
+
+                        return;
+                    }
+                }
+
+                $instance->is_private = false;
+
+                // @deprecated BC layer, remove beta 17
+                $event = new GetModelIsPrivate($instance);
+
+                $instance->is_private = $this->app->make('events')->until($event) === true;
+            });
+        }
     }
 }

src/Database/ScopeVisibilityTrait.php

@@ -9,22 +9,46 @@
 
 namespace Flarum\Database;
 
-use Flarum\Event\ScopeModelVisibility;
 use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Arr;
 
 trait ScopeVisibilityTrait
 {
+    protected static $visibilityScopers = [];
+
+    public static function registerVisibilityScoper($scoper, $ability = null)
+    {
+        $model = static::class;
+
+        if ($ability === null) {
+            $ability = '*';
+        }
+
+        if (! Arr::has(static::$visibilityScopers, "$model.$ability")) {
+            Arr::set(static::$visibilityScopers, "$model.$ability", []);
+        }
+
+        static::$visibilityScopers[$model][$ability][] = $scoper;
+    }
+
     /**
      * Scope a query to only include records that are visible to a user.
      *
      * @param Builder $query
      * @param User $actor
      */
-    public function scopeWhereVisibleTo(Builder $query, User $actor)
+    public function scopeWhereVisibleTo(Builder $query, User $actor, string $ability = 'view')
     {
-        static::$dispatcher->dispatch(
-            new ScopeModelVisibility($query, $actor, 'view')
-        );
+        foreach (array_reverse(array_merge([static::class], class_parents($this))) as $class) {
+            foreach (Arr::get(static::$visibilityScopers, "$class.*", []) as $listener) {
+                $listener($actor, $query, $ability);
+            }
+            foreach (Arr::get(static::$visibilityScopers, "$class.$ability", []) as $listener) {
+                $listener($actor, $query);
+            }
+        }
+
+        return $query;
     }
 }

src/Discussion/Access/DiscussionPolicy.php

@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Discussion\Access;
+
+use Flarum\Discussion\Discussion;
+use Flarum\Settings\SettingsRepositoryInterface;
+use Flarum\User\Access\AbstractPolicy;
+use Flarum\User\User;
+use Illuminate\Contracts\Events\Dispatcher;
+
+class DiscussionPolicy extends AbstractPolicy
+{
+    /**
+     * @var SettingsRepositoryInterface
+     */
+    protected $settings;
+
+    /**
+     * @param SettingsRepositoryInterface $settings
+     * @param Dispatcher $events
+     */
+    public function __construct(SettingsRepositoryInterface $settings)
+    {
+        $this->settings = $settings;
+    }
+
+    /**
+     * @param User $actor
+     * @param string $ability
+     * @return bool|null
+     */
+    public function can(User $actor, $ability)
+    {
+        if ($actor->hasPermission('discussion.'.$ability)) {
+            return $this->allow();
+        }
+    }
+
+    /**
+     * @param User $actor
+     * @param \Flarum\Discussion\Discussion $discussion
+     * @return bool|null
+     */
+    public function rename(User $actor, Discussion $discussion)
+    {
+        if ($discussion->user_id == $actor->id && $actor->can('reply', $discussion)) {
+            $allowRenaming = $this->settings->get('allow_renaming');
+
+            if ($allowRenaming === '-1'
+                || ($allowRenaming === 'reply' && $discussion->participant_count <= 1)
+                || ($discussion->created_at->diffInMinutes() < $allowRenaming)) {
+                return $this->allow();
+            }
+        }
+    }
+
+    /**
+     * @param User $actor
+     * @param \Flarum\Discussion\Discussion $discussion
+     * @return bool|null
+     */
+    public function hide(User $actor, Discussion $discussion)
+    {
+        if ($discussion->user_id == $actor->id
+            && $discussion->participant_count <= 1
+            && (! $discussion->hidden_at || $discussion->hidden_user_id == $actor->id)
+            && $actor->can('reply', $discussion)
+        ) {
+            return $this->allow();
+        }
+    }
+}

src/Discussion/Access/ScopeDiscussionVisibility.php

@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Discussion\Access;
+
+use Flarum\User\User;
+use Illuminate\Database\Eloquent\Builder;
+
+class ScopeDiscussionVisibility
+{
+    /**
+     * @param User $actor
+     * @param Builder $query
+     */
+    public function __invoke(User $actor, $query)
+    {
+        if ($actor->cannot('viewDiscussions')) {
+            $query->whereRaw('FALSE');
+
+            return;
+        }
+
+        // Hide private discussions by default.
+        $query->where(function ($query) use ($actor) {
+            $query->where('discussions.is_private', false)
+            ->orWhere(function ($query) use ($actor) {
+                $query->whereVisibleTo($actor, 'viewPrivate');
+            });
+        });
+
+        // Hide hidden discussions, unless they are authored by the current
+        // user, or the current user has permission to view hidden  discussions.
+        if (! $actor->hasPermission('discussion.hide')) {
+            $query->where(function ($query) use ($actor) {
+                $query->whereNull('discussions.hidden_at')
+                ->orWhere('discussions.user_id', $actor->id)
+                    ->orWhere(function ($query) use ($actor) {
+                        $query->whereVisibleTo($actor, 'hide');
+                    });
+            });
+        }
+
+        // Hide discussions with no comments, unless they are authored by the
+        // current user, or the user is allowed to edit the discussion's posts.
+        if (! $actor->hasPermission('discussion.editPosts')) {
+            $query->where(function ($query) use ($actor) {
+                $query->where('discussions.comment_count', '>', 0)
+                    ->orWhere('discussions.user_id', $actor->id)
+                    ->orWhere(function ($query) use ($actor) {
+                        $query->whereVisibleTo($actor, 'editPosts');
+                    });
+            });
+        }
+    }
+}

src/Discussion/Discussion.php

@@ -17,7 +17,6 @@ use Flarum\Discussion\Event\Hidden;
 use Flarum\Discussion\Event\Renamed;
 use Flarum\Discussion\Event\Restored;
 use Flarum\Discussion\Event\Started;
-use Flarum\Event\GetModelIsPrivate;
 use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Notification\Notification;
 use Flarum\Post\MergeableInterface;
@@ -109,12 +108,6 @@ class Discussion extends AbstractModel
 
             Notification::whereSubject($discussion)->delete();
         });
-
-        static::saving(function (self $discussion) {
-            $event = new GetModelIsPrivate($discussion);
-
-            $discussion->is_private = static::$dispatcher->until($event) === true;
-        });
     }
 
     /**

src/Discussion/DiscussionPolicy.php

@@ -1,142 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Discussion;
-
-use Flarum\Event\ScopeModelVisibility;
-use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AbstractPolicy;
-use Flarum\User\User;
-use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Database\Eloquent\Builder;
-
-class DiscussionPolicy extends AbstractPolicy
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected $model = Discussion::class;
-
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
-
-    /**
-     * @var Dispatcher
-     */
-    protected $events;
-
-    /**
-     * @param SettingsRepositoryInterface $settings
-     * @param Dispatcher $events
-     */
-    public function __construct(SettingsRepositoryInterface $settings, Dispatcher $events)
-    {
-        $this->settings = $settings;
-        $this->events = $events;
-    }
-
-    /**
-     * @param User $actor
-     * @param string $ability
-     * @return bool|null
-     */
-    public function can(User $actor, $ability)
-    {
-        if ($actor->hasPermission('discussion.'.$ability)) {
-            return true;
-        }
-    }
-
-    /**
-     * @param User $actor
-     * @param Builder $query
-     */
-    public function find(User $actor, Builder $query)
-    {
-        if ($actor->cannot('viewDiscussions')) {
-            $query->whereRaw('FALSE');
-
-            return;
-        }
-
-        // Hide private discussions by default.
-        $query->where(function ($query) use ($actor) {
-            $query->where('discussions.is_private', false)
-                ->orWhere(function ($query) use ($actor) {
-                    $this->events->dispatch(
-                        new ScopeModelVisibility($query, $actor, 'viewPrivate')
-                    );
-                });
-        });
-
-        // Hide hidden discussions, unless they are authored by the current
-        // user, or the current user has permission to view hidden discussions.
-        if (! $actor->hasPermission('discussion.hide')) {
-            $query->where(function ($query) use ($actor) {
-                $query->whereNull('discussions.hidden_at')
-                    ->orWhere('discussions.user_id', $actor->id)
-                    ->orWhere(function ($query) use ($actor) {
-                        $this->events->dispatch(
-                            new ScopeModelVisibility($query, $actor, 'hide')
-                        );
-                    });
-            });
-        }
-
-        // Hide discussions with no comments, unless they are authored by the
-        // current user, or the user is allowed to edit the discussion's posts.
-        if (! $actor->hasPermission('discussion.editPosts')) {
-            $query->where(function ($query) use ($actor) {
-                $query->where('discussions.comment_count', '>', 0)
-                    ->orWhere('discussions.user_id', $actor->id)
-                    ->orWhere(function ($query) use ($actor) {
-                        $this->events->dispatch(
-                            new ScopeModelVisibility($query, $actor, 'editPosts')
-                        );
-                    });
-            });
-        }
-    }
-
-    /**
-     * @param User $actor
-     * @param \Flarum\Discussion\Discussion $discussion
-     * @return bool|null
-     */
-    public function rename(User $actor, Discussion $discussion)
-    {
-        if ($discussion->user_id == $actor->id && $actor->can('reply', $discussion)) {
-            $allowRenaming = $this->settings->get('allow_renaming');
-
-            if ($allowRenaming === '-1'
-                || ($allowRenaming === 'reply' && $discussion->participant_count <= 1)
-                || ($discussion->created_at->diffInMinutes() < $allowRenaming)) {
-                return true;
-            }
-        }
-    }
-
-    /**
-     * @param User $actor
-     * @param \Flarum\Discussion\Discussion $discussion
-     * @return bool|null
-     */
-    public function hide(User $actor, Discussion $discussion)
-    {
-        if ($discussion->user_id == $actor->id
-            && $discussion->participant_count <= 1
-            && (! $discussion->hidden_at || $discussion->hidden_user_id == $actor->id)
-            && $actor->can('reply', $discussion)
-        ) {
-            return true;
-        }
-    }
-}