diff --git a/Tweeder.py b/Tweeder.py index ebe0582..5ddad24 100644 --- a/Tweeder.py +++ b/Tweeder.py @@ -263,15 +263,17 @@ def messaging(user): if request.method == "GET": return render_template( "messages.html", - messaging=accounts.get_display_name(user), + logged_in=logged_in, + messaging=accounts.get_display_name(user.lower()), messages=messages.get_messages(logged_in, user.lower()) ) elif request.method == "POST": messages.send_message( - accounts.get_display_name(logged_in), - accounts.get_display_name(user), + accounts.get_display_name(logged_in.lower()), + accounts.get_display_name(user.lower()), request.form['message_content'] ) + return redirect(request.referrer) if __name__ == '__main__': diff --git a/backend/messages.py b/backend/messages.py index d89dced..e908e4b 100644 --- a/backend/messages.py +++ b/backend/messages.py @@ -11,13 +11,13 @@ messages_db = db.messages def send_message(msg_from, msg_to, msg_content): if type(msg_from) == str: - from_id = accounts.get_profile(msg_from)['_id'] + from_id = accounts.account_details(msg_from.lower())['_id'] elif type(msg_from) == ObjectId: from_id = msg_from msg_from = accounts_db.find_one({'_id': from_id})['displayname'] if type(msg_to) == str: - to_id = accounts.get_profile(msg_to)['_id'] + to_id = accounts.account_details(msg_to.lower())['_id'] elif type(msg_to) == ObjectId: to_id = msg_to msg_to = accounts_db.find_one({'_id': to_id})['displayname'] @@ -51,5 +51,5 @@ def get_messages(user1, user2): "to" : user1_id } ]} - ).sort('timeSent', pymongo.DESCENDING) + ).sort('timeSent', pymongo.ASCENDING) return messages diff --git a/templates/messages.html b/templates/messages.html index 3ac092c..c10dd97 100644 --- a/templates/messages.html +++ b/templates/messages.html @@ -14,7 +14,7 @@ {% if messages %} {% for message in messages %}