add gotify img

_playwright/bilibili.py

@@ -17,6 +17,7 @@ from __init__ import (
     bilibili_cookie_file,
     bilibili_title,
     bilibili_logger,
+    bilibili_img,
 )
 
 bilibili_live_rooms = get_bilibili_live_rooms_from_pi()
@@ -31,7 +32,7 @@ async def is_login(page):
     else:
         stderr = "Cookie 过期"
         bilibili_logger.error(stderr)
-        push_msg(bilibili_title, stderr)
+        push_msg(bilibili_title, stderr, bilibili_img)
     return False
 
 
@@ -54,7 +55,7 @@ async def sign(page):
     else:
         sign_res = f"签到失败"
         bilibili_logger.error(sign_res)
-        push_msg(bilibili_title, sign_res)
+        push_msg(bilibili_title, sign_res, bilibili_img)
         msg.append(sign_res)
 
     return "\n".join(msg)
@@ -82,14 +83,10 @@ async def live(page):
         if await send_button.is_visible():
             # 点击发送按钮
             await send_button.click()
-            room_msg = (
-                f"直播间：【{bilibili_live_rooms[room_id]}】打卡成功，打卡时间：【{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}】"
-            )
+            room_msg = f"直播间：【{bilibili_live_rooms[room_id]}】打卡成功，打卡时间：【{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}】"
             bilibili_logger.info(room_msg)
         else:
-            room_msg = (
-                f"直播间：【{bilibili_live_rooms[room_id]}】打卡失败，打卡时间：【{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}】"
-            )
+            room_msg = f"直播间：【{bilibili_live_rooms[room_id]}】打卡失败，打卡时间：【{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}】"
             bilibili_logger.error(room_msg)
         msg.append(room_msg)
 
@@ -116,7 +113,11 @@ async def bilibili_sign():
         sign_result = sign_task.result()
         live_result = live_task.result()
         # ""分割两个服务的消息
-        push_msg(bilibili_title, "\n".join([sign_result, "", live_result]))
+        push_msg(
+            title=bilibili_title,
+            message="\n".join([sign_result, "", live_result]),
+            imgurl=bilibili_img,
+        )
 
 
 if __name__ == "__main__":

_playwright/tsdm.py

@@ -20,6 +20,7 @@ from __init__ import (
     tsdm_cookie_file,
     tsdm_title,
     tsdm_logger,
+    tsdm_img,
 )
 
 
@@ -32,7 +33,7 @@ async def is_login(page):
     else:
         stderr = "Cookie 过期"
         tsdm_logger.error(stderr)
-        push_msg(tsdm_title, stderr)
+        push_msg(tsdm_title, stderr, tsdm_img)
     return False
 
 
@@ -109,7 +110,7 @@ async def tsdm_sign():
         sign_result = sign_task.result()
         cliwork_result = cliwork_task.result()
         # ""分割两个服务的消息
-        push_msg(tsdm_title, "\n".join([sign_result, "", cliwork_result]))
+        push_msg(tsdm_title, "\n".join([sign_result, "", cliwork_result]), tsdm_img)
 
 
 if __name__ == "__main__":

_playwright/v2ex.py

@@ -16,6 +16,7 @@ from __init__ import (
     v2ex_cookie_file,
     v2ex_title,
     v2ex_logger,
+    v2ex_img,
 )
 
 
@@ -28,7 +29,7 @@ async def is_login(page):
     else:
         stderr = "Cookie 过期"
         v2ex_logger.error(stderr)
-        push_msg(v2ex_title, stderr)
+        push_msg(v2ex_title, stderr, v2ex_img)
     return False
 
 
@@ -65,7 +66,7 @@ async def v2ex_sign():
         await browser.close()
         # 推送
         sign_result = sign_task.result()
-        push_msg(v2ex_title, "\n".join([sign_result]))
+        push_msg(v2ex_title, "\n".join([sign_result]), v2ex_img)
 
 
 if __name__ == "__main__":

_playwright/vits.py

@@ -15,6 +15,7 @@ from __init__ import (
     vits_cookie_file,
     vits_title,
     vits_logger,
+    vits_img,
 )
 
 
@@ -27,7 +28,7 @@ async def is_login(page):
     else:
         stderr = "Cookie 过期"
         vits_logger.error(stderr)
-        push_msg(vits_title, stderr)
+        push_msg(vits_title, stderr, vits_img)
     return False
 
 
@@ -59,7 +60,7 @@ async def vits_sign():
         await browser.close()
         # 推送
         sign_result = sign_task.result()
-        push_msg(vits_title, sign_result)
+        push_msg(vits_title, sign_result, vits_img)
 
 
 if __name__ == "__main__":

_playwright/wuaipojie.py

@@ -16,6 +16,7 @@ from __init__ import (
     wuaipojie_cookie_file,
     wuaipojie_title,
     wuaipojie_logger,
+    wuaipojie_img,
 )
 
 
@@ -53,7 +54,7 @@ async def wuaipojie_sign():
         await browser.close()
         # 推送
         sign_result = sign_task.result()
-        push_msg(wuaipojie_title, "\n".join([sign_result]))
+        push_msg(wuaipojie_title, "\n".join([sign_result]), wuaipojie_img)
 
 
 if __name__ == "__main__":

_requests/aliyundrive.py

@@ -18,6 +18,7 @@ from __init__ import (
     aliyundrive_reward_url,
     aliyundrive_title,
     aliyundrive_logger,
+    aliyundrive_img,
 )
 
 # session
@@ -42,7 +43,7 @@ def validate_access_token():
     if resp.status_code != 200:
         msg = "阿里云 access_token 失效"
         aliyundrive_logger.error(msg)
-        push_msg(aliyundrive_title, msg)
+        push_msg(aliyundrive_title, msg, aliyundrive_img)
     else:
         aliyundrive_logger.info("阿里云 access_token 有效")
         new_access_token = resp.json()["access_token"]
@@ -57,12 +58,12 @@ def get_aliyun_nickname():
     # 获取用户名
     user_res = session.post(aliyundrive_nickname_url, headers=headers, json=query_body)
     if user_res.status_code == 200:
-        msg = f"获取用户名成功，stdout：{user_res.json()}"
+        user_msg = f"获取用户名成功，stdout：{user_res.json()}"
         nickname = user_res.json()["nick_name"]
     else:
-        msg = f"获取用户名失败，stderr：{user_res.json()}"
-        aliyundrive_logger.error(msg)
-        push_msg(title=aliyundrive_title, message=msg)
+        user_msg = f"获取用户名失败，stderr：{user_res.json()}"
+        aliyundrive_logger.error(user_msg)
+        push_msg(title=aliyundrive_title, message=user_msg, img_url=aliyundrive_img)
     return nickname
 
 
@@ -72,7 +73,7 @@ def sign():
     if sign_res.status_code != 200:
         sign_msg = f"阿里云盘签到失败，stderr：{sign_res.json()}"
         aliyundrive_logger.error(sign_msg)
-        push_msg(title=aliyundrive_title, message=sign_msg)
+        push_msg(title=aliyundrive_title, message=sign_res, img_url=aliyundrive_img)
     else:
         sign_msg = f"阿里云盘签到成功"
         aliyundrive_logger.info(sign_msg)
@@ -100,7 +101,7 @@ def get_reward(signin_count):
     else:
         reward_msg = f"领取奖励失败，stderr：{reward_res.json()}"
         aliyundrive_logger.error(reward_msg)
-        push_msg(title=aliyundrive_title, message=reward_msg)
+        push_msg(title=aliyundrive_title, message=reward_msg, img_url=aliyundrive_img)
         return reward_msg
     return False
 
@@ -113,7 +114,7 @@ def aliyundrive_sign():
         get_reward(signin_count)
     message = f"{nickname} 签到成功，本月累计签到 {signin_count} 天\n本次签到获得：{curent_reward}"
     aliyundrive_logger.info(message)
-    push_msg(title=aliyundrive_title, message=message)
+    push_msg(title=aliyundrive_title, message=message, img_url=aliyundrive_img)
     return message
 
 

config/settings_prod.py

@@ -13,9 +13,7 @@ from option_logger import register_logger
 # playwright
 browser_headless = True
 browser_proxy = {"server": None}
-user_agent = (
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
-)
+user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
 ignore_https_errors = True
 
 # api
@@ -25,6 +23,7 @@ api_token = os.environ.get("token")
 gotify_host = os.environ.get("gotify_host")
 gotify_port = os.environ.get("gotify_port")
 gotify_token = os.environ.get("gotify_token")
+gotify_img = "https://img.evimo.top/bg.png"
 
 # mysql
 mysql_option = {
@@ -52,6 +51,7 @@ vits_logger = register_logger("vits", logfile_mapping["vits"])
 vits_cookie_file = join(PROD_PATH, "cookie/vits.json")
 hf_username = os.environ.get("hf_username")
 hf_password = os.environ.get("hf_password")
+vits_img = "https://img.evimo.top/huggingface.png"
 
 # wuaipojie
 wuaipojie_title = "wuaipojie"
@@ -59,6 +59,7 @@ wuaipojie_logger = register_logger("wuaipojie", logfile_mapping["wuaipojie"])
 wuaipojie_cookie_file = join(PROD_PATH, "cookie/wuaipojie.json")
 wuaipojie_url = "https://www.52pojie.cn/home.php?mod=task&do=apply&id=2"
 wuaipojie_sign_url = "https://www.52pojie.cn/home.php?mod=task&do=draw&id=2"
+wuaipojie_img = "https://img.evimo.top/wuaipojie.png"
 
 # v2ex
 v2ex_title = "V2EX"
@@ -66,15 +67,19 @@ v2ex_logger = register_logger("v2ex", logfile_mapping["v2ex"])
 v2ex_cookie_file = join(PROD_PATH, "cookie/v2ex.json")
 v2ex_url = "https://v2ex.com"
 v2ex_sign_url = "https://v2ex.com/mission/daily"
+v2ex_img = "https://img.evimo.top/v2ex.png"
 
 # bilibili
 bilibili_title = "Bilibili"
 bilibili_logger = register_logger("bilibili", logfile_mapping["bilibili"])
 bilibili_cookie_file = join(PROD_PATH, "cookie/bilibili.json")
 bilibili_url = "https://account.bilibili.com/account/home"
-bilibili_sign_url = "https://api.live.bilibili.com/xlive/web-ucenter/v1/sign/DoSign"  # 签到地址
+bilibili_sign_url = (
+    "https://api.live.bilibili.com/xlive/web-ucenter/v1/sign/DoSign"  # 签到地址
+)
 bilibili_live_url = "https://live.bilibili.com"  # 直播间地址
 bilibili_live_rooms = os.environ.get("bilibili_live_rooms")
+bilibili_img = "https://img.evimo.top/bilibili.png"
 
 # tsdm
 tsdm_title = "天使动漫"
@@ -95,6 +100,7 @@ tsdm_minds = {
     "yl": "慵懒",
     "shuai": "衰",
 }  # 心情
+tsdm_img = "https://img.evimo.top/tsdm.jpg"
 
 # aliyundrive
 aliyundrive_title = "阿里云盘"
@@ -106,3 +112,4 @@ aliyundrive_nickname_url = "https://api.aliyundrive.com/adrive/v2/user/get"
 aliyundrive_access_token_url = "https://auth.aliyundrive.com/v2/account/token"
 aliyundrive_signin_url = "https://member.aliyundrive.com/v1/activity/sign_in_list"
 aliyundrive_reward_url = "https://member.aliyundrive.com/v1/activity/sign_in_reward"
+aliyundrive_img = "https://img.evimo.top/aliyundrive.png"

utils.py

@@ -17,6 +17,7 @@ from __init__ import (
     gotify_host,
     gotify_port,
     gotify_token,
+    gotify_img,
     mysql_option,
     DIR_PATH,
     DEBUG,
@@ -24,7 +25,6 @@ from __init__ import (
     browser_proxy,
     ignore_https_errors,
     user_agent,
-    aliyundrive_access_token_url,
 )
 
 
@@ -107,12 +107,22 @@ def get_domain_ip(host: str) -> str:
 
 
 # gotify 推送
-def push_msg(title, message):
+def push_msg(title: str = "无标题", message: str = "无内容", img_url: str = gotify_img):
     gotify_ip = get_domain_ip(gotify_host)
     url = f"http://{gotify_ip}:{gotify_port}/message?token={gotify_token}"
-    data = {"title": title, "message": message, "priority": 10}
-    with requests.post(url, json=data) as resp:
-        return resp.json()
+    resp = requests.post(
+        url,
+        json={
+            "title": title,
+            "message": message,
+            "priority": 10,
+            "extras": {
+                "client::display": {"contentType": "text/markdown"},
+                "client::notification": {"bigImageUrl": img_url},
+            },
+        },
+    )
+    return resp.json()
 
 
 def get_bilibili_live_rooms_from_pi() -> dict: