mirror of
				https://github.com/zulip/zulip.git
				synced 2025-10-31 20:13:46 +00:00 
			
		
		
		
	mattermost: Run html2text as a subprocess.
html2text is GPL licensed. Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
		
				
					committed by
					
						 Tim Abbott
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							e10b7f2f3c
						
					
				
				
					commit
					f3254bb558
				
			| @@ -422,10 +422,6 @@ def process_raw_message_batch( | |||||||
|     mention_map: Dict[int, Set[int]] = {} |     mention_map: Dict[int, Set[int]] = {} | ||||||
|     zerver_message = [] |     zerver_message = [] | ||||||
|  |  | ||||||
|     import html2text |  | ||||||
|  |  | ||||||
|     h = html2text.HTML2Text() |  | ||||||
|  |  | ||||||
|     pm_members = {} |     pm_members = {} | ||||||
|  |  | ||||||
|     for raw_message in raw_messages: |     for raw_message in raw_messages: | ||||||
| @@ -437,7 +433,9 @@ def process_raw_message_batch( | |||||||
|             content=raw_message["content"], |             content=raw_message["content"], | ||||||
|             mention_user_ids=mention_user_ids, |             mention_user_ids=mention_user_ids, | ||||||
|         ) |         ) | ||||||
|         content = h.handle(content) |  | ||||||
|  |         # html2text is GPL licensed, so run it as a subprocess. | ||||||
|  |         content = subprocess.check_output(["html2text"], input=content, text=True) | ||||||
|  |  | ||||||
|         if len(content) > 10000:  # nocoverage |         if len(content) > 10000:  # nocoverage | ||||||
|             logging.info("skipping too-long message of length %s", len(content)) |             logging.info("skipping too-long message of length %s", len(content)) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user