spaceapi remove feed type

diff --git a/r3-webstatus-spaceapi/main.go b/r3-webstatus-spaceapi/main.go
index a34390b..322b647 100644 (file)
--- a/r3-webstatus-spaceapi/main.go
+++ b/r3-webstatus-spaceapi/main.go
@@ -123,8 +123,9 @@ ReOpenSocket:
 }
 
 func main() {
-       spaceapidata.AddSpaceFeed("calendar", "application/rss+xml", "http://grical.realraum.at/s/?query=!realraum&view=rss")
-       spaceapidata.AddSpaceFeed("google+", "text/html", "https://plus.google.com/113737596421797426873")
+       spaceapidata.AddSpaceFeed("calendar", "http://grical.realraum.at/s/?query=!realraum&view=rss")
+       spaceapidata.AddSpaceFeed("blog", "https://plus.google.com/113737596421797426873")
+       spaceapidata.AddSpaceFeed("wiki", "http://realraum.at/wiki")
        spaceapidata.AddSpaceContactInfo("+43780700888524", "irc://irc.oftc.net/#realraum", "realraum@realraum.at", "realraum@realraum.at", "realraum@realraum.at", "vorstand@realraum.at")
        eventqueue := make(chan string)
        ticker := time.NewTicker(time.Duration(7) * time.Minute)

diff --git a/r3-webstatus-spaceapi/spaceapi/spaceapi.go b/r3-webstatus-spaceapi/spaceapi/spaceapi.go
index d32aa79..4162295 100644 (file)
--- a/r3-webstatus-spaceapi/spaceapi/spaceapi.go
+++ b/r3-webstatus-spaceapi/spaceapi/spaceapi.go
@@ -148,8 +148,8 @@ func (nsi SpaceInfo) AddSpaceContactInfo(phone, irc, email, ml, jabber, issuemai
        return nsi
 }
 
-func (nsi SpaceInfo) AddSpaceFeed(feedtype, mimetype, url string) SpaceInfo {
-       newfeed := SpaceInfo{"type": mimetype, "url": url}
+func (nsi SpaceInfo) AddSpaceFeed(feedtype, url string) SpaceInfo {
+       newfeed := SpaceInfo{"url": url}
        if nsi["feeds"] == nil {
         nsi["feeds"] = SpaceInfo{feedtype: newfeed}
        } else {