mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 06:02:26 -05:00 
			
		
		
		
	mention regex better but not 100% there
This commit is contained in:
		
					parent
					
						
							
								197ef03ead
							
						
					
				
			
			
				commit
				
					
						c85c63680d
					
				
			
		
					 7 changed files with 50 additions and 12 deletions
				
			
		|  | @ -3,6 +3,7 @@ package status | |||
| import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||
|  | @ -228,3 +229,28 @@ func (p *processor) processEmojis(form *apimodel.AdvancedStatusCreateForm, accou | |||
| 	status.Emojis = emojis | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| func (p *processor) processContent(form *apimodel.AdvancedStatusCreateForm, accountID string, status *gtsmodel.Status) error { | ||||
| 	if form.Status == "" { | ||||
| 		status.Content = "" | ||||
| 		return nil | ||||
| 	} | ||||
| 
 | ||||
| 	// surround the whole status in '<p>' | ||||
| 	content := fmt.Sprintf(`<p>%s</p>`, form.Status) | ||||
| 
 | ||||
| 	// format mentions nicely | ||||
| 	for _, menchie := range status.GTSMentions { | ||||
| 		targetAccount := >smodel.Account{} | ||||
| 		if err := p.db.GetByID(menchie.TargetAccountID, targetAccount); err == nil { | ||||
| 			mentionContent := fmt.Sprintf(`<span class="h-card"><a href="%s" class="u-url mention">@<span>%s</span></a></span>`, targetAccount.URL, targetAccount.Username) | ||||
| 			content = strings.ReplaceAll(content, menchie.NameString, mentionContent) | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	// replace newlines with breaks | ||||
| 	content = strings.ReplaceAll(content, "\n", "<br />") | ||||
| 
 | ||||
| 	status.Content = content | ||||
| 	return nil | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue