Merge pull request #300 from zlei1/master

New material_add_news API
Eric-Guo · Apr 21, 2021 · f31241d · f31241d
2 parents 8195bb0 + 888c816
commit f31241d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 1 deletion.
diff --git a/README-CN.md b/README-CN.md
@@ -366,6 +366,7 @@ Wechat Public Account commands:
   wechat groups                                                 # 查询所有分组
   wechat material_get [MEDIA_ID, PATH]                          # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
+  wechat material_add_news [MPNEWS_YAML_PATH]                   # 永久图文素材上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
   wechat material_list [TYPE, OFFSET, COUNT]                    # 获取永久素材列表

diff --git a/README.md b/README.md
@@ -395,8 +395,9 @@ Wechat Public Account commands:
   wechat group_delete [GROUP_ID]                                # 删除分组
   wechat group_update [GROUP_ID, NEW_GROUP_NAME]                # 修改分组名
   wechat groups                                                 # 查询所有分组
-  wechat material_get [MEDIA_ID, PATH]                              # 永久媒体下载
+  wechat material_get [MEDIA_ID, PATH]                          # 永久媒体下载
   wechat material_add [MEDIA_TYPE, PATH]                        # 永久媒体上传
+  wechat material_add_news [MPNEWS_YAML_PATH]                   # 永久图文素材上传
   wechat material_count                                         # 获取永久素材总数
   wechat material_delete [MEDIA_ID]                             # 删除永久素材
   wechat material_list [TYPE, OFFSET, COUNT]                    # 获取永久素材列表

diff --git a/bin/wechat b/bin/wechat
@@ -408,6 +408,12 @@ class App < Thor
     puts wechat_api.material_add(type, path)
   end
 
+  desc 'material_add_news [MPNEWS_YAML_PATH]', '永久图文素材上传'
+  def material_add_news(mpnews_yaml_path)
+    new = YAML.load(File.read(mpnews_yaml_path))
+    puts wechat_api.material_add_news(Wechat::Message.new(MsgType: 'mpnews').mpnews(new['articles']))
+  end
+
   desc 'material_delete [MEDIA_ID]', '删除永久素材'
   def material_delete(media_id)
     puts wechat_api.material_delete(media_id)

diff --git a/lib/wechat/concern/common.rb b/lib/wechat/concern/common.rb
@@ -152,6 +152,10 @@ def material_add(type, file)
         post_file 'material/add_material', file, params: { type: type }
       end
 
+      def material_add_news(mpnews_message)
+        post 'material/add_news', mpnews_message.to_json
+      end
+
       def material_delete(media_id)
         post 'material/del_material', JSON.generate(media_id: media_id)
       end

diff --git a/spec/lib/wechat/api_spec.rb b/spec/lib/wechat/api_spec.rb
@@ -520,6 +520,46 @@
     end
   end
 
+  describe '#material_add_news' do
+    let(:items) do
+      [
+        { 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 },
+        { 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: 0 }
+      ]
+    end
+    specify 'will post material/media_add_news with access_token and mpnews in json' do
+      mpnews = {
+        articles: [
+          {
+            thumb_media_id: 'qI6_Ze_6PtV7svjolgs-rN6stStuHIjs9_DidOHaj0Q-mwvBelOXCFZiq2OsIU-p',
+            title: 'Happy Day',
+            content: 'content',
+            author: 'xxx',
+            content_source_url: 'www.qq.com',
+            digest: 'digest',
+            show_cover_pic: 1
+          },
+          {
+            thumb_media_id: 'qI6_Ze_6PtV7svjolgs-rN6stStuHIjs9_DidOHaj0Q-mwvBelOXCFZiq2OsIU-p',
+            title: 'Happy Day',
+            content: 'content',
+            author: 'xxx',
+            content_source_url: 'www.qq.com',
+            digest: 'digest',
+            show_cover_pic: 0
+          }
+        ]
+      }
+      result = { type: 'news', media_id: 'CsEf3ldqkAYJAU6EJeIkStVDSvffUJ54vqbThMgplD-VJXXof6ctX5fI6-aYyUiQ', created_at: 1391857799 }
+      expect(subject.client).to receive(:post).with('material/add_news', mpnews.to_json, params: { access_token: 'access_token' }).and_return(result)
+      expect(subject.material_add_news(Wechat::Message.new(MsgType: 'mpnews').mpnews(items))).to eq(result)
+    end
+  end
+
   describe '#material_delete' do
     specify 'will post material/del_material with access_token and media_id in payload' do
       media_id = 'media_id'