8go
parent
2715e7b677
commit
6cf71d37cf
|
|
@ -11,3 +11,10 @@ For e2ee support, python-olm is needed which requires the
|
|||
- On MacOS one can use [brew](https://brew.sh/) to install package `libolm`.
|
||||
|
||||
Make sure that version 3 is installed. Version 2 will not work.
|
||||
|
||||
For macOS Monterey 12.4 (21F79) (Apple M1 Pro) and similar please follow
|
||||
the these steps:
|
||||
- Install `libolm`, `dbus` and `libmagic` using Homebrew
|
||||
- Install `matrix-commander` using this command:
|
||||
- `pip3 install --global-option=build_ext --global-option="-I/opt/homebrew/include/" --global-option="-L/opt/homebrew/lib/" matrix-commander`
|
||||
- For more details see Issue #79. Thanks to @KizzyCode for the contribution.
|
||||
|
|
|
|||
11
README.md
11
README.md
|
|
@ -2,11 +2,14 @@
|
|||
https://img.shields.io/badge/built%20with-matrix--nio-brightgreen)](
|
||||
https://github.com/poljar/matrix-nio)
|
||||
|
||||
|
||||
<p>
|
||||
<img
|
||||
src="https://raw.githubusercontent.com/8go/matrix-commander/master/logos/mc.svg"
|
||||
alt="MC> logo" height="150">
|
||||
|
||||
<p>
|
||||
<a href="https://matrix.org/docs/projects/client/matrix-commander">
|
||||
<img src="https://matrix.org/docs/projects/images//made-for-matrix.png"
|
||||
<img src="https://matrix.org/docs/projects/images/made-for-matrix.png"
|
||||
alt="made for Matrix" height="100"></a>
|
||||
|
||||
<a href="https://pypi.org/project/matrix-commander/">
|
||||
|
|
@ -1196,7 +1199,7 @@ options:
|
|||
information program will continue to run. This is
|
||||
useful for having version number in the log files.
|
||||
|
||||
You are running version 2.34.0 2022-06-08. Enjoy, star on Github and
|
||||
You are running version 2.34.1 2022-06-09. Enjoy, star on Github and
|
||||
contribute by submitting a Pull Request.
|
||||
```
|
||||
|
||||
|
|
@ -1260,7 +1263,7 @@ See [GPL3 at FSF](https://www.fsf.org/licensing/).
|
|||
- Thanks to all of you who already have contributed! So appreciated!
|
||||
- :heart: and :thumbsup: to @fyfe, @berlincount, @ezwen, @Scriptkiddi,
|
||||
@pelzvieh, @mizlan, @edwinsage, @jschwartzentruber, @nirgal, @benneti,
|
||||
@opk12, @pataquets, etc.
|
||||
@opk12, @pataquets, @KizzyCode, etc.
|
||||
- Enjoy!
|
||||
- Give it a :star: star on GitHub! Pull requests are welcome :heart:
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,83 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
sodipodi:docname="mc.svg"
|
||||
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
||||
id="svg866"
|
||||
version="1.1"
|
||||
viewBox="0 0 18.520834 18.520834"
|
||||
height="0.72916669in"
|
||||
width="0.72916669in">
|
||||
<defs
|
||||
id="defs860" />
|
||||
<sodipodi:namedview
|
||||
units="in"
|
||||
fit-margin-bottom="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-top="0"
|
||||
inkscape:snap-to-guides="false"
|
||||
inkscape:snap-grids="false"
|
||||
showgrid="false"
|
||||
inkscape:document-rotation="0"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:cy="64.487048"
|
||||
inkscape:cx="72.514389"
|
||||
inkscape:zoom="4.2978116"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base" />
|
||||
<metadata
|
||||
id="metadata863">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
transform="translate(-52.160713,-117.93012)"
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Layer 1">
|
||||
<rect
|
||||
ry="2.8930881"
|
||||
y="117.93012"
|
||||
x="52.160713"
|
||||
height="18.520834"
|
||||
width="18.520834"
|
||||
id="rect916"
|
||||
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;image-rendering:auto" />
|
||||
<g
|
||||
transform="translate(0.07045106)"
|
||||
id="g974">
|
||||
<path
|
||||
id="path868"
|
||||
style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:Poppins;-inkscape-font-specification:'Poppins Medium';display:inline;fill:#aaeeff;fill-opacity:1;stroke:none;stroke-width:0.264583"
|
||||
d="m 65.327982,124.92206 h 1.523995 l 2.434159,2.40241 -2.434159,2.4024 h -1.523995 l 2.444742,-2.40241 z" />
|
||||
<path
|
||||
d="m 54.277095,124.63213 h 1.092096 l 1.956815,1.9637 1.956816,-1.9637 h 1.092095 v 5.38467 h -1.092095 v -3.87229 l -1.956816,1.88447 -1.956815,-1.88447 v 3.87229 h -1.092096 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Krona One';-inkscape-font-specification:'Krona One';letter-spacing:-0.66675px;word-spacing:0px;white-space:pre;display:inline;fill:#aaeeff;fill-opacity:1;stroke:none;stroke-width:1"
|
||||
id="path899-5" />
|
||||
<path
|
||||
d="m 60.291884,127.28915 c 0,-0.37437 0.07061,-0.72295 0.211842,-1.04576 0.141228,-0.32505 0.345223,-0.60638 0.611986,-0.844 0.269005,-0.23987 0.596294,-0.42817 0.981868,-0.56491 0.387816,-0.13675 0.82607,-0.20512 1.314761,-0.20512 0.428167,0 0.820466,0.0437 1.176897,0.13114 -0.195028,0.92134 0,0 -0.195028,0.92134 -0.134503,-0.0336 -0.274609,-0.0594 -0.42032,-0.0773 -0.143468,-0.0179 -0.285818,-0.0269 -0.427045,-0.0269 -0.34074,0 -0.644492,0.0426 -0.911255,0.12777 -0.266763,0.083 -0.492055,0.20064 -0.675874,0.35307 -0.181579,0.1502 -0.320565,0.33066 -0.416958,0.54138 -0.09415,0.20847 -0.141228,0.43825 -0.141228,0.68932 0,0.26004 0.04932,0.49878 0.147952,0.71623 0.09863,0.21744 0.240984,0.40575 0.427047,0.56491 0.188303,0.15692 0.416957,0.28021 0.685961,0.36988 0.271247,0.0874 0.577241,0.13114 0.917981,0.13114 0.154678,0 0.308234,-0.0112 0.46067,-0.0336 0.152435,-0.0224 0.299268,-0.0527 0.440496,-0.0908 0.279093,0.91798 0,0 0.279093,0.91798 -0.376608,0.1031 -0.776752,0.15465 -1.200435,0.15465 -0.540251,0 -1.014373,-0.0695 -1.422363,-0.20846 -0.407992,-0.14122 -0.748731,-0.33401 -1.02222,-0.57836 -0.273488,-0.24658 -0.479725,-0.53576 -0.618712,-0.86754 -0.136743,-0.33401 -0.205116,-0.69269 -0.205116,-1.07602 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:'Krona One';-inkscape-font-specification:'Krona One';letter-spacing:0px;word-spacing:0px;white-space:pre;display:inline;fill:#aaeeff;fill-opacity:1;stroke:none;stroke-width:0.172164"
|
||||
id="path918"
|
||||
sodipodi:nodetypes="ccccscccscccssccssccsccccc" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.6 KiB |
|
|
@ -9,11 +9,14 @@ r"""matrix_commander.py.
|
|||
https://img.shields.io/badge/built%20with-matrix--nio-brightgreen)](
|
||||
https://github.com/poljar/matrix-nio)
|
||||
|
||||
|
||||
<p>
|
||||
<img
|
||||
src="https://raw.githubusercontent.com/8go/matrix-commander/master/logos/mc.svg"
|
||||
alt="MC> logo" height="150">
|
||||
|
||||
<p>
|
||||
<a href="https://matrix.org/docs/projects/client/matrix-commander">
|
||||
<img src="https://matrix.org/docs/projects/images//made-for-matrix.png"
|
||||
<img src="https://matrix.org/docs/projects/images/made-for-matrix.png"
|
||||
alt="made for Matrix" height="100"></a>
|
||||
|
||||
<a href="https://pypi.org/project/matrix-commander/">
|
||||
|
|
@ -1203,7 +1206,7 @@ options:
|
|||
information program will continue to run. This is
|
||||
useful for having version number in the log files.
|
||||
|
||||
You are running version 2.34.0 2022-06-08. Enjoy, star on Github and
|
||||
You are running version 2.34.1 2022-06-09. Enjoy, star on Github and
|
||||
contribute by submitting a Pull Request.
|
||||
```
|
||||
|
||||
|
|
@ -1267,14 +1270,13 @@ See [GPL3 at FSF](https://www.fsf.org/licensing/).
|
|||
- Thanks to all of you who already have contributed! So appreciated!
|
||||
- :heart: and :thumbsup: to @fyfe, @berlincount, @ezwen, @Scriptkiddi,
|
||||
@pelzvieh, @mizlan, @edwinsage, @jschwartzentruber, @nirgal, @benneti,
|
||||
@opk12, @pataquets, etc.
|
||||
@opk12, @pataquets, @KizzyCode, etc.
|
||||
- Enjoy!
|
||||
- Give it a :star: star on GitHub! Pull requests are welcome :heart:
|
||||
|
||||
"""
|
||||
|
||||
import argparse
|
||||
|
||||
# automatically sorted by isort,
|
||||
# then formatted by black --line-length 79
|
||||
import ast
|
||||
|
|
@ -1308,74 +1310,27 @@ import magic
|
|||
import pkg_resources
|
||||
from aiohttp import ClientConnectorError, ClientSession, TCPConnector, web
|
||||
from markdown import markdown
|
||||
from nio import (
|
||||
AsyncClient,
|
||||
AsyncClientConfig,
|
||||
DevicesError,
|
||||
DiscoveryInfoError,
|
||||
DownloadError,
|
||||
EnableEncryptionBuilder,
|
||||
EncryptionError,
|
||||
JoinedMembersError,
|
||||
JoinedRoomsError,
|
||||
JoinError,
|
||||
KeyVerificationCancel,
|
||||
KeyVerificationEvent,
|
||||
KeyVerificationKey,
|
||||
KeyVerificationMac,
|
||||
KeyVerificationStart,
|
||||
LocalProtocolError,
|
||||
LoginInfoError,
|
||||
LoginResponse,
|
||||
MatrixRoom,
|
||||
MessageDirection,
|
||||
PresenceGetError,
|
||||
PresenceSetError,
|
||||
ProfileGetAvatarResponse,
|
||||
ProfileGetDisplayNameError,
|
||||
ProfileSetAvatarResponse,
|
||||
ProfileSetDisplayNameError,
|
||||
RedactedEvent,
|
||||
RedactionEvent,
|
||||
RoomAliasEvent,
|
||||
RoomBanError,
|
||||
RoomCreateError,
|
||||
RoomEncryptedAudio,
|
||||
RoomEncryptedFile,
|
||||
RoomEncryptedImage,
|
||||
RoomEncryptedMedia,
|
||||
RoomEncryptedVideo,
|
||||
RoomEncryptionEvent,
|
||||
RoomForgetError,
|
||||
RoomInviteError,
|
||||
RoomKickError,
|
||||
RoomLeaveError,
|
||||
RoomMemberEvent,
|
||||
RoomMessage,
|
||||
RoomMessageAudio,
|
||||
RoomMessageEmote,
|
||||
RoomMessageFile,
|
||||
RoomMessageFormatted,
|
||||
RoomMessageImage,
|
||||
RoomMessageMedia,
|
||||
RoomMessageNotice,
|
||||
RoomMessagesError,
|
||||
RoomMessageText,
|
||||
RoomMessageUnknown,
|
||||
RoomMessageVideo,
|
||||
RoomNameEvent,
|
||||
RoomReadMarkersError,
|
||||
RoomResolveAliasError,
|
||||
RoomUnbanError,
|
||||
SyncError,
|
||||
SyncResponse,
|
||||
ToDeviceError,
|
||||
UnknownEvent,
|
||||
UpdateDeviceError,
|
||||
UploadError,
|
||||
UploadResponse,
|
||||
crypto,
|
||||
)
|
||||
from nio import (AsyncClient, AsyncClientConfig, DevicesError,
|
||||
DiscoveryInfoError, DownloadError, EnableEncryptionBuilder,
|
||||
EncryptionError, JoinedMembersError, JoinedRoomsError,
|
||||
JoinError, KeyVerificationCancel, KeyVerificationEvent,
|
||||
KeyVerificationKey, KeyVerificationMac, KeyVerificationStart,
|
||||
LocalProtocolError, LoginInfoError, LoginResponse, MatrixRoom,
|
||||
MessageDirection, PresenceGetError, PresenceSetError,
|
||||
ProfileGetAvatarResponse, ProfileGetDisplayNameError,
|
||||
ProfileSetAvatarResponse, ProfileSetDisplayNameError,
|
||||
RedactedEvent, RedactionEvent, RoomAliasEvent, RoomBanError,
|
||||
RoomCreateError, RoomEncryptedAudio, RoomEncryptedFile,
|
||||
RoomEncryptedImage, RoomEncryptedMedia, RoomEncryptedVideo,
|
||||
RoomEncryptionEvent, RoomForgetError, RoomInviteError,
|
||||
RoomKickError, RoomLeaveError, RoomMemberEvent, RoomMessage,
|
||||
RoomMessageAudio, RoomMessageEmote, RoomMessageFile,
|
||||
RoomMessageFormatted, RoomMessageImage, RoomMessageMedia,
|
||||
RoomMessageNotice, RoomMessagesError, RoomMessageText,
|
||||
RoomMessageUnknown, RoomMessageVideo, RoomNameEvent,
|
||||
RoomReadMarkersError, RoomResolveAliasError, RoomUnbanError,
|
||||
SyncError, SyncResponse, ToDeviceError, UnknownEvent,
|
||||
UpdateDeviceError, UploadError, UploadResponse, crypto)
|
||||
from PIL import Image
|
||||
|
||||
try:
|
||||
|
|
@ -1393,8 +1348,8 @@ except ImportError:
|
|||
HAVE_OPENID = False
|
||||
|
||||
# version number
|
||||
VERSION = "2022-06-08"
|
||||
VERSIONNR = "2.34.0"
|
||||
VERSION = "2022-06-09"
|
||||
VERSIONNR = "2.34.1"
|
||||
# matrix-commander; for backwards compitability replace _ with -
|
||||
PROG_WITHOUT_EXT = os.path.splitext(os.path.basename(__file__))[0].replace(
|
||||
"_", "-"
|
||||
|
|
@ -4506,7 +4461,7 @@ async def action_download(client: AsyncClient, credentials: dict) -> None:
|
|||
"(i.e. plain-text). No decryption will be attempted."
|
||||
)
|
||||
mxc = download
|
||||
# version incompatibility between matrix-nio 0.18.7 and 0.19.0
|
||||
# version incompatibility between matrix-nio 0.19.0 and 0.19.1+
|
||||
# https://mtrx.sytes.net/OIukKBUUpPsPXkEGBxuKVIEo
|
||||
# server_name = "mtrx.sytes.net"
|
||||
# media_id = "OIukKBUUpPsPXkEGBxuKVIEo"
|
||||
|
|
@ -4522,8 +4477,8 @@ async def action_download(client: AsyncClient, credentials: dict) -> None:
|
|||
f"Converted mxc {mxc} to server_name {server_name} and "
|
||||
f"media_id {media_id}."
|
||||
)
|
||||
# v0.18.7: resp = await client.download(mxc=mxc, filename=filename)
|
||||
# v0.19.0+
|
||||
# v0.19.1+: resp = await client.download(mxc=mxc, filename=filename)
|
||||
# v0.19.0:
|
||||
resp = await client.download(
|
||||
server_name=server_name, media_id=media_id, filename=filename
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# https://packaging.python.org/en/latest/tutorials/packaging-projects/
|
||||
# https://setuptools.pypa.io/en/latest/userguide/
|
||||
name = matrix-commander
|
||||
version = 2.34.0
|
||||
version = 2.34.1
|
||||
author = 8go
|
||||
description = A simple command-line Matrix client
|
||||
long_description = file: PyPi-Instructions.md, README.md
|
||||
|
|
|
|||
Loading…
Reference in New Issue