Merge pull request #623 from dev-hato/develop

リリース

Author: nakkaa

CHANGELOG.md

@@ -7,6 +7,12 @@
   * `Removed` 削除された機能について。
   * `Fixed` バグ修正について。
 
+## v2.1.1 - 2021-06-17
+
+### Fixed
+
+* リクエスト再送による重複投稿をなくしました。(#620)
+
 ## v2.1.0 - 2021-06-13
 
 ### Changed

plugins/hato.py

@@ -23,7 +23,7 @@
 from library.clientclass import BaseClient
 from library.jma_amesh import jma_amesh
 logger = getLogger(__name__)
-VERSION = "2.1.0"
+VERSION = "2.1.1"
 
 
 def split_command(command: str, maxsplit: int = 0) -> List[str]:

run.py

@@ -14,6 +14,7 @@
 import plugins.hato as hato
 import plugins.analyze as analyze
 from library.clientclass import SlackClient, ApiClient
+from library.database import Database
 
 app = Flask(__name__)
 
@@ -53,6 +54,32 @@ def on_app_mention(event_data):
     channel = event_data["event"]["channel"]
     blocks = event_data['event']['blocks']
     authed_users = event_data['authed_users']
+    client_msg_id = event_data['event']['client_msg_id']
+
+    print(f'event_data: {event_data}')
+    print(f'channel: {channel}')
+    print(f'blocks: {blocks}')
+    print(f'authed_users: {authed_users}')
+    print(f'client_msg_id: {client_msg_id}')
+
+    with Database() as _db, _db.conn.cursor() as cursor:
+        cursor.execute(
+            'SELECT client_msg_id FROM slack_client_msg_id WHERE client_msg_id = %s LIMIT 1',
+            (client_msg_id,))
+
+        if cursor.fetchone():
+            print('skip')
+            return
+
+        cursor.execute(
+            "DELETE FROM slack_client_msg_id "
+            "WHERE created_at < CURRENT_TIMESTAMP - interval '10 minutes'",
+            (client_msg_id,))
+        cursor.execute(
+            'INSERT INTO slack_client_msg_id(client_msg_id, created_at) '
+            'VALUES(%s, CURRENT_TIMESTAMP)',
+            (client_msg_id,))
+        _db.conn.commit()
 
     with ThreadPoolExecutor(max_workers=3) as tpe:
         for block in blocks:
@@ -68,11 +95,6 @@ def on_app_mention(event_data):
                                        SlackClient(channel,
                                                    block_element_elements[0]['user_id']))
 
-    print(f'event_data: {event_data}')
-    print(f'channel: {channel}')
-    print(f'blocks: {blocks}')
-    print(f'authed_users: {authed_users}')
-
 
 @app.route("/", methods=["GET", "POST"])
 def http_app():

setup/pgsql-init/02_init.sql

@@ -1 +1,2 @@
 CREATE TABLE IF NOT EXISTS vocabulary(no serial UNIQUE, word text);
+CREATE TABLE IF NOT EXISTS slack_client_msg_id(client_msg_id text unique, created_at timestamp);