-
Notifications
You must be signed in to change notification settings - Fork 15
add support for directly send msg to room; example in README #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
C1tas
wants to merge
4
commits into
zulip:master
Choose a base branch
from
C1tas:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ | |
from errbot.rendering.ansiext import enable_format, TEXT_CHRS | ||
|
||
from urllib.parse import quote | ||
import re | ||
|
||
# Can't use __name__ because of Yapsy. | ||
log = logging.getLogger('errbot.backends.zulip') | ||
|
@@ -293,11 +294,111 @@ def change_presence(self, status: str = ONLINE, message: str = '') -> None: | |
# At this time, Zulip doesn't support active presence change. | ||
pass | ||
|
||
@staticmethod | ||
def check_email(email): | ||
regex_email = re.compile(r'^.+@([?)[a-zA-Z0-9-.]+.([a-zA-Z]{2,3}|[0-9]{1,3})(]?))$') | ||
if regex_email.match(email) != None: | ||
return True | ||
else: | ||
return False | ||
|
||
def extract_identifiers_from_string(self, text): | ||
""" | ||
extract username streamname topicname from text | ||
:param text: | ||
:return username streamname topicname: | ||
""" | ||
|
||
exception_message = ( | ||
'Unparseable zulip identifier, should be of the format `#{{stream}}*{{topic}}`,' | ||
'`@U12345`. (Got `%s`)' | ||
) | ||
text = text.strip() | ||
|
||
if text == '': | ||
raise ValueError(exception_message % '') | ||
|
||
username = None | ||
streamname = None | ||
topicname = None | ||
|
||
regex_str_stream = r'#{{(.*)}}$' | ||
regex_str_topic = r'\*{{(.*)}}$' | ||
regex_str_user = r'@{{(.*)}}$' | ||
|
||
regex_stream = re.compile(regex_str_stream) | ||
regex_topic = re.compile(regex_str_topic) | ||
regex_user = re.compile(regex_str_user) | ||
|
||
if self.check_email(text): | ||
username = text | ||
|
||
if text[0] == "#": | ||
if '*{{' in text: | ||
tmp_text = text.split('*{{') | ||
try: | ||
tmp_text[1] = '*{{' + tmp_text[1] | ||
except Exception as e: | ||
pass | ||
re_res = regex_stream.search(tmp_text[0]) | ||
if re_res: | ||
if len(re_res.groups()) > 0: | ||
streamname = re_res[1] | ||
re_res = regex_topic.search(tmp_text[1]) | ||
if re_res: | ||
if len(re_res.groups()) > 0: | ||
topicname = re_res[1] | ||
else: | ||
re_res = regex_stream.search(text) | ||
if re_res: | ||
if len(re_res.groups()) > 0: | ||
streamname = re_res[1] | ||
elif text[0] == '@': | ||
if text[1] != '{': | ||
username= text | ||
else: | ||
re_res = regex_user.search(text) | ||
if re_res: | ||
if len(re_res.groups()) > 0: | ||
username = re_res[1] | ||
else: | ||
raise ValueError(exception_message % text) | ||
|
||
return username, streamname, topicname | ||
|
||
def build_identifier(self, txtrep): | ||
return ZulipPerson(id=txtrep, | ||
full_name=txtrep, | ||
emails=[txtrep], | ||
client=self.client) | ||
|
||
log.debug('building an identifier from %s.', txtrep) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Another debugging artifact. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (Or do other backends actually log something here?) |
||
if self.check_email(txtrep): | ||
return ZulipPerson( | ||
id=txtrep, | ||
full_name=txtrep, | ||
emails=[txtrep], | ||
client=self.client | ||
) | ||
username, streamname, topicname = self.extract_identifiers_from_string(txtrep) | ||
|
||
if username: | ||
return ZulipPerson( | ||
id=txtrep, | ||
full_name=txtrep, | ||
emails=[txtrep], | ||
client=self.client | ||
) | ||
if streamname and not topicname: | ||
return ZulipRoom( | ||
id=streamname, | ||
title=streamname, | ||
subject='', | ||
client=self.client, | ||
) | ||
elif streamname and topicname: | ||
return ZulipRoom( | ||
id=streamname, | ||
title=streamname, | ||
subject=topicname, | ||
client=self.client, | ||
) | ||
|
||
def build_reply(self, msg, text=None, private=False, threaded=False): | ||
response = self.build_message(text) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic in this if-statement is rather complicated. Perhaps there is a simpler way to parse this? Maybe something that involves extracting every occurrence of
{{}}
and making the if-statements switch based on the number of these statements.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sry for my poor regex skill, if you have some cool idea, just instead of using my poor code