Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-11-04 15:57:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve messages duplicates in database and order messages by timestamp

Browse Source
This commit is contained in:
Jeremy Zhang
2017-06-15 17:47:45 +00:00
parent 38df1a8ed0
commit 5505928e5b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/titanembeds/database/messages.py
View File

@@ -31,11 +31,15 @@ class Messages(db.Model):
def get_channel_messages(channel_id, after_snowflake=None): def get_channel_messages(channel_id, after_snowflake=None):
if not after_snowflake: if not after_snowflake:
q = db.session.query(Messages).filter(Messages.channel_id == channel_id).order_by(Messages.id.desc()).limit(50) q = db.session.query(Messages).filter(Messages.channel_id == channel_id).order_by(Messages.timestamp.desc()).limit(50)
else: else:
q = db.session.query(Messages).filter(cast(Messages.channel_id, db.Integer) == int(channel_id)).filter(Messages.message_id > after_snowflake).order_by(Messages.id.desc()).limit(50) q = db.session.query(Messages).filter(cast(Messages.channel_id, db.Integer) == int(channel_id)).filter(Messages.message_id > after_snowflake).order_by(Messages.timestamp.desc()).limit(50)
msgs = [] msgs = []
snowflakes = []
for x in q: for x in q:
if x.message_id in snowflakes:
continue
snowflakes.append(x.message_id)
msgs.append({ msgs.append({
"attachments": json.loads(x.attachments), "attachments": json.loads(x.attachments),
"timestamp": x.timestamp, "timestamp": x.timestamp,