Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
3e0bdbf8
by lovetox at 2020-09-06T20:28:16+02:00
2 changed files:
Changes:
| ... | ... | @@ -1430,3 +1430,16 @@ def ask_for_status_message(status, signin=False): |
| 1430 | 1430 |
return app.settings.get('ask_offline_status')
|
| 1431 | 1431 |
|
| 1432 | 1432 |
return app.settings.get('always_ask_for_status_message')
|
| 1433 |
+ |
|
| 1434 |
+ |
|
| 1435 |
+def get_group_chat_nick(account, room_jid):
|
|
| 1436 |
+ nick = app.nicks[account]
|
|
| 1437 |
+ |
|
| 1438 |
+ client = app.get_client(account)
|
|
| 1439 |
+ |
|
| 1440 |
+ bookmark = client.get_module('Bookmarks').get_bookmark(room_jid)
|
|
| 1441 |
+ if bookmark is not None:
|
|
| 1442 |
+ if bookmark.nick is not None:
|
|
| 1443 |
+ nick = bookmark.nick
|
|
| 1444 |
+ |
|
| 1445 |
+ return nick
|
| ... | ... | @@ -76,6 +76,7 @@ from gajim.common import helpers |
| 76 | 76 |
from gajim.common import passwords
|
| 77 | 77 |
from gajim.common import logging_helpers
|
| 78 | 78 |
from gajim.common.helpers import ask_for_status_message
|
| 79 |
+from gajim.common.helpers import get_group_chat_nick
|
|
| 79 | 80 |
from gajim.common.structs import MUCData
|
| 80 | 81 |
from gajim.common.nec import NetworkEvent
|
| 81 | 82 |
from gajim.common.i18n import _
|
| ... | ... | @@ -1347,15 +1348,12 @@ class Interface: |
| 1347 | 1348 |
@staticmethod
|
| 1348 | 1349 |
def _create_muc_data(account, room_jid, nick, password, config):
|
| 1349 | 1350 |
if not nick:
|
| 1350 |
- nick = app.nicks[account]
|
|
| 1351 |
+ nick = get_group_chat_nick(account, room_jid)
|
|
| 1351 | 1352 |
|
| 1352 | 1353 |
# Fetch data from bookmarks
|
| 1353 |
- con = app.connections[account]
|
|
| 1354 |
- bookmark = con.get_module('Bookmarks').get_bookmark(room_jid)
|
|
| 1354 |
+ client = app.get_client(account)
|
|
| 1355 |
+ bookmark = client.get_module('Bookmarks').get_bookmark(room_jid)
|
|
| 1355 | 1356 |
if bookmark is not None:
|
| 1356 |
- if bookmark.nick is not None:
|
|
| 1357 |
- nick = bookmark.nick
|
|
| 1358 |
- |
|
| 1359 | 1357 |
if bookmark.password is not None:
|
| 1360 | 1358 |
password = bookmark.password
|
| 1361 | 1359 |
|