diff options
| author | Link Mauve <linkmauve@linkmauve.fr> | 2020-12-04 19:12:34 +0100 |
|---|---|---|
| committer | Link Mauve <linkmauve@linkmauve.fr> | 2020-12-04 19:12:34 +0100 |
| commit | e592a46c99888594bfb0bf71da99c88755912a37 (patch) | |
| tree | 3122bfa1fc5917ef75f001f4215d17c4432a0696 | |
| parent | d660e447ee8c7635a84d030fd51963a177dd42ad (diff) | |
| parent | fa6fe5e851543175867621da1962f35f4d55828f (diff) | |
| download | slixmpp-e592a46c99888594bfb0bf71da99c88755912a37.tar.gz slixmpp-e592a46c99888594bfb0bf71da99c88755912a37.tar.bz2 slixmpp-e592a46c99888594bfb0bf71da99c88755912a37.tar.xz slixmpp-e592a46c99888594bfb0bf71da99c88755912a37.zip | |
Merge branch 'add-363' into 'master'
XEP-0363: Add 0363 to the extension list
See merge request poezio/slixmpp!74
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | doap.xml | 8 | ||||
| -rw-r--r-- | slixmpp/plugins/__init__.py | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a4013b6..e3daa539 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ test: script: - apt update - apt install -y python3 python3-pip cython3 gpg - - pip3 install emoji + - pip3 install emoji aiohttp - ./run_tests.py trigger_poezio: @@ -522,6 +522,14 @@ </implements> <implements> <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0.0</xmpp:version> + <xmpp:since>1.4.1</xmpp:since> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0369.html"/> <xmpp:status>unknown</xmpp:status> </xmpp:SupportedXep> diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index 4c3235f1..f948ead6 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -86,6 +86,7 @@ __all__ = [ 'xep_0325', # IoT Systems Control 'xep_0332', # HTTP Over XMPP Transport 'xep_0353', # Jingle Message Initiation + 'xep_0363', # HTTP File Upload 'xep_0369', # MIX-CORE 'xep_0377', # Spam reporting 'xep_0403', # MIX-Presence |