Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mautrix-amp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Tulir Asokan
mautrix-amp
Commits
177058b6
Commit
177058b6
authored
3 years ago
by
Tulir Asokan
Browse files
Options
Downloads
Patches
Plain Diff
Fix cleaning up old rooms and update mautrix-python
parent
7702898b
Branches
unpuppet
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#2820
passed
3 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
mautrix_amp/puppet.py
+6
-1
6 additions, 1 deletion
mautrix_amp/puppet.py
requirements.txt
+1
-1
1 addition, 1 deletion
requirements.txt
with
7 additions
and
2 deletions
mautrix_amp/puppet.py
+
6
−
1
View file @
177058b6
...
...
@@ -93,7 +93,12 @@ class Puppet(DBPuppet, BasePuppet):
@classmethod
def
get_id_from_mxid
(
cls
,
mxid
:
UserID
)
->
Optional
[
int
]:
return
cls
.
mxid_template
.
parse
(
mxid
)
user_id
=
cls
.
mxid_template
.
parse
(
mxid
)
# Legacy user IDs had phone numbers, which are too big for the new database,
# so filter those out here.
if
isinstance
(
user_id
,
int
)
and
user_id
<
2
**
31
:
return
user_id
return
None
@classmethod
def
get_mxid_from_id
(
cls
,
mid
:
int
)
->
UserID
:
...
...
This diff is collapsed.
Click to expand it.
requirements.txt
+
1
−
1
View file @
177058b6
...
...
@@ -4,7 +4,7 @@ commonmark>=0.8,<0.10
aiohttp
>=3,<4
yarl
>=1,<2
attrs
>=19.1
mautrix
>=0.9,<0.10
mautrix
>=0.9
.2
,<0.10
asyncpg
>=0.20,<0.23
pillow
>=4,<9
qrcode
>=6,<7
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