Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

markdown: Refactor classes handling stream topic links. 

The classes StreamPattern and StreamTopicPattern both had a
separate copy of the function `find_stream_id` which did the same
thing. Since another Pattern will be added as a part of #31920, it
is a good idea to move that function into a superclass which is then
inherited by all the related patterns.

Fixes part of #31920
This commit is contained in:
Kislay Udbhav Verma 2024-10-27 16:50:08 +05:30 committed by Tim Abbott
parent efa5b3cce1
commit 65c9b249b7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/markdown/__init__.py
View File

@ -1984,7 +1984,7 @@ class UserGroupMentionPattern(CompiledInlineProcessor):
return None, None, None return None, None, None
class StreamPattern(CompiledInlineProcessor): class StreamTopicMessageProcessor(CompiledInlineProcessor):
def find_stream_id(self, name: str) -> int | None: def find_stream_id(self, name: str) -> int | None:
db_data: DbData | None = self.zmd.zulip_db_data db_data: DbData | None = self.zmd.zulip_db_data
if db_data is None: if db_data is None:
@ -1992,6 +1992,8 @@ class StreamPattern(CompiledInlineProcessor):
stream_id = db_data.stream_names.get(name) stream_id = db_data.stream_names.get(name)
return stream_id return stream_id
class StreamPattern(StreamTopicMessageProcessor):
@override @override
def handleMatch( # type: ignore[override] # https://github.com/python/mypy/issues/10197 def handleMatch( # type: ignore[override] # https://github.com/python/mypy/issues/10197
self, m: Match[str], data: str self, m: Match[str], data: str
@ -2016,14 +2018,7 @@ class StreamPattern(CompiledInlineProcessor):
return el, m.start(), m.end() return el, m.start(), m.end()
class StreamTopicPattern(CompiledInlineProcessor): class StreamTopicPattern(StreamTopicMessageProcessor):
def find_stream_id(self, name: str) -> int | None:
db_data: DbData | None = self.zmd.zulip_db_data
if db_data is None:
return None
stream_id = db_data.stream_names.get(name)
return stream_id
@override @override
def handleMatch( # type: ignore[override] # https://github.com/python/mypy/issues/10197 def handleMatch( # type: ignore[override] # https://github.com/python/mypy/issues/10197
self, m: Match[str], data: str self, m: Match[str], data: str