From 6bed4549eceb8063c72b84f3d3b65e49c86ac20f Mon Sep 17 00:00:00 2001
From: Queensferry <queensferry.me@gmail.com>
Date: Wed, 12 May 2021 12:39:27 +0800
Subject: [PATCH] fix(route): migrate weibo routes to new `timezone` (#6795)
 (#7513)

---
 lib/routes/meipai/user.js   | 2 --
 lib/routes/weibo/keyword.js | 8 ++++----
 lib/routes/weibo/user.js    | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/routes/meipai/user.js b/lib/routes/meipai/user.js
index e8c3da812..4809ddbbb 100644
--- a/lib/routes/meipai/user.js
+++ b/lib/routes/meipai/user.js
@@ -2,8 +2,6 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const util = require('./utils');
 
-// const date = require('@/utils/date');
-
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
 
diff --git a/lib/routes/weibo/keyword.js b/lib/routes/weibo/keyword.js
index ac0fb1228..e70a84c03 100644
--- a/lib/routes/weibo/keyword.js
+++ b/lib/routes/weibo/keyword.js
@@ -1,7 +1,7 @@
 const querystring = require('querystring');
 const got = require('@/utils/got');
 const weiboUtils = require('./utils');
-const date = require('@/utils/date');
+const timezone = require('@/utils/timezone');
 const { fallback, queryToBoolean } = require('@/utils/readable-social');
 
 module.exports = async (ctx) => {
@@ -25,9 +25,9 @@ module.exports = async (ctx) => {
         link: `http://s.weibo.com/weibo/${encodeURIComponent(keyword)}&b=1&nodup=1`,
         description: `又有人在微博提到${keyword}了`,
         item: data.map((item) => {
-            item.mblog.created_at = date(item.mblog.created_at, 8);
+            item.mblog.created_at = timezone(item.mblog.created_at, +8);
             if (item.mblog.retweeted_status && item.mblog.retweeted_status.created_at) {
-                item.mblog.retweeted_status.created_at = date(item.mblog.retweeted_status.created_at, 8);
+                item.mblog.retweeted_status.created_at = timezone(item.mblog.retweeted_status.created_at, +8);
             }
             const formatExtended = weiboUtils.formatExtended(ctx, item.mblog, {
                 showAuthorInTitle: fallback(undefined, queryToBoolean(routeParams.showAuthorInTitle), true),
@@ -38,7 +38,7 @@ module.exports = async (ctx) => {
             return {
                 title: title,
                 description: description,
-                pubDate: date(item.mblog.created_at, 8),
+                pubDate: item.mblog.created_at,
                 author: item.mblog.user.screen_name,
                 link: `https://weibo.com/${item.mblog.user.id}/${item.mblog.bid}`,
             };
diff --git a/lib/routes/weibo/user.js b/lib/routes/weibo/user.js
index c353f3096..d2853a306 100644
--- a/lib/routes/weibo/user.js
+++ b/lib/routes/weibo/user.js
@@ -1,7 +1,7 @@
 const querystring = require('querystring');
 const got = require('@/utils/got');
 const weiboUtils = require('./utils');
-const date = require('@/utils/date');
+const timezone = require('@/utils/timezone');
 const { fallback, queryToBoolean } = require('@/utils/readable-social');
 
 module.exports = async (ctx) => {
@@ -78,7 +78,7 @@ module.exports = async (ctx) => {
                 let description = formatExtended.description;
                 const formattedTitle = formatExtended.title;
                 const title = formattedTitle;
-                const pubDate = isDataOK ? new Date(data.created_at).toUTCString() : date(item.mblog.created_at, 8);
+                const pubDate = isDataOK ? new Date(data.created_at) : timezone(item.mblog.created_at, +8);
 
                 // 视频的处理
                 if (displayVideo === '1') {