backend/blueprints/chat/__init__.py

@@ -90,12 +90,23 @@ def get_messages():
                 if not reference_message:
                     return jsonify({'message': 'Reference message not found'}), 404
                 query = query.order_by(Chat.chatDate.asc()).where(Chat.chatDate > reference_message.chatDate)
+                # For after queries, reverse the order later
+                query = query.order_by(Chat.chatDate)
             except ValueError:
                 return jsonify({'message': 'Invalid message ID format'}), 400
         else:
-            query = query.order_by(Chat.chatDate.desc())
+            # Default ordering
+            query = query.order_by(desc(Chat.chatDate))
+
+        # Apply limit and execute query
         query = query.limit(limit)
-        messages = db.session.execute(query).scalars()
+        messages = list(db.session.execute(query).scalars())
+
+        # Reverse the order for 'after' queries to maintain consistency
+        if after_id:
+            messages.reverse()
+
+        # Format messages
         chat_messages = [{
             'id': str(msg.id),
             'text': msg.textContent,
@@ -103,9 +114,12 @@ def get_messages():
             'username': msg.user.username,
             'timestamp': msg.chatDate.isoformat()
         } for msg in messages]
+
         return jsonify({
             'messages': chat_messages,
             'count': len(chat_messages),
+            'hasMore': len(chat_messages) == limit
         }), 200
+
     except Exception as e:
         return jsonify({'message': f'An error occurred: {str(e)}'}), 500