1
0

rename ApplicationServices.is_interested -> is_interested_in_event

This commit is contained in:
Andrew Morgan
2021-11-26 17:13:48 +00:00
parent bf40bfe37f
commit d7dc699f0a
3 changed files with 38 additions and 12 deletions
+1 -1
View File
@@ -207,7 +207,7 @@ class ApplicationService:
return True
return False
async def is_interested(
async def is_interested_in_event(
self, event: EventBase, store: Optional["DataStore"] = None
) -> bool:
"""Check if this service is interested in this event.
+1 -1
View File
@@ -712,7 +712,7 @@ class ApplicationServicesHandler:
# inside of a list comprehension anymore.
interested_list = []
for s in services:
if await s.is_interested(event, self.store):
if await s.is_interested_in_event(event, self.store):
interested_list.append(s)
return interested_list
+36 -10
View File
@@ -50,7 +50,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
self.event.sender = "@irc_foobar:matrix.org"
self.assertTrue(
(yield defer.ensureDeferred(self.service.is_interested(self.event)))
(
yield defer.ensureDeferred(
self.service.is_interested_in_event(self.event)
)
)
)
@defer.inlineCallbacks
@@ -58,7 +62,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
self.event.sender = "@someone_else:matrix.org"
self.assertFalse(
(yield defer.ensureDeferred(self.service.is_interested(self.event)))
(
yield defer.ensureDeferred(
self.service.is_interested_in_event(self.event)
)
)
)
@defer.inlineCallbacks
@@ -68,7 +76,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.event.type = "m.room.member"
self.event.state_key = "@irc_foobar:matrix.org"
self.assertTrue(
(yield defer.ensureDeferred(self.service.is_interested(self.event)))
(
yield defer.ensureDeferred(
self.service.is_interested_in_event(self.event)
)
)
)
@defer.inlineCallbacks
@@ -78,7 +90,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
)
self.event.room_id = "!some_prefixs0m3th1nGsome_suffix:matrix.org"
self.assertTrue(
(yield defer.ensureDeferred(self.service.is_interested(self.event)))
(
yield defer.ensureDeferred(
self.service.is_interested_in_event(self.event)
)
)
)
@defer.inlineCallbacks
@@ -88,7 +104,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
)
self.event.room_id = "!XqBunHwQIXUiqCaoxq:matrix.org"
self.assertFalse(
(yield defer.ensureDeferred(self.service.is_interested(self.event)))
(
yield defer.ensureDeferred(
self.service.is_interested_in_event(self.event)
)
)
)
@defer.inlineCallbacks
@@ -103,7 +123,7 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.assertTrue(
(
yield defer.ensureDeferred(
self.service.is_interested(self.event, self.store)
self.service.is_interested_in_event(self.event, self.store)
)
)
)
@@ -156,7 +176,7 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.assertFalse(
(
yield defer.ensureDeferred(
self.service.is_interested(self.event, self.store)
self.service.is_interested_in_event(self.event, self.store)
)
)
)
@@ -175,7 +195,7 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.assertTrue(
(
yield defer.ensureDeferred(
self.service.is_interested(self.event, self.store)
self.service.is_interested_in_event(self.event, self.store)
)
)
)
@@ -189,7 +209,11 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.event.content = {"membership": "invite"}
self.event.state_key = self.service.sender
self.assertTrue(
(yield defer.ensureDeferred(self.service.is_interested(self.event)))
(
yield defer.ensureDeferred(
self.service.is_interested_in_event(self.event)
)
)
)
@defer.inlineCallbacks
@@ -205,7 +229,9 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.assertTrue(
(
yield defer.ensureDeferred(
self.service.is_interested(event=self.event, store=self.store)
self.service.is_interested_in_event(
event=self.event, store=self.store
)
)
)
)