File tree Expand file tree Collapse file tree 6 files changed +8
-15
lines changed Expand file tree Collapse file tree 6 files changed +8
-15
lines changed Original file line number Diff line number Diff line change 1
1
package main
2
2
3
3
import (
4
- "html"
5
4
"log"
6
5
"regexp"
7
6
"strings"
@@ -323,7 +322,7 @@ func TibiaCharactersCharacterV3(c *gin.Context) {
323
322
if len (subma1a ) > 0 {
324
323
325
324
// fixing encoding for achievement name
326
- subma1a [0 ][2 ] = html . UnescapeString (subma1a [0 ][2 ])
325
+ subma1a [0 ][2 ] = TibiaDataSanitizeEscapedString (subma1a [0 ][2 ])
327
326
328
327
// get the name of the achievement (and ignore the secret image on the right)
329
328
Name := strings .Split (subma1a [0 ][2 ], "<img" )
Original file line number Diff line number Diff line change 1
1
package main
2
2
3
3
import (
4
- "html"
5
4
"log"
6
5
"regexp"
7
6
"strings"
@@ -148,7 +147,7 @@ func TibiaFansitesV3(c *gin.Context) {
148
147
}
149
148
150
149
// Specials
151
- subma1 [0 ][8 ] = html . UnescapeString (subma1 [0 ][8 ])
150
+ subma1 [0 ][8 ] = TibiaDataSanitizeEscapedString (subma1 [0 ][8 ])
152
151
FansiteSpecialsData := strings .Split (subma1 [0 ][8 ], "</li><li>" )
153
152
154
153
// FansiteItem & FansiteItemURL
Original file line number Diff line number Diff line change @@ -120,7 +120,7 @@ func TibiaGuildsGuildV3(c *gin.Context) {
120
120
121
121
// Abort loop and continue wiht next section
122
122
if strings .Contains (line , "<br/><br/>" ) {
123
- GuildDescription = TibiadataUnescapeStringV3 (GuildDescription )
123
+ GuildDescription = TibiaDataSanitizeEscapedString (GuildDescription )
124
124
GuildDescriptionFinished = true
125
125
}
126
126
@@ -160,7 +160,7 @@ func TibiaGuildsGuildV3(c *gin.Context) {
160
160
subma1b := regex1b .FindAllStringSubmatch (line , - 1 )
161
161
162
162
GuildGuildhallData = append (GuildGuildhallData , Guildhall {
163
- Name : TibiadataUnescapeStringV3 (subma1b [0 ][1 ]),
163
+ Name : TibiaDataSanitizeEscapedString (subma1b [0 ][1 ]),
164
164
World : GuildWorld ,
165
165
PaidUntil : TibiadataDateV3 (subma1b [0 ][2 ]),
166
166
})
@@ -213,7 +213,7 @@ func TibiaGuildsGuildV3(c *gin.Context) {
213
213
}
214
214
215
215
MembersData = append (MembersData , Members {
216
- Name : TibiadataUnescapeStringV3 (subma1 [0 ][2 ]),
216
+ Name : TibiaDataSanitizeEscapedString (subma1 [0 ][2 ]),
217
217
Title : MembersTitle ,
218
218
Rank : MembersRank ,
219
219
Vocation : subma1 [0 ][4 ],
Original file line number Diff line number Diff line change @@ -76,9 +76,9 @@ func TibiaGuildsOverviewV3(c *gin.Context) {
76
76
77
77
if len (subma1 ) > 0 {
78
78
OneGuild := Guild {
79
- Name : TibiadataUnescapeStringV3 (subma1 [0 ][2 ]),
79
+ Name : TibiaDataSanitizeEscapedString (subma1 [0 ][2 ]),
80
80
LogoURL : subma1 [0 ][1 ],
81
- Description : TibiadataUnescapeStringV3 (strings .TrimSpace (subma1 [0 ][4 ])),
81
+ Description : TibiaDataSanitizeEscapedString (strings .TrimSpace (subma1 [0 ][4 ])),
82
82
}
83
83
84
84
// Adding OneWorld to correct category
Original file line number Diff line number Diff line change @@ -122,7 +122,7 @@ func TibiaSpellsOverviewV3(c *gin.Context) {
122
122
SpellsData = append (SpellsData , Spell {
123
123
Name : subma1 [0 ][2 ],
124
124
Spell : subma1 [0 ][1 ],
125
- Formula : TibiaDataSanitizeDoubleQuoteString (TibiadataUnescapeStringV3 (subma1 [0 ][3 ])),
125
+ Formula : TibiaDataSanitizeDoubleQuoteString (TibiaDataSanitizeEscapedString (subma1 [0 ][3 ])),
126
126
Level : TibiadataStringToIntegerV3 (subma1 [0 ][6 ]),
127
127
Mana : TibiadataStringToIntegerV3 (subma1 [0 ][7 ]),
128
128
Price : TibiadataStringToIntegerV3 (subma1 [0 ][8 ]),
Original file line number Diff line number Diff line change @@ -333,11 +333,6 @@ func TibiadataStringWorldFormatToTitleV3(world string) string {
333
333
return strings .Title (strings .ToLower (world ))
334
334
}
335
335
336
- // TibiadataUnescapeStringV3 func
337
- func TibiadataUnescapeStringV3 (data string ) string {
338
- return html .UnescapeString (data )
339
- }
340
-
341
336
// TibiadataQueryEscapeStringV3 func - encode string to be correct formatted
342
337
func TibiadataQueryEscapeStringV3 (data string ) string {
343
338
// switching "+" to " "
You can’t perform that action at this time.
0 commit comments