- fix redirects (/~witnesses for example)

- fix user.json
- fix post.json

src/server/json/post_json.jsx

@@ -7,12 +7,12 @@ export default function usePostJson(app) {
     const router = koa_router();
     app.use(router.routes());
 
-    router.get(routeRegex.PostJson, function* () {
+    router.get(routeRegex.PostJson, async (ctx) => {
         // validate and build post details in JSON
-        const author = this.url.match(/(@[\w\d.-]+)/)[0].replace('@', '');
-        const permalink = this.url.match(/(@[\w\d.-]+)\/?([\w\d-]+)/)[2];
+        const author = ctx.url.match(/(@[\w\d.-]+)/)[0].replace('@', '');
+        const permalink = ctx.url.match(/(@[\w\d.-]+)\/?([\w\d-]+)/)[2];
         let status = '';
-        let post = yield api.getContentAsync(author, permalink);
+        let post = await api.getContentAsync(author, permalink);
 
         if (GDPRUserList.includes(post.author)) {
             post = 'Content unavailable';
@@ -30,6 +30,6 @@ export default function usePostJson(app) {
             status = '404';
         }
         // return response and status code
-        this.body = { post, status };
+        ctx.body = { post, status };
     });
 }

src/server/json/user_json.jsx

@@ -7,13 +7,13 @@ export default function useUserJson(app) {
     const router = koa_router();
     app.use(router.routes());
 
-    router.get(routeRegex.UserJson, function* () {
+    router.get(routeRegex.UserJson, async (ctx) => {
         // validate and build user details in JSON
-        const user_name = this.url.match(routeRegex.UserJson)[1].replace('@', '');
+        const user_name = ctx.url.match(routeRegex.UserJson)[1].replace('@', '');
         let user = '';
         let status = '';
 
-        const [chainAccount] = yield api.getAccountsAsync([user_name]);
+        const [chainAccount] = await api.getAccountsAsync([user_name]);
 
         if (GDPRUserList.includes(user_name)) {
             user = 'Content unavailable';
@@ -31,6 +31,6 @@ export default function useUserJson(app) {
             status = '404';
         }
         // return response and status code
-        this.body = { user, status };
+        ctx.body = { user, status };
     });
 }

src/server/redirects.js

@@ -16,13 +16,13 @@ export default function useRedirects(app) {
 
     redirects.forEach((redirectConfig) => {
         // eslint-disable-next-line require-yield
-        router.get(redirectConfig[0], function* () {
-            const dest = Object.keys(this.params).reduce((value, key) => {
-                return value.replace('$' + key, this.params[key]);
+        router.get(redirectConfig[0], async (ctx) => {
+            const dest = Object.keys(ctx.params).reduce((value, key) => {
+                return value.replace('$' + key, ctx.params[key]);
             }, redirectConfig[1]);
-            console.log(`server redirect: [${redirectConfig[0]}] ${this.request.url} -> ${dest}`);
-            this.status = redirectConfig[2] || 301;
-            this.redirect(dest);
+            console.log(`server redirect: [${redirectConfig[0]}] ${ctx.request.url} -> ${dest}`);
+            ctx.status = redirectConfig[2] || 301;
+            ctx.redirect(dest);
         });
     });
 }

src/server/server.js

@@ -94,6 +94,9 @@ app.use(new csrf({
 }));
 
 useGeneralApi(app);
+useRedirects(app);
+useUserJson(app);
+usePostJson(app);
 
 koaLocale(app);
 
@@ -269,10 +272,6 @@ if (env !== 'test') {
     });
 }
 
-useRedirects(app);
-useUserJson(app);
-usePostJson(app);
-
 // Logging
 if (env === 'production') {
     app.use(prod_logger());