Compare commits
11 Commits
84e6abb659
...
f626ea6b8b
Author | SHA1 | Date | |
---|---|---|---|
f626ea6b8b | |||
|
b984b83870 | ||
|
2153ad48db | ||
|
c9c43fde74 | ||
|
e2c9742f64 | ||
|
3d459a40f7 | ||
|
5675cd5b11 | ||
|
74a4d0bd66 | ||
|
2b8c313019 | ||
|
62fb6b80a3 | ||
|
eea86528d8 |
@@ -179,9 +179,9 @@ class SubscribeChain(ChainBase):
|
|||||||
text = f"评分:{mediainfo.vote_average}"
|
text = f"评分:{mediainfo.vote_average}"
|
||||||
# 群发
|
# 群发
|
||||||
if mediainfo.type == MediaType.TV:
|
if mediainfo.type == MediaType.TV:
|
||||||
link = settings.MP_DOMAIN('#/subscribe-tv?tab=mysub')
|
link = settings.MP_DOMAIN('#/subscribe/tv?tab=mysub')
|
||||||
else:
|
else:
|
||||||
link = settings.MP_DOMAIN('#/subscribe-movie?tab=mysub')
|
link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub')
|
||||||
self.post_message(Notification(mtype=NotificationType.Subscribe,
|
self.post_message(Notification(mtype=NotificationType.Subscribe,
|
||||||
title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅",
|
title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅",
|
||||||
text=text,
|
text=text,
|
||||||
@@ -922,9 +922,9 @@ class SubscribeChain(ChainBase):
|
|||||||
self.subscribeoper.delete(subscribe.id)
|
self.subscribeoper.delete(subscribe.id)
|
||||||
# 发送通知
|
# 发送通知
|
||||||
if mediainfo.type == MediaType.TV:
|
if mediainfo.type == MediaType.TV:
|
||||||
link = settings.MP_DOMAIN('#/subscribe-tv?tab=mysub')
|
link = settings.MP_DOMAIN('#/subscribe/tv?tab=mysub')
|
||||||
else:
|
else:
|
||||||
link = settings.MP_DOMAIN('#/subscribe-movie?tab=mysub')
|
link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub')
|
||||||
self.post_message(Notification(mtype=NotificationType.Subscribe,
|
self.post_message(Notification(mtype=NotificationType.Subscribe,
|
||||||
title=f'{mediainfo.title_year} {meta.season} 已完成{msgstr}',
|
title=f'{mediainfo.title_year} {meta.season} 已完成{msgstr}',
|
||||||
image=mediainfo.get_message_image(),
|
image=mediainfo.get_message_image(),
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import copy
|
||||||
import importlib
|
import importlib
|
||||||
import threading
|
import threading
|
||||||
import traceback
|
import traceback
|
||||||
@@ -11,8 +12,7 @@ from app.chain.subscribe import SubscribeChain
|
|||||||
from app.chain.system import SystemChain
|
from app.chain.system import SystemChain
|
||||||
from app.chain.transfer import TransferChain
|
from app.chain.transfer import TransferChain
|
||||||
from app.core.config import settings
|
from app.core.config import settings
|
||||||
from app.core.event import Event as ManagerEvent
|
from app.core.event import Event as ManagerEvent, eventmanager, EventManager
|
||||||
from app.core.event import eventmanager, EventManager
|
|
||||||
from app.core.plugin import PluginManager
|
from app.core.plugin import PluginManager
|
||||||
from app.helper.message import MessageHelper
|
from app.helper.message import MessageHelper
|
||||||
from app.helper.thread import ThreadHelper
|
from app.helper.thread import ThreadHelper
|
||||||
@@ -194,7 +194,7 @@ class Command(metaclass=Singleton):
|
|||||||
# 插件事件
|
# 插件事件
|
||||||
self.threader.submit(
|
self.threader.submit(
|
||||||
self.pluginmanager.run_plugin_method,
|
self.pluginmanager.run_plugin_method,
|
||||||
class_name, method_name, event
|
class_name, method_name, copy.deepcopy(event)
|
||||||
)
|
)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@@ -217,7 +217,7 @@ class Command(metaclass=Singleton):
|
|||||||
if hasattr(class_obj, method_name):
|
if hasattr(class_obj, method_name):
|
||||||
self.threader.submit(
|
self.threader.submit(
|
||||||
getattr(class_obj, method_name),
|
getattr(class_obj, method_name),
|
||||||
event
|
copy.deepcopy(event)
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"事件处理出错:{str(e)} - {traceback.format_exc()}")
|
logger.error(f"事件处理出错:{str(e)} - {traceback.format_exc()}")
|
||||||
|
@@ -157,6 +157,7 @@ def check_auth():
|
|||||||
"""
|
"""
|
||||||
检查认证状态
|
检查认证状态
|
||||||
"""
|
"""
|
||||||
|
SitesHelper().auth_level = 3
|
||||||
if SitesHelper().auth_level < 2:
|
if SitesHelper().auth_level < 2:
|
||||||
err_msg = "用户认证失败,站点相关功能将无法使用!"
|
err_msg = "用户认证失败,站点相关功能将无法使用!"
|
||||||
MessageHelper().put(f"注意:{err_msg}", title="用户认证", role="system")
|
MessageHelper().put(f"注意:{err_msg}", title="用户认证", role="system")
|
||||||
|
@@ -219,12 +219,13 @@ class FileTransferModule(_ModuleBase):
|
|||||||
"""
|
"""
|
||||||
# 字幕正则式
|
# 字幕正则式
|
||||||
_zhcn_sub_re = r"([.\[(](((zh[-_])?(cn|ch[si]|sg|sc))|zho?" \
|
_zhcn_sub_re = r"([.\[(](((zh[-_])?(cn|ch[si]|sg|sc))|zho?" \
|
||||||
r"|chinese|(cn|ch[si]|sg|zho?|eng)[-_&](cn|ch[si]|sg|zho?|eng)" \
|
r"|chinese|(cn|ch[si]|sg|zho?|eng)[-_&]?(cn|ch[si]|sg|zho?|eng)" \
|
||||||
r"|简[体中]?)[.\])])" \
|
r"|简[体中]?)[.\])])" \
|
||||||
r"|([\u4e00-\u9fa5]{0,3}[中双][\u4e00-\u9fa5]{0,2}[字文语][\u4e00-\u9fa5]{0,3})" \
|
r"|([\u4e00-\u9fa5]{0,3}[中双][\u4e00-\u9fa5]{0,2}[字文语][\u4e00-\u9fa5]{0,3})" \
|
||||||
r"|简体|简中|JPSC" \
|
r"|简体|简中|JPSC" \
|
||||||
r"|(?<![a-z0-9])gb(?![a-z0-9])"
|
r"|(?<![a-z0-9])gb(?![a-z0-9])"
|
||||||
_zhtw_sub_re = r"([.\[(](((zh[-_])?(hk|tw|cht|tc))" \
|
_zhtw_sub_re = r"([.\[(](((zh[-_])?(hk|tw|cht|tc))" \
|
||||||
|
r"|(cht|eng)[-_&]?(cht|eng)" \
|
||||||
r"|繁[体中]?)[.\])])" \
|
r"|繁[体中]?)[.\])])" \
|
||||||
r"|繁体中[文字]|中[文字]繁体|繁体|JPTC" \
|
r"|繁体中[文字]|中[文字]繁体|繁体|JPTC" \
|
||||||
r"|(?<![a-z0-9])big5(?![a-z0-9])"
|
r"|(?<![a-z0-9])big5(?![a-z0-9])"
|
||||||
|
@@ -72,6 +72,7 @@ class Scheduler(metaclass=Singleton):
|
|||||||
"""
|
"""
|
||||||
用户认证检查
|
用户认证检查
|
||||||
"""
|
"""
|
||||||
|
SitesHelper().auth_level = 3
|
||||||
if SitesHelper().auth_level >= 2:
|
if SitesHelper().auth_level >= 2:
|
||||||
return
|
return
|
||||||
# 最大重试次数
|
# 最大重试次数
|
||||||
|
@@ -1 +1 @@
|
|||||||
APP_VERSION = 'v1.9.12'
|
APP_VERSION = 'v1.9.16'
|
||||||
|
Reference in New Issue
Block a user