Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Pretix Matrix Inviter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KIF
Pretix Matrix Inviter
Commits
9ddfcbe5
Commit
9ddfcbe5
authored
3 years ago
by
Felix Schäfer
Browse files
Options
Downloads
Patches
Plain Diff
Handle empty configuration
parent
e50d2b6c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
pretix_matrix_inviter/forms.py
+3
-1
3 additions, 1 deletion
pretix_matrix_inviter/forms.py
pretix_matrix_inviter/helpers.py
+12
-1
12 additions, 1 deletion
pretix_matrix_inviter/helpers.py
with
15 additions
and
2 deletions
pretix_matrix_inviter/forms.py
+
3
−
1
View file @
9ddfcbe5
...
@@ -61,7 +61,9 @@ class MatrixInviterForm(SettingsForm):
...
@@ -61,7 +61,9 @@ class MatrixInviterForm(SettingsForm):
]
]
room_info
=
matrix_room_info_for_event
(
self
.
obj
)
room_info
=
matrix_room_info_for_event
(
self
.
obj
)
if
self
.
obj
.
settings
.
matrix_inviter_matrix_room
.
startswith
(
"
!
"
):
if
not
room_info
[
"
room_id
"
]:
room_help_text
=
""
elif
self
.
obj
.
settings
.
matrix_inviter_matrix_room
.
startswith
(
"
!
"
):
if
room_info
[
"
canonical_alias
"
]:
if
room_info
[
"
canonical_alias
"
]:
room_help_text
=
_
(
room_help_text
=
_
(
'"
{name}
"
(main address: <code>{canonical_alias}</code>)
'
'"
{name}
"
(main address: <code>{canonical_alias}</code>)
'
...
...
This diff is collapsed.
Click to expand it.
pretix_matrix_inviter/helpers.py
+
12
−
1
View file @
9ddfcbe5
...
@@ -27,13 +27,18 @@ def matrix_room_info(server, token, room_id_or_alias):
...
@@ -27,13 +27,18 @@ def matrix_room_info(server, token, room_id_or_alias):
def
matrix_room_id
(
server
,
room_id_or_alias
):
def
matrix_room_id
(
server
,
room_id_or_alias
):
if
room_id_or_alias
.
startswith
(
"
!
"
):
if
not
server
or
not
room_id_or_alias
:
return
""
elif
room_id_or_alias
.
startswith
(
"
!
"
):
return
room_id_or_alias
return
room_id_or_alias
else
:
else
:
return
matrix_room_id_from_alias
(
server
,
room_id_or_alias
)
return
matrix_room_id_from_alias
(
server
,
room_id_or_alias
)
def
matrix_room_id_from_alias
(
server
,
alias
):
def
matrix_room_id_from_alias
(
server
,
alias
):
if
not
server
or
not
alias
:
return
""
r
=
requests
.
get
(
r
=
requests
.
get
(
"
https://{}/_matrix/client/v3/directory/room/{}
"
.
format
(
"
https://{}/_matrix/client/v3/directory/room/{}
"
.
format
(
url_quote
(
server
),
url_quote
(
server
),
...
@@ -45,6 +50,9 @@ def matrix_room_id_from_alias(server, alias):
...
@@ -45,6 +50,9 @@ def matrix_room_id_from_alias(server, alias):
def
matrix_room_canonical_alias_from_id
(
server
,
token
,
room_id
):
def
matrix_room_canonical_alias_from_id
(
server
,
token
,
room_id
):
if
not
server
or
not
token
or
not
room_id
:
return
""
r
=
requests
.
get
(
r
=
requests
.
get
(
"
https://{}/_matrix/client/v3/rooms/{}/state/m.room.canonical_alias
"
.
format
(
"
https://{}/_matrix/client/v3/rooms/{}/state/m.room.canonical_alias
"
.
format
(
url_quote
(
server
),
url_quote
(
server
),
...
@@ -59,6 +67,9 @@ def matrix_room_canonical_alias_from_id(server, token, room_id):
...
@@ -59,6 +67,9 @@ def matrix_room_canonical_alias_from_id(server, token, room_id):
def
matrix_room_name_from_id
(
server
,
token
,
room_id
):
def
matrix_room_name_from_id
(
server
,
token
,
room_id
):
if
not
server
or
not
token
or
not
room_id
:
return
""
r
=
requests
.
get
(
r
=
requests
.
get
(
"
https://{}/_matrix/client/v3/rooms/{}/state/m.room.name
"
.
format
(
"
https://{}/_matrix/client/v3/rooms/{}/state/m.room.name
"
.
format
(
url_quote
(
server
),
url_quote
(
server
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment