Bump version to 0.2.0rc5

alembic/versions/2228d49c383f_add_cascade_rules_to_userportal.py

@@ -0,0 +1,30 @@
+"""Add cascade rules to UserPortal
+
+Revision ID: 2228d49c383f
+Revises: bcfefa1f1299
+Create Date: 2018-05-31 11:11:59.482112
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '2228d49c383f'
+down_revision = 'bcfefa1f1299'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_constraint('user_portal_user_fkey', 'user_portal', type_='foreignkey')
+    op.drop_constraint('user_portal_portal_fkey', 'user_portal', type_='foreignkey')
+    op.create_foreign_key('user_portal_user_fkey', 'user_portal', 'user', ['user'], ['tgid'], onupdate='CASCADE', ondelete='CASCADE')
+    op.create_foreign_key('user_portal_portal_fkey', 'user_portal', 'portal', ['portal', 'portal_receiver'], ['tgid', 'tg_receiver'], onupdate='CASCADE', ondelete='CASCADE')
+
+
+def downgrade():
+    op.drop_constraint('user_portal_portal_fkey', 'user_portal', type_='foreignkey')
+    op.drop_constraint('user_portal_user_fkey', 'user_portal', type_='foreignkey')
+    op.create_foreign_key('user_portal_portal_fkey', 'user_portal', 'portal', ['portal', 'portal_receiver'], ['tgid', 'tg_receiver'])
+    op.create_foreign_key('user_portal_user_fkey', 'user_portal', 'user', ['user'], ['tgid'])

mautrix_telegram/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.2.0rc4"
+__version__ = "0.2.0rc5"
 __author__ = "Tulir Asokan <tulir@maunium.net>"

mautrix_telegram/commands/portal.py

@@ -17,6 +17,7 @@
 import asyncio
 
 from telethon.errors import *
+from telethon.tl.types import ChatForbidden, ChannelForbidden
 from mautrix_appservice import MatrixRequestError
 
 from .. import portal as po
@@ -258,6 +259,12 @@ async def confirm_bridge(evt: CommandEvent):
         else:
             return await evt.reply("Failed to get info of telegram chat. "
                                    "You're not logged in, is the relay bot in the chat?")
+    if isinstance(entity, (ChatForbidden, ChannelForbidden)):
+        if evt.sender.logged_in:
+            return await evt.reply("You don't seem to be in that chat.")
+        else:
+            return await evt.reply("The bot doesn't seem to be in that chat.")
+
     direct = False
 
     portal.mxid = bridge_to_mxid

mautrix_telegram/db.py

@@ -57,12 +57,14 @@ class UserPortal(Base):
     query = None
     __tablename__ = "user_portal"
 
-    user = Column(Integer, ForeignKey("user.tgid"), primary_key=True)
+    user = Column(Integer, ForeignKey("user.tgid", onupdate="CASCADE", ondelete="CASCADE"),
+                  primary_key=True)
     portal = Column(Integer, primary_key=True)
     portal_receiver = Column(Integer, primary_key=True)
 
     __table_args__ = (ForeignKeyConstraint(("portal", "portal_receiver"),
-                                           ("portal.tgid", "portal.tg_receiver")),)
+                                           ("portal.tgid", "portal.tg_receiver"),
+                                           onupdate="CASCADE", ondelete="CASCADE"),)
 
 
 class User(Base):

mautrix_telegram/matrix.py

@@ -154,7 +154,7 @@ class MatrixHandler:
 
         puppet = Puppet.get_by_mxid(user)
         if sender and puppet:
-            await portal.leave_matrix(puppet, sender)
+            await portal.leave_matrix(puppet, sender, event_id)
 
         user = User.get_by_mxid(user, create=False)
         if not user:

mautrix_telegram/portal.py

@@ -1318,6 +1318,8 @@ class Portal:
             await intent.redact(self.mxid, mxid)
 
     async def _create_room_on_action(self, source, action):
+        if source.is_relaybot:
+            return False
         create_and_exit = (MessageActionChatCreate, MessageActionChannelCreate)
         create_and_continue = (MessageActionChatAddUser, MessageActionChatJoinedByLink)
         if isinstance(action, create_and_exit + create_and_continue):
@@ -1331,7 +1333,7 @@ class Portal:
         action = update.action
         should_ignore = ((not self.mxid and not await self._create_room_on_action(source, action))
                          or self.is_duplicate_action(update))
-        if should_ignore:
+        if should_ignore or not self.mxid:
             return
         # TODO figure out how to see changes to about text / channel username
         if isinstance(action, MessageActionChatEditTitle):