From e996a078740dc519be1a18fee7f94a4db03dc70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksa=20Siri=C5=A1ki?= <31509435+aleksasiriski@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:12:42 +0100 Subject: [PATCH] go imports --- .goreleaser.yml | 4 ++-- Dockerfile | 17 ++++++++--------- README.md | 6 +++--- api-users.go | 2 +- api.go | 2 +- common/go.mod | 2 +- docs/go.mod | 2 +- go.mod | 26 +++++++++++++------------- go.sum | 4 ++-- html/admin.html | 4 ++-- html/crash.html | 2 +- linecache/go.mod | 2 +- log.go | 2 +- logger/go.mod | 2 +- main.go | 10 +++++----- ombi/go.mod | 4 ++-- ombi/ombi.go | 2 +- package.json | 6 +++--- setup.go | 2 +- site/index.html | 10 +++++----- storage.go | 2 +- updater.go | 2 +- userdaemon.go | 2 +- views.go | 2 +- 24 files changed, 59 insertions(+), 60 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 88c2404..2fb08fa 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -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 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 license: MIT diff --git a/Dockerfile b/Dockerfile index 7463464..253b248 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] \ No newline at end of file diff --git a/README.md b/README.md index a01ab0c..52c419d 100644 --- a/README.md +++ b/README.md @@ -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/) diff --git a/api-users.go b/api-users.go index ada3a7a..c75f344 100644 --- a/api-users.go +++ b/api-users.go @@ -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. diff --git a/api.go b/api.go index 92579b6..5d7f9ce 100644 --- a/api.go +++ b/api.go @@ -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" ) diff --git a/common/go.mod b/common/go.mod index ec0c50a..fa5f5d6 100644 --- a/common/go.mod +++ b/common/go.mod @@ -1,3 +1,3 @@ -module github.com/hrfee/jfa-go/common +module github.com/aleksasiriski/jfa-go/common go 1.15 diff --git a/docs/go.mod b/docs/go.mod index fd8b7c6..4af40d8 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,4 +1,4 @@ -module github.com/hrfee/jfa-go/docs +module github.com/aleksasiriski/jfa-go/docs go 1.15 diff --git a/go.mod b/go.mod index 6e4a0c2..83a8ab2 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index f2a0734..074fe7e 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/html/admin.html b/html/admin.html index 6e4765c..8dcbd03 100644 --- a/html/admin.html +++ b/html/admin.html @@ -52,7 +52,7 @@

{{ .strings.version }} {{ .version }}

{{ .strings.commitNoun }} {{ .commit }}

- github + github wiki/docs translation
@@ -70,7 +70,7 @@
discord
-

Available under the MIT License.

+

Available under the MIT License.

{{ .license }}
diff --git a/html/crash.html b/html/crash.html index 720a572..8a0f99f 100644 --- a/html/crash.html +++ b/html/crash.html @@ -15,7 +15,7 @@ Error: {{ .Err }} {{ end }} - Create an Issue + Create an Issue
diff --git a/linecache/go.mod b/linecache/go.mod index 62b942e..581b5f3 100644 --- a/linecache/go.mod +++ b/linecache/go.mod @@ -1,3 +1,3 @@ -module github.com/hrfee/jfa-go/linecache +module github.com/aleksasiriski/jfa-go/linecache go 1.16 diff --git a/log.go b/log.go index e008ded..1284179 100644 --- a/log.go +++ b/log.go @@ -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") diff --git a/logger/go.mod b/logger/go.mod index 1c45293..ecdfc78 100644 --- a/logger/go.mod +++ b/logger/go.mod @@ -1,4 +1,4 @@ -module github.com/hrfee/jfa-go/logger +module github.com/aleksasiriski/jfa-go/logger go 1.16 diff --git a/main.go b/main.go index d1fd84e..1b8ae0d 100644 --- a/main.go +++ b/main.go @@ -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" ) diff --git a/ombi/go.mod b/ombi/go.mod index bdc5ffa..44fdbcc 100644 --- a/ombi/go.mod +++ b/ombi/go.mod @@ -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 diff --git a/ombi/ombi.go b/ombi/ombi.go index 29a6e1c..6f44707 100644 --- a/ombi/ombi.go +++ b/ombi/ombi.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/hrfee/jfa-go/common" + "github.com/aleksasiriski/jfa-go/common" ) const ( diff --git a/package.json b/package.json index 1879bda..64fab46 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/setup.go b/setup.go index 3ccaf5b..85dd807 100644 --- a/setup.go +++ b/setup.go @@ -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) { diff --git a/site/index.html b/site/index.html index 79e4fe4..49c31fb 100644 --- a/site/index.html +++ b/site/index.html @@ -68,12 +68,12 @@ sudo apt-get install jfa-go-tray
  • Send messages & notifications to your users (email, discord, telegram, matrix available)
  • Set accounts to expire after a specified time
  • Manage your users in bulk
    • -
  • More
    • +
  • More
    • links
    - github + github wiki/docs translation
    @@ -92,7 +92,7 @@ sudo apt-get install jfa-go-tray discord

    downloads

    -

    instructions can be found here

    +

    instructions can be found here

    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.

    Stable @@ -101,7 +101,7 @@ sudo apt-get install jfa-go-tray

    Usually released once/twice every month, and aren't necessarily super stable.

    - windows/mac/linux + windows/mac/linux docker debian/ubuntu arch (aur) @@ -117,7 +117,7 @@ sudo apt-get install jfa-go-tray
    diff --git a/storage.go b/storage.go index c1fadda..a0fc1c1 100644 --- a/storage.go +++ b/storage.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/hrfee/mediabrowser" + "github.com/aleksasiriski/mediabrowser" "github.com/steambap/captcha" ) diff --git a/updater.go b/updater.go index a72b9ab..0a854fd 100644 --- a/updater.go +++ b/updater.go @@ -16,7 +16,7 @@ import ( "strings" "time" - "github.com/hrfee/jfa-go/common" + "github.com/aleksasiriski/jfa-go/common" ) const ( diff --git a/userdaemon.go b/userdaemon.go index 4db091f..cf68a1a 100644 --- a/userdaemon.go +++ b/userdaemon.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/hrfee/mediabrowser" + "github.com/aleksasiriski/mediabrowser" ) type userDaemon struct { diff --git a/views.go b/views.go index dcf6d01..0bc18b7 100644 --- a/views.go +++ b/views.go @@ -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" )