FIX: Compatibility between Client and Server routing.

mend

app/assets/javascripts/discourse/models/topic.js.es6

@@ -29,6 +29,8 @@ export function loadTopicView(topic, args) {
   });
 }
 
+export const ID_CONSTRAINT = /^\d+$/;
+
 const Topic = RestModel.extend({
   message: null,
   errorLoading: false,

app/assets/javascripts/discourse/routes/app-route-map.js.es6

@@ -9,7 +9,8 @@ export default function() {
     this.route('fromParams', { path: '/' });
     this.route('fromParamsNear', { path: '/:nearPost' });
   });
-  this.route('topicBySlug', { path: '/t/:slug', resetNamespace: true });
+
+  this.route('topicBySlugOrId', { path: '/t/:slugOrId', resetNamespace: true });
   this.route('topicUnsubscribe', { path: '/t/:slug/:id/unsubscribe' });
 
   this.route('discovery', { path: '/', resetNamespace: true }, function() {

app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6

@@ -0,0 +1,16 @@
+import { default as Topic, ID_CONSTRAINT } from 'discourse/models/topic';
+import DiscourseURL from 'discourse/lib/url';
+
+export default Discourse.Route.extend({
+  model(params) {
+    if (params.slugOrId.match(ID_CONSTRAINT)) {
+      return { url: `/t/topic/${params.slugOrId}` };
+    } else {
+      return Topic.idForSlug(params.slugOrId);
+    }
+  },
+
+  afterModel(result) {
+    DiscourseURL.routeTo(result.url, { replaceURL: true });
+  }
+});

app/assets/javascripts/discourse/routes/topic-by-slug.js.es6

@@ -1,12 +0,0 @@
-import Topic from 'discourse/models/topic';
-import DiscourseURL from 'discourse/lib/url';
-
-export default Discourse.Route.extend({
-  model: function(params) {
-    return Topic.idForSlug(params.slug);
-  },
-
-  afterModel: function(result) {
-    DiscourseURL.routeTo(result.url, { replaceURL: true });
-  }
-});

app/assets/javascripts/discourse/routes/topic.js.es6

@@ -1,4 +1,5 @@
 import DiscourseURL from 'discourse/lib/url';
+import { ID_CONSTRAINT } from 'discourse/models/topic';
 
 let isTransitioning = false,
     scheduledReplace = null,
@@ -157,6 +158,10 @@ const TopicRoute = Discourse.Route.extend({
   },
 
   model(params, transition) {
+    if (params.slug.match(ID_CONSTRAINT)) {
+      return DiscourseURL.routeTo(`/t/topic/${params.slug}/${params.id}`, { replaceURL: true });
+    };
+
     const queryParams = transition.queryParams;
 
     let topic = this.modelFor('topic');

test/javascripts/acceptance/topic-test.js.es6

@@ -142,6 +142,26 @@ QUnit.test("Reply as new message", assert => {
   });
 });
 
+QUnit.test("Visit topic routes", assert => {
+  visit("/t/12");
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(), 'PM for testing',
+      'it routes to the right topic'
+    );
+  });
+
+  visit("/t/280/20");
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(), 'Internationalization / localization',
+      'it routes to the right topic'
+    );
+  });
+});
+
 QUnit.test("Updating the topic title with emojis", assert => {
   visit("/t/internationalization-localization/280");
   click('#topic-title .d-icon-pencil');

test/javascripts/helpers/create-pretender.js.es6

@@ -131,6 +131,7 @@ export default function() {
     this.put('/u/eviltrout.json', () => response({ user: {} }));
 
     this.get("/t/280.json", () => response(fixturesByUrl['/t/280/1.json']));
+    this.get("/t/280/20.json", () => response(fixturesByUrl['/t/280/1.json']));
     this.get("/t/28830.json", () => response(fixturesByUrl['/t/28830/1.json']));
     this.get("/t/9.json", () => response(fixturesByUrl['/t/9/1.json']));
     this.get("/t/12.json", () => response(fixturesByUrl['/t/12/1.json']));