diff --git a/.gitignore b/.gitignore index d3f37f4ad..a17a5ede6 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ config.ini config.env .vscode/settings.json *.session +rn diff --git a/userge/plugins/welcome.py b/userge/plugins/welcome.py index 08661e2b0..debfbca1d 100644 --- a/userge/plugins/welcome.py +++ b/userge/plugins/welcome.py @@ -61,14 +61,19 @@ async def dowel(_, message: userge.MSG): async def saywel(_, message: userge.MSG): welcome_message = welcome_db.findone('_id', message.chat.id)['data'] + user = message.from_user + fname = user.first_name if user.first_name else '' + lname = user.last_name if user.last_name else '' + fullname = fname + ' ' + lname + username = user.username if user.username else '' + kwargs = { - 'fname': message.from_user.first_name, - 'lname': message.from_user.last_name, - 'fullname': message.from_user.first_name + message.from_user.last_name, - 'uname': message.from_user.username, - 'chat': message.chat.title, - 'mention': f'\ - {message.from_user.username or message.from_user.first_name + message.from_user.last_name}', + 'fname': fname, + 'lname': lname, + 'fullname': fullname, + 'uname': username, + 'chat': message.chat.title if message.chat.title else "this group", + 'mention': f'{username or fullname or "user"}', } await message.reply(welcome_message.format(**kwargs))