mirrors/rimgo
1
0
Fork 0
mirror of https://codeberg.org/video-prize-ranch/rimgo.git synced 2025-12-13 19:55:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix tag backgrounds

Browse Source
This commit is contained in:
video-prize-ranch
2022-07-22 12:20:51 -04:00
parent e0efe6caca
commit 150df2435d
4 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api/album.go
View File

@@ -19,9 +19,9 @@ type Album struct {
CreatedAt string
UpdatedAt string
Comments int64
User User
User User
Media []Media
Tags []Tag
Tags []Tag
}
type Media struct {
@@ -30,8 +30,8 @@ type Media struct {
Title string
Description string
Url string
Type string
MimeType string
Type string
MimeType string
}
var albumCache = cache.New(1*time.Hour, 15*time.Minute)
@@ -52,7 +52,7 @@ func FetchAlbum(albumID string) (Album, error) {
return Album{}, err
}
albumCache.Set(albumID + "-album", album, cache.DefaultExpiration)
albumCache.Set(albumID+"-album", album, cache.DefaultExpiration)
return album, err
}
@@ -72,7 +72,7 @@ func FetchPosts(albumID string) (Album, error) {
return Album{}, err
}
albumCache.Set(albumID + "-posts", album, cache.DefaultExpiration)
albumCache.Set(albumID+"-posts", album, cache.DefaultExpiration)
return album, nil
}
@@ -81,7 +81,7 @@ func FetchMedia(mediaID string) (Album, error) {
if found {
return cacheData.(Album), nil
}
data, err := utils.GetJSON("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
if err != nil {
return Album{}, err
@@ -92,7 +92,7 @@ func FetchMedia(mediaID string) (Album, error) {
return Album{}, err
}
albumCache.Set(mediaID + "-media", album, cache.DefaultExpiration)
albumCache.Set(mediaID+"-media", album, cache.DefaultExpiration)
return album, nil
}
@@ -121,9 +121,10 @@ func ParseAlbum(data gjson.Result) (Album, error) {
data.Get("tags").ForEach(
func(key gjson.Result, value gjson.Result) bool {
tags = append(tags, Tag{
Tag: value.Get("tag").String(),
Display: value.Get("display").String(),
Background: "/" + value.Get("background_id").String() + ".webp",
Tag: value.Get("tag").String(),
Display: value.Get("display").String(),
Background: "/" + value.Get("background_id").String() + ".webp",
BackgroundId: value.Get("background_id").String(),
})
return true
},
@@ -144,15 +145,15 @@ func ParseAlbum(data gjson.Result) (Album, error) {
Comments: data.Get("comment_count").Int(),
CreatedAt: createdAt,
Media: media,
Tags: tags,
Tags: tags,
}
account := data.Get("account")
if account.Raw != "" {
album.User = User{
Id: account.Get("id").Int(),
Id: account.Get("id").Int(),
Username: account.Get("username").String(),
Avatar: strings.ReplaceAll(account.Get("avatar_url").String(), "https://i.imgur.com", ""),
Avatar: strings.ReplaceAll(account.Get("avatar_url").String(), "https://i.imgur.com", ""),
}
}

29
api/tag.go
View File

@@ -13,12 +13,13 @@ import (
)
type Tag struct {
Tag string
Display string
Sort string
PostCount int64
Posts []Submission
Background string
Tag string
Display string
Sort string
PostCount int64
Posts []Submission
Background string
BackgroundId string
}
var tagCache = cache.New(15*time.Minute, 15*time.Minute)
@@ -80,9 +81,9 @@ func FetchTag(tag string, sort string, page string) (Tag, error) {
Title: value.Get("title").String(),
Link: strings.ReplaceAll(value.Get("url").String(), "https://imgur.com", ""),
Cover: Media{
Id: value.Get("cover_id").String(),
Id: value.Get("cover_id").String(),
Type: value.Get("cover.type").String(),
Url: strings.ReplaceAll(value.Get("cover.url").String(), "https://i.imgur.com", ""),
Url: strings.ReplaceAll(value.Get("cover.url").String(), "https://i.imgur.com", ""),
},
Points: value.Get("point_count").Int(),
Upvotes: value.Get("upvote_count").Int(),
@@ -100,12 +101,12 @@ func FetchTag(tag string, sort string, page string) (Tag, error) {
wg.Wait()
tagData := Tag{
Tag: tag,
Display: data.Get("display").String(),
Sort: sort,
PostCount: data.Get("post_count").Int(),
Posts: posts,
Background: "/" + data.Get("background_id").String() + ".webp",
Tag: tag,
Display: data.Get("display").String(),
Sort: sort,
PostCount: data.Get("post_count").Int(),
Posts: posts,
Background: "/" + data.Get("background_id").String() + ".webp",
}
tagCache.Set(tag, tagData, cache.DefaultExpiration)