hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 17:10:10 +00:00
Code Issues Projects Releases Wiki Activity

go imports

Browse Source
This commit is contained in:
Aleksa Siriški 2023-01-30 18:12:42 +01:00
parent 876d5f4ce6
commit e996a07874
24 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.goreleaser.yml
View File

@ -127,7 +127,7 @@ nfpms:
- id: notray
file_name_template: '{{ .ProjectName }}{{ if .IsSnapshot }}-git{{ end }}_{{ .Arch }}_{{ if .IsSnapshot }}{{ .ShortCommit }}{{ else }}v{{ .Version }}{{ end }}'
package_name: jfa-go
homepage: https://github.com/hrfee/jfa-go
homepage: https://github.com/aleksasiriski/jfa-go
description: A web app for managing users on Jellyfin
maintainer: Harvey Tindall <hrfee@hrfee.dev>
license: MIT
@ -145,7 +145,7 @@ nfpms:
- id: tray
file_name_template: '{{ .ProjectName }}{{ if .IsSnapshot }}-git{{ end }}_TrayIcon_{{ .Arch }}_{{ if .IsSnapshot }}{{ .ShortCommit }}{{ else }}v{{ .Version }}{{ end }}'
package_name: jfa-go-tray
homepage: https://github.com/hrfee/jfa-go
homepage: https://github.com/aleksasiriski/jfa-go
description: A web app for managing users on Jellyfin
maintainer: Harvey Tindall <hrfee@hrfee.dev>
license: MIT

17
Dockerfile
View File

@ -1,31 +1,30 @@
FROM --platform=$BUILDPLATFORM golang:latest AS support
COPY . /var/build
COPY . /opt/build
RUN apt-get update -y \
&& apt-get install build-essential python3-pip curl software-properties-common sed -y \
&& (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \
&& apt-get install nodejs \
&& (cd /var/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
&& sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /var/build/build/data/html/setup.html
&& (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
&& sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
FROM --platform=$BUILDPLATFORM golang:latest AS build
ARG TARGETARCH
ENV GOARCH=$TARGETARCH
COPY --from=support /var/build /var/build
COPY --from=support /opt/build /opt/build
RUN (cd /var/build; make compile INTERNAL=off UPDATER=docker)
RUN (cd /opt/build; make compile INTERNAL=off UPDATER=docker)
FROM golang:latest
COPY --from=build /var/build/build /usr/bin/jfa-go
COPY --from=build /opt/build/build /opt/jfa-go
EXPOSE 8056
EXPOSE 8057
VOLUME /config
CMD [ "/opt/jfa-go/jfa-go", "-data", "/data" ]
ENTRYPOINT ["/usr/bin/jfa-go/jfa-go", \
"-data", "/config"]

6
README.md
View File

@ -10,7 +10,7 @@
---
jfa-go is a user management app for [Jellyfin](https://github.com/jellyfin/jellyfin) (and now [Emby](https://emby.media/)) that provides invite-based account creation as well as other features that make one's instance much easier to manage.
a rewrite of [jellyfin-accounts](https://github.com/hrfee/jellyfin-accounts) (original naming for both, ik
a rewrite of [jellyfin-accounts](https://github.com/aleksasiriski/jellyfin-accounts) (original naming for both, ik
😂).
#### Features
@ -92,7 +92,7 @@ Available on the AUR as:
##### Other platforms
Download precompiled binaries from:
* [The releases section](https://github.com/hrfee/jfa-go/releases) (stable)
* [The releases section](https://github.com/aleksasiriski/jfa-go/releases) (stable)
* [Buildrone](https://builds.hrfee.dev/view/hrfee/jfa-go) (nightly)
unzip the `jfa-go`/`jfa-go.exe` executable to somewhere useful.
@ -150,7 +150,7 @@ If you're switching from jellyfin-accounts, copy your existing `~/.jf-accounts`
(or specify config/data path with `-config/-data` respectively.)
#### Contributing
See [CONTRIBUTING.md](https://github.com/hrfee/jfa-go/blob/main/CONTRIBUTING.md).
See [CONTRIBUTING.md](https://github.com/aleksasiriski/jfa-go/blob/main/CONTRIBUTING.md).
##### Translation
[![Translation status](https://weblate.jfa-go.com/widgets/jfa-go/-/multi-auto.svg)](https://weblate.jfa-go.com/engage/jfa-go/)

2
api-users.go
View File

@ -8,7 +8,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/mediabrowser"
)
// @Summary Creates a new Jellyfin user without an invite.

2
api.go
View File

@ -5,7 +5,7 @@ import (
"time"
"github.com/gin-gonic/gin"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/mediabrowser"
"github.com/itchyny/timefmt-go"
"gopkg.in/ini.v1"
)

2
common/go.mod
View File

@ -1,3 +1,3 @@
module github.com/hrfee/jfa-go/common
module github.com/aleksasiriski/jfa-go/common
go 1.15

2
docs/go.mod
View File

@ -1,4 +1,4 @@
module github.com/hrfee/jfa-go/docs
module github.com/aleksasiriski/jfa-go/docs
go 1.15

26
go.mod
View File

@ -1,18 +1,18 @@
module github.com/hrfee/jfa-go
module github.com/aleksasiriski/jfa-go
go 1.16
replace github.com/hrfee/jfa-go/docs => ./docs
replace github.com/aleksasiriski/jfa-go/docs => ./docs
replace github.com/hrfee/jfa-go/common => ./common
replace github.com/aleksasiriski/jfa-go/common => ./common
replace github.com/hrfee/jfa-go/ombi => ./ombi
replace github.com/aleksasiriski/jfa-go/ombi => ./ombi
replace github.com/hrfee/jfa-go/logger => ./logger
replace github.com/aleksasiriski/jfa-go/logger => ./logger
replace github.com/hrfee/jfa-go/linecache => ./linecache
replace github.com/aleksasiriski/jfa-go/linecache => ./linecache
replace github.com/hrfee/jfa-go/api => ./api
replace github.com/aleksasiriski/jfa-go/api => ./api
require (
github.com/bwmarrin/discordgo v0.23.3-0.20211228023845-29269347e820
@ -34,12 +34,12 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/gomarkdown/markdown v0.0.0-20211212230626-5af6ad2f47df
github.com/google/uuid v1.3.0 // indirect
github.com/hrfee/jfa-go/common v0.0.0-20211222231100-d47afe05f49c
github.com/hrfee/jfa-go/docs v0.0.0-20211222231100-d47afe05f49c
github.com/hrfee/jfa-go/linecache v0.0.0-20211222231100-d47afe05f49c
github.com/hrfee/jfa-go/logger v0.0.0-20211222231100-d47afe05f49c
github.com/hrfee/jfa-go/ombi v0.0.0-20211222231100-d47afe05f49c
github.com/hrfee/mediabrowser v0.3.8
github.com/aleksasiriski/jfa-go/common v0.0.0-20211222231100-d47afe05f49c
github.com/aleksasiriski/jfa-go/docs v0.0.0-20211222231100-d47afe05f49c
github.com/aleksasiriski/jfa-go/linecache v0.0.0-20211222231100-d47afe05f49c
github.com/aleksasiriski/jfa-go/logger v0.0.0-20211222231100-d47afe05f49c
github.com/aleksasiriski/jfa-go/ombi v0.0.0-20211222231100-d47afe05f49c
github.com/aleksasiriski/mediabrowser v0.3.8
github.com/itchyny/timefmt-go v0.1.3
github.com/json-iterator/go v1.1.12 // indirect
github.com/lithammer/shortuuid/v3 v3.0.7

4
go.sum
View File

@ -150,8 +150,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hrfee/mediabrowser v0.3.8 h1:y0iBCb6jE3QKcsiCJSYva2fFPHRn4UA+sGRzoPuJ/Dk=
github.com/hrfee/mediabrowser v0.3.8/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
github.com/aleksasiriski/mediabrowser v0.3.8 h1:y0iBCb6jE3QKcsiCJSYva2fFPHRn4UA+sGRzoPuJ/Dk=
github.com/aleksasiriski/mediabrowser v0.3.8/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921iRkU=
github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=

4
html/admin.html
View File

@ -52,7 +52,7 @@
<p>{{ .strings.version }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .version }}</span></p>
<p>{{ .strings.commitNoun }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .commit }}</span></p>
<div class="row col flex">
<a class="button ~neutral mr-2 mt-4 mb-4 lang-link" href="https://github.com/hrfee/jfa-go"><i class="ri-github-line mr-2"></i>github</a>
<a class="button ~neutral mr-2 mt-4 mb-4 lang-link" href="https://github.com/aleksasiriski/jfa-go"><i class="ri-github-line mr-2"></i>github</a>
<a class="button ~urge mt-4 mb-4 mr-2 lang-link" href="https://wiki.jfa-go.com">wiki/docs</a>
<a class="button ~positive mt-4 mb-4 mr-2 lang-link" href="https://weblate.jfa-go.com">translation</a>
<div class="dropdown mr-2" tabindex="0">
@ -70,7 +70,7 @@
</div>
<a class="button ~urge mt-4 mb-4 @low discord lang-link" href="https://discord.com/invite/MrtvuQmyhP" target="_blank"><i class="ri-discord-line mr-2"></i>discord</a>
</div>
<p><a href="https://github.com/hrfee/jfa-go/blob/main/LICENSE">Available under the MIT License.</a></p>
<p><a href="https://github.com/aleksasiriski/jfa-go/blob/main/LICENSE">Available under the MIT License.</a></p>
<pre class="font-mono bg-inherit">{{ .license }}</pre>
</div>
</div>

2
html/crash.html
View File

@ -15,7 +15,7 @@
Error: {{ .Err }}
</div>
{{ end }}
<a class="button ~critical mb-4" target="_blank" href="https://github.com/hrfee/jfa-go/issues/new/choose">Create an Issue</a>
<a class="button ~critical mb-4" target="_blank" href="https://github.com/aleksasiriski/jfa-go/issues/new/choose">Create an Issue</a>
</section>
<section class="section ~neutral @low">
<div class="flex-expand">

2
linecache/go.mod
View File

@ -1,3 +1,3 @@
module github.com/hrfee/jfa-go/linecache
module github.com/aleksasiriski/jfa-go/linecache
go 1.16

2
log.go
View File

@ -8,7 +8,7 @@ import (
"regexp"
"github.com/gin-gonic/gin"
"github.com/hrfee/jfa-go/linecache"
"github.com/aleksasiriski/jfa-go/linecache"
)
var logPath string = filepath.Join(temp, "jfa-go.log")

2
logger/go.mod
View File

@ -1,4 +1,4 @@
module github.com/hrfee/jfa-go/logger
module github.com/aleksasiriski/jfa-go/logger
go 1.16

10
main.go
View File

@ -20,11 +20,11 @@ import (
"time"
"github.com/fatih/color"
"github.com/hrfee/jfa-go/common"
_ "github.com/hrfee/jfa-go/docs"
"github.com/hrfee/jfa-go/logger"
"github.com/hrfee/jfa-go/ombi"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/jfa-go/common"
_ "github.com/aleksasiriski/jfa-go/docs"
"github.com/aleksasiriski/jfa-go/logger"
"github.com/aleksasiriski/jfa-go/ombi"
"github.com/aleksasiriski/mediabrowser"
"github.com/lithammer/shortuuid/v3"
"gopkg.in/ini.v1"
)

4
ombi/go.mod
View File

@ -1,5 +1,5 @@
module github.com/hrfee/jfa-go/ombi
module github.com/aleksasiriski/jfa-go/ombi
replace github.com/hrfee/jfa-go/common => ../common
replace github.com/aleksasiriski/jfa-go/common => ../common
go 1.15

2
ombi/ombi.go
View File

@ -10,7 +10,7 @@ import (
"strings"
"time"
"github.com/hrfee/jfa-go/common"
"github.com/aleksasiriski/jfa-go/common"
)
const (

6
package.json
View File

@ -8,14 +8,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/hrfee/jfa-go.git"
"url": "git+https://github.com/aleksasiriski/jfa-go.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/hrfee/jfa-go/issues"
"url": "https://github.com/aleksasiriski/jfa-go/issues"
},
"homepage": "https://github.com/hrfee/jfa-go#readme",
"homepage": "https://github.com/aleksasiriski/jfa-go#readme",
"dependencies": {
"@ts-stack/markdown": "^1.3.0",
"@types/node": "^15.0.1",

2
setup.go
View File

@ -7,7 +7,7 @@ import (
"strings"
"github.com/gin-gonic/gin"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/mediabrowser"
)
func (app *appContext) ServeSetup(gc *gin.Context) {

10
site/index.html
View File

@ -68,12 +68,12 @@ sudo apt-get install jfa-go-tray
<li>Send messages & notifications to your users (email, discord, telegram, matrix available)</li>
<li>Set accounts to expire after a specified time</li>
<li>Manage your users in bulk</li>
<li><a href="https://github.com/hrfee/jfa-go#features" target="_blank">More</a></li>
<li><a href="https://github.com/aleksasiriski/jfa-go#features" target="_blank">More</a></li>
</ul>
</div>
<span class="row col flex center supra">links</span>
<div class="row col flex center">
<a class="button ~neutral mr-2 mt-1 mb-1" href="https://github.com/hrfee/jfa-go">github</a>
<a class="button ~neutral mr-2 mt-1 mb-1" href="https://github.com/aleksasiriski/jfa-go">github</a>
<a class="button ~urge mt-1 mb-1 mr-2" href="https://wiki.jfa-go.com">wiki/docs</a>
<a class="button ~positive mt-1 mb-1 mr-2" href="https://weblate.jfa-go.com">translation</a>
<div class="dropdown mr-2" tabindex="0">
@ -92,7 +92,7 @@ sudo apt-get install jfa-go-tray
<a class="button ~urge mt-1 mb-1 @low discord" href="https://discord.com/invite/MrtvuQmyhP" target="_blank"><i class="ri-discord-line mr-2"></i>discord</a>
</div>
<p class="row col flex center supra">downloads</p>
<p class="row col flex center support">instructions can be found&nbsp<a target="_blank" href="https://github.com/hrfee/jfa-go#install">here</a></p>
<p class="row col flex center support">instructions can be found&nbsp<a target="_blank" href="https://github.com/aleksasiriski/jfa-go#install">here</a></p>
<p class="row col flex center text-center support">note: tray icon builds should only be used on systems with a Desktop Interface, and require extra dependencies on linux, see the github README for more info.</p>
<div class="row col flex center">
<span class="button ~neutral @high mr-1 mt-1" id="download-stable">Stable</span>
@ -101,7 +101,7 @@ sudo apt-get install jfa-go-tray
<div class="mt-1" id="sect-stable">
<p class="row center">Usually released once/twice every month, and aren't necessarily super stable.</p>
<div class="row col flex center">
<a class="button ~info mr-2 mb-2 lang-link" target="_blank" href="https://github.com/hrfee/jfa-go/releases">windows/mac/linux</a>
<a class="button ~info mr-2 mb-2 lang-link" target="_blank" href="https://github.com/aleksasiriski/jfa-go/releases">windows/mac/linux</a>
<a class="button ~info mr-2 mb-2 lang-link" id="download-docker">docker</a>
<a class="button ~info mr-2 mb-2 lang-link" id="download-deb">debian/ubuntu</a>
<a class="button ~info mr-2 mb-2 lang-link" target="_blank" href="https://aur.archlinux.org/packages/jfa-go">arch (aur)</a>
@ -117,7 +117,7 @@ sudo apt-get install jfa-go-tray
</div>
</div>
<section class="section ~neutral banner footer flex-expand middle">
<a href="https://github.com/hrfee/jfa-go/blob/main/LICENSE" class="support">© 2021 Harvey Tindall</a>
<a href="https://github.com/aleksasiriski/jfa-go/blob/main/LICENSE" class="support">© 2021 Harvey Tindall</a>
</section>
</div>
</div>

2
storage.go
View File

@ -11,7 +11,7 @@ import (
"sync"
"time"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/mediabrowser"
"github.com/steambap/captcha"
)

2
updater.go
View File

@ -16,7 +16,7 @@ import (
"strings"
"time"
"github.com/hrfee/jfa-go/common"
"github.com/aleksasiriski/jfa-go/common"
)
const (

2
userdaemon.go
View File

@ -3,7 +3,7 @@ package main
import (
"time"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/mediabrowser"
)
type userDaemon struct {

2
views.go
View File

@ -9,7 +9,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt"
"github.com/hrfee/mediabrowser"
"github.com/aleksasiriski/mediabrowser"
"github.com/steambap/captcha"
)