iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix cleaning up management rooms. Fixes #172

Browse Source
This commit is contained in:
Tulir Asokan
2018-07-15 15:46:28 +03:00
parent c4b41f0a5c
commit dfca56b292
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands/clean_rooms.py
+19 -10
View File
@@ -14,17 +14,24 @@
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
from mautrix_appservice import MatrixRequestError from typing import Tuple, List
from mautrix_appservice import MatrixRequestError, IntentAPI
from . import command_handler, CommandEvent, SECTION_ADMIN from . import command_handler, CommandEvent, SECTION_ADMIN
from .. import puppet as pu, portal as po from .. import puppet as pu, portal as po
ManagementRoomList = List[Tuple[str, str]]
RoomIDList = List[str]
PortalList = List[po.Portal]
async def _find_rooms(intent):
management_rooms = [] async def _find_rooms(intent: IntentAPI) -> Tuple[
unidentified_rooms = [] ManagementRoomList, RoomIDList, PortalList, PortalList]:
portals = [] management_rooms = [] # type: ManagementRoomList
empty_portals = [] unidentified_rooms = [] # type: RoomIDList
portals = [] # type: PortalList
empty_portals = [] # type: PortalList
rooms = await intent.get_joined_rooms() rooms = await intent.get_joined_rooms()
for room in rooms: for room in rooms:
@@ -88,7 +95,7 @@ async def clean_rooms(evt: CommandEvent):
"where `range` is the range (e.g. `5-21`) prefixed with the first letter of" "where `range` is the range (e.g. `5-21`) prefixed with the first letter of"
"the group name."), "the group name."),
"", "",
("Please note that you will have to re-run `$cmdprefix+sp cleanrooms` " ("Please note that you will have to re-run `$cmdprefix+sp clean-rooms` "
"between each use of the commands above.")] "between each use of the commands above.")]
evt.sender.command_status = { evt.sender.command_status = {
@@ -100,7 +107,9 @@ async def clean_rooms(evt: CommandEvent):
return await evt.reply("\n".join(reply)) return await evt.reply("\n".join(reply))
async def set_rooms_to_clean(evt, management_rooms, unidentified_rooms, portals, empty_portals): async def set_rooms_to_clean(evt, management_rooms: ManagementRoomList,
unidentified_rooms: RoomIDList, portals: PortalList,
empty_portals: PortalList):
command = evt.args[0] command = evt.args[0]
rooms_to_clean = [] rooms_to_clean = []
if command == "clean-recommended": if command == "clean-recommended":
@@ -110,7 +119,7 @@ async def set_rooms_to_clean(evt, management_rooms, unidentified_rooms, portals,
return await evt.reply("**Usage:** `$cmdprefix+sp clean-groups [M][A][U][I]") return await evt.reply("**Usage:** `$cmdprefix+sp clean-groups [M][A][U][I]")
groups_to_clean = evt.args[1] groups_to_clean = evt.args[1]
if "M" in groups_to_clean: if "M" in groups_to_clean:
rooms_to_clean += management_rooms rooms_to_clean += [room_id for (room_id, user_id) in management_rooms]
if "A" in groups_to_clean: if "A" in groups_to_clean:
rooms_to_clean += portals rooms_to_clean += portals
if "U" in groups_to_clean: if "U" in groups_to_clean:
@@ -124,7 +133,7 @@ async def set_rooms_to_clean(evt, management_rooms, unidentified_rooms, portals,
start, end = range.split("-") start, end = range.split("-")
start, end = int(start), int(end) start, end = int(start), int(end)
if group == "M": if group == "M":
group = management_rooms group = [room_id for (room_id, user_id) in management_rooms]
elif group == "A": elif group == "A":
group = portals group = portals
elif group == "U": elif group == "U":