1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-10-18 17:10:11 +00:00

Compare commits

..

No commits in common. "1a6d78352c2d5c2d827aac2a7ea516768157861b" and "618cc32a17f94d7caca5fab927d0a12207c69ce7" have entirely different histories.

6 changed files with 7 additions and 19 deletions

View File

@ -52,11 +52,6 @@
padding: var(--spacing-4,1rem);
}
.modal-content .banner {
margin-left: calc(-1 * var(--spacing-4,1rem) - 0.5%); /* Not sure why this is necessary */
margin-right: calc(-1 * var(--spacing-4,1rem) - 0.5%);
}
div.card:contains(section.banner.footer) {
padding-bottom: 0px;
}

View File

@ -40,8 +40,8 @@
</div>
<div id="modal-about" class="modal">
<div class="modal-content content card">
<img src="{{ .urlBase }}/banner.svg" class="banner header" alt="jfa-go banner">
<span class="heading"><span class="modal-close">&times;</span></span>
<span class="heading">{{ .strings.aboutProgram }} <span class="modal-close">&times;</span></span>
<img src="{{ .urlBase }}/banner.svg" class="mt-1" alt="jfa-go banner">
<p><i class="icon ri-github-fill"></i><a href="https://github.com/hrfee/jfa-go">jfa-go</a></p>
<p>{{ .strings.version }} <span class="code monospace">{{ .version }}</span></p>
<p>{{ .strings.commitNoun }} <span class="code monospace">{{ .commit }}</span></p>

View File

@ -79,7 +79,7 @@ type appContext struct {
configBase settings
dataPath string
webFS httpFS
cssClass string // Default theme, "light-theme"|"dark-theme".
cssClass string
jellyfinLogin bool
users []User
invalidTokens []string

View File

@ -1,6 +1,3 @@
// Mediabrowser provides user-related bindings to the Jellyfin & Emby APIs.
// Some data aren't bound to structs as jfa-go doesn't need to interact with them, for example DisplayPreferences.
// See Jellyfin/Emby swagger docs for more info on them.
package mediabrowser
import (
@ -24,8 +21,7 @@ const (
EmbyServer
)
// ServerInfo stores info about the server.
type ServerInfo struct {
type serverInfo struct {
LocalAddress string `json:"LocalAddress"`
Name string `json:"ServerName"`
Version string `json:"Version"`
@ -43,7 +39,7 @@ type MediaBrowser struct {
useragent string
auth string
header map[string]string
ServerInfo ServerInfo
ServerInfo serverInfo
Username string
password string
Authenticated bool
@ -60,7 +56,7 @@ type MediaBrowser struct {
timeoutHandler common.TimeoutHandler
}
// NewServer returns a new Mediabrowser object.
// NewServer returns a new Jellyfin object.
func NewServer(st serverType, server, client, version, device, deviceID string, timeoutHandler common.TimeoutHandler, cacheTimeout int) (*MediaBrowser, error) {
mb := &MediaBrowser{}
mb.serverType = st

View File

@ -11,7 +11,6 @@ type magicParse struct {
Parsed time.Time `json:"parseme"`
}
// Time embeds time.Time with a custom JSON Unmarshal method to work with Jellyfin & Emby's time formatting.
type Time struct {
time.Time
}
@ -63,7 +62,6 @@ type User struct {
LastLoginDate Time `json:"LastLoginDate"`
LastActivityDate Time `json:"LastActivityDate"`
Configuration Configuration `json:"Configuration"`
// Policy stores the user's permissions.
Policy Policy `json:"Policy"`
}

View File

@ -76,7 +76,6 @@ func (app *appContext) checkUsers() {
}
if !found {
app.info.Printf("Expired user already deleted, ignoring.")
delete(app.storage.users, id)
continue
}
app.info.Printf("%s expired user \"%s\"", termPlural, user.Name)