enable to show html as plain text if enabled and the url and text is not the same or nor contains data-mautrix-no-link

2020-08-17 00:57:25 +02:00
parent 2a1329d981
commit 0f77c17e9c
4 changed files with 65 additions and 14 deletions
--- a/config/config.go
+++ b/config/config.go
@ -50,7 +50,11 @@ type UserPreferences struct {
 	DisableHTML          bool `yaml:"disable_html"`
 	DisableDownloads     bool `yaml:"disable_downloads"`
 	DisableNotifications bool `yaml:"disable_notifications"`
-	DisableShowUrls      bool `yaml:"disable_show_urls"`
+<<<<<<< HEAD
+	DisableShowURLs      bool `yaml:"disable_show_urls"`
+=======
+	DisableShowurls      bool `yaml:"disable_show_urls"`
+>>>>>>> 67c0262587404c2b2912e934092dacdba7cc2ed0
 }

 // Config contains the main config of gomuks.