web/notify.moe
Code Issues Pull Requests Activity

Removed games integration

Browse Source
This commit is contained in:
Eduard Urbach
2021-11-20 21:26:51 +09:00
parent 9368689019
commit 0a41069e4a
21 changed files with 3 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arn/APIKeys.go
View File

@ -6,7 +6,6 @@ import (
"path"
"github.com/animenotifier/anilist"
"github.com/animenotifier/osu"
jsoniter "github.com/json-iterator/go"
)
@ -57,10 +56,6 @@ type APIKeysData struct {
Secret string `json:"secret"`
} `json:"anilist"`
Osu struct {
Secret string `json:"secret"`
} `json:"osu"`
PayPal struct {
ID string `json:"id"`
Secret string `json:"secret"`
@ -111,9 +106,6 @@ func init() {
panic(err)
}
// Set Osu API key
osu.APIKey = APIKeys.Osu.Secret
// Set Anilist API keys
anilist.APIKeyID = APIKeys.AniList.ID
anilist.APIKeySecret = APIKeys.AniList.Secret

10
arn/SoundTrack.go
View File

@ -104,16 +104,6 @@ func (track *SoundTrack) Anime() []*Anime {
return animeList
}
// OsuBeatmaps returns all osu beatmap IDs of the sound track.
func (track *SoundTrack) OsuBeatmaps() []string {
return FilterIDTags(track.Tags, "osu-beatmap")
}
// EtternaBeatmaps returns all Etterna song IDs of the sound track.
func (track *SoundTrack) EtternaBeatmaps() []string {
return FilterIDTags(track.Tags, "etterna")
}
// MainAnime ...
func (track *SoundTrack) MainAnime() *Anime {
allAnime := track.Anime()

71
arn/User.go
View File

@ -5,18 +5,14 @@ import (
"fmt"
"io/ioutil"
"net/http"
"strconv"
"strings"
"sync"
"time"
"github.com/aerogo/aero/event"
"github.com/aerogo/http/client"
"github.com/animenotifier/ffxiv"
"github.com/animenotifier/notify.moe/arn/autocorrect"
"github.com/animenotifier/notify.moe/arn/validate"
"github.com/animenotifier/osu"
"github.com/animenotifier/overwatch"
gravatar "github.com/ungerik/go-gravatar"
)
@ -514,70 +510,3 @@ func (user *User) TypeName() string {
func (user *User) Self() Loggable {
return user
}
// RefreshOsuInfo refreshes a user's Osu information.
func (user *User) RefreshOsuInfo() error {
if user.Accounts.Osu.Nick == "" {
return nil
}
osu, err := osu.GetUser(user.Accounts.Osu.Nick)
if err != nil {
return err
}
user.Accounts.Osu.PP, _ = strconv.ParseFloat(osu.PPRaw, 64)
user.Accounts.Osu.Level, _ = strconv.ParseFloat(osu.Level, 64)
user.Accounts.Osu.Accuracy, _ = strconv.ParseFloat(osu.Accuracy, 64)
return nil
}
// RefreshFFXIVInfo refreshes a user's FFXIV information.
func (user *User) RefreshFFXIVInfo() error {
if user.Accounts.FinalFantasyXIV.Nick == "" || user.Accounts.FinalFantasyXIV.Server == "" {
return nil
}
characterID, err := ffxiv.GetCharacterID(user.Accounts.FinalFantasyXIV.Nick, user.Accounts.FinalFantasyXIV.Server)
if err != nil {
return err
}
character, err := ffxiv.GetCharacter(characterID)
if err != nil {
return err
}
user.Accounts.FinalFantasyXIV.Class = character.Class
user.Accounts.FinalFantasyXIV.Level = character.Level
user.Accounts.FinalFantasyXIV.ItemLevel = character.ItemLevel
return nil
}
// RefreshOverwatchInfo refreshes a user's Overwatch information.
func (user *User) RefreshOverwatchInfo() error {
if user.Accounts.Overwatch.BattleTag == "" {
return nil
}
stats, err := overwatch.GetPlayerStats(user.Accounts.Overwatch.BattleTag)
if err != nil {
return err
}
skillRating, tier := stats.HighestSkillRating()
// Only show career highest skill rating
if skillRating > user.Accounts.Overwatch.SkillRating {
user.Accounts.Overwatch.SkillRating = skillRating
user.Accounts.Overwatch.Tier = tier
}
return nil
}

71
arn/UserAPI.go
View File

@ -11,7 +11,6 @@ import (
"github.com/aerogo/aero"
"github.com/aerogo/api"
"github.com/aerogo/http/client"
"github.com/akyoto/color"
"github.com/animenotifier/notify.moe/arn/autocorrect"
)
@ -127,54 +126,6 @@ func (user *User) Edit(ctx aero.Context, key string, value reflect.Value, newVal
user.Accounts.Discord.Verified = false
}
return true, nil
case "Accounts.Overwatch.BattleTag":
newBattleTag := newValue.String()
value.SetString(newBattleTag)
if newBattleTag == "" {
user.Accounts.Overwatch.SkillRating = 0
user.Accounts.Overwatch.Tier = ""
} else {
// Refresh Overwatch info if the battletag changed
go func() {
err := user.RefreshOverwatchInfo()
if err != nil {
color.Red("Error refreshing Overwatch info of user '%s' with Overwatch battle tag '%s': %v", user.Nick, newBattleTag, err)
return
}
color.Green("Refreshed Overwatch info of user '%s' with Overwatch battle tag '%s': %v", user.Nick, newBattleTag, user.Accounts.Overwatch.SkillRating)
user.Save()
}()
}
return true, nil
case "Accounts.FinalFantasyXIV.Nick", "Accounts.FinalFantasyXIV.Server":
newValue := newValue.String()
value.SetString(newValue)
if newValue == "" {
user.Accounts.FinalFantasyXIV.Class = ""
user.Accounts.FinalFantasyXIV.Level = 0
user.Accounts.FinalFantasyXIV.ItemLevel = 0
} else if user.Accounts.FinalFantasyXIV.Nick != "" && user.Accounts.FinalFantasyXIV.Server != "" {
// Refresh FinalFantasyXIV info if the name or server changed
go func() {
err := user.RefreshFFXIVInfo()
if err != nil {
color.Red("Error refreshing FinalFantasy XIV info of user '%s' with nick '%s' on server '%s': %v", user.Nick, user.Accounts.FinalFantasyXIV.Nick, user.Accounts.FinalFantasyXIV.Server, err)
return
}
user.Save()
}()
}
return true, nil
}
@ -183,28 +134,6 @@ func (user *User) Edit(ctx aero.Context, key string, value reflect.Value, newVal
newNick := newValue.String()
newNick = autocorrect.AccountNick(newNick)
value.SetString(newNick)
// Refresh osu info if the name changed
if key == "Accounts.Osu.Nick" {
if newNick == "" {
user.Accounts.Osu.PP = 0
user.Accounts.Osu.Level = 0
user.Accounts.Osu.Accuracy = 0
} else {
go func() {
err := user.RefreshOsuInfo()
if err != nil {
color.Red("Error refreshing osu info of user '%s' with osu nick '%s': %v", user.Nick, newNick, err)
return
}
color.Green("Refreshed osu info of user '%s' with osu nick '%s': %v", user.Nick, newNick, user.Accounts.Osu.PP)
user.Save()
}()
}
}
return true, nil
}

94
arn/UserAccounts.go
View File

@ -1,78 +1,5 @@
package arn
// Register a list of gaming servers.
func init() {
DataLists["ffxiv-servers"] = []*Option{
{"", ""},
{"Adamantoise", "Adamantoise"},
{"Aegis", "Aegis"},
{"Alexander", "Alexander"},
{"Anima", "Anima"},
{"Asura", "Asura"},
{"Atomos", "Atomos"},
{"Bahamut", "Bahamut"},
{"Balmung", "Balmung"},
{"Behemoth", "Behemoth"},
{"Belias", "Belias"},
{"Brynhildr", "Brynhildr"},
{"Cactuar", "Cactuar"},
{"Carbuncle", "Carbuncle"},
{"Cerberus", "Cerberus"},
{"Chocobo", "Chocobo"},
{"Coeurl", "Coeurl"},
{"Diabolos", "Diabolos"},
{"Durandal", "Durandal"},
{"Excalibur", "Excalibur"},
{"Exodus", "Exodus"},
{"Faerie", "Faerie"},
{"Famfrit", "Famfrit"},
{"Fenrir", "Fenrir"},
{"Garuda", "Garuda"},
{"Gilgamesh", "Gilgamesh"},
{"Goblin", "Goblin"},
{"Gungnir", "Gungnir"},
{"Hades", "Hades"},
{"Hyperion", "Hyperion"},
{"Ifrit", "Ifrit"},
{"Ixion", "Ixion"},
{"Jenova", "Jenova"},
{"Kujata", "Kujata"},
{"Lamia", "Lamia"},
{"Leviathan", "Leviathan"},
{"Lich", "Lich"},
{"Louisoix", "Louisoix"},
{"Malboro", "Malboro"},
{"Mandragora", "Mandragora"},
{"Masamune", "Masamune"},
{"Mateus", "Mateus"},
{"Midgardsormr", "Midgardsormr"},
{"Moogle", "Moogle"},
{"Odin", "Odin"},
{"Omega", "Omega"},
{"Pandaemonium", "Pandaemonium"},
{"Phoenix", "Phoenix"},
{"Ragnarok", "Ragnarok"},
{"Ramuh", "Ramuh"},
{"Ridill", "Ridill"},
{"Sargatanas", "Sargatanas"},
{"Shinryu", "Shinryu"},
{"Shiva", "Shiva"},
{"Siren", "Siren"},
{"Tiamat", "Tiamat"},
{"Titan", "Titan"},
{"Tonberry", "Tonberry"},
{"Typhon", "Typhon"},
{"Ultima", "Ultima"},
{"Ultros", "Ultros"},
{"Unicorn", "Unicorn"},
{"Valefor", "Valefor"},
{"Yojimbo", "Yojimbo"},
{"Zalera", "Zalera"},
{"Zeromus", "Zeromus"},
{"Zodiark", "Zodiark"},
}
}
// UserAccounts represents a user's accounts on external services.
type UserAccounts struct {
Facebook struct {
@ -93,27 +20,6 @@ type UserAccounts struct {
Verified bool `json:"verified"`
} `json:"discord"`
Osu struct {
Nick string `json:"nick" editable:"true"`
PP float64 `json:"pp"`
Accuracy float64 `json:"accuracy"`
Level float64 `json:"level"`
} `json:"osu"`
Overwatch struct {
BattleTag string `json:"battleTag" editable:"true"`
SkillRating int `json:"skillRating"`
Tier string `json:"tier"`
} `json:"overwatch"`
FinalFantasyXIV struct {
Nick string `json:"nick" editable:"true"`
Server string `json:"server" editable:"true" datalist:"ffxiv-servers"`
Class string `json:"class"`
Level int `json:"level"`
ItemLevel int `json:"itemLevel"`
} `json:"ffxiv"`
AniList struct {
Nick string `json:"nick" editable:"true"`
} `json:"anilist"`