瀏覽代碼

Improvements to social media preview URL regexes

main
Rocketsoup 2 週之前
父節點
當前提交
99281f1377
共有 1 個檔案被更改,包括 9 行新增6 行删除
  1. 9
    6
      rocketbot/cogs/videopreviewcog.py

+ 9
- 6
rocketbot/cogs/videopreviewcog.py 查看文件

@@ -73,9 +73,9 @@ class VideoPreviewCog(BaseCog, name='Video Link Previews'):
73 73
 		brief='whether to show video previews for Twitter links',
74 74
 	)
75 75
 
76
-	REGEX_INSTAGRAM_POST = r'https?:\/\/(?:www\.)?instagram\.com\/(?:p|reel)\/[a-zA-Z0-9_-]+\/?'
77
-	REGEX_FACEBOOK_POST = r'https?:\/\/(?:www\.)?facebook\.com\/share\/[rv]\/[a-zA-Z0-9_-]+\/?'
78
-	REGEX_TWITTER_POST = r'https?:\/\/(?:twitter|x)\.com\/[a-zA-Z0-9_-]+/status/[0-9]+'
76
+	REGEX_INSTAGRAM_POST = r'(https?:\/\/(?:www\.)?)\w*(instagram\.com\/\w+/\w+\/?)'
77
+	REGEX_FACEBOOK_POST = r'(https?:\/\/(?:www\.)?)\w*(facebook\.com(?:\/\w+)+\/\w+\/?)'
78
+	REGEX_TWITTER_POST = r'(https?:\/\/(?:www\.)?)\w*((?:twitter|x)\.com\/\w+\/status\/[0-9]+)'
79 79
 
80 80
 	REGEX_SPOILERS = '\|\|.+\|\|'
81 81
 
@@ -125,13 +125,16 @@ class VideoPreviewCog(BaseCog, name='Video Link Previews'):
125 125
 		has_spoilers = re.match(Self.REGEX_SPOILERS, content) is not None
126 126
 		if self.get_guild_setting(message.guild, Self.SETTING_INSTAGRAM):
127 127
 			for link in re.findall(Self.REGEX_INSTAGRAM_POST, content):
128
-				links.append(MessageLink(link, 'instagram', has_spoilers))
128
+				url = link[0] + link[1]
129
+				links.append(MessageLink(url, 'instagram', has_spoilers))
129 130
 		if self.get_guild_setting(message.guild, Self.SETTING_FACEBOOK):
130 131
 			for link in re.findall(Self.REGEX_FACEBOOK_POST, content):
131
-				links.append(MessageLink(link, 'facebook', has_spoilers))
132
+				url = link[0] + link[1]
133
+				links.append(MessageLink(url, 'facebook', has_spoilers))
132 134
 		if self.get_guild_setting(message.guild, Self.SETTING_TWITTER):
133 135
 			for link in re.findall(Self.REGEX_TWITTER_POST, content):
134
-				links.append(MessageLink(link, 'twitter', has_spoilers))
136
+				url = link[0] + link[1]
137
+				links.append(MessageLink(url, 'twitter', has_spoilers))
135 138
 		# TODO: Custom patterns
136 139
 		return links
137 140
 

Loading…
取消
儲存