diff --git a/commands.py b/commands.py index c85b51c..c3abbb8 100644 --- a/commands.py +++ b/commands.py @@ -287,17 +287,19 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No [ "Post Votes:", html_parser.hyperlink( - f"up:{upvote_post_count}", - f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=1", - ), - html_parser.hyperlink( - f"down:{downvote_post_count}", - f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=-1", - ), - html_parser.hyperlink( - f"total:{vote_post_count}", + vote_post_count, f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}", ), + f"({' '.join([ + html_parser.hyperlink( + f"up:{upvote_post_count}", + f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=1", + ), + html_parser.hyperlink( + f"down:{downvote_post_count}", + f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=-1", + ), + ])})", ] ) ) @@ -418,27 +420,33 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No ] ) ) - avg_feedback_count = user_data["positive_feedback_count"] - user_data["negative_feedback_count"] + total_feedback_count = ( + user_data["positive_feedback_count"] + + user_data["neutral_feedback_count"] + + user_data["negative_feedback_count"] + ) m.append( " ".join( [ "Feedback:", html_parser.hyperlink( - f"positive:{user_data['positive_feedback_count']}", - f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=positive", - ), - html_parser.hyperlink( - f"neutral:{user_data['neutral_feedback_count']}", - f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=neutral", - ), - html_parser.hyperlink( - f"negative:{user_data['negative_feedback_count']}", - f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=negative", - ), - html_parser.hyperlink( - f"avg:{avg_feedback_count}", + total_feedback_count, f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}", ), + f"({' '.join([ + html_parser.hyperlink( + f"positive:{user_data['positive_feedback_count']}", + f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=positive", + ), + html_parser.hyperlink( + f"neutral:{user_data['neutral_feedback_count']}", + f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=neutral", + ), + html_parser.hyperlink( + f"negative:{user_data['negative_feedback_count']}", + f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=negative", + ), + ])})" ] ) )