Revert changes made accidentally in TibiaNews and Newslist (TibiaURLs to TibiaURL)

Author: Kai-Animator

src/TibiaNews.go

@@ -16,7 +16,7 @@ type News struct {
 	Title       string `json:"title,omitempty"` // The title of the news.
 	Category    string `json:"category"`        // The category of the news.
 	Type        string `json:"type,omitempty"`  // The type of news.
-	TibiaURLs    string `json:"url"`             // The URL for the news with id.
+	TibiaURL    string `json:"url"`             // The URL for the news with id.
 	Content     string `json:"content"`         // The news in plain text.
 	ContentHTML string `json:"content_html"`    // The news in HTML format.
 }
@@ -45,7 +45,7 @@ func TibiaNewsImpl(NewsID int, rawUrl string, BoxContentHTML string) (NewsRespon
 	}
 
 	NewsData.ID = NewsID
-	NewsData.TibiaURLs = rawUrl
+	NewsData.TibiaURL = rawUrl
 
 	ReaderHTML.Find(".NewsHeadline").EachWithBreak(func(index int, s *goquery.Selection) bool {
 		// getting category by image src
@@ -141,7 +141,7 @@ func TibiaNewsImpl(NewsID int, rawUrl string, BoxContentHTML string) (NewsRespon
 		Information{
 			APIDetails: TibiaDataAPIDetails,
 			Timestamp:  TibiaDataDatetime(""),
-			TibiaURLs:   []string{rawUrl},
+			TibiaURLs:  []string{rawUrl},
 			Status: Status{
 				HTTPCode: http.StatusOK,
 			},

src/TibiaNews_test.go

@@ -35,7 +35,7 @@ func TestNewsById(t *testing.T) {
 	assert.Empty(newsArticleJson.News.Title)
 	assert.Equal("development", newsArticleJson.News.Category)
 	assert.Equal("ticker", newsArticleJson.News.Type)
-	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6529", newsArticleJson.News.TibiaURLs)
+	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6529", newsArticleJson.News.TibiaURL)
 	assert.Equal("A number of issues related to the 25 years activities have been fixed, including the following: Dragon pinatas that were stuck in the inbox have been changed into dragon pinata kits. The wind-up loco can now be taken even after defeating Lord Retro. The baby seals can now be painted even when the quest The Ice Islands is active. The weight of wallpapers and fairy lights has been increased and their market category has been changed to decoration. A number of typos and map issues have been fixed as well.", newsArticleJson.News.Content)
 	assert.Equal("A number of issues related to the 25 years activities have been fixed, including the following: Dragon pinatas that were stuck in the inbox have been changed into dragon pinata kits. The wind-up loco can now be taken even after defeating Lord Retro. The baby seals can now be painted even when the quest The Ice Islands is active. The weight of wallpapers and fairy lights has been increased and their market category has been changed to decoration. A number of typos and map issues have been fixed as well.", newsArticleJson.News.ContentHTML)
 }
@@ -64,7 +64,7 @@ func TestNews6512(t *testing.T) {
 	assert.Empty(newsArticleJson.News.Title)
 	assert.Equal("community", newsArticleJson.News.Category)
 	assert.Equal("ticker", newsArticleJson.News.Type)
-	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6512", newsArticleJson.News.TibiaURLs)
+	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6512", newsArticleJson.News.TibiaURL)
 	assert.Equal("TibiaData.com has some news to share! First of all, they invite you to participate in their Discord Server. Further, they are now present on GitHub. They are working on their v3, which is still in beta. If you are interested in such things, head on over there to see what is cooking.", newsArticleJson.News.Content)
 	assert.Equal("<a href=\"https://tibiadata.com\" target=\"_blank\" rel=\"noopener noreferrer\" rel=\"noopener\">TibiaData.com</a> has some news to share! First of all, they invite you to participate in their <a href=\"https://tibiadata.com/2021/07/join-tibiadata-on-discord/\" target=\"_blank\" rel=\"noopener noreferrer\" rel=\"noopener\">Discord Server</a>. Further, they are now present on <a href=\"https://tibiadata.com/2021/12/tibiadata-has-gone-open-source/\" target=\"_blank\" rel=\"noopener noreferrer\" rel=\"noopener\">GitHub</a>. They are working on their <a href=\"https://tibiadata.com/doc-api-v3/v3-beta/\" target=\"_blank\" rel=\"noopener noreferrer\" rel=\"noopener\">v3</a>, which is still in beta. If you are interested in such things, head on over there to see what is cooking.", newsArticleJson.News.ContentHTML)
 }
@@ -93,7 +93,7 @@ func TestNews504(t *testing.T) {
 	assert.Empty(newsArticleJson.News.Title)
 	assert.Equal("community", newsArticleJson.News.Category)
 	assert.Equal("ticker", newsArticleJson.News.Type)
-	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=504", newsArticleJson.News.TibiaURLs)
+	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=504", newsArticleJson.News.TibiaURL)
 	assert.Equal("A new feedback form has been released today. Help us to find out which websites and magazines are popular in your country by filling out the new questionnaire. In our current poll we are curious about your occupation.", newsArticleJson.News.Content)
 	assert.Equal("<br/>A new feedback form has been released today. Help us to find out which websites and magazines are popular in your country by filling out the new questionnaire. In our current poll we are curious about your occupation.", newsArticleJson.News.ContentHTML)
 }
@@ -122,7 +122,7 @@ func TestNews6481(t *testing.T) {
 	assert.Equal("New Mounts", newsArticleJson.News.Title)
 	assert.Equal("development", newsArticleJson.News.Category)
 	assert.Empty(newsArticleJson.News.Type)
-	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6481", newsArticleJson.News.TibiaURLs)
+	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6481", newsArticleJson.News.TibiaURL)
 	assert.Equal("New mounts have been added to the Store today!\nThe origins of the Emerald Raven, Mystic Raven, and Radiant Raven are shrouded in darkness, as no written record nor tale told by even the most knowing storytellers mentions but a trace of them. Superstition surrounds them, as some see these gigantic birds as an echo of a long forgotten past, while others believe them to herald hitherto unknown events. What is clear is that they are highly intelligent beings which make great companions if they deem somebody worthy.\n\nClick on image to enlarge.\n\nOnce bought, your character can use the mount ingame anytime, no matter if you are a free account or a Premium account.\nGet yourself a corvid companion!Your Community Managers ", newsArticleJson.News.Content)
 	assert.Equal("<p>New mounts have been added to the Store today!</p>\n<p>The origins of the <strong>Emerald Raven</strong>, <strong>Mystic Raven</strong>, and <strong>Radiant Raven</strong> are shrouded in darkness, as no written record nor tale told by even the most knowing storytellers mentions but a trace of them. Superstition surrounds them, as some see these gigantic birds as an echo of a long forgotten past, while others believe them to herald hitherto unknown events. What is clear is that they are highly intelligent beings which make great companions if they deem somebody worthy.</p>\n<figure><center><img style=\"cursor: pointer;\" src=\"https://static.tibia.com/images/news/emeraldraven_small.jpg\" onclick=\"ImageInNewWindow(&#39;https://static.tibia.com/images/news/emeraldraven.jpg&#39;)\"/></center>\n<figcaption><center><em>Click on image to enlarge.</em></center></figcaption>\n</figure>\n<p>Once bought, your character can use the mount ingame anytime, no matter if you are a free account or a Premium account.</p>\n<p>Get yourself a corvid companion!<br/>Your Community Managers</p> ", newsArticleJson.News.ContentHTML)
 }

src/TibiaNewslist.go

@@ -16,7 +16,7 @@ type NewsItem struct {
 	News     string `json:"news"`              // The news in plain text.
 	Category string `json:"category"`          // The category of the news.
 	Type     string `json:"type"`              // The type of news.
-	TibiaURLs string `json:"url"`               // The URL for the news with id.
+	TibiaURL string `json:"url"`               // The URL for the news with id.
 	ApiURL   string `json:"url_api,omitempty"` // The URL for the news in this API.
 }
 
@@ -63,7 +63,7 @@ func TibiaNewslistImpl(days int, BoxContentHTML string, handlerURL string) (News
 		NewsID := p.Query().Get("id")
 		NewsSplit := strings.Split(NewsURL, NewsID)
 		OneNews.ID = TibiaDataStringToInteger(NewsID)
-		OneNews.TibiaURLs = NewsSplit[0] + NewsID
+		OneNews.TibiaURL = NewsSplit[0] + NewsID
 
 		if TibiaDataHost != "" {
 			OneNews.ApiURL = "https://" + TibiaDataHost + "/v4/news/id/" + NewsID
@@ -86,7 +86,7 @@ func TibiaNewslistImpl(days int, BoxContentHTML string, handlerURL string) (News
 		Information{
 			APIDetails: TibiaDataAPIDetails,
 			Timestamp:  TibiaDataDatetime(""),
-			TibiaURLs:   []string{handlerURL},
+			TibiaURLs:  []string{handlerURL},
 			Status: Status{
 				HTTPCode: http.StatusOK,
 			},

src/TibiaNewslist_test.go

@@ -40,6 +40,6 @@ func TestNewsList(t *testing.T) {
 	assert.Equal("A number of issues related to the 25 years activities have been fixed,...", firstArticle.News)
 	assert.Equal("development", firstArticle.Category)
 	assert.Equal("ticker", firstArticle.Type)
-	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6529", firstArticle.TibiaURLs)
+	assert.Equal("https://www.tibia.com/news/?subtopic=newsarchive&id=6529", firstArticle.TibiaURL)
 	assert.Equal("https://unittest.example.com/v4/news/id/6529", firstArticle.ApiURL)
 }