v1.2.3

hitokoto-osc · Mar 4, 2018 · 643fcab · 643fcab
1 parent 3c7cbfd
commit 643fcab
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/controllers/hitokoto.js b/src/controllers/hitokoto.js
@@ -28,11 +28,13 @@ async function hitokoto (ctx, next) {
     const encode = ctx.query.encode
     let response
     let js = false
+    let text
     switch (encode) {
       case 'json':
         response = Buffer.from(JSON.stringify(ret))
         break
       case 'text':
+        text = true
         response = Buffer.from(ret.hitokoto)
         break
       case 'js':
@@ -48,13 +50,17 @@ async function hitokoto (ctx, next) {
     if (ctx.query && ctx.query.charset && ctx.query.charset.toLocaleLowerCase() === 'gbk') {
       if (js) {
         ctx.set('Content-Type', 'text/javascript; charset=gbk')
+      } else if (text) {
+        ctx.set('Content-Type', 'text/plain; charset=gbk')
       } else {
         ctx.set('Content-Type', 'application/json; charset=gbk')
       }
       ctx.body = iconv.encode(response, 'GBK')
     } else {
       if (js) {
         ctx.set('Content-Type', 'text/javascript; charset=utf-8')
+      } else if (text) {
+        ctx.set('Content-Type', 'text/plain; charset=utf-8')
       } else {
         ctx.set('Content-Type', 'application/json; charset=utf-8')
       }
@@ -71,11 +77,13 @@ async function hitokoto (ctx, next) {
     const encode = ctx.query.encode
     let response
     let js = false
+    let text = false
     switch (encode) {
       case 'json':
         response = Buffer.from(JSON.stringify(ret))
         break
       case 'text':
+        text = true
         response = Buffer.from(ret.hitokoto)
         break
       case 'js':
@@ -91,13 +99,17 @@ async function hitokoto (ctx, next) {
     if (ctx.query && ctx.query.charset && ctx.query.charset.toLocaleLowerCase() === 'gbk') {
       if (js) {
         ctx.set('Content-Type', 'text/javascript; charset=gbk')
+      } else if (text) {
+        ctx.set('Content-Type', 'text/plain; charset=gbk')
       } else {
         ctx.set('Content-Type', 'application/json; charset=gbk')
       }
       ctx.body = iconv.encode(response, 'GBK')
     } else {
       if (js) {
         ctx.set('Content-Type', 'text/javascript; charset=utf-8')
+      } else if (text) {
+        ctx.set('Content-Type', 'text/plain; charset=utf-8')
       } else {
         ctx.set('Content-Type', 'application/json; charset=utf-8')
       }