carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fix 500 error when no keyword notifs are present

master
Aevann 2024-03-02 12:14:11 +02:00
parent 0214ce34aa
commit f797a50010
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/classes/user.py
View File

@ -1169,13 +1169,6 @@ class User(Base):
l = [i for i in l if i]
return l
@property
@lazy
def notif_words(self):
l = self.keyword_notifs.lower().split('\n')
l = [i for i in l if i]
return l
@property
@lazy
def lottery_stats(self):

8
files/helpers/alerts.py
View File

@ -153,12 +153,12 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, obj=None, followers_ping=Tr
criteria = (Notification.user_id == User.id, Notification.read == False)
keyword_users = g.db.query(User).options(load_only(User.id, User.keyword_notifs)).outerjoin(Notification, and_(*criteria)).group_by(User.id).having(func.count(Notification.user_id) < 100).filter(User.keyword_notifs != None)
keyword_users = g.db.query(User.id, User.keyword_notifs).outerjoin(Notification, and_(*criteria)).group_by(User.id, User.keyword_notifs).having(func.count(Notification.user_id) < 100).filter(User.keyword_notifs != None)
for user in keyword_users:
for word in user.notif_words:
for id, keyword_notifs in keyword_users:
for word in keyword_notifs.lower().split('\n'):
if word in text:
notify_users.add(user.id)
notify_users.add(id)
names = set(m.group(1) for m in mention_regex.finditer(text))