Drop mixin-like attributes and convert to typescript

.gitignore

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

CHANGELOG.md

@@ -1,73 +1,5 @@
 # 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

@@ -76,12 +76,11 @@
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "s9e/text-formatter": "^2.3.6",
-        "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",
+        "symfony/config": "^3.3",
+        "symfony/console": "^4.2",
+        "symfony/event-dispatcher": "^4.3.2",
+        "symfony/translation": "^3.3",
+        "symfony/yaml": "^3.3",
         "tobscure/json-api": "^0.3.0",
         "wikimedia/less.php": "^3.0"
     },

js/package-lock.json

@@ -3382,9 +3382,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
     "interpret": {
       "version": "1.2.0",

js/shims.d.ts

@@ -4,6 +4,7 @@ import Mithril from 'mithril';
 // Other third-party libs
 import * as _dayjs from 'dayjs';
 import * as _$ from 'jquery';
+import * as _ColorThief from 'color-thief-browser';
 
 // Globals from flarum/core
 import Application from './src/common/Application';
@@ -22,6 +23,7 @@ declare global {
   const $: typeof _$;
   const m: Mithril.Static;
   const dayjs: typeof _dayjs;
+  const ColorThief: _ColorThief;
 }
 
 /**

js/src/admin/AdminApplication.js

@@ -1,29 +1,13 @@
 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,
-    language: 10,
-    other: 0,
-  };
-
   history = {
     canGoBack: () => true,
     getPrevious: () => {},
@@ -50,13 +34,7 @@ export default class AdminApplication extends Application {
     m.route.prefix = '#';
     super.mount();
 
-    m.mount(document.getElementById('app-navigation'), {
-      view: () =>
-        Navigation.component({
-          className: 'App-backControl',
-          drawer: true,
-        }),
-    });
+    m.mount(document.getElementById('app-navigation'), { view: () => Navigation.component({ className: 'App-backControl', drawer: true }) });
     m.mount(document.getElementById('header-navigation'), Navigation);
     m.mount(document.getElementById('header-primary'), HeaderPrimary);
     m.mount(document.getElementById('header-secondary'), HeaderSecondary);
@@ -65,7 +43,7 @@ export default class AdminApplication extends Application {
     // 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') {
+    if (enabled && this.extensionSettings[enabled]) {
       this.extensionSettings[enabled]();
       localStorage.removeItem('enabledExtension');
     }

js/src/admin/compat.js

@@ -1,24 +1,19 @@
 import compat from '../common/compat';
 
 import saveSettings from './utils/saveSettings';
-import ExtensionData from './utils/ExtensionData';
-import isExtensionEnabled from './utils/isExtensionEnabled';
-import getCategorizedExtensions from './utils/getCategorizedExtensions';
 import SettingDropdown from './components/SettingDropdown';
 import EditCustomFooterModal from './components/EditCustomFooterModal';
 import SessionDropdown from './components/SessionDropdown';
 import HeaderPrimary from './components/HeaderPrimary';
 import AppearancePage from './components/AppearancePage';
 import StatusWidget from './components/StatusWidget';
-import ExtensionsWidget from './components/ExtensionsWidget';
 import HeaderSecondary from './components/HeaderSecondary';
 import SettingsModal from './components/SettingsModal';
 import DashboardWidget from './components/DashboardWidget';
-import ExtensionPage from './components/ExtensionPage';
-import ExtensionLinkButton from './components/ExtensionLinkButton';
+import AddExtensionModal from './components/AddExtensionModal';
+import ExtensionsPage from './components/ExtensionsPage';
 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';
@@ -28,7 +23,6 @@ import EditCustomHeaderModal from './components/EditCustomHeaderModal';
 import PermissionsPage from './components/PermissionsPage';
 import PermissionDropdown from './components/PermissionDropdown';
 import AdminNav from './components/AdminNav';
-import AdminHeader from './components/AdminHeader';
 import EditCustomCssModal from './components/EditCustomCssModal';
 import EditGroupModal from './components/EditGroupModal';
 import routes from './routes';
@@ -36,24 +30,19 @@ import AdminApplication from './AdminApplication';
 
 export default Object.assign(compat, {
   'utils/saveSettings': saveSettings,
-  'utils/ExtensionData': ExtensionData,
-  'utils/isExtensionEnabled': isExtensionEnabled,
-  'utils/getCategorizedExtensions': getCategorizedExtensions,
   'components/SettingDropdown': SettingDropdown,
   'components/EditCustomFooterModal': EditCustomFooterModal,
   'components/SessionDropdown': SessionDropdown,
   'components/HeaderPrimary': HeaderPrimary,
   'components/AppearancePage': AppearancePage,
   'components/StatusWidget': StatusWidget,
-  'components/ExtensionsWidget': ExtensionsWidget,
   'components/HeaderSecondary': HeaderSecondary,
   'components/SettingsModal': SettingsModal,
   'components/DashboardWidget': DashboardWidget,
-  'components/ExtensionPage': ExtensionPage,
-  'components/ExtensionLinkButton': ExtensionLinkButton,
+  'components/AddExtensionModal': AddExtensionModal,
+  'components/ExtensionsPage': ExtensionsPage,
   'components/AdminLinkButton': AdminLinkButton,
   'components/PermissionGrid': PermissionGrid,
-  'components/ExtensionPermissionGrid': ExtensionPermissionGrid,
   'components/MailPage': MailPage,
   'components/UploadImageButton': UploadImageButton,
   'components/LoadingModal': LoadingModal,
@@ -63,7 +52,6 @@ export default Object.assign(compat, {
   'components/PermissionsPage': PermissionsPage,
   'components/PermissionDropdown': PermissionDropdown,
   'components/AdminNav': AdminNav,
-  'components/AdminHeader': AdminHeader,
   'components/EditCustomCssModal': EditCustomCssModal,
   'components/EditGroupModal': EditGroupModal,
   routes: routes,

js/src/admin/components/AdminHeader.js

@@ -1,19 +0,0 @@
-import Component from '../../common/Component';
-import classList from '../../common/utils/classList';
-import icon from '../../common/helpers/icon';
-
-export default class AdminHeader extends Component {
-  view(vnode) {
-    return [
-      <div className={classList(['AdminHeader', this.attrs.className])}>
-        <div className="container">
-          <h2>
-            {icon(this.attrs.icon)}
-            {vnode.children}
-          </h2>
-          <div className="AdminHeader-description">{this.attrs.description}</div>
-        </div>
-      </div>,
-    ];
-  }
-}

js/src/admin/components/AdminNav.js

@@ -1,150 +1,106 @@
-import ExtensionLinkButton from './ExtensionLinkButton';
+/*
+ * 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 Component from '../../common/Component';
-import LinkButton from '../../common/components/LinkButton';
+import AdminLinkButton from './AdminLinkButton';
 import SelectDropdown from '../../common/components/SelectDropdown';
-import getCategorizedExtensions from '../utils/getCategorizedExtensions';
 import ItemList from '../../common/utils/ItemList';
-import Stream from '../../common/utils/Stream';
 
 export default class AdminNav extends Component {
-  oninit(vnode) {
-    super.oninit(vnode);
-
-    this.query = Stream('');
-  }
-
   view() {
     return (
-      <SelectDropdown className="AdminNav App-titleControl AdminNav-Main" buttonClassName="Button">
-        {this.items().toArray().concat(this.extensionItems().toArray())}
+      <SelectDropdown className="AdminNav App-titleControl" buttonClassName="Button">
+        {this.items().toArray()}
       </SelectDropdown>
     );
   }
 
-  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.
+   * Build an item list of links to show in the admin navigation.
    *
    * @return {ItemList}
    */
   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')}>
-        {app.translator.trans('core.admin.nav.dashboard_button')}
-      </LinkButton>
+      AdminLinkButton.component(
+        {
+          href: app.route('dashboard'),
+          icon: 'far fa-chart-bar',
+          description: app.translator.trans('core.admin.nav.dashboard_text'),
+        },
+        app.translator.trans('core.admin.nav.dashboard_button')
+      )
     );
 
     items.add(
       'basics',
-      <LinkButton href={app.route('basics')} icon="fas fa-pencil-alt" title={app.translator.trans('core.admin.nav.basics_title')}>
-        {app.translator.trans('core.admin.nav.basics_button')}
-      </LinkButton>
+      AdminLinkButton.component(
+        {
+          href: app.route('basics'),
+          icon: 'fas fa-pencil-alt',
+          description: app.translator.trans('core.admin.nav.basics_text'),
+        },
+        app.translator.trans('core.admin.nav.basics_button')
+      )
     );
 
     items.add(
       'mail',
-      <LinkButton href={app.route('mail')} icon="fas fa-envelope" title={app.translator.trans('core.admin.nav.email_title')}>
-        {app.translator.trans('core.admin.nav.email_button')}
-      </LinkButton>
+      AdminLinkButton.component(
+        {
+          href: app.route('mail'),
+          icon: 'fas fa-envelope',
+          description: app.translator.trans('core.admin.nav.email_text'),
+        },
+        app.translator.trans('core.admin.nav.email_button')
+      )
     );
 
     items.add(
       'permissions',
-      <LinkButton href={app.route('permissions')} icon="fas fa-key" title={app.translator.trans('core.admin.nav.permissions_title')}>
-        {app.translator.trans('core.admin.nav.permissions_button')}
-      </LinkButton>
+      AdminLinkButton.component(
+        {
+          href: app.route('permissions'),
+          icon: 'fas fa-key',
+          description: app.translator.trans('core.admin.nav.permissions_text'),
+        },
+        app.translator.trans('core.admin.nav.permissions_button')
+      )
     );
 
     items.add(
       'appearance',
-      <LinkButton href={app.route('appearance')} icon="fas fa-paint-brush" title={app.translator.trans('core.admin.nav.appearance_title')}>
-        {app.translator.trans('core.admin.nav.appearance_button')}
-      </LinkButton>
+      AdminLinkButton.component(
+        {
+          href: app.route('appearance'),
+          icon: 'fas fa-paint-brush',
+          description: app.translator.trans('core.admin.nav.appearance_text'),
+        },
+        app.translator.trans('core.admin.nav.appearance_button')
+      )
     );
 
     items.add(
-      'search',
-      <div className="Search-input">
-        <input
-          className="FormControl SearchBar"
-          bidi={this.query}
-          type="search"
-          placeholder={app.translator.trans('core.admin.nav.search_placeholder')}
-        />
-      </div>
+      'extensions',
+      AdminLinkButton.component(
+        {
+          href: app.route('extensions'),
+          icon: 'fas fa-puzzle-piece',
+          description: app.translator.trans('core.admin.nav.extensions_text'),
+        },
+        app.translator.trans('core.admin.nav.extensions_button')
+      )
     );
 
     return items;
   }
-
-  extensionItems() {
-    const items = new ItemList();
-
-    const categorizedExtensions = getCategorizedExtensions();
-    const categories = app.extensionCategories;
-
-    Object.keys(categorizedExtensions).map((category) => {
-      if (!this.query()) {
-        items.add(
-          `category-${category}`,
-          <h4 className="ExtensionListTitle">{app.translator.trans(`core.admin.nav.categories.${category}`)}</h4>,
-          categories[category]
-        );
-      }
-
-      categorizedExtensions[category].map((extension) => {
-        const query = this.query().toUpperCase();
-        const title = extension.extra['flarum-extension'].title;
-
-        if (!query || title.toUpperCase().includes(query) || extension.description.toUpperCase().includes(query)) {
-          items.add(
-            `extension-${extension.id}`,
-            <ExtensionLinkButton
-              href={app.route('extension', { id: extension.id })}
-              extensionId={extension.id}
-              className="ExtensionNavButton"
-              title={extension.description}
-            >
-              {title}
-            </ExtensionLinkButton>,
-            categories[category]
-          );
-        }
-      });
-    });
-
-    return items;
-  }
 }

js/src/admin/components/AppearancePage.js

@@ -7,7 +7,6 @@ import EditCustomHeaderModal from './EditCustomHeaderModal';
 import EditCustomFooterModal from './EditCustomFooterModal';
 import UploadImageButton from './UploadImageButton';
 import saveSettings from '../utils/saveSettings';
-import AdminHeader from './AdminHeader';
 
 export default class AppearancePage extends Page {
   oninit(vnode) {
@@ -22,13 +21,6 @@ export default class AppearancePage extends Page {
   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">

js/src/admin/components/BasicsPage.js

@@ -7,7 +7,6 @@ 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';
 
 export default class BasicsPage extends Page {
   oninit(vnode) {
@@ -25,6 +24,10 @@ export default class BasicsPage extends Page {
       'welcome_message',
       'display_name_driver',
     ];
+    this.values = {};
+
+    const settings = app.data.settings;
+    this.fields.forEach((key) => (this.values[key] = Stream(settings[key])));
 
     this.localeOptions = {};
     const locales = app.data.locales;
@@ -38,38 +41,14 @@ export default class BasicsPage extends Page {
       this.displayNameOptions[identifier] = identifier;
     }, this);
 
-    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(
@@ -149,30 +128,20 @@ export default class BasicsPage extends Page {
               ]
             )}
 
-            {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>
-                );
-              }
-            })}
+            {Object.keys(this.displayNameOptions).length > 1
+              ? FieldSet.component(
+                  {
+                    label: app.translator.trans('core.admin.basics.display_name_heading'),
+                  },
+                  [
+                    <div className="helpText">{app.translator.trans('core.admin.basics.display_name_text')}</div>,
+                    Select.component({
+                      options: this.displayNameOptions,
+                      bidi: this.values.display_name_driver,
+                    }),
+                  ]
+                )
+              : ''}
 
             {Button.component(
               {

js/src/admin/components/DashboardPage.js

@@ -1,29 +1,16 @@
 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';
 
 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 className="container">{this.availableWidgets()}</div>
       </div>
     );
   }
 
   availableWidgets() {
-    const items = new ItemList();
-
-    items.add('status', <StatusWidget />, 30);
-
-    items.add('extensions', <ExtensionsWidget />, 10);
-
-    return items;
+    return [<StatusWidget />];
   }
 }

js/src/admin/components/ExtensionLinkButton.js

@@ -1,29 +0,0 @@
-import isExtensionEnabled from '../utils/isExtensionEnabled';
-import LinkButton from '../../common/components/LinkButton';
-import icon from '../../common/helpers/icon';
-import ItemList from '../../common/utils/ItemList';
-
-export default class ExtensionLinkButton extends LinkButton {
-  getButtonContent(children) {
-    const content = super.getButtonContent(children);
-    const extension = app.data.extensions[this.attrs.extensionId];
-    const statuses = this.statusItems(extension.id).toArray();
-
-    content.unshift(
-      <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
-        {extension.icon ? icon(extension.icon.name) : ''}
-      </span>
-    );
-    content.push(statuses);
-
-    return content;
-  }
-
-  statusItems(name) {
-    const items = new ItemList();
-
-    items.add('enabled', <span class={'ExtensionListItem-Dot ' + (isExtensionEnabled(name) ? 'enabled' : 'disabled')} />);
-
-    return items;
-  }
-}

js/src/admin/components/ExtensionPage.js

@@ -1,363 +0,0 @@
-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 isExtensionEnabled from '../utils/isExtensionEnabled';
-
-export default class ExtensionPage extends Page {
-  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',
-      documentation: 'fas fa-book',
-      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];
-    }
-  }
-
-  className() {
-    return this.extension.id + '-Page';
-  }
-
-  view() {
-    return (
-      <div className={'ExtensionPage ' + this.className()}>
-        {this.header()}
-        {!this.isEnabled() ? (
-          <div className="container">
-            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.enable_to_see')}</h3>
-          </div>
-        ) : (
-          <div className="ExtensionPage-body">{this.sections().toArray()}</div>
-        )}
-      </div>
-    );
-  }
-
-  header() {
-    return [
-      <div className="ExtensionPage-header">
-        <div className="container">
-          <div className="ExtensionTitle">
-            <span className="ExtensionIcon" style={this.extension.icon}>
-              {this.extension.icon ? icon(this.extension.icon.name) : ''}
-            </span>
-            <div className="ExtensionName">
-              <h2>{this.extension.extra['flarum-extension'].title}</h2>
-            </div>
-            <div className="ExtensionPage-headerTopItems">
-              <ul>{listItems(this.topItems().toArray())}</ul>
-            </div>
-          </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>
-            <aside className="ExtensionInfo">
-              <ul>{listItems(this.infoItems().toArray())}</ul>
-            </aside>
-          </div>
-        </div>
-      </div>,
-    ];
-  }
-
-  sections() {
-    const items = new ItemList();
-
-    items.add('content', this.content());
-
-    items.add('permissions', [
-      <div className="ExtensionPage-permissions">
-        <div className="ExtensionPage-permissions-header">
-          <div className="container">
-            <h2 className="ExtensionTitle">{app.translator.trans('core.admin.extension.permissions_title')}</h2>
-          </div>
-        </div>
-        <div className="container">
-          {app.extensionData.extensionHasPermissions(this.extension.id) ? (
-            ExtensionPermissionGrid.component({ extensionId: this.extension.id })
-          ) : (
-            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_permissions')}</h3>
-          )}
-        </div>
-      </div>,
-    ]);
-
-    return items;
-  }
-
-  content() {
-    const settings = app.extensionData.getSettings(this.extension.id);
-
-    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 ? (
-            <div className="Form">
-              {settings.map(this.buildSettingComponent.bind(this))}
-              <div className="Form-group">{this.submitButton()}</div>
-            </div>
-          ) : (
-            <h3 className="ExtensionPage-subHeader">{app.translator.trans('core.admin.extension.no_settings')}</h3>
-          )}
-        </div>
-      </div>
-    );
-  }
-
-  topItems() {
-    const items = new ItemList();
-
-    items.add('version', <span className="ExtensionVersion">{this.extension.version}</span>);
-
-    if (!this.isEnabled()) {
-      const uninstall = () => {
-        if (confirm(app.translator.trans('core.admin.extension.confirm_uninstall'))) {
-          app
-            .request({
-              url: app.forum.attribute('apiUrl') + '/extensions/' + this.extension.id,
-              method: 'DELETE',
-            })
-            .then(() => window.location.reload());
-
-          app.modal.show(LoadingModal);
-        }
-      };
-
-      items.add(
-        'uninstall',
-        <Button icon="fas fa-trash-alt" className="Button Button--primary" onclick={uninstall.bind(this)}>
-          {app.translator.trans('core.admin.extension.uninstall_button')}
-        </Button>
-      );
-    }
-
-    return items;
-  }
-
-  infoItems() {
-    const items = new ItemList();
-
-    const links = this.extension.links;
-
-    if (links.authors.length) {
-      let authors = [];
-
-      links.authors.map((author) => {
-        authors.push(
-          <Link href={author.link} external={true} target="_blank">
-            {author.name}
-          </Link>
-        );
-      });
-
-      items.add('authors', [icon('fas fa-user'), <span>{punctuateSeries(authors)}</span>]);
-    }
-
-    Object.keys(this.infoFields).map((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>
-        );
-      }
-    });
-
-    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.
-   *
-   * 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'
-   * }
-   *
-   * @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 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();
-
-    this.changingState = true;
-
-    app
-      .request({
-        url: app.forum.attribute('apiUrl') + '/extensions/' + this.extension.id,
-        method: 'PATCH',
-        body: { enabled: !enabled },
-        errorHandler: this.onerror.bind(this),
-      })
-      .then(() => {
-        if (!enabled) localStorage.setItem('enabledExtension', this.extension.id);
-        window.location.reload();
-      });
-
-    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;
-  }
-
-  onerror(e) {
-    // We need to give the modal animation time to start; if we close the modal too early,
-    // it breaks the bootstrap modal library.
-    // TODO: This workaround should be removed when we move away from bootstrap JS for modals.
-    setTimeout(() => {
-      app.modal.close();
-    }, 300); // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.
-
-    if (e.status !== 409) {
-      throw e;
-    }
-
-    const error = e.response.errors[0];
-
-    app.alerts.show(
-      { type: 'error' },
-      app.translator.trans(`core.lib.error.${error.code}_message`, {
-        extension: error.extension,
-        extensions: error.extensions.join(', '),
-      })
-    );
-  }
-}

js/src/admin/components/ExtensionPermissionGrid.js

@@ -1,39 +0,0 @@
-import PermissionGrid from './PermissionGrid';
-import ItemList from '../../common/utils/ItemList';
-
-export default class ExtensionPermissionGrid extends PermissionGrid {
-  oninit(vnode) {
-    super.oninit(vnode);
-
-    this.extensionId = this.attrs.extensionId;
-  }
-
-  permissionItems() {
-    const permissionCategories = super.permissionItems();
-
-    permissionCategories.items = Object.entries(permissionCategories.items)
-      .filter(([category, info]) => info.content.children.length > 0)
-      .reduce((obj, [category, info]) => {
-        obj[category] = info;
-        return obj;
-      }, {});
-
-    return permissionCategories;
-  }
-
-  viewItems() {
-    return app.extensionData.getExtensionPermissions(this.extensionId, 'view') || new ItemList();
-  }
-
-  startItems() {
-    return app.extensionData.getExtensionPermissions(this.extensionId, 'start') || new ItemList();
-  }
-
-  replyItems() {
-    return app.extensionData.getExtensionPermissions(this.extensionId, 'reply') || new ItemList();
-  }
-
-  moderateItems() {
-    return app.extensionData.getExtensionPermissions(this.extensionId, 'moderate') || new ItemList();
-  }
-}

js/src/admin/components/ExtensionsPage.js

@@ -0,0 +1,158 @@
+import Page from '../../common/components/Page';
+import Button from '../../common/components/Button';
+import Dropdown from '../../common/components/Dropdown';
+import AddExtensionModal from './AddExtensionModal';
+import LoadingModal from './LoadingModal';
+import ItemList from '../../common/utils/ItemList';
+import icon from '../../common/helpers/icon';
+
+export default class ExtensionsPage extends Page {
+  view() {
+    return (
+      <div className="ExtensionsPage">
+        <div className="ExtensionsPage-header">
+          <div className="container">
+            {Button.component(
+              {
+                icon: 'fas fa-plus',
+                className: 'Button Button--primary',
+                onclick: () => app.modal.show(AddExtensionModal),
+              },
+              app.translator.trans('core.admin.extensions.add_button')
+            )}
+          </div>
+        </div>
+
+        <div className="ExtensionsPage-list">
+          <div className="container">
+            <ul className="ExtensionList">
+              {Object.keys(app.data.extensions).map((id) => {
+                const extension = app.data.extensions[id];
+                const controls = this.controlItems(extension.id).toArray();
+
+                return (
+                  <li className={'ExtensionListItem ' + (!this.isEnabled(extension.id) ? 'disabled' : '')}>
+                    <div className="ExtensionListItem-content">
+                      <span className="ExtensionListItem-icon ExtensionIcon" style={extension.icon}>
+                        {extension.icon ? icon(extension.icon.name) : ''}
+                      </span>
+                      {controls.length ? (
+                        <Dropdown
+                          className="ExtensionListItem-controls"
+                          buttonClassName="Button Button--icon Button--flat"
+                          menuClassName="Dropdown-menu--right"
+                          icon="fas fa-ellipsis-h"
+                        >
+                          {controls}
+                        </Dropdown>
+                      ) : (
+                        ''
+                      )}
+                      <div className="ExtensionListItem-main">
+                        <label className="ExtensionListItem-title">
+                          <input type="checkbox" checked={this.isEnabled(extension.id)} onclick={this.toggle.bind(this, extension.id)} />{' '}
+                          {extension.extra['flarum-extension'].title}
+                        </label>
+                        <div className="ExtensionListItem-version">{extension.version}</div>
+                        <div className="ExtensionListItem-description">{extension.description}</div>
+                      </div>
+                    </div>
+                  </li>
+                );
+              })}
+            </ul>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  controlItems(name) {
+    const items = new ItemList();
+    const enabled = this.isEnabled(name);
+
+    if (app.extensionSettings[name]) {
+      items.add(
+        'settings',
+        Button.component(
+          {
+            icon: 'fas fa-cog',
+            onclick: app.extensionSettings[name],
+          },
+          app.translator.trans('core.admin.extensions.settings_button')
+        )
+      );
+    }
+
+    if (!enabled) {
+      items.add(
+        'uninstall',
+        Button.component(
+          {
+            icon: 'far fa-trash-alt',
+            onclick: () => {
+              app
+                .request({
+                  url: app.forum.attribute('apiUrl') + '/extensions/' + name,
+                  method: 'DELETE',
+                })
+                .then(() => window.location.reload());
+
+              app.modal.show(LoadingModal);
+            },
+          },
+          app.translator.trans('core.admin.extensions.uninstall_button')
+        )
+      );
+    }
+
+    return items;
+  }
+
+  isEnabled(name) {
+    const enabled = JSON.parse(app.data.settings.extensions_enabled);
+
+    return enabled.indexOf(name) !== -1;
+  }
+
+  toggle(id) {
+    const enabled = this.isEnabled(id);
+
+    app
+      .request({
+        url: app.forum.attribute('apiUrl') + '/extensions/' + id,
+        method: 'PATCH',
+        body: { enabled: !enabled },
+        errorHandler: this.onerror.bind(this),
+      })
+      .then(() => {
+        if (!enabled) localStorage.setItem('enabledExtension', id);
+        window.location.reload();
+      });
+
+    app.modal.show(LoadingModal);
+  }
+
+  onerror(e) {
+    // We need to give the modal animation time to start; if we close the modal too early,
+    // it breaks the bootstrap modal library.
+    // TODO: This workaround should be removed when we move away from bootstrap JS for modals.
+    setTimeout(() => {
+      app.modal.close();
+    }, 300); // Bootstrap's Modal.TRANSITION_DURATION is 300 ms.
+
+    if (e.status !== 409) {
+      throw e;
+    }
+
+    const error = e.response.errors[0];
+
+    app.alerts.show(
+      { type: 'error' },
+      app.translator.trans(`core.lib.error.${error.code}_message`, {
+        extension: error.extension,
+        extensions: error.extensions.join(', '),
+      })
+    );
+  }
+}

js/src/admin/components/ExtensionsWidget.js

@@ -1,46 +0,0 @@
-import DashboardWidget from './DashboardWidget';
-import isExtensionEnabled from '../utils/isExtensionEnabled';
-import getCategorizedExtensions from '../utils/getCategorizedExtensions';
-import Link from '../../common/components/Link';
-import icon from '../../common/helpers/icon';
-
-export default class ExtensionsWidget extends DashboardWidget {
-  className() {
-    return 'ExtensionsWidget';
-  }
-
-  content() {
-    const categorizedExtensions = getCategorizedExtensions();
-    const categories = app.extensionCategories;
-
-    return (
-      <div className="ExtensionsWidget-list">
-        {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>
-    );
-  }
-}

js/src/admin/components/HeaderSecondary.js

@@ -1,5 +1,4 @@
 import Component from '../../common/Component';
-import LinkButton from '../../common/components/LinkButton';
 import SessionDropdown from './SessionDropdown';
 import ItemList from '../../common/utils/ItemList';
 import listItems from '../../common/helpers/listItems';
@@ -20,13 +19,6 @@ export default class HeaderSecondary extends Component {
   items() {
     const items = new ItemList();
 
-    items.add(
-      'help',
-      <LinkButton href="https://docs.flarum.org/troubleshoot.html" icon="fas fa-question-circle" external={true} target="_blank">
-        {app.translator.trans('core.admin.header.get_help')}
-      </LinkButton>
-    );
-
     items.add('session', SessionDropdown.component());
 
     return items;

js/src/admin/components/MailPage.js

@@ -6,8 +6,6 @@ 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';
 
 export default class MailPage extends Page {
   oninit(vnode) {
@@ -67,11 +65,11 @@ export default class MailPage extends Page {
 
     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)}>
+            <h2>{app.translator.trans('core.admin.email.heading')}</h2>
+            <div className="helpText">{app.translator.trans('core.admin.email.text')}</div>
+
             {FieldSet.component(
               {
                 label: app.translator.trans('core.admin.email.addresses_heading'),

js/src/admin/components/PermissionGrid.js

@@ -6,6 +6,12 @@ import ItemList from '../../common/utils/ItemList';
 import icon from '../../common/helpers/icon';
 
 export default class PermissionGrid extends Component {
+  oninit(vnode) {
+    super.oninit(vnode);
+
+    this.permissions = this.permissionItems().toArray();
+  }
+
   view() {
     const scopes = this.scopeItems().toArray();
 
@@ -29,27 +35,25 @@ export default class PermissionGrid extends Component {
             <th>{this.scopeControlItems().toArray()}</th>
           </tr>
         </thead>
-        {this.permissionItems()
-          .toArray()
-          .map((section) => (
-            <tbody>
-              <tr className="PermissionGrid-section">
-                <th>{section.label}</th>
-                {permissionCells(section)}
+        {this.permissions.map((section) => (
+          <tbody>
+            <tr className="PermissionGrid-section">
+              <th>{section.label}</th>
+              {permissionCells(section)}
+              <td />
+            </tr>
+            {section.children.map((child) => (
+              <tr className="PermissionGrid-child">
+                <th>
+                  {icon(child.icon)}
+                  {child.label}
+                </th>
+                {permissionCells(child)}
                 <td />
               </tr>
-              {section.children.map((child) => (
-                <tr className="PermissionGrid-child">
-                  <th>
-                    {icon(child.icon)}
-                    {child.label}
-                  </th>
-                  {permissionCells(child)}
-                  <td />
-                </tr>
-              ))}
-            </tbody>
-          ))}
+            ))}
+          </tbody>
+        ))}
       </table>
     );
   }
@@ -154,8 +158,6 @@ export default class PermissionGrid extends Component {
       permission: 'user.viewLastSeenAt',
     });
 
-    items.merge(app.extensionData.getAllExtensionPermissions('view'));
-
     return items;
   }
 
@@ -196,8 +198,6 @@ export default class PermissionGrid extends Component {
       90
     );
 
-    items.merge(app.extensionData.getAllExtensionPermissions('start'));
-
     return items;
   }
 
@@ -238,8 +238,6 @@ export default class PermissionGrid extends Component {
       90
     );
 
-    items.merge(app.extensionData.getAllExtensionPermissions('reply'));
-
     return items;
   }
 
@@ -336,8 +334,6 @@ export default class PermissionGrid extends Component {
       60
     );
 
-    items.merge(app.extensionData.getAllExtensionPermissions('moderate'));
-
     return items;
   }
 

js/src/admin/components/PermissionsPage.js

@@ -4,15 +4,11 @@ import EditGroupModal from './EditGroupModal';
 import Group from '../../common/models/Group';
 import icon from '../../common/helpers/icon';
 import PermissionGrid from './PermissionGrid';
-import AdminHeader from './AdminHeader';
 
 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

js/src/admin/index.js

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

js/src/admin/resolvers/ExtensionPageResolver.ts

@@ -1,19 +0,0 @@
-import DefaultResolver from '../../common/resolvers/DefaultResolver';
-
-/**
- * A custom route resolver for ExtensionPage that generates handles routes
- * to default extension pages or a page provided by an extension.
- */
-export default class ExtensionPageResolver extends DefaultResolver {
-  static extension: string | null = null;
-
-  onmatch(args, requestedPath, route) {
-    const extensionPage = app.extensionData.getPage(args.id);
-
-    if (extensionPage) {
-      return extensionPage;
-    }
-
-    return super.onmatch(args, requestedPath, route);
-  }
-}

js/src/admin/routes.js

@@ -2,9 +2,8 @@ import DashboardPage from './components/DashboardPage';
 import BasicsPage from './components/BasicsPage';
 import PermissionsPage from './components/PermissionsPage';
 import AppearancePage from './components/AppearancePage';
+import ExtensionsPage from './components/ExtensionsPage';
 import MailPage from './components/MailPage';
-import ExtensionPage from './components/ExtensionPage';
-import ExtensionPageResolver from './resolvers/ExtensionPageResolver';
 
 /**
  * The `routes` initializer defines the forum app's routes.
@@ -17,7 +16,7 @@ export default function (app) {
     basics: { path: '/basics', component: BasicsPage },
     permissions: { path: '/permissions', component: PermissionsPage },
     appearance: { path: '/appearance', component: AppearancePage },
+    extensions: { path: '/extensions', component: ExtensionsPage },
     mail: { path: '/mail', component: MailPage },
-    extension: { path: '/extension/:id', component: ExtensionPage, resolverClass: ExtensionPageResolver },
   };
 }

js/src/admin/utils/ExtensionData.js

@@ -1,177 +0,0 @@
-import ItemList from '../../common/utils/ItemList';
-
-export default class ExtensionData {
-  constructor() {
-    this.data = {};
-    this.currentExtension = null;
-  }
-
-  /**
-   * This function simply takes the extension id
-   *
-   * @example
-   * app.extensionData.load('flarum-tags')
-   *
-   * flarum/flags -> flarum-flags | acme/extension -> acme-extension
-   *
-   * @param extension
-   */
-  for(extension) {
-    this.currentExtension = extension;
-    this.data[extension] = this.data[extension] || {};
-
-    return this;
-  }
-
-  /**
-   * This function registers your settings with Flarum
-   *
-   * It takes either a settings object or a callback.
-   *
-   * @example
-   *
-   * .registerSetting({
-   *   setting: 'flarum-flags.guidelines_url',
-   *   type: 'text', // This will be inputted into the input tag for the setting (text/number/etc)
-   *   label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')
-   * }, 15) // priority is optional (ItemList)
-   *
-   *
-   * @param content
-   * @param priority
-   * @returns {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;
-  }
-
-  /**
-   * This function registers your permission with Flarum
-   *
-   * @example
-   *
-   * .registerPermission('permissions', {
-   *     icon: 'fas fa-flag',
-   *     label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
-   *     permission: 'discussion.viewFlags'
-   * }, 'moderate', 65)
-   *
-   * @param content
-   * @param permissionType
-   * @param priority
-   * @returns {ExtensionData}
-   */
-  registerPermission(content, permissionType = null, priority = 0) {
-    this.data[this.currentExtension].permissions = this.data[this.currentExtension].permissions || {};
-
-    if (!this.data[this.currentExtension].permissions[permissionType]) {
-      this.data[this.currentExtension].permissions[permissionType] = new ItemList();
-    }
-
-    this.data[this.currentExtension].permissions[permissionType].add(content.permission, content, priority);
-
-    return this;
-  }
-
-  /**
-   * Replace the default extension page with a custom component.
-   * This component would typically extend ExtensionPage
-   *
-   * @param component
-   * @returns {ExtensionData}
-   */
-  registerPage(component) {
-    this.data[this.currentExtension].page = component;
-
-    return this;
-  }
-
-  /**
-   * Get an extension's registered settings
-   *
-   * @param extensionId
-   * @returns {boolean|*}
-   */
-  getSettings(extensionId) {
-    if (this.data[extensionId] && this.data[extensionId].settings) {
-      return this.data[extensionId].settings.toArray();
-    }
-
-    return false;
-  }
-
-  /**
-   *
-   * Get an ItemList of all extensions' registered permissions
-   *
-   * @param extension
-   * @param type
-   * @returns {ItemList}
-   */
-  getAllExtensionPermissions(type) {
-    const items = new ItemList();
-
-    Object.keys(this.data).map((extension) => {
-      if (this.extensionHasPermissions(extension) && this.data[extension].permissions[type]) {
-        items.merge(this.data[extension].permissions[type]);
-      }
-    });
-
-    return items;
-  }
-
-  /**
-   * Get a singular extension's registered permissions
-   *
-   * @param extension
-   * @param type
-   * @returns {boolean|*}
-   */
-  getExtensionPermissions(extension, type) {
-    if (this.extensionHasPermissions(extension) && this.data[extension].permissions[type]) {
-      return this.data[extension].permissions[type];
-    }
-
-    return new ItemList();
-  }
-
-  /**
-   * Checks whether a given extension has registered permissions.
-   *
-   * @param extension
-   * @returns {boolean}
-   */
-  extensionHasPermissions(extension) {
-    if (this.data[extension] && this.data[extension].permissions) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Returns an extension's custom page component if it exists.
-   *
-   * @param extension
-   * @returns {boolean|*}
-   */
-  getPage(extension) {
-    if (this.data[extension]) {
-      return this.data[extension].page;
-    }
-
-    return false;
-  }
-}

js/src/admin/utils/getCategorizedExtensions.js

@@ -1,25 +0,0 @@
-export default function getCategorizedExtensions() {
-  let extensions = {};
-
-  Object.keys(app.data.extensions).map((id) => {
-    const extension = app.data.extensions[id];
-    let category = extension.extra['flarum-extension'].category;
-
-    // Wrap languages packs into new system
-    if (extension.extra['flarum-locale']) {
-      category = 'language';
-    }
-
-    if (category in app.extensionCategories) {
-      extensions[category] = extensions[category] || [];
-
-      extensions[category].push(extension);
-    } else {
-      extensions.other = extensions.other || [];
-
-      extensions.other.push(extension);
-    }
-  });
-
-  return extensions;
-}

js/src/admin/utils/isExtensionEnabled.js

@@ -1,5 +0,0 @@
-export default function isExtensionEnabled(name) {
-  const enabled = JSON.parse(app.data.settings.extensions_enabled);
-
-  return enabled.includes(name);
-}

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.forum.attribute('basePath') + '/' ? this.title + ' - ' : '';
+    const pageTitleWithSeparator = this.title && m.route.get() !== '/' ? this.title + ' - ' : '';
     const title = this.forum.attribute('title');
     document.title = count + pageTitleWithSeparator + title;
   }

js/src/common/Component.ts

@@ -1,5 +1,8 @@
 import * as Mithril from 'mithril';
 
+let deprecatedPropsWarned = false;
+let deprecatedInitPropsWarned = false;
+
 export interface ComponentAttrs extends Mithril.Attributes {}
 
 /**
@@ -128,5 +131,38 @@ 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 {}
+  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
 }

js/src/common/Model.ts

@@ -1,3 +1,17 @@
+import Store from './Store';
+import Mithril from 'mithril';
+
+interface ModelData {
+  type?: string;
+  id?: string;
+  attributes?: any;
+  relationships?: any;
+}
+
+interface SaveOptions extends Mithril.RequestOptions<any> {
+  meta?: any;
+}
+
 /**
  * The `Model` class represents a local data resource. It provides methods to
  * persist changes via the API.
@@ -5,55 +19,58 @@
  * @abstract
  */
 export default class Model {
+  /**
+   * The resource object from the API.
+   *
+   * @type {Object}
+   * @public
+   */
+  data: ModelData = {};
+
+  /**
+   * The time at which the model's data was last updated. Watching the value
+   * of this property is a fast way to retain/cache a subtree if data hasn't
+   * changed.
+   *
+   * @type {Date}
+   * @public
+   */
+  freshness: Date = new Date();
+
+  /**
+   * Whether or not the resource exists on the server.
+   *
+   * @type {Boolean}
+   * @public
+   */
+  exists: boolean = false;
+
+  /**
+   * The data store that this resource should be persisted to.
+   *
+   * @type {Store}
+   * @protected
+   */
+  store?: Store = null;
+
   /**
    * @param {Object} data A resource object from the API.
    * @param {Store} store The data store that this model should be persisted to.
    * @public
    */
-  constructor(data = {}, store = null) {
-    /**
-     * The resource object from the API.
-     *
-     * @type {Object}
-     * @public
-     */
+  constructor(data: ModelData = {}, store = null) {
     this.data = data;
-
-    /**
-     * The time at which the model's data was last updated. Watching the value
-     * of this property is a fast way to retain/cache a subtree if data hasn't
-     * changed.
-     *
-     * @type {Date}
-     * @public
-     */
-    this.freshness = new Date();
-
-    /**
-     * Whether or not the resource exists on the server.
-     *
-     * @type {Boolean}
-     * @public
-     */
-    this.exists = false;
-
-    /**
-     * The data store that this resource should be persisted to.
-     *
-     * @type {Store}
-     * @protected
-     */
     this.store = store;
   }
 
   /**
    * Get the model's ID.
    *
-   * @return {Integer}
+   * @return {String}
    * @public
    * @final
    */
-  id() {
+  id(): string | undefined {
     return this.data.id;
   }
 
@@ -121,8 +138,8 @@ export default class Model {
    * @return {Promise}
    * @public
    */
-  save(attributes, options = {}) {
-    const data = {
+  save(attributes, options: SaveOptions = {}) {
+    const data: ModelData = {
       type: this.data.type,
       id: this.data.id,
       attributes,
@@ -152,7 +169,7 @@ export default class Model {
 
     this.pushData(data);
 
-    const request = { data };
+    const request: any = { data };
     if (options.meta) request.meta = options.meta;
 
     return app
@@ -220,11 +237,11 @@ export default class Model {
    * @return {String}
    * @protected
    */
-  apiEndpoint() {
+  apiEndpoint(): string {
     return '/' + this.data.type + (this.exists ? '/' + this.data.id : '');
   }
 
-  copyData() {
+  copyData(): ModelData {
     return JSON.parse(JSON.stringify(this.data));
   }
 
@@ -236,8 +253,8 @@ export default class Model {
    * @return {*}
    * @public
    */
-  static attribute(name, transform) {
-    return function () {
+  static attribute<T>(name: string, transform?: Function) {
+    return function (this: Model): T | null | undefined {
       const value = this.data.attributes && this.data.attributes[name];
 
       return transform ? transform(value) : value;
@@ -254,8 +271,8 @@ export default class Model {
    *     has not been loaded; or the model if it has been loaded.
    * @public
    */
-  static hasOne(name) {
-    return function () {
+  static hasOne<T>(name: string) {
+    return function (this: Model): T | null | false {
       if (this.data.relationships) {
         const relationship = this.data.relationships[name];
 
@@ -278,8 +295,8 @@ export default class Model {
    *     loaded, and undefined for those that have not.
    * @public
    */
-  static hasMany(name) {
-    return function () {
+  static hasMany<T>(name: string) {
+    return function (this: Model): T[] | false {
       if (this.data.relationships) {
         const relationship = this.data.relationships[name];
 
@@ -299,7 +316,7 @@ export default class Model {
    * @return {Date|null}
    * @public
    */
-  static transformDate(value) {
+  static transformDate(value: string): Date | null {
     return value ? new Date(value) : null;
   }
 
@@ -310,7 +327,7 @@ export default class Model {
    * @return {Object}
    * @protected
    */
-  static getIdentifier(model) {
+  static getIdentifier(model: Model) {
     return {
       type: model.data.type,
       id: model.data.id,

js/src/common/compat.js

@@ -19,9 +19,7 @@ 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';
@@ -92,10 +90,8 @@ 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/Button.js

@@ -35,11 +35,6 @@ export default class Button extends Component {
       attrs['aria-label'] = attrs.title;
     }
 
-    // If given a translation object, extract the text.
-    if (typeof attrs.title === 'object') {
-      attrs.title = extractText(attrs.title);
-    }
-
     // If nothing else is provided, we use the textual button content as tooltip
     if (!attrs.title && vnode.children) {
       attrs.title = extractText(vnode.children);

js/src/common/components/Page.js

@@ -29,13 +29,6 @@ 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) {
@@ -48,10 +41,6 @@ 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/components/SelectDropdown.js

@@ -12,9 +12,6 @@ import icon from '../helpers/icon';
 function isActive(vnode) {
   const tag = vnode.tag;
 
-  // Allow non-selectable dividers/headers to be added.
-  if (typeof tag === 'string' && tag !== 'a' && tag !== 'button') return false;
-
   if ('initAttrs' in tag) {
     tag.initAttrs(vnode.attrs);
   }

js/src/common/helpers/fullTime.js

@@ -1,11 +1,11 @@
-import dayjs from 'dayjs';
-import * as Mithril from 'mithril';
-
 /**
  * The `fullTime` helper displays a formatted time string wrapped in a <time>
  * tag.
+ *
+ * @param {Date} time
+ * @return {Object}
  */
-export default function fullTime(time: Date): Mithril.Vnode {
+export default function fullTime(time) {
   const d = dayjs(time);
 
   const datetime = d.format();

js/src/common/helpers/humanTime.js

@@ -1,13 +1,14 @@
-import dayjs from 'dayjs';
-import * as Mithril from 'mithril';
 import humanTimeUtil from '../utils/humanTime';
 
 /**
  * The `humanTime` helper displays a time in a human-friendly time-ago format
  * (e.g. '12 days ago'), wrapped in a <time> tag with other information about
  * the time.
+ *
+ * @param {Date} time
+ * @return {Object}
  */
-export default function humanTime(time: Date): Mithril.Vnode {
+export default function humanTime(time) {
   const d = dayjs(time);
 
   const datetime = d.format();

js/src/common/index.js

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

js/src/common/models/Discussion.tsx

@@ -2,40 +2,40 @@ import Model from '../Model';
 import computed from '../utils/computed';
 import ItemList from '../utils/ItemList';
 import Badge from '../components/Badge';
+import User from './User';
+import Post from './Post';
 
-export default class Discussion extends Model {}
+export default class Discussion extends Model {
+  title = Model.attribute<string>('title');
+  slug = Model.attribute<string>('slug');
 
-Object.assign(Discussion.prototype, {
-  title: Model.attribute('title'),
-  slug: Model.attribute('slug'),
+  createdAt = Model.attribute<Date>('createdAt', Model.transformDate);
+  user = Model.hasOne<User>('user');
+  firstPost = Model.hasOne<Post>('firstPost');
 
-  createdAt: Model.attribute('createdAt', Model.transformDate),
-  user: Model.hasOne('user'),
-  firstPost: Model.hasOne('firstPost'),
+  lastPostedAt = Model.attribute<Date>('lastPostedAt', Model.transformDate);
+  lastPostedUser = Model.hasOne<User>('lastPostedUser');
+  lastPost = Model.hasOne<Post>('lastPost');
+  lastPostNumber = Model.attribute<number>('lastPostNumber');
 
-  lastPostedAt: Model.attribute('lastPostedAt', Model.transformDate),
-  lastPostedUser: Model.hasOne('lastPostedUser'),
-  lastPost: Model.hasOne('lastPost'),
-  lastPostNumber: Model.attribute('lastPostNumber'),
+  commentCount = Model.attribute<number>('commentCount');
+  replyCount = computed<number>('commentCount', (commentCount) => Math.max(0, commentCount - 1));
+  posts = Model.hasMany<Post>('posts');
+  mostRelevantPost = Model.hasOne<Post>('mostRelevantPost');
 
-  commentCount: Model.attribute('commentCount'),
-  replyCount: computed('commentCount', (commentCount) => Math.max(0, commentCount - 1)),
-  posts: Model.hasMany('posts'),
-  mostRelevantPost: Model.hasOne('mostRelevantPost'),
+  lastReadAt = Model.attribute<Date>('lastReadAt', Model.transformDate);
+  lastReadPostNumber = Model.attribute<number>('lastReadPostNumber');
+  isUnread = computed<boolean>('unreadCount', (unreadCount) => !!unreadCount);
+  isRead = computed<boolean>('unreadCount', (unreadCount) => app.session.user && !unreadCount);
 
-  lastReadAt: Model.attribute('lastReadAt', Model.transformDate),
-  lastReadPostNumber: Model.attribute('lastReadPostNumber'),
-  isUnread: computed('unreadCount', (unreadCount) => !!unreadCount),
-  isRead: computed('unreadCount', (unreadCount) => app.session.user && !unreadCount),
+  hiddenAt = Model.attribute<Date>('hiddenAt', Model.transformDate);
+  hiddenUser = Model.hasOne<User>('hiddenUser');
+  isHidden = computed<boolean>('hiddenAt', (hiddenAt) => !!hiddenAt);
 
-  hiddenAt: Model.attribute('hiddenAt', Model.transformDate),
-  hiddenUser: Model.hasOne('hiddenUser'),
-  isHidden: computed('hiddenAt', (hiddenAt) => !!hiddenAt),
-
-  canReply: Model.attribute('canReply'),
-  canRename: Model.attribute('canRename'),
-  canHide: Model.attribute('canHide'),
-  canDelete: Model.attribute('canDelete'),
+  canReply = Model.attribute<boolean>('canReply');
+  canRename = Model.attribute<boolean>('canRename');
+  canHide = Model.attribute<boolean>('canHide');
+  canDelete = Model.attribute<boolean>('canDelete');
 
   /**
    * Remove a post from the discussion's posts relationship.
@@ -55,7 +55,7 @@ Object.assign(Discussion.prototype, {
         }
       });
     }
-  },
+  }
 
   /**
    * Get the estimated number of unread posts in this discussion for the current
@@ -64,7 +64,7 @@ Object.assign(Discussion.prototype, {
    * @return {Integer}
    * @public
    */
-  unreadCount() {
+  unreadCount(): number {
     const user = app.session.user;
 
     if (user && user.markedAllAsReadAt() < this.lastPostedAt()) {
@@ -75,7 +75,7 @@ Object.assign(Discussion.prototype, {
     }
 
     return 0;
-  },
+  }
 
   /**
    * Get the Badge components that apply to this discussion.
@@ -83,7 +83,7 @@ Object.assign(Discussion.prototype, {
    * @return {ItemList}
    * @public
    */
-  badges() {
+  badges(): ItemList {
     const items = new ItemList();
 
     if (this.isHidden()) {
@@ -91,7 +91,7 @@ Object.assign(Discussion.prototype, {
     }
 
     return items;
-  },
+  }
 
   /**
    * Get a list of all of the post IDs in this discussion.
@@ -99,9 +99,9 @@ Object.assign(Discussion.prototype, {
    * @return {Array}
    * @public
    */
-  postIds() {
+  postIds(): string[] {
     const posts = this.data.relationships.posts;
 
     return posts ? posts.data.map((link) => link.id) : [];
-  },
-});
+  }
+}

js/src/common/models/Group.js

@@ -1,17 +0,0 @@
-import Model from '../Model';
-
-class Group extends Model {}
-
-Object.assign(Group.prototype, {
-  nameSingular: Model.attribute('nameSingular'),
-  namePlural: Model.attribute('namePlural'),
-  color: Model.attribute('color'),
-  icon: Model.attribute('icon'),
-  isHidden: Model.attribute('isHidden'),
-});
-
-Group.ADMINISTRATOR_ID = '1';
-Group.GUEST_ID = '2';
-Group.MEMBER_ID = '3';
-
-export default Group;

js/src/common/models/Group.ts

@@ -0,0 +1,13 @@
+import Model from '../Model';
+
+export default class Group extends Model {
+  static ADMINISTRATOR_ID = '1';
+  static GUEST_ID = '2';
+  static MEMBER_ID = '3';
+
+  nameSingular = Model.attribute<string>('nameSingular');
+  namePlural = Model.attribute<string>('namePlural');
+  color = Model.attribute<string>('color');
+  icon = Model.attribute<string>('icon');
+  isHidden = Model.attribute<boolean>('isHidden');
+}

js/src/common/models/Notification.js

@@ -1,15 +0,0 @@
-import Model from '../Model';
-
-export default class Notification extends Model {}
-
-Object.assign(Notification.prototype, {
-  contentType: Model.attribute('contentType'),
-  content: Model.attribute('content'),
-  createdAt: Model.attribute('createdAt', Model.transformDate),
-
-  isRead: Model.attribute('isRead'),
-
-  user: Model.hasOne('user'),
-  fromUser: Model.hasOne('fromUser'),
-  subject: Model.hasOne('subject'),
-});

js/src/common/models/Notification.ts

@@ -0,0 +1,14 @@
+import Model from '../Model';
+import User from './User';
+
+export default class Notification extends Model {
+  contentType = Model.attribute<string>('contentType');
+  content = Model.attribute<any>('content');
+  createdAt = Model.attribute<Date>('createdAt', Model.transformDate);
+
+  isRead = Model.attribute<boolean>('isRead');
+
+  user = Model.hasOne<User>('user');
+  fromUser = Model.hasOne<User>('fromUser');
+  subject = Model.hasOne<any>('subject');
+}

js/src/common/models/Post.js

@@ -1,29 +0,0 @@
-import Model from '../Model';
-import computed from '../utils/computed';
-import { getPlainContent } from '../utils/string';
-
-export default class Post extends Model {}
-
-Object.assign(Post.prototype, {
-  number: Model.attribute('number'),
-  discussion: Model.hasOne('discussion'),
-
-  createdAt: Model.attribute('createdAt', Model.transformDate),
-  user: Model.hasOne('user'),
-  contentType: Model.attribute('contentType'),
-  content: Model.attribute('content'),
-  contentHtml: Model.attribute('contentHtml'),
-  contentPlain: computed('contentHtml', getPlainContent),
-
-  editedAt: Model.attribute('editedAt', Model.transformDate),
-  editedUser: Model.hasOne('editedUser'),
-  isEdited: computed('editedAt', (editedAt) => !!editedAt),
-
-  hiddenAt: Model.attribute('hiddenAt', Model.transformDate),
-  hiddenUser: Model.hasOne('hiddenUser'),
-  isHidden: computed('hiddenAt', (hiddenAt) => !!hiddenAt),
-
-  canEdit: Model.attribute('canEdit'),
-  canHide: Model.attribute('canHide'),
-  canDelete: Model.attribute('canDelete'),
-});

js/src/common/models/Post.ts

@@ -0,0 +1,29 @@
+import Model from '../Model';
+import computed from '../utils/computed';
+import { getPlainContent } from '../utils/string';
+import Discussion from './Discussion';
+import User from './User';
+
+export default class Post extends Model {
+  number = Model.attribute<number>('number');
+  discussion = Model.hasOne<Discussion>('discussion');
+
+  createdAt = Model.attribute<Date>('createdAt', Model.transformDate);
+  user = Model.hasOne<User>('user');
+  contentType = Model.attribute<string>('contentType');
+  content = Model.attribute<string>('content');
+  contentHtml = Model.attribute<string>('contentHtml');
+  contentPlain = computed<string>('contentHtml', getPlainContent);
+
+  editedAt = Model.attribute<Date>('editedAt', Model.transformDate);
+  editedUser = Model.hasOne<User>('editedUser');
+  isEdited = computed<boolean>('editedAt', (editedAt) => !!editedAt);
+
+  hiddenAt = Model.attribute<Date>('hiddenAt', Model.transformDate);
+  hiddenUser = Model.hasOne<User>('hiddenUser');
+  isHidden = computed<boolean>('hiddenAt', (hiddenAt) => !!hiddenAt);
+
+  canEdit = Model.attribute<boolean>('canEdit');
+  canHide = Model.attribute<boolean>('canHide');
+  canDelete = Model.attribute<boolean>('canDelete');
+}

js/src/common/models/User.ts

@@ -5,35 +5,33 @@ import stringToColor from '../utils/stringToColor';
 import ItemList from '../utils/ItemList';
 import computed from '../utils/computed';
 import GroupBadge from '../components/GroupBadge';
+import Group from './Group';
 
-export default class User extends Model {}
+export default class User extends Model {
+  username = Model.attribute<string>('username');
+  displayName = Model.attribute<string>('displayName');
+  email = Model.attribute<string>('email');
+  isEmailConfirmed = Model.attribute<boolean>('isEmailConfirmed');
+  password = Model.attribute<string>('password');
 
-Object.assign(User.prototype, {
-  username: Model.attribute('username'),
-  slug: Model.attribute('slug'),
-  displayName: Model.attribute('displayName'),
-  email: Model.attribute('email'),
-  isEmailConfirmed: Model.attribute('isEmailConfirmed'),
-  password: Model.attribute('password'),
+  avatarUrl = Model.attribute<string>('avatarUrl');
+  preferences = Model.attribute<any>('preferences');
+  groups = Model.hasMany<Group>('groups');
 
-  avatarUrl: Model.attribute('avatarUrl'),
-  preferences: Model.attribute('preferences'),
-  groups: Model.hasMany('groups'),
+  joinTime = Model.attribute<Date>('joinTime', Model.transformDate);
+  lastSeenAt = Model.attribute<Date>('lastSeenAt', Model.transformDate);
+  markedAllAsReadAt = Model.attribute<Date>('markedAllAsReadAt', Model.transformDate);
+  unreadNotificationCount = Model.attribute<number>('unreadNotificationCount');
+  newNotificationCount = Model.attribute<number>('newNotificationCount');
 
-  joinTime: Model.attribute('joinTime', Model.transformDate),
-  lastSeenAt: Model.attribute('lastSeenAt', Model.transformDate),
-  markedAllAsReadAt: Model.attribute('markedAllAsReadAt', Model.transformDate),
-  unreadNotificationCount: Model.attribute('unreadNotificationCount'),
-  newNotificationCount: Model.attribute('newNotificationCount'),
+  discussionCount = Model.attribute<number>('discussionCount');
+  commentCount = Model.attribute<number>('commentCount');
 
-  discussionCount: Model.attribute('discussionCount'),
-  commentCount: Model.attribute('commentCount'),
+  canEdit = Model.attribute<boolean>('canEdit');
+  canDelete = Model.attribute<boolean>('canDelete');
 
-  canEdit: Model.attribute('canEdit'),
-  canDelete: Model.attribute('canDelete'),
-
-  avatarColor: null,
-  color: computed('username', 'avatarUrl', 'avatarColor', function (username, avatarUrl, avatarColor) {
+  avatarColor = null;
+  color = computed<string>('username', 'avatarUrl', 'avatarColor', (username, avatarUrl, avatarColor) => {
     // If we've already calculated and cached the dominant color of the user's
     // avatar, then we can return that in RGB format. If we haven't, we'll want
     // to calculate it. Unless the user doesn't have an avatar, in which case
@@ -46,7 +44,7 @@ Object.assign(User.prototype, {
     }
 
     return '#' + stringToColor(username);
-  }),
+  });
 
   /**
    * Check whether or not the user has been seen in the last 5 minutes.
@@ -54,16 +52,16 @@ Object.assign(User.prototype, {
    * @return {Boolean}
    * @public
    */
-  isOnline() {
+  isOnline(): boolean {
     return dayjs().subtract(5, 'minutes').isBefore(this.lastSeenAt());
-  },
+  }
 
   /**
    * Get the Badge components that apply to this user.
    *
    * @return {ItemList}
    */
-  badges() {
+  badges(): ItemList {
     const items = new ItemList();
     const groups = this.groups();
 
@@ -74,7 +72,7 @@ Object.assign(User.prototype, {
     }
 
     return items;
-  },
+  }
 
   /**
    * Calculate the dominant color of the user's avatar. The dominant color will
@@ -94,7 +92,7 @@ Object.assign(User.prototype, {
     };
     image.crossOrigin = 'anonymous';
     image.src = this.avatarUrl();
-  },
+  }
 
   /**
    * Update the user's preferences.
@@ -108,5 +106,5 @@ Object.assign(User.prototype, {
     Object.assign(preferences, newPreferences);
 
     return this.save({ preferences });
-  },
-});
+  }
+}

js/src/common/utils/Pagination.ts

@@ -1,80 +0,0 @@
-export default class Pagination<T> {
-  private readonly loadFunction: (page: number) => Promise<any>;
-
-  public loading = {
-    prev: false,
-    next: false,
-  };
-
-  public page: number;
-
-  public data: { [page: number]: T } = {};
-
-  public pages: {
-    first: number;
-    last: number;
-  };
-
-  constructor(load: (page: number) => Promise<any>, page: number = 1) {
-    this.loadFunction = load;
-    this.page = page;
-
-    this.pages = {
-      first: page,
-      last: page,
-    };
-  }
-
-  clear() {
-    this.data = {};
-  }
-
-  refresh(page: number) {
-    this.clear();
-
-    this.page = page;
-    this.pages.last = page - 1;
-    this.pages.first = page;
-
-    return this.loadNext();
-  }
-
-  loadNext() {
-    this.loading.next = true;
-    const page = this.pages.last + 1;
-
-    return this.load(
-      page,
-      () => (this.loading.next = false),
-      () => (this.pages.last = this.page = page)
-    );
-  }
-
-  loadPrev() {
-    this.loading.prev = true;
-    const page = this.pages.first - 1;
-
-    return this.load(
-      page,
-      () => (this.loading.prev = false),
-      () => (this.pages.first = this.page = page)
-    );
-  }
-
-  private load(page, done, success) {
-    return this.loadFunction(page)
-      .then((out) => {
-        done();
-        success();
-
-        this.data[this.page] = out;
-
-        return out;
-      })
-      .catch((err) => {
-        done();
-
-        return Promise.reject(err);
-      });
-  }
-}

js/src/common/utils/computed.ts

@@ -1,3 +1,5 @@
+import Model from '../Model';
+
 /**
  * The `computed` utility creates a function that will cache its output until
  * any of the dependent values are dirty.
@@ -7,14 +9,14 @@
  *     dependent values.
  * @return {Function}
  */
-export default function computed(...dependentKeys) {
+export default function computed<T, M = Model>(...dependentKeys: any[]) {
   const keys = dependentKeys.slice(0, -1);
   const compute = dependentKeys.slice(-1)[0];
 
   const dependentValues = {};
   let computedValue;
 
-  return function () {
+  return function (this: M): T {
     let recompute = false;
 
     // Read all of the dependent values. If any of them have changed since last

js/src/common/utils/humanTime.ts

@@ -1,6 +1,3 @@
-import dayjs from 'dayjs';
-import 'dayjs/plugin/relativeTime';
-
 /**
  * The `humanTime` utility converts a date to a localized, human-readable time-
  * ago string.

js/src/common/utils/patchMithril.js

@@ -1,3 +1,9 @@
+import withAttr from './withAttr';
+import Stream from './Stream';
+
+let deprecatedMPropWarned = false;
+let deprecatedMWithAttrWarned = false;
+
 export default function patchMithril(global) {
   const defaultMithril = global.m;
 
@@ -16,5 +22,23 @@ 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

@@ -1,10 +0,0 @@
-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,6 +90,11 @@ 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/components/ChangeEmailModal.js

@@ -118,10 +118,7 @@ export default class ChangeEmailModal extends Modal {
           meta: { password: this.password() },
         }
       )
-      .then(() => {
-        this.success = true;
-        this.alertAttrs = null;
-      })
+      .then(() => (this.success = true))
       .catch(() => {})
       .then(this.loaded.bind(this));
   }

js/src/forum/components/CommentPost.js

@@ -56,7 +56,9 @@ export default class CommentPost extends Post {
     ]);
   }
 
-  refreshContent() {
+  onupdate(vnode) {
+    super.onupdate();
+
     const contentHtml = this.isEditing() ? '' : this.attrs.post.contentHtml();
 
     // If the post content has changed since the last render, we'll run through
@@ -64,28 +66,13 @@ export default class CommentPost extends Post {
     // necessary because TextFormatter outputs them for e.g. syntax highlighting.
     if (this.contentHtml !== contentHtml) {
       this.$('.Post-body script').each(function () {
-        const script = document.createElement('script');
-        script.textContent = this.textContent;
-        Array.from(this.attributes).forEach((attr) => script.setAttribute(attr.name, attr.value));
-        this.parentNode.replaceChild(script, this);
+        eval.call(window, $(this).text());
       });
     }
 
     this.contentHtml = contentHtml;
   }
 
-  oncreate(vnode) {
-    super.oncreate(vnode);
-
-    this.refreshContent();
-  }
-
-  onupdate(vnode) {
-    super.onupdate(vnode);
-
-    this.refreshContent();
-  }
-
   isEditing() {
     return app.composer.bodyMatches(EditPostComposer, { post: this.attrs.post });
   }

js/src/forum/components/Composer.js

@@ -199,7 +199,7 @@ export default class Composer extends Component {
    */
   animatePositionChange() {
     // When exiting full-screen mode: focus content
-    if (this.prevPosition === ComposerState.Position.FULLSCREEN && this.state.position === ComposerState.Position.NORMAL) {
+    if (this.prevPosition === ComposerState.Position.FULLSCREEN) {
       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', 0);
+      this.$().css('top', $(window).scrollTop());
       this.showBackdrop();
     }
   }

js/src/forum/components/ComposerBody.js

@@ -44,6 +44,12 @@ 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/DiscussionComposer.js

@@ -100,7 +100,7 @@ export default class DiscussionComposer extends ComposerBody {
       .save(data)
       .then((discussion) => {
         this.composer.hide();
-        app.discussions.refresh({ deferClear: true });
+        app.discussions.refresh();
         m.route.set(app.route.discussion(discussion));
       }, this.loaded.bind(this));
   }

js/src/forum/components/DiscussionList.js

@@ -21,7 +21,13 @@ export default class DiscussionList extends Component {
     if (state.isLoading()) {
       loading = LoadingIndicator.component();
     } else if (state.moreResults) {
-      loading = this.getLoadButton('more', state.loadMore.bind(state));
+      loading = Button.component(
+        {
+          className: 'Button',
+          onclick: state.loadMore.bind(state),
+        },
+        app.translator.trans('core.forum.discussion_list.load_more_button')
+      );
     }
 
     if (state.empty()) {
@@ -29,18 +35,8 @@ export default class DiscussionList extends Component {
       return <div className="DiscussionList">{Placeholder.component({ text })}</div>;
     }
 
-    console.log(state);
-
     return (
       <div className={'DiscussionList' + (state.isSearchResults() ? ' DiscussionList--searchResults' : '')}>
-        {state.isLoadingPrev() ? (
-          <LoadingIndicator />
-        ) : state.pagination.pages.first !== 1 ? (
-          <div className="DiscussionList-loadMore">{this.getLoadButton('prev', state.loadPrev.bind(state))}</div>
-        ) : (
-          ''
-        )}
-
         <ul className="DiscussionList-discussions">
           {state.discussions.map((discussion) => {
             return (
@@ -50,17 +46,8 @@ export default class DiscussionList extends Component {
             );
           })}
         </ul>
-
         <div className="DiscussionList-loadMore">{loading}</div>
       </div>
     );
   }
-
-  getLoadButton(key, onclick) {
-    return (
-      <Button className="Button" onclick={onclick}>
-        {app.translator.trans(`core.forum.discussion_list.load_${key}_button`)}
-      </Button>
-    );
-  }
 }

js/src/forum/components/DiscussionListItem.js

@@ -14,7 +14,6 @@ import DiscussionControls from '../utils/DiscussionControls';
 import slidable from '../utils/slidable';
 import extractText from '../../common/utils/extractText';
 import classList from '../../common/utils/classList';
-import DiscussionPage from './DiscussionPage';
 
 import { escapeRegExp } from 'lodash-es';
 /**
@@ -157,7 +156,9 @@ export default class DiscussionListItem extends Component {
    * @return {Boolean}
    */
   active() {
-    return app.current.matches(DiscussionPage, { discussion: this.attrs.discussion });
+    const idParam = m.route.param('id');
+
+    return idParam && idParam.split('-')[0] === this.attrs.discussion.id();
   }
 
   /**

js/src/forum/components/DiscussionPage.js

@@ -18,8 +18,6 @@ export default class DiscussionPage extends Page {
   oninit(vnode) {
     super.oninit(vnode);
 
-    this.useBrowserScrollRestoration = false;
-
     /**
      * The discussion that is being viewed.
      *
@@ -109,7 +107,7 @@ export default class DiscussionPage extends Page {
     } else {
       const params = this.requestParams();
 
-      app.store.find('discussions', m.route.param('id'), params).then(this.show.bind(this));
+      app.store.find('discussions', m.route.param('id').split('-')[0], params).then(this.show.bind(this));
     }
 
     m.redraw();
@@ -123,7 +121,6 @@ export default class DiscussionPage extends Page {
    */
   requestParams() {
     return {
-      bySlug: true,
       page: { near: this.near },
     };
   }

js/src/forum/components/PostStream.js

@@ -149,11 +149,6 @@ export default class PostStream extends Component {
    */
   onscroll(top = window.pageYOffset) {
     if (this.stream.paused) return;
-
-    this.updateScrubber(top);
-
-    if (this.stream.pagesLoading) return;
-
     const marginTop = this.getMarginTop();
     const viewportHeight = $(window).height() - marginTop;
     const viewportTop = top + marginTop;
@@ -179,6 +174,8 @@ export default class PostStream extends Component {
     // viewport) to 100ms.
     clearTimeout(this.calculatePositionTimeout);
     this.calculatePositionTimeout = setTimeout(this.calculatePosition.bind(this, top), 100);
+
+    this.updateScrubber(top);
   }
 
   updateScrubber(top = window.pageYOffset) {
@@ -290,9 +287,7 @@ export default class PostStream extends Component {
    * @return {Integer}
    */
   getMarginTop() {
-    const headerId = app.screen() === 'phone' ? '#app-navigation' : '#header';
-
-    return this.$() && $(headerId).outerHeight() + parseInt(this.$().css('margin-top'), 10);
+    return this.$() && $('#header').outerHeight() + parseInt(this.$().css('margin-top'), 10);
   }
 
   /**

js/src/forum/components/Search.js

@@ -21,8 +21,6 @@ import UsersSearchSource from './UsersSearchSource';
  * - state: SearchState instance.
  */
 export default class Search extends Component {
-  static MIN_SEARCH_LEN = 3;
-
   oninit(vnode) {
     super.oninit(vnode);
     this.state = this.attrs.state;
@@ -154,7 +152,7 @@ export default class Search extends Component {
         search.searchTimeout = setTimeout(() => {
           if (state.isCached(query)) return;
 
-          if (query.length >= Search.MIN_SEARCH_LEN) {
+          if (query.length >= 3) {
             search.sources.map((source) => {
               if (!source.search) return;
 

js/src/forum/components/UserPage.js

@@ -102,7 +102,7 @@ export default class UserPage extends Page {
     });
 
     if (!this.user) {
-      app.store.find('users', username, { bySlug: true }).then(this.show.bind(this));
+      app.store.find('users', username).then(this.show.bind(this));
     }
   }
 

js/src/forum/index.js

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

js/src/forum/resolvers/DiscussionPageResolver.ts

@@ -1,6 +1,15 @@
 import DefaultResolver from '../../common/resolvers/DefaultResolver';
 import DiscussionPage from '../components/DiscussionPage';
 
+/**
+ * This isn't exported as it is a temporary measure.
+ * A more robust system will be implemented alongside UTF-8 support in beta 15.
+ */
+function getDiscussionIdFromSlug(slug: string | undefined) {
+  if (!slug) return;
+  return slug.split('-')[0];
+}
+
 /**
  * A custom route resolver for DiscussionPage that generates the same key to all posts
  * on the same discussion. It triggers a scroll when going from one post to another
@@ -9,32 +18,17 @@ import DiscussionPage from '../components/DiscussionPage';
 export default class DiscussionPageResolver extends DefaultResolver {
   static scrollToPostNumber: string | null = null;
 
-  /**
-   * Remove optional parts of a discussion's slug to keep the substring
-   * that bijectively maps to a discussion object. By default this just
-   * extracts the numerical ID from the slug. If a custom discussion
-   * slugging driver is used, this may need to be overriden.
-   * @param slug
-   */
-  canonicalizeDiscussionSlug(slug: string | undefined) {
-    if (!slug) return;
-    return slug.split('-')[0];
-  }
-
-  /**
-   * @inheritdoc
-   */
   makeKey() {
     const params = { ...m.route.param() };
     if ('near' in params) {
       delete params.near;
     }
-    params.id = this.canonicalizeDiscussionSlug(params.id);
+    params.id = getDiscussionIdFromSlug(params.id);
     return this.routeName.replace('.near', '') + JSON.stringify(params);
   }
 
   onmatch(args, requestedPath, route) {
-    if (app.current.matches(DiscussionPage) && this.canonicalizeDiscussionSlug(args.id) === this.canonicalizeDiscussionSlug(m.route.param('id'))) {
+    if (app.current.matches(DiscussionPage) && getDiscussionIdFromSlug(args.id) === getDiscussionIdFromSlug(m.route.param('id'))) {
       // By default, the first post number of any discussion is 1
       DiscussionPageResolver.scrollToPostNumber = args.near || '1';
     }

js/src/forum/routes.js

@@ -34,8 +34,9 @@ export default function (app) {
    * @return {String}
    */
   app.route.discussion = (discussion, near) => {
+    const slug = discussion.slug();
     return app.route(near && near !== 1 ? 'discussion.near' : 'discussion', {
-      id: discussion.slug(),
+      id: discussion.id() + (slug.trim() ? '-' + slug : ''),
       near: near && near !== 1 ? near : undefined,
     });
   };
@@ -58,7 +59,7 @@ export default function (app) {
    */
   app.route.user = (user) => {
     return app.route('user', {
-      username: user.slug(),
+      username: user.username(),
     });
   };
 }

js/src/forum/states/ComposerState.js

@@ -34,6 +34,11 @@ class ComposerState {
     this.editor = null;
 
     this.clear();
+
+    /**
+     * @deprecated BC layer, remove in Beta 15.
+     */
+    this.component = this;
   }
 
   /**
@@ -72,6 +77,12 @@ class ComposerState {
     this.fields = {
       content: Stream(''),
     };
+
+    /**
+     * @deprecated BC layer, remove in Beta 15.
+     */
+    this.content = this.fields.content;
+    this.value = this.fields.content;
   }
 
   /**

js/src/forum/states/DiscussionListState.js

@@ -1,8 +1,4 @@
-import Pagination from '../../common/utils/Pagination';
-
 export default class DiscussionListState {
-  static DISCUSSIONS_PER_PAGE = 20;
-
   constructor(params = {}, app = window.app) {
     this.params = params;
 
@@ -12,7 +8,7 @@ export default class DiscussionListState {
 
     this.moreResults = false;
 
-    this.pagination = new Pagination(this.load.bind(this));
+    this.loading = false;
   }
 
   /**
@@ -86,16 +82,33 @@ export default class DiscussionListState {
    * This can be used to refresh discussions without loading animations.
    */
   refresh({ deferClear = false } = {}) {
-    this.pagination.loading.next = true;
+    this.loading = true;
 
     if (!deferClear) {
       this.clear();
     }
 
-    return this.pagination.refresh(Number(m.route.param('page')) || 1).then(this.parse.bind(this));
+    return this.loadResults().then(
+      (results) => {
+        // This ensures that any changes made while waiting on this request
+        // are ignored. Otherwise, we could get duplicate discussions.
+        // We don't use `this.clear()` to avoid an unnecessary redraw.
+        this.discussions = [];
+        this.parseResults(results);
+      },
+      () => {
+        this.loading = false;
+        m.redraw();
+      }
+    );
   }
 
-  load(page) {
+  /**
+   * Load a new page of discussion results.
+   *
+   * @param offset The index to start the page at.
+   */
+  loadResults(offset) {
     const preloadedDiscussions = this.app.preloadedApiDocument();
 
     if (preloadedDiscussions) {
@@ -103,54 +116,44 @@ export default class DiscussionListState {
     }
 
     const params = this.requestParams();
-    params.page = { offset: DiscussionListState.DISCUSSIONS_PER_PAGE * (page - 1) };
+    params.page = { offset };
     params.include = params.include.join(',');
 
     return this.app.store.find('discussions', params);
   }
 
-  loadPrev() {
-    return this.pagination.loadPrev().then(this.parse.bind(this));
-  }
-
+  /**
+   * Load the next page of discussion results.
+   */
   loadMore() {
-    return this.pagination.loadNext().then(this.parse.bind(this));
+    this.loading = true;
+
+    this.loadResults(this.discussions.length).then(this.parseResults.bind(this));
   }
 
   /**
    * Parse results and append them to the discussion list.
    */
-  parse() {
-    const discussions = [];
-    const { first, last } = this.pagination.pages;
+  parseResults(results) {
+    this.discussions.push(...results);
 
-    for (let page = first; page <= last; page++) {
-      const results = this.pagination.data[page];
-
-      if (Array.isArray(results)) discussions.push(...results);
-    }
-
-    this.discussions = discussions;
-
-    const results = this.pagination.data[last];
-    this.moreResults = !!results.payload.links.next;
+    this.loading = false;
+    this.moreResults = !!results.payload.links && !!results.payload.links.next;
 
     m.redraw();
 
-    return discussions;
+    return results;
   }
 
   /**
    * Remove a discussion from the list if it is present.
    */
   removeDiscussion(discussion) {
-    Object.keys(this.pagination.data).forEach((key) => {
-      const index = this.pagination.data[key].indexOf(discussion);
+    const index = this.discussions.indexOf(discussion);
 
-      this.pagination.data[key].splice(index, 1);
-    });
-
-    this.parse();
+    if (index !== -1) {
+      this.discussions.splice(index, 1);
+    }
 
     m.redraw();
   }
@@ -174,11 +177,7 @@ export default class DiscussionListState {
    * Are discussions currently being loaded?
    */
   isLoading() {
-    return this.pagination.loading.next;
-  }
-
-  isLoadingPrev() {
-    return this.pagination.loading.prev;
+    return this.loading;
   }
 
   /**

js/src/forum/states/PostStreamState.js

@@ -172,7 +172,7 @@ class PostStreamState {
    * @return {Promise}
    */
   loadNearIndex(index) {
-    if (index >= this.visibleStart && index < this.visibleEnd) {
+    if (index >= this.visibleStart && index <= this.visibleEnd) {
       return Promise.resolve();
     }
 
@@ -238,26 +238,23 @@ class PostStreamState {
    * @param {Boolean} backwards
    */
   loadPage(start, end, backwards = false) {
-    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();
+    m.redraw();
 
     this.loadPageTimeouts[start] = setTimeout(
       () => {
         this.loadRange(start, end).then(() => {
-          redraw();
+          if (start >= this.visibleStart && end <= this.visibleEnd) {
+            const anchorIndex = backwards ? this.visibleEnd - 1 : this.visibleStart;
+            anchorScroll(`.PostStream-item[data-index="${anchorIndex}"]`, () => m.redraw.sync());
+          }
           this.pagesLoading--;
         });
         this.loadPageTimeouts[start] = null;
       },
-      this.pagesLoading - 1 ? 1000 : 0
+      this.pagesLoading ? 1000 : 0
     );
+
+    this.pagesLoading++;
   }
 
   /**

js/tsconfig.json

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

less/admin.less

@@ -1,12 +1,10 @@
 @import "common/common";
 
-@import "admin/AdminHeader";
 @import "admin/AdminNav";
 @import "admin/DashboardPage";
 @import "admin/BasicsPage";
 @import "admin/PermissionsPage";
 @import "admin/EditGroupModal";
-@import "admin/ExtensionPage";
-@import "admin/ExtensionWidget";
+@import "admin/ExtensionsPage";
 @import "admin/AppearancePage";
 @import "admin/MailPage";

less/admin/AdminHeader.less

@@ -1,20 +0,0 @@
-.AdminHeader {
-  background: @control-bg;
-  margin-bottom: 20px;
-  padding: 20px 0;
-
-  h2 {
-    margin-top: 0;
-    margin-bottom: 10px;
-    color: @muted-color;
-  }
-
-  .AdminHeader-description {
-    margin: 0;
-    color: @control-color;
-  }
-
-  .icon {
-    margin-right: 15px;
-  }
-}

less/admin/AdminNav.less

@@ -1,83 +1,18 @@
-@admin-pane-width: 250px;
+@admin-pane-width: 300px;
 
 .App {
   padding-bottom: 0;
 }
-
+.AdminLinkButton-description {
+  display: none;
+}
 .AdminContent {
   padding: 20px 0;
 }
 .App-content .sideNavOffset {
   margin-top: 0;
 }
-
-.Header-controls {
-  > li {
-    margin-left: 10px;
-  }
-}
-
-@media @phone {
-  .Dropdown-menu {
-    height: 70vh;
-
-    .item-search {
-      margin: 10px;
-
-      .SearchBar {
-        width: 100%
-      }
-    }
-  }
-
-  .ExtensionNavButton {
-    .Button-label {
-      margin-left: 30px;
-    }
-    .ExtensionIcon {
-      margin: 0 0 0 -4px !important;
-    }
-  }
-}
-
-@media @tablet {
-  .AdminNav {
-    .item-search,
-    li[class^="item-category"],
-    li[class^="item-extension"],
-    .AdminLinkButton-description {
-      display: none !important;
-    }
-  }
-}
-
-@media @phone, @tablet {
-  .App-nav .AdminNav {
-    .Dropdown-menu {
-      > li {
-        .ExtensionListTitle {
-          color: @muted-color;
-          text-transform: uppercase;
-          margin: 25px 0 10px 15px;
-        }
-
-        .ExtensionIcon {
-          margin: -2px -29px;
-          width: 25px;
-          height: 25px;
-          font-size: 12.5px;
-
-          .icon {
-            margin: 0;
-          }
-        }
-      }
-    }
-  }
-}
-
-
-@media @desktop-up {
+@media @desktop, @desktop-hd {
   .App-nav {
     position: absolute;
     top: @header-height;
@@ -85,95 +20,60 @@
     width: @admin-pane-width;
     .box-shadow(0 6px 6px @shadow-color);
     background: @body-bg;
+    border-top: 1px solid @control-bg;
     z-index: @zindex-pane;
-    overflow-y: scroll;
-    padding-bottom: 40px;
+    overflow: auto;
 
     .affix & {
       position: fixed;
       bottom: 0;
+      height: auto;
     }
   }
   .App-content .sideNavOffset {
     margin-left: @admin-pane-width;
   }
   .App-nav .AdminNav {
-    .Dropdown-menu {
-      .item-search {
-        margin-top: 10px;
-        margin-bottom: 20px;
+    .Dropdown-menu > li {
+      > a {
+        padding: 15px 15px 15px 45px;
+        display: block;
+        text-decoration: none;
+        white-space: normal;
       }
-
-      .item-category-core {
-        > .ExtensionListTitle {
-          margin-top: 10px;
-        }
+      > a, > a:hover, &.active > a {
+        color: @muted-color;
       }
+      > a:hover {
+        background: @control-bg;
+      }
+      &.active > a {
+        background: @control-bg;
+        font-weight: normal;
 
-      > li {
-        > a {
-          padding: 10px 10px 10px 45px;
-          display: block;
-          text-decoration: none;
-        }
-
-        > a,
-        > a:hover,
-        &.active > a {
+        .Button-label, .Button-icon {
           color: @text-color;
-        }
-
-        > a:hover {
-          background: @control-bg;
-        }
-
-        &.active > a {
-          background: @control-color;
-          font-weight: normal;
-          color: @body-bg;
-
-          .Button-label,
-          .Button-icon {
-            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;
-          font-weight: normal;
-        }
-
-        .Search-input,
-        .SearchBar {
-          max-width: 215px;
-          margin: 0 auto;
-        }
-
-        .ExtensionListTitle {
-          color: @muted-color;
-          text-transform: uppercase;
-          margin: 25px 0 8px 15px;
-        }
-
-        .ExtensionIcon {
-          width: 25px;
-          height: 25px;
-          font-size: 15px;
-          margin-left: -29px;
-          vertical-align: middle;
+          font-weight: bold;
         }
       }
     }
+    .Button-icon {
+      float: left;
+      margin-left: -30px;
+      font-size: 14px;
+      margin-top: 4px !important;
+    }
+    .Button-label {
+      display: block;
+      font-size: 15px;
+      font-weight: normal;
+      margin: 0 0 5px;
+    }
+    .AdminLinkButton-description {
+      display: block;
+      font-size: 12px;
+    }
   }
-
   .container {
     width: 100%;
     margin: 0;
@@ -185,38 +85,4 @@
       padding: 0;
     }
   }
-
-}
-
-.AdminLinkButton-description {
-  white-space: normal;
-  padding-left: 5px;
-}
-
-.ExtensionListItem-Dot {
-  height: 10px;
-  width: 10px;
-  border-radius: 50%;
-  display: inline-block;
-  right: 13px;
-  margin: 6px 5px;
-  position: absolute;
-}
-
-.ExtensionNavButton {
-  .Button-label {
-    display: inline-block;
-    max-width: calc(100% - 18px);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: middle;
-    margin-left: 5px;
-  }
-}
-
-.ExtensionListItem-Dot.enabled {
-  background-color: #2ECC40;
-}
-.ExtensionListItem-Dot.disabled {
-  background-color: #FF4136;
 }

less/admin/AppearancePage.less

@@ -1,8 +1,8 @@
 .AppearancePage {
-
   @media @desktop-up {
     .container {
       max-width: 600px;
+      padding: 30px;
       margin: 0;
     }
   }

less/admin/BasicsPage.less

@@ -1,4 +1,5 @@
 .BasicsPage {
+  padding: 20px 0;
 
   @media @desktop-up {
     .container {

less/admin/DashboardPage.less

@@ -1,30 +1,33 @@
 .DashboardPage {
-  background: @body-bg;
+  background: @control-bg;
   color: @control-color;
   min-height: 100vh;
+
+  @media @desktop-up {
+    .container {
+      padding: 30px;
+      margin: 0;
+    }
+  }
 }
 
-.Widget {
-  background: @control-bg;
+.DashboardWidget {
+  background: @body-bg;
   color: @text-color;
   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;
@@ -35,7 +38,6 @@
         overflow: hidden;
         text-overflow: ellipsis;
       }
-
       &.item-tools {
         float: right;
         margin-right: 0;

less/admin/ExtensionPage.less

@@ -1,157 +0,0 @@
-.ExtensionPage {
-  min-height: 110vh;
-
-  .ExtensionPage-header {
-    .ExtensionTitle {
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-      margin: 20px 0 15px;
-    }
-
-    .helpText {
-      margin-bottom: 5px;
-    }
-
-    h2 {
-      display: inline-block;
-      margin: 0;
-      vertical-align: middle;
-    }
-  }
-
-  .ExtensionPage-header,
-  .ExtensionPage-permissions-header {
-    background: @control-bg;
-
-    h2 {
-      color: @muted-color;
-
-      span {
-        font-size: 13px;
-        color: @muted-color;
-        font-weight: normal;
-      }
-    }
-
-    .Button-icon {
-      display: unset;
-    }
-
-    ul {
-      display: flex;
-      align-items: center;
-      list-style-type: none;
-      padding: 0;
-      margin: 0;
-
-      > li {
-        display: inline;
-        color: @muted-color;
-        margin-left: 13px;
-
-
-        > a {
-          color: @muted-color;
-        }
-
-        > .icon {
-          margin-right: 5px;
-        }
-      }
-    }
-
-    .ExtensionPage-headerItems {
-      padding: 15px 0;
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-
-      .Checkbox {
-        margin: 5px 0 0 0;
-        display: inline-block;
-      }
-    }
-
-    .Checkbox.off {
-      .Checkbox-display {
-        background: @muted-more-color;
-      }
-    }
-
-    .ExtensionInfo {
-      margin-left: auto;
-
-      .item-authors {
-        a {
-          color: @muted-color;
-        }
-      }
-    }
-
-
-    .ExtensionName {
-      display: inline-block;
-      margin-left: 8px;
-    }
-
-    .ExtensionIcon {
-      width: 30px;
-      height: 30px;
-      font-size: 15px;
-      margin-left: 0;
-      vertical-align: middle;
-    }
-
-    .ExtensionPage-headerTopItems {
-      margin-left: auto;
-    }
-
-    @media (max-width: @screen-phone-max) {
-      .ExtensionPage-headerTopItems {
-        float: right;
-        position: relative;
-      }
-
-      .item-website, .item-source, .item-documentation {
-        display: none;
-      }
-    }
-  }
-
-  .ExtensionPage-settings, .ExtensionPage-permissions {
-    .ExtensionPage-subHeader {
-      margin: 5px 0px;
-    }
-  }
-
-  .ExtensionPage-settings {
-    margin-top: 20px;
-    padding: 10px 0;
-
-    input {
-      max-width: 400px;
-    }
-  }
-
-  .ExtensionPage-subHeader {
-    color: @muted-color;
-    font-weight: normal;
-  }
-
-
-  .ExtensionPage-permissions {
-
-    @media @phone {
-      > .container {
-        overflow-x: scroll;
-        padding-bottom: 20px;
-      }
-    }
-
-    .ExtensionPage-permissions-header {
-      margin: 20px 0 20px;
-      padding: 5px 0;
-    }
-  }
-}

less/admin/ExtensionWidget.less

@@ -1,91 +0,0 @@
-.ExtensionsWidget {
-  background-color: @body-bg;
-  padding: 0;
-}
-
-.ExtensionsWidget-list {
-  padding: 0;
-  background-color: @body-bg;
-
-  .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;
-    }
-  }
-
-  .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;
-    color: @muted-color;
-  }
-
-  .ExtensionListItem-icon {
-    opacity: 0.5;
-  }
-}
-
-.ExtensionListItem {
-  transition: .15s ease-in-out;
-
-  &:hover {
-    transform: scale(1.05);
-  }
-
-  .ExtensionListItem-title {
-    display: block;
-    text-align: center;
-    margin-top: 5px;
-    color: @text-color;
-  }
-
-  a:hover {
-    text-decoration: none;
-  }
-}
-
-.ExtensionIcon {
-  width: 90px;
-  height: 90px;
-  background: @control-bg;
-  color: @control-color;
-  border-radius: 6px;
-  display: inline-flex;
-  font-size: 45px;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  vertical-align: middle;
-}

less/admin/ExtensionsPage.less

@@ -0,0 +1,115 @@
+@extension-list-column-width: 410px;
+
+.ExtensionsPage-header {
+  padding: 20px 0;
+  background: @control-bg;
+}
+
+.ExtensionsPage-list {
+  padding: 30px 0;
+}
+.ExtensionGroup {
+  margin-bottom: 20px;
+
+  h3 {
+    color: @muted-color;
+    text-transform: uppercase;
+    font-size: 12px;
+    margin: 0 0 10px;
+  }
+}
+
+.ExtensionList {
+  columns: 3;
+  column-width: @extension-list-column-width;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  .clearfix();
+
+  > li {
+    -webkit-column-break-inside: avoid;
+    break-inside: avoid-column;
+    page-break-inside: avoid;
+    text-align: left;
+    position: relative;
+    border-radius: 4px;
+    transition: background .2s;
+  }
+}
+.ExtensionListItem.disabled {
+  .ExtensionListItem-title {
+    opacity: 0.5;
+    color: @muted-color;
+  }
+  .ExtensionListItem-icon {
+    opacity: 0.5;
+  }
+}
+.ExtensionListItem {
+  padding: 10px;
+}
+.ExtensionListItem:hover {
+  background: @control-bg;
+}
+.ExtensionListItem-content {
+  padding: 0 50px;
+  min-height: 40px;
+}
+.ExtensionListItem-main {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.ExtensionListItem-title {
+  display: inline-block;
+  font-size: 13px;
+  font-weight: bold;
+  white-space: nowrap;
+  cursor: pointer;
+  padding-right: 10px;
+}
+.ExtensionListItem-version {
+  color: @muted-more-color;
+  font-size: 11px;
+  font-weight: normal;
+  display: inline-flex;
+}
+.ExtensionListItem-controls {
+  float: right;
+  display: none;
+  margin-right: -50px;
+  margin-top: 1px;
+
+  .ExtensionListItem:hover &, &.open {
+    display: block;
+  }
+}
+.ExtensionListItem-description {
+  font-size: 11px;
+  font-weight: normal;
+  text-align: justify;
+}
+
+.ExtensionIcon {
+  width: 40px;
+  height: 40px;
+  background: @control-bg;
+  color: @control-color;
+  border-radius: 6px;
+  display: inline-block;
+  font-size: 20px;
+  line-height: 40px;
+  text-align: center;
+  margin-left: -50px;
+  position: absolute;
+}
+
+@media (max-width: @extension-list-column-width) {
+  .ExtensionListItem-description {
+    display: none;
+  }
+  .ExtensionListItem-version {
+    display: block;
+    margin-top: 8px;
+  }
+}

less/admin/MailPage.less

@@ -1,4 +1,5 @@
 .MailPage {
+  padding: 20px 0;
 
   @media @desktop-up {
     .container {

less/admin/PermissionsPage.less

@@ -1,15 +1,6 @@
 .PermissionsPage-groups {
   background: @control-bg;
-  border-radius: @border-radius;
-  max-width: calc(~'100% - 60px');
-  display: block;
-  margin-left: 30px;
-  overflow-x: auto;
-  padding: 10px 0 8px;
-
-  > .container {
-    padding: 0 10px;
-  }
+  padding: 20px 0;
 }
 .Group {
   width: 90px;
@@ -46,7 +37,6 @@
 
 .PermissionGrid {
   white-space: nowrap;
-  padding-left: 0 12px;
 
   td, th {
     padding: 5px;
@@ -122,7 +112,7 @@
 }
 .PermissionGrid-section {
   td, th {
-    padding-top: 10px;
+    padding-top: 20px;
   }
 }
 .PermissionGrid-child {

less/common/App.less

@@ -10,23 +10,29 @@
   }
 }
 
+// Fix a solid white box to the top of the viewport. This toolbar's contents
+// will differ depending on the device: on phones it will be content
+// controls, whereas on desktops it will be the header. We will overlay
+// these things on top of it later.
+.App:before {
+  content: " ";
+  .header-background();
+  border-bottom: 0;
+  position: absolute;
+
+  .affix& {
+    position: fixed;
+  }
+
+  .scrolled& {
+    .box-shadow(0 2px 6px @shadow-color);
+  }
+}
+
 // PHONES: Somewhere on the page there will be a .App-backControl, a
 // .App-primaryControl, and a .App-titleControl. We will position these on the
 // left, right, and center of the header respectively.
 @media @phone {
-  .App-navigation {
-    .header-background();
-    border-bottom: 0;
-    position: absolute;
-
-    .affix & {
-      position: fixed;
-    }
-
-    .scrolled & {
-      .box-shadow(0 2px 6px @shadow-color);
-    }
-  }
   .App-primaryControl, .App-titleControl, .App-backControl {
     position: absolute !important;
     z-index: @zindex-header + 1;
@@ -228,19 +234,18 @@
     display: none;
   }
   .App-header {
-    .header-background();
     padding: 8px;
+    height: @header-height;
     position: absolute;
-    border-bottom: 0;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: @zindex-header;
 
     .affix & {
       position: fixed;
     }
 
-    .scrolled & {
-      .box-shadow(0 2px 6px @shadow-color);
-    }
-
     & when (@config-colored-header = true) {
       .light-contents(@header-color, @header-control-bg, @header-control-color);
     }

less/common/Modal.less

@@ -105,10 +105,6 @@
       text-align: left;
     }
   }
-
-  .off.Checkbox--switch .Checkbox-display {
-    background: @muted-more-color;
-  }
 }
 .Modal-footer {
   border: 0;

less/common/mixins/header-background.less

@@ -6,6 +6,7 @@
   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,7 +114,7 @@
     background: @body-bg;
 
     &:not(.minimized) {
-      position: fixed;
+      position: absolute;
       top: 0;
       height: 350px !important;
       padding-top: @header-height-phone;
@@ -219,6 +219,7 @@
   .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");

src/Admin/AdminServiceProvider.php

@@ -54,10 +54,9 @@ class AdminServiceProvider extends AbstractServiceProvider
                 HttpMiddleware\StartSession::class,
                 HttpMiddleware\RememberFromCookie::class,
                 HttpMiddleware\AuthenticateWithSession::class,
-                HttpMiddleware\SetLocale::class,
-                'flarum.admin.route_resolver',
                 HttpMiddleware\CheckCsrfToken::class,
-                Middleware\RequireAdministrateAbility::class
+                HttpMiddleware\SetLocale::class,
+                Middleware\RequireAdministrateAbility::class,
             ];
         });
 
@@ -69,10 +68,6 @@ class AdminServiceProvider extends AbstractServiceProvider
             );
         });
 
-        $this->app->bind('flarum.admin.route_resolver', function () {
-            return new HttpMiddleware\ResolveRoute($this->app->make('flarum.admin.routes'));
-        });
-
         $this->app->singleton('flarum.admin.handler', function () {
             $pipe = new MiddlewarePipe;
 
@@ -80,7 +75,7 @@ class AdminServiceProvider extends AbstractServiceProvider
                 $pipe->pipe($this->app->make($middleware));
             }
 
-            $pipe->pipe(new HttpMiddleware\ExecuteRoute());
+            $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.admin.routes')));
 
             return $pipe;
         });

src/Admin/Content/AdminPayload.php

@@ -75,9 +75,6 @@ class AdminPayload
         $document->payload['extensions'] = $this->extensions->getExtensions()->toArray();
 
         $document->payload['displayNameDrivers'] = array_keys($this->container->make('flarum.user.display_name.supported_drivers'));
-        $document->payload['slugDrivers'] = array_map(function ($resourceDrivers) {
-            return array_keys($resourceDrivers);
-        }, $this->container->make('flarum.http.slugDrivers'));
 
         $document->payload['phpVersion'] = PHP_VERSION;
         $document->payload['mysqlVersion'] = $this->db->selectOne('select version() as version')->version;

src/Api/ApiServiceProvider.php

@@ -42,20 +42,6 @@ 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',
@@ -65,10 +51,8 @@ class ApiServiceProvider extends AbstractServiceProvider
                 HttpMiddleware\RememberFromCookie::class,
                 HttpMiddleware\AuthenticateWithSession::class,
                 HttpMiddleware\AuthenticateWithHeader::class,
-                HttpMiddleware\SetLocale::class,
-                'flarum.api.route_resolver',
                 HttpMiddleware\CheckCsrfToken::class,
-                Middleware\ThrottleApi::class
+                HttpMiddleware\SetLocale::class,
             ];
         });
 
@@ -80,10 +64,6 @@ class ApiServiceProvider extends AbstractServiceProvider
             );
         });
 
-        $this->app->bind('flarum.api.route_resolver', function () {
-            return new HttpMiddleware\ResolveRoute($this->app->make('flarum.api.routes'));
-        });
-
         $this->app->singleton('flarum.api.handler', function () {
             $pipe = new MiddlewarePipe;
 
@@ -91,16 +71,10 @@ class ApiServiceProvider extends AbstractServiceProvider
                 $pipe->pipe($this->app->make($middleware));
             }
 
-            $pipe->pipe(new HttpMiddleware\ExecuteRoute());
+            $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes')));
 
             return $pipe;
         });
-
-        $this->app->singleton('flarum.api.notification_serializers', function () {
-            return [
-                'discussionRenamed' => BasicDiscussionSerializer::class
-            ];
-        });
     }
 
     /**
@@ -108,7 +82,7 @@ class ApiServiceProvider extends AbstractServiceProvider
      */
     public function boot()
     {
-        $this->setNotificationSerializers();
+        $this->registerNotificationSerializers();
 
         AbstractSerializeController::setContainer($this->app);
         AbstractSerializeController::setEventDispatcher($events = $this->app->make('events'));
@@ -120,12 +94,13 @@ class ApiServiceProvider extends AbstractServiceProvider
     /**
      * Register notification serializers.
      */
-    protected function setNotificationSerializers()
+    protected function registerNotificationSerializers()
     {
         $blueprints = [];
-        $serializers = $this->app->make('flarum.api.notification_serializers');
+        $serializers = [
+            'discussionRenamed' => BasicDiscussionSerializer::class
+        ];
 
-        // Deprecated in beta 15, remove in beta 16
         $this->app->make('events')->dispatch(
             new ConfigureNotificationTypes($blueprints, $serializers)
         );

src/Api/Controller/AbstractSerializeController.php

@@ -82,16 +82,6 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
      */
     protected static $events;
 
-    /**
-     * @var array
-     */
-    protected static $beforeDataCallbacks = [];
-
-    /**
-     * @var array
-     */
-    protected static $beforeSerializationCallbacks = [];
-
     /**
      * {@inheritdoc}
      */
@@ -99,30 +89,12 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
     {
         $document = new Document;
 
-        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);
-                }
-            }
-        }
-
-        // Deprected in beta 15, removed in beta 16
         static::$events->dispatch(
             new WillGetData($this)
         );
 
         $data = $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);
-                }
-            }
-        }
-
-        // Deprecated in beta 15, removed in beta 16
         static::$events->dispatch(
             new WillSerializeData($this, $data, $request, $document)
         );
@@ -225,106 +197,6 @@ abstract class AbstractSerializeController implements RequestHandlerInterface
         return new Parameters($request->getQueryParams());
     }
 
-    /**
-     * Set the serializer that will serialize data for the endpoint.
-     *
-     * @param string $serializer
-     */
-    public function setSerializer(string $serializer)
-    {
-        $this->serializer = $serializer;
-    }
-
-    /**
-     * Include the given relationship by default.
-     *
-     * @param string|array $name
-     */
-    public function addInclude($name)
-    {
-        $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;
-    }
-
     /**
      * @return Dispatcher
      */
@@ -356,30 +228,4 @@ 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

@@ -64,9 +64,6 @@ class CreateDiscussionController extends AbstractCreateController
         $actor = $request->getAttribute('actor');
         $ipAddress = Arr::get($request->getServerParams(), 'REMOTE_ADDR', '127.0.0.1');
 
-        /**
-         * @deprecated, remove in beta 15.
-         */
         if (! $request->getAttribute('bypassFloodgate')) {
             $this->floodgate->assertNotFlooding($actor);
         }

src/Api/Controller/CreatePostController.php

@@ -65,9 +65,6 @@ class CreatePostController extends AbstractCreateController
         $discussionId = Arr::get($data, 'relationships.discussion.data.id');
         $ipAddress = Arr::get($request->getServerParams(), 'REMOTE_ADDR', '127.0.0.1');
 
-        /**
-         * @deprecated, remove in beta 15.
-         */
         if (! $request->getAttribute('bypassFloodgate')) {
             $this->floodgate->assertNotFlooding($actor);
         }

src/Api/Controller/ShowDiscussionController.php

@@ -12,7 +12,6 @@ namespace Flarum\Api\Controller;
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Discussion\Discussion;
 use Flarum\Discussion\DiscussionRepository;
-use Flarum\Http\SlugManager;
 use Flarum\Post\PostRepository;
 use Flarum\User\User;
 use Illuminate\Support\Arr;
@@ -32,11 +31,6 @@ class ShowDiscussionController extends AbstractShowController
      */
     protected $posts;
 
-    /**
-     * @var SlugManager
-     */
-    protected $slugManager;
-
     /**
      * {@inheritdoc}
      */
@@ -67,13 +61,11 @@ class ShowDiscussionController extends AbstractShowController
     /**
      * @param \Flarum\Discussion\DiscussionRepository $discussions
      * @param \Flarum\Post\PostRepository $posts
-     * @param \Flarum\Http\SlugManager $slugManager
      */
-    public function __construct(DiscussionRepository $discussions, PostRepository $posts, SlugManager $slugManager)
+    public function __construct(DiscussionRepository $discussions, PostRepository $posts)
     {
         $this->discussions = $discussions;
         $this->posts = $posts;
-        $this->slugManager = $slugManager;
     }
 
     /**
@@ -85,11 +77,7 @@ class ShowDiscussionController extends AbstractShowController
         $actor = $request->getAttribute('actor');
         $include = $this->extractInclude($request);
 
-        if (Arr::get($request->getQueryParams(), 'bySlug', false)) {
-            $discussion = $this->slugManager->forResource(Discussion::class)->fromSlug($discussionId, $actor);
-        } else {
-            $discussion = $this->discussions->findOrFail($discussionId, $actor);
-        }
+        $discussion = $this->discussions->findOrFail($discussionId, $actor);
 
         if (in_array('posts', $include)) {
             $postRelationships = $this->getPostRelationships($include);

src/Api/Controller/ShowUserController.php

@@ -11,8 +11,6 @@ namespace Flarum\Api\Controller;
 
 use Flarum\Api\Serializer\CurrentUserSerializer;
 use Flarum\Api\Serializer\UserSerializer;
-use Flarum\Http\SlugManager;
-use Flarum\User\User;
 use Flarum\User\UserRepository;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
@@ -31,22 +29,15 @@ class ShowUserController extends AbstractShowController
     public $include = ['groups'];
 
     /**
-     * @var SlugManager
-     */
-    protected $slugManager;
-
-    /**
-     * @var UserRepository
+     * @var \Flarum\User\UserRepository
      */
     protected $users;
 
     /**
-     * @param SlugManager $slugManager
-     * @param UserRepository $users
+     * @param \Flarum\User\UserRepository $users
      */
-    public function __construct(SlugManager $slugManager, UserRepository $users)
+    public function __construct(UserRepository $users)
     {
-        $this->slugManager = $slugManager;
         $this->users = $users;
     }
 
@@ -56,18 +47,17 @@ class ShowUserController extends AbstractShowController
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $id = Arr::get($request->getQueryParams(), 'id');
-        $actor = $request->getAttribute('actor');
 
-        if (Arr::get($request->getQueryParams(), 'bySlug', false)) {
-            $user = $this->slugManager->forResource(User::class)->fromSlug($id, $actor);
-        } else {
-            $user = $this->users->findOrFail($id, $actor);
+        if (! is_numeric($id)) {
+            $id = $this->users->getIdForUsername($id);
         }
 
-        if ($actor->id === $user->id) {
+        $actor = $request->getAttribute('actor');
+
+        if ($actor->id == $id) {
             $this->serializer = CurrentUserSerializer::class;
         }
 
-        return $user;
+        return $this->users->findOrFail($id, $actor);
     }
 }

src/Api/Controller/UploadFaviconController.php

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

src/Api/Controller/UploadImageController.php

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