Skip to content

Commit

Permalink
fix: Show Lastname
Browse files Browse the repository at this point in the history
  • Loading branch information
KimmyXYC committed Feb 7, 2024
1 parent 15b868a commit bca11ab
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
12 changes: 10 additions & 2 deletions App/JoinRequest.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ async def handle_join_request(self, bot, request: types.ChatJoinRequest, db):
self.request = request
self.bot_member = await bot.get_chat_member(self.chat_id, self.bot_id)

self.user_mention = f'<a href="tg://user?id={self.user_id}">{request.from_user.first_name}</a>'
self.user_mention = f'<a href="tg://user?id={self.user_id}">{request.from_user.first_name}'
if request.from_user.last_name is not None:
self.user_mention += f" {request.from_user.last_name}</a>"
else:
self.user_mention += "</a>"

# Log
logger.info(f"New join request from {request.from_user.first_name}(ID: {self.user_id}) in {self.chat_id}")
Expand Down Expand Up @@ -187,7 +191,11 @@ async def handle_button(self, bot, callback_query: types.CallbackQuery, action):
await bot.answer_callback_query(callback_query.id, "This request has been processed")
return

admin_mention = f'<a href="tg://user?id={callback_query.from_user.id}">{callback_query.from_user.first_name}</a>'
admin_mention = f'<a href="tg://user?id={callback_query.from_user.id}">{callback_query.from_user.first_name}'
if callback_query.from_user.last_name is not None:
admin_mention += f" {callback_query.from_user.last_name}</a>"
else:
admin_mention += "</a>"

if action == "Approve":
self.finished = True
Expand Down
6 changes: 5 additions & 1 deletion utils/LogChannel.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@


async def log_c(bot, request: types.ChatJoinRequest, log_type, config, admin_mention=None):
mention = f'<a href="tg://user?id={request.from_user.id}">{request.from_user.first_name}</a>'
mention = f'<a href="tg://user?id={request.from_user.id}">{request.from_user.first_name}'
if request.from_user.last_name is not None:
mention += f" {request.from_user.last_name}</a>"
else:
mention += "</a>"
message = f"""
#{log_type}:
<b>Chat</b>: {request.chat.title}
Expand Down

0 comments on commit bca11ab

Please sign in to comment.