Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
99f52e7e
by Philipp Hörist at 2019-12-09T20:20:12Z
1 changed file:
Changes:
| ... | ... | @@ -1627,12 +1627,23 @@ def get_default_muc_config(): |
| 1627 | 1627 |
}
|
| 1628 | 1628 |
|
| 1629 | 1629 |
|
| 1630 |
-def validate_jid(jid):
|
|
| 1630 |
+def validate_jid(jid, type_=None):
|
|
| 1631 | 1631 |
try:
|
| 1632 |
- return JID(str(jid))
|
|
| 1632 |
+ jid = JID(str(jid))
|
|
| 1633 | 1633 |
except InvalidJid as error:
|
| 1634 | 1634 |
raise ValueError(error)
|
| 1635 | 1635 |
|
| 1636 |
+ if type_ is None:
|
|
| 1637 |
+ return jid
|
|
| 1638 |
+ if type_ == 'bare' and jid.isBare:
|
|
| 1639 |
+ return jid
|
|
| 1640 |
+ if type_ == 'full' and jid.isFull:
|
|
| 1641 |
+ return jid
|
|
| 1642 |
+ if type_ == 'domain' and jid.isDomain:
|
|
| 1643 |
+ return jid
|
|
| 1644 |
+ |
|
| 1645 |
+ raise ValueError('Not a %s JID' % type_)
|
|
| 1646 |
+ |
|
| 1636 | 1647 |
|
| 1637 | 1648 |
def to_user_string(error):
|
| 1638 | 1649 |
text = error.get_text(get_rfc5646_lang())
|