Skip to content
This repository has been archived by the owner on Apr 1, 2021. It is now read-only.

修復最新消息在過期時間為負數的錯誤，以及顯示過期時間 #68

Merged
merged 3 commits into from
Oct 11, 2019
Merged

修復最新消息在過期時間為負數的錯誤，以及顯示過期時間 #68

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5241a2
Fix negative time error
takidog Oct 11, 2019
efc6609
Add response expireTime in query
takidog Oct 11, 2019
1f8c005
Fix negative time error in Update news
takidog Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/news/news.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,19 @@ def add_news(**kwargs):
"weight": int(kwargs.get('weight', 0)),
"imgUrl": kwargs.get('imgUrl', None),
"url": kwargs.get('url', None),
"description": kwargs.get('description', None)
"description": kwargs.get('description', None),
"expireTime": None
}
expire_time_seconds = kwargs.get('expireTime', None)
if kwargs.get('expireTime', False):
utc = time_format(kwargs.get('expireTime', False))
expire_time_seconds = (utc-datetime.datetime.utcnow()).seconds
expire_time_seconds = int(
(utc-datetime.datetime.utcnow()).total_seconds())
if expire_time_seconds < 0:
expire_time_seconds = None
else:
news_data["expireTime"] = time_format(kwargs.get(
'expireTime', False)).isoformat(timespec="seconds")+"Z"
data_dumps = json.dumps(news_data, ensure_ascii=False)

red_news.set(name=news_name.format(news_id=news_id),
Expand Down Expand Up @@ -219,7 +226,13 @@ def update_news(news_id=None, **kwargs):
if kwargs.get('expireTime', origin_news.get('expireTime', False)):
utc = time_format(kwargs.get(
'expireTime', origin_news.get('expireTime', False)))
expire_time_seconds = (utc-datetime.datetime.utcnow()).seconds
expire_time_seconds = int(
(utc-datetime.datetime.utcnow()).total_seconds())
if expire_time_seconds < 0:
expire_time_seconds = None
else:
news_data["expireTime"] = time_format(kwargs.get(
'expireTime', False)).isoformat(timespec="seconds")+"Z"
data_dumps = json.dumps(news_data, ensure_ascii=False)

red_news.set(name=news_name,
Expand Down