Skip to content

Fix twitch.tv parsing of CJK username #226

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.

Sign up for GitHub

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix twitch.tv parsing of CJK username #226

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf4b0cc
Update twitch.py
JC-Chung Sep 14, 2023
d1c0675
Clean comment code
JC-Chung Sep 24, 2024
7323606
Retention of the original mode
JC-Chung Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions chat_downloader/sites/twitch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,11 +1309,12 @@ def get_chat_by_clip_id(self, clip_id, params):
)

_MESSAGE_REGEX = re.compile(
r'^@(.+?(?=\s+:)).*tmi\.twitch\.tv\s+(\S+)(?:[^#\r\n]+#)?\s(?:\S+)?(?:\s:([^\r\n]*))?', re.MULTILINE)
r'^@(.+?(?=\s+:))\s+:(.*)?tmi\.twitch\.tv\s+(\S+)(?:[^#\r\n]+#)?\s(?:\S+)?(?:\s:([^\r\n]*))?', re.MULTILINE)
# Groups:
# 1. Tag info
# 2. Action type
# 3. Message
# 2. ?User name
# 3. Action type
# 4. Message

_BADGE_KEYS = ('title', 'image1x', 'image2x',
'image4x', 'clickAction', 'clickURL')
Expand Down Expand Up @@ -1416,7 +1417,7 @@ def _parse_irc_item(match):
r.remap(info, TwitchChatDownloader._IRC_REMAPPING,
keys[0], keys[1], keep_unknown_keys=True, replace_char_with_underscores='-')

message_match = match.group(3)
message_match = match.group(4)
if message_match:
info['message'] = remove_prefixes(message_match, '\u0001ACTION ')

Expand All @@ -1443,16 +1444,18 @@ def _parse_irc_item(match):
subscriber_badge['months'] = int_or_none(
subscriber_badge_metadata['version'], 0)

author_display_name = info.get('author_display_name')
if author_display_name:
info['author_name'] = author_display_name.lower()
user_name_match = match.group(2)
if user_name_match:
info['author_name'] = user_name_match.split('!')[0]
elif info.get('author_display_name'):
info['author_name'] = info['author_display_name'].lower()

in_reply_to = BaseChatDownloader._move_to_dict(info, 'in_reply_to')

BaseChatDownloader._move_to_dict(in_reply_to, 'author')
BaseChatDownloader._move_to_dict(info, 'author')

original_action_type = match.group(2)
original_action_type = match.group(3)

if original_action_type:
new_action_type = TwitchChatDownloader._ACTION_TYPE_REMAPPING.get(
Expand Down