From 6c70a509a980473f9f2470dc4da10e6f510b25a1 Mon Sep 17 00:00:00 2001
From: Wu Haotian <whtsky@gmail.com>
Date: Sat, 19 Oct 2019 20:32:38 +0800
Subject: [PATCH 1/2] chore(docs): fix docstring for Client.upload_news

---
 werobot/client.py | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/werobot/client.py b/werobot/client.py
index 0e438fe4..bfab4b53 100644
--- a/werobot/client.py
+++ b/werobot/client.py
@@ -1148,19 +1148,23 @@ def untag_users(self, tag_id, open_id_list):
 
     def upload_news(self, articles):
         """
-        上传图文消息素材。
-        具体请参考:https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Batch_Sends_and_Originality_Checks.html#1
-        articles = [{
-                    "thumb_media_id":"qI6_Ze_6PtV7svjolgs-rN6stStuHIjs9_DidOHaj0Q-mwvBelOXCFZiq2OsIU-p",
-                    "author":"xxx",
-                    "title":"Happy Day",
-                    "content_source_url":"www.qq.com",
-                    "content":"content",
-                    "digest":"digest",
-                    "show_cover_pic":1,
-                    "need_open_comment":1,
-                    "only_fans_can_comment":1
-                }]
+        上传图文消息素材 ::
+
+            articles = [{
+                "thumb_media_id":"qI6_Ze_6PtV7svjolgs-rN6stStuHIjs9_DidOHaj0Q-mwvBelOXCFZiq2OsIU-p",
+                "author":"xxx",
+                "title":"Happy Day",
+                "content_source_url":"www.qq.com",
+                "content":"content",
+                "digest":"digest",
+                "show_cover_pic":1,
+                "need_open_comment":1,
+                "only_fans_can_comment":1
+            }]
+
+        具体请参考: https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Batch_Sends_and_Originality_Checks.html#1
+
+
         :param articles: 上传的图文消息数据。
         :return: 返回的 JSON 数据包。
         """

From 483c7935988223d15fdbd14a2ba989ed8a7b59b2 Mon Sep 17 00:00:00 2001
From: Wu Haotian <whtsky@gmail.com>
Date: Sat, 19 Oct 2019 20:27:14 +0800
Subject: [PATCH 2/2] chore(release): version 1.10.0

---
 .bumpversion.cfg    |  7 -------
 docs/changelog.rst  |  6 ++++++
 docs/client.rst     | 15 +++++++++++++++
 werobot/__init__.py |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)
 delete mode 100644 .bumpversion.cfg

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
deleted file mode 100644
index 41c6d9ad..00000000
--- a/.bumpversion.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[bumpversion]
-current_version = 1.8.0
-commit = True
-tag = True
-
-[bumpversion:file:werobot/__init__.py]
-
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9a58ba2e..363a0d8c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,5 +1,11 @@
 Changelog
 =============
+
+Version 1.10.0
+----------------
++ 在 Client 中增加对 :ref:`上传图文消息素材` 的支持  ( `#493 <https://github.com/offu/WeRoBot/pull/493>`_ )
++ 在 Client 中增加对 :ref:`群发接口` 的支持  ( `#493 <https://github.com/offu/WeRoBot/pull/493>`_ )
+
 Version 1.9.0
 ----------------
 + 在 Client 中增加对 :ref:`用户标签管理` 的支持 ( `#426 <https://github.com/offu/WeRoBot/pull/426>`_ )
diff --git a/docs/client.rst b/docs/client.rst
index e091c832..1a8e96e3 100644
--- a/docs/client.rst
+++ b/docs/client.rst
@@ -80,6 +80,16 @@
 .. automethod:: Client.send_news_message
 .. automethod:: Client.send_miniprogrampage_message
 
+群发接口
+``````````````````````````````
+
+.. automethod:: Client.send_mass_msg
+.. automethod:: Client.delete_mass_msg
+.. automethod:: Client.send_mass_preview_to_user
+.. automethod:: Client.get_mass_msg_status
+.. automethod:: Client.get_mass_msg_speed
+.. automethod:: Client.delete_mass_msg
+
 用户管理
 ------------
 
@@ -161,6 +171,11 @@
 
 .. automethod:: Client.delete_permanent_media
 
+上传图文消息素材
+``````````````````````````````
+
+.. automethod:: Client.upload_news
+
 修改永久图文素材
 ``````````````````````````````
 详细请参考 http://mp.weixin.qq.com/wiki/10/c7bad9a463db20ff8ccefeedeef51f9e.html
diff --git a/werobot/__init__.py b/werobot/__init__.py
index e6b84d26..d142f754 100644
--- a/werobot/__init__.py
+++ b/werobot/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '1.9.0'
+__version__ = '1.10.0'
 __author__ = 'whtsky'
 __license__ = 'MIT'