Remove viper and file configuration

This commit is contained in:
video-prize-ranch
2022-04-22 11:55:53 -04:00
parent 4a41e59d34
commit 088f46a5bb
10 changed files with 62 additions and 82 deletions

View File

@@ -9,7 +9,6 @@ import (
"codeberg.org/video-prize-ranch/rimgo/types"
"codeberg.org/video-prize-ranch/rimgo/utils"
"github.com/patrickmn/go-cache"
"github.com/spf13/viper"
"github.com/tidwall/gjson"
)
@@ -21,7 +20,7 @@ func FetchAlbum(albumID string) (types.Album, error) {
return cacheData.(types.Album), nil
}
res, err := http.Get("https://api.imgur.com/post/v1/albums/" + albumID + "?client_id=" + viper.GetString("RIMGU_IMGUR_CLIENT_ID") + "&include=media%2Caccount")
res, err := http.Get("https://api.imgur.com/post/v1/albums/" + albumID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
if err != nil {
return types.Album{}, err
}
@@ -50,7 +49,7 @@ func FetchPosts(albumID string) (types.Album, error) {
return cacheData.(types.Album), nil
}
res, err := http.Get("https://api.imgur.com/post/v1/posts/" + albumID + "?client_id=" + viper.GetString("RIMGU_IMGUR_CLIENT_ID") + "&include=media%2Caccount%2Ctags")
res, err := http.Get("https://api.imgur.com/post/v1/posts/" + albumID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount%2Ctags")
if err != nil {
return types.Album{}, err
}
@@ -76,7 +75,7 @@ func FetchMedia(mediaID string) (types.Album, error) {
return cacheData.(types.Album), nil
}
res, err := http.Get("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + viper.GetString("RIMGU_IMGUR_CLIENT_ID") + "&include=media%2Caccount")
res, err := http.Get("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
if err != nil {
return types.Album{}, err
}

View File

@@ -11,7 +11,6 @@ import (
"codeberg.org/video-prize-ranch/rimgo/utils"
"github.com/dustin/go-humanize"
"github.com/patrickmn/go-cache"
"github.com/spf13/viper"
"github.com/tidwall/gjson"
)
@@ -23,7 +22,7 @@ func FetchComments(galleryID string) ([]types.Comment, error) {
return cacheData.([]types.Comment), nil
}
res, err := http.Get("https://api.imgur.com/comment/v1/comments?client_id=" + viper.GetString("RIMGU_IMGUR_CLIENT_ID") + "&filter[post]=eq:" + galleryID + "&include=account,adconfig&per_page=30&sort=best")
res, err := http.Get("https://api.imgur.com/comment/v1/comments?client_id=" + utils.Config["imgurId"].(string) + "&filter[post]=eq:" + galleryID + "&include=account,adconfig&per_page=30&sort=best")
if err != nil {
return []types.Comment{}, err
}

View File

@@ -8,8 +8,8 @@ import (
"time"
"codeberg.org/video-prize-ranch/rimgo/types"
"codeberg.org/video-prize-ranch/rimgo/utils"
"github.com/patrickmn/go-cache"
"github.com/spf13/viper"
"github.com/tidwall/gjson"
)
@@ -27,7 +27,7 @@ func FetchTag(tag string, sort string, page string) (types.Tag, error) {
}
q := req.URL.Query()
q.Add("client_id", viper.GetString("RIMGU_IMGUR_CLIENT_ID"))
q.Add("client_id", utils.Config["imgurId"].(string))
q.Add("include", "cover")
q.Add("page", page)

View File

@@ -8,8 +8,8 @@ import (
"time"
"codeberg.org/video-prize-ranch/rimgo/types"
"codeberg.org/video-prize-ranch/rimgo/utils"
"github.com/patrickmn/go-cache"
"github.com/spf13/viper"
"github.com/tidwall/gjson"
)
@@ -21,7 +21,7 @@ func FetchUser(username string) (types.User, error) {
return cacheData.(types.User), nil
}
res, err := http.Get("https://api.imgur.com/account/v1/accounts/" + username + "?client_id=" + viper.GetString("RIMGU_IMGUR_CLIENT_ID"))
res, err := http.Get("https://api.imgur.com/account/v1/accounts/" + username + "?client_id=" + utils.Config["imgurId"].(string))
if err != nil {
return types.User{}, err
}
@@ -55,7 +55,7 @@ func FetchSubmissions(username string, sort string, page string) ([]types.Submis
return cacheData.([]types.Submission), nil
}
res, err := http.Get("https://api.imgur.com/3/account/" + username + "/submissions/" + page + "/" + sort + "?album_previews=1&client_id=" + viper.GetString("RIMGU_IMGUR_CLIENT_ID"))
res, err := http.Get("https://api.imgur.com/3/account/" + username + "/submissions/" + page + "/" + sort + "?album_previews=1&client_id=" + utils.Config["imgurId"].(string))
if err != nil {
return []types.Submission{}, err
}