diff --git a/README.md b/README.md index e9a6f7f..6beb19c 100644 --- a/README.md +++ b/README.md @@ -1616,16 +1616,17 @@ options: room alias (e.g. '#SomeRoomAlias:matrix.example.com'), or short alias (e.g. 'SomeRoomAlias' or '#SomeRoomAlias'). As response room id, room display - name, room canonical alias, room topic, room creator, - and room encryption are printed. One line per room - will be printed. Since either room id or room alias - are accepted as input and both room id and room alias - are given as output, one can hence use this option to - map from room id to room alias as well as vice versa - from room alias to room id. Do not confuse this option - with the options '--get-display-name' and '--set- - display-name', which get/set the user display name, - not the room display name. + name, room canonical alias, room topic, and room + encryption are printed. One line per room will be + printed. If --output is set to JSON a lot more + information will be printed. Since either room id or + room alias are accepted as input and both room id and + room alias are given as output, one can hence use this + option to map from room id to room alias as well as + vice versa from room alias to room id. Do not confuse + this option with the options '--get-display-name' and + '--set-display-name', which get/set the user display + name, not the room display name. --get-client-info Print client information. Details:: Print information kept in the client, i.e. matrix-commander. Output is printed in JSON format. @@ -1944,7 +1945,7 @@ options: the program will continue to run. This is useful for having version number in the log files. -You are running version 7.7.1 2024-10-21. Enjoy, star on Github and contribute +You are running version 8.0.0 2024-11-01. Enjoy, star on Github and contribute by submitting a Pull Request. Also have a look at matrix-commander-tui. ``` diff --git a/VERSION b/VERSION index 5942a0d..ae9a76b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.7.1 +8.0.0 diff --git a/dist/matrix_commander-7.7.1-py3-none-any.whl b/dist/matrix_commander-7.7.1-py3-none-any.whl deleted file mode 100644 index 3a53be4..0000000 Binary files a/dist/matrix_commander-7.7.1-py3-none-any.whl and /dev/null differ diff --git a/dist/matrix_commander-7.7.1.tar.gz b/dist/matrix_commander-7.7.1.tar.gz deleted file mode 100644 index 865144d..0000000 Binary files a/dist/matrix_commander-7.7.1.tar.gz and /dev/null differ diff --git a/dist/matrix_commander-8.0.0-py3-none-any.whl b/dist/matrix_commander-8.0.0-py3-none-any.whl new file mode 100644 index 0000000..b9f8a82 Binary files /dev/null and b/dist/matrix_commander-8.0.0-py3-none-any.whl differ diff --git a/dist/matrix_commander-8.0.0.tar.gz b/dist/matrix_commander-8.0.0.tar.gz new file mode 100644 index 0000000..035aeaf Binary files /dev/null and b/dist/matrix_commander-8.0.0.tar.gz differ diff --git a/help.help.txt b/help.help.txt index 69aba64..d9d4ea3 100644 --- a/help.help.txt +++ b/help.help.txt @@ -206,5 +206,5 @@ delete-content ROOM_ID EVENT_ID REASON [ROOM_ID EVENT_ID REASON ...] -v [PRINT|CHECK], -V [PRINT|CHECK], --version [PRINT|CHECK] Print version information or check for updates. -You are running version 7.7.1 2024-10-21. Enjoy, star on Github and contribute +You are running version 8.0.0 2024-11-01. Enjoy, star on Github and contribute by submitting a Pull Request. Also have a look at matrix-commander-tui. diff --git a/help.manual.txt b/help.manual.txt index 68a7745..8228696 100644 --- a/help.manual.txt +++ b/help.manual.txt @@ -856,16 +856,17 @@ options: room alias (e.g. '#SomeRoomAlias:matrix.example.com'), or short alias (e.g. 'SomeRoomAlias' or '#SomeRoomAlias'). As response room id, room display - name, room canonical alias, room topic, room creator, - and room encryption are printed. One line per room - will be printed. Since either room id or room alias - are accepted as input and both room id and room alias - are given as output, one can hence use this option to - map from room id to room alias as well as vice versa - from room alias to room id. Do not confuse this option - with the options '--get-display-name' and '--set- - display-name', which get/set the user display name, - not the room display name. + name, room canonical alias, room topic, and room + encryption are printed. One line per room will be + printed. If --output is set to JSON a lot more + information will be printed. Since either room id or + room alias are accepted as input and both room id and + room alias are given as output, one can hence use this + option to map from room id to room alias as well as + vice versa from room alias to room id. Do not confuse + this option with the options '--get-display-name' and + '--set-display-name', which get/set the user display + name, not the room display name. --get-client-info Print client information. Details:: Print information kept in the client, i.e. matrix-commander. Output is printed in JSON format. @@ -1184,5 +1185,5 @@ options: the program will continue to run. This is useful for having version number in the log files. -You are running version 7.7.1 2024-10-21. Enjoy, star on Github and contribute +You are running version 8.0.0 2024-11-01. Enjoy, star on Github and contribute by submitting a Pull Request. Also have a look at matrix-commander-tui. diff --git a/help.usage.txt b/help.usage.txt index 7bf52d2..09e288a 100644 --- a/help.usage.txt +++ b/help.usage.txt @@ -66,5 +66,5 @@ usage: matrix-commander [--usage] [-h] [--manual] [--readme] [-d] [--room-invites [LIST|JOIN|LIST+JOIN]] [-v [PRINT|CHECK]] -You are running version 7.7.1 2024-10-21. Enjoy, star on Github and contribute +You are running version 8.0.0 2024-11-01. Enjoy, star on Github and contribute by submitting a Pull Request. Also have a look at matrix-commander-tui. diff --git a/matrix_commander/matrix_commander.py b/matrix_commander/matrix_commander.py index f4a84d9..a7f7ec1 100755 --- a/matrix_commander/matrix_commander.py +++ b/matrix_commander/matrix_commander.py @@ -100,8 +100,8 @@ HAVE_OPENID = False # version number -VERSION = "2024-10-21" -VERSIONNR = "7.7.1" +VERSION = "2024-11-01" +VERSIONNR = "8.0.0" # matrix-commander; for backwards compitability replace _ with - PROG_WITHOUT_EXT = os.path.splitext(os.path.basename(__file__))[0].replace( "_", "-" @@ -5646,13 +5646,15 @@ async def action_get_room_info(client: AsyncClient, credentials: dict) -> None: f"room id is {room_id}, " f"room display name is {room_displayname}, " f"room is {room}. " + f"room dict is {room.__dict__}. " ) resp = room # output format controlled via --output flag text = ( f"{room_id}{SEP}{room_displayname}{SEP}" - f"{room.canonical_alias}{SEP}{room.topic}{SEP}" - f"{room.creator}{SEP}{room.encrypted}" + f"{room.canonical_alias}{SEP}{room.topic}" + f"{SEP}{room.encrypted}" + # f"{SEP}{room.own_user_id}" # f"{SEP}{user_id}" ) # Object of type xxxResponse is not JSON @@ -9234,8 +9236,9 @@ def main_inner( "or short alias (e.g. 'SomeRoomAlias' or '#SomeRoomAlias'). " "As response " "room id, room display name, room canonical alias, room topic, " - "room creator, and room encryption " + "and room encryption " "are printed. One line per room will be printed. " + "If --output is set to JSON a lot more information will be printed. " "Since either room id or room alias are accepted as input and both " "room id and room alias are given as output, one can hence use this " "option to map from room id to room alias " diff --git a/setup.cfg b/setup.cfg index 9010fc7..5752a7e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ # https://packaging.python.org/en/latest/tutorials/packaging-projects/ # https://setuptools.pypa.io/en/latest/userguide/ name = matrix-commander -version = 7.7.1 +version = 8.0.0 author = 8go description = A simple command-line Matrix client long_description = file: PyPi-Instructions.md, README.md