.drone.yml

@@ -45,6 +45,9 @@ type: docker
 steps:
     - name: build-deploy
       image: appleboy/drone-ssh
+      volumes:
+          - name: ssh_key
+            path: /root/drone_rsa
       settings:
           host:
               from_secret: ssh2_host
@@ -52,8 +55,9 @@ steps:
               from_secret: ssh2_username
           port:
               from_secret: ssh2_port
-          key:
+          volumes:
-              from_secret: ssh2_key
+              - /root/.ssh/docker-build:/root/drone_rsa
+          key_path: /root/drone_rsa
           command_timeout: 50m
           script:
               - /mnt/buildx/jfa-go/build.sh stable
@@ -124,6 +128,9 @@ type: docker
 steps:
     - name: build-deploy
       image: appleboy/drone-ssh
+      volumes:
+          - name: ssh_key
+            path: /root/drone_rsa
       environment:
           BUILDRONE_KEY:
               from_secret: BUILDRONE_KEY
@@ -134,10 +141,11 @@ steps:
               from_secret: ssh2_username
           port:
               from_secret: ssh2_port
+          volumes:
+              - /root/.ssh/docker-build:/root/drone_rsa
           envs:
               - buildrone_key
-          key:
+          key_path: /root/drone_rsa
-              from_secret: ssh2_key
           command_timeout: 50m
           script:
               - /mnt/buildx/jfa-go/build.sh

README.md

@@ -13,7 +13,7 @@
 Studies mean I can't work on this project a lot outside of breaks, however I hope i'll be able to fit in general support and things like bug fixes into my time. New features and such will likely come in short bursts throughout the year (if they do at all).
 
 #### Does/Will it still work?
-jfa-go currently works on Jellyfin 10.8.13, the latest version as of 26/12/23. I should be able to maintain compatability in the future, unless any big changes occur.
+jfa-go currently works on Jellyfin 10.8.9, the latest version. I should be able to maintain compatability in the future, unless any big changes occur.
 
 #### Alternatives
 If you want a bit more of a guarantee of support, I've seen these projects mentioned although haven't tried them myself.

lang/admin/ar-aa.json

@@ -32,12 +32,12 @@
         "before": "قبل",
         "user": "مستخدم",
         "userExpiry": "انتهاء صلاحية المستخدم",
-        "userExpiryDescription": "بعد وقت محدد من تسجيل مستخدم جديد, jfa-go سوف يمسح\\يلغي تفعيل الحساب. بامكانك تغيير هذا السلوك في الاعدادات.",
+        "userExpiryDescription": "",
         "aboutProgram": "حول",
         "version": "إصدار",
-        "commitNoun": "فرض",
+        "commitNoun": "تعديل",
         "newUser": "مستخدم جديد",
-        "profile": "حساب تعريفي",
+        "profile": "ملف",
         "unknown": "غير معروف",
         "label": "وسم",
         "logs": "السجلات",
@@ -63,19 +63,19 @@
         "markdownSupported": "",
         "modifySettings": "",
         "modifySettingsDescription": "",
-        "applyHomescreenLayout": "تطبيق ترتيب الصفحه الرئيسيه",
+        "applyHomescreenLayout": "",
-        "sendDeleteNotificationEmail": "ارسال رساله اشعار",
+        "sendDeleteNotificationEmail": "",
-        "sendDeleteNotifiationExample": "تم حذف حسابك.",
+        "sendDeleteNotifiationExample": "",
-        "settingsRestart": "اعاده تشغيل",
+        "settingsRestart": "",
-        "settingsRestarting": "اعاده التشغيل…",
+        "settingsRestarting": "",
-        "settingsRestartRequired": "يجب اعاده التشغيل",
+        "settingsRestartRequired": "",
-        "settingsRestartRequiredDescription": "يجب اعاده التشغيل لتطبيق بعض الاعدادات التي تم تغييرها. اعاده التشغيل الان ام لاحقا؟",
+        "settingsRestartRequiredDescription": "",
-        "settingsApplyRestartLater": "تطبيق الاعدادات, اعاده التشغيل لاحقا",
+        "settingsApplyRestartLater": "",
-        "settingsApplyRestartNow": "تطبيق الاعدادات و اعاده التشغيل",
+        "settingsApplyRestartNow": "",
-        "settingsApplied": "تم تطبيق الاعدادات.",
+        "settingsApplied": "",
-        "settingsRefreshPage": "اعد انعاش الصفحه بعد بضع ثوان.",
+        "settingsRefreshPage": "",
-        "settingsRequiredOrRestartMessage": "ملاحظه: {n} تشير الى حقل اجباري, {n} تشير ان التغييرات تحتاج لاعاده التشغيل.",
+        "settingsRequiredOrRestartMessage": "",
-        "settingsSave": "حفظ",
+        "settingsSave": "",
         "ombiProfile": "",
         "ombiUserDefaultsDescription": "",
         "userProfiles": "",
@@ -117,15 +117,7 @@
         "userPageLogin": "",
         "userPagePage": "",
         "buildTime": "",
-        "builtBy": "",
+        "builtBy": ""
-        "activity": "الانشطه",
-        "userLabel": "وسم المستخدم",
-        "userLabelDescription": "الوسام للمستخدمين المفعلين من هذه الدعوه.",
-        "enableReferrals": "تفعيل الاحالات",
-        "disableReferrals": "ابطال الاحالات",
-        "invite": "دعوه",
-        "enableReferralsProfileDescription": "تمكين المستخدمين من هذا الحساب التعريفي للاحالات الخاصه, لارسالها للعائله\\الاصدقاء. انشاء دعوه بالاعدادات المطلوبه, ثم اختارها هنا. كل احاله سوف تكون مبنيه على اعدادات هذه الدعوه. بامكانك مسح الدعوه عند لانتهاء.",
-        "enableReferralsDescription": "تمكين المستخدمين لاستعمال احالات خاصه مثل الدعوه, لارسالها للعائله\\للاصدقاء. ممكن اصدارها من قوالب الاحالات في الحساب التعريفي, او من دعوه مفعله."
     },
     "notifications": {
         "changedEmailAddress": "",

lang/admin/de-de.json

@@ -115,8 +115,7 @@
         "after": "nach",
         "before": "vor",
         "unlink": "Account trennen",
-        "sortingBy": "Sortieren nach",
+        "sortingBy": "Sortieren nach"
-        "activity": "Aktivität"
     },
     "notifications": {
         "changedEmailAddress": "E-Mail-Adresse von {n} geändert.",

lang/admin/nl-nl.json

@@ -130,53 +130,7 @@
         "searchOptions": "Zoekopties",
         "matchText": "Tekstovereenkomst",
         "jellyfinID": "Jellyfin ID",
-        "userPagePage": "Gebruikerspagina: Pagina",
+        "userPagePage": "Gebruikerspagina: Pagina"
-        "activity": "Activiteit",
-        "deleted": "Verwijderd",
-        "disabled": "Uitgeschakeld",
-        "keepSearching": "Blijf zoeken",
-        "keepSearchingDescription": "Alleen momenteel ingeladen activiteiten zijn doorzocht. Klik hieronder om alle activiteiten te doorzoeken.",
-        "sortDirection": "Sorteerrichting",
-        "referrer": "Verwijzer",
-        "accountLinked": "{contactMethod} gekoppeld: {user}",
-        "accountUnlinked": "{contactMethod} verwijderd: {user}",
-        "accountResetPassword": "{user} heeft hun wachtwoord gereset",
-        "accountChangedPassword": "{user} heeft hun wachtwoord gewijzigd",
-        "accountDisabled": "Account uitgeschakeld: {user}",
-        "accountDeleted": "Account verwijderd: {user}",
-        "accountCreated": "Account aangemaakt: {user}",
-        "accountReEnabled": "Account opnieuw ingeschakeld: {user}",
-        "accountExpired": "Account verlopen: {user}",
-        "userDeleted": "Gebruiker is verwijderd.",
-        "userDisabled": "Gebruiker is uitgeschakeld",
-        "inviteCreated": "Uitnodiging aangemaakt: {invite}",
-        "inviteDeleted": "Uitnodiging verwijderd: {invite}",
-        "inviteExpired": "Uitnodiging verlopen: {invite}",
-        "fromInvite": "Via uitnodiging",
-        "byAdmin": "Door beheerder",
-        "byUser": "Door gebruiker",
-        "byJfaGo": "Door jfa-go",
-        "activityID": "Activiteit ID",
-        "title": "Titel",
-        "usersMentioned": "Genoemde gebruiker",
-        "actor": "Uitvoerder",
-        "actorDescription": "Wat deze actie veroorzaakt heeft. \"gebruiker\"/\"beheerder\"/\"daemon\" of een gebruikersnaam.",
-        "accountCreationFilter": "Aanmaken van account",
-        "accountDeletionFilter": "Verwijderen van account",
-        "accountDisabledFilter": "Account uitgeschakeld",
-        "accountEnabledFilter": "Account ingeschakeld",
-        "contactLinkedFilter": "Contact gekoppeld",
-        "contactUnlinkedFilter": "Contact ontkoppeld",
-        "passwordChangeFilter": "Wachtwoord gewijzigd",
-        "passwordResetFilter": "Wachtwoord gereset",
-        "inviteCreatedFilter": "Uitnodiging aangemaakt",
-        "inviteDeletedFilter": "Uitnodiging verwijderd/verlopen",
-        "loadMore": "Laad meer",
-        "loadAll": "Laad alles",
-        "noMoreResults": "Niet meer resultaten.",
-        "totalRecords": "{n} documenten totaal",
-        "loadedRecords": "{n} geladen",
-        "shownRecords": "{n} getoond"
     },
     "notifications": {
         "changedEmailAddress": "E-mailadres van {n} gewijzigd.",
@@ -216,11 +170,7 @@
         "setOmbiProfile": "Opgeslagen ombi-profiel.",
         "errorSetOmbiProfile": "Opslaan van ombi-profiel mislukt.",
         "errorNoReferralTemplate": "Profiel bevat geen verwijzingssjabloon, voeg er een toe bij instellingen.",
-        "referralsEnabled": "Verwijzingen actief.",
+        "referralsEnabled": "Verwijzingen actief."
-        "activityDeleted": "Activiteit verwijderd.",
-        "errorInviteNoLongerExists": "Uitnodiging bestaat niet meer.",
-        "errorInviteNotFound": "Uitnodiging niet gevonden.",
-        "errorLoadActivities": "Laden van activiteiten mislukt."
     },
     "quantityStrings": {
         "modifySettingsFor": {

lang/admin/zh-hans.json

@@ -69,7 +69,7 @@
         "ombiUserDefaults": "Ombi 用户默认值",
         "ombiUserDefaultsDescription": "创建并配置 Ombi 用户，然后在下面选择它。它的设置/权限将被存储并应用于由 jfa-go 创建的新 Ombi 用户。",
         "userProfiles": "用户档案",
-        "userProfilesDescription": "个人资料在用户创建帐户时应用于他们。个人资料包括库访问权限和主屏幕布局。",
+        "userProfilesDescription": "配置文件在用户创建帐户时应用于用户。配置文件包括库访问权限和主屏幕布局。",
         "userProfilesIsDefault": "默认",
         "userProfilesLibraries": "库",
         "addProfile": "添加档案",
@@ -117,66 +117,7 @@
         "before": "之前",
         "unlink": "取消关联帐户",
         "sortingBy": "排序方式",
-        "userPageLogin": "用户页面：登录",
+        "userPageLogin": "用户页面：登录"
-        "activity": "活动",
-        "userLabelDescription": "标签应用于使用此邀请创建的用户。",
-        "disabled": "禁用",
-        "keepSearchingDescription": "只有当前加载的活动被搜索了。如果您想搜索所有活动，请点击下方。",
-        "enableReferralsDescription": "为用户提供一个个人的推荐链接，类似于邀请，以便他们发送给朋友和家人。可以从个人资料中的推荐模板获取，或从现有的邀请中获取。",
-        "userDeleted": "用户已被删除。",
-        "inviteCreated": "邀请已创建：{invite}",
-        "usersMentioned": "用户提到的",
-        "actorDescription": "引起这个操作的事物。可以是“用户”、“管理员”、“守护程序”或用户名。",
-        "loginNotAdmin": "不是管理员？",
-        "invite": "邀请",
-        "noResultsFound": "没有发现任何结果",
-        "settingsHiddenDependency": "匹配设置被隐藏，因为它们取决于另一个设置的值：",
-        "settingsDependsOn": "{setting}：依赖于 {dependency}",
-        "settingsAdvancedMode": "{setting}：必须启用高级设置",
-        "settingsMaybeUnderAdvanced": "提示：通过启用高级设置，您可能会找到您正在寻找的内容。",
-        "userLabel": "用户标签",
-        "deleted": "删除",
-        "keepSearching": "继续搜索",
-        "enableReferrals": "启用推荐",
-        "disableReferrals": "禁用推荐",
-        "enableReferralsProfileDescription": "为使用该个人资料创建的用户提供一个类似邀请的个人推荐链接，以便他们发送给朋友和家人。创建一个具有所需设置的邀请，然后在此处进行选择。然后，每个推荐都将基于这个邀请。完成后，您可以删除邀请。",
-        "sortDirection": "排序方向",
-        "referrer": "推荐人",
-        "accountLinked": "{contactMethod} 已关联：{user}",
-        "accountUnlinked": "{contactMethod} 已移除：{user}",
-        "accountResetPassword": "{user} 重置了他们的密码",
-        "accountChangedPassword": "{user} 更改了他们的密码",
-        "accountCreated": "账户已创建：{user}",
-        "accountDeleted": "账户已删除：{user}",
-        "accountDisabled": "账户已禁用：{user}",
-        "accountReEnabled": "账户已重新启用：{user}",
-        "accountExpired": "账户已过期：{user}",
-        "userDisabled": "用户已被禁用",
-        "inviteDeleted": "邀请已删除：{invite}",
-        "inviteExpired": "邀请已过期：{invite}",
-        "fromInvite": "来自邀请",
-        "byAdmin": "由管理员发起的",
-        "byUser": "由用户发起的",
-        "byJfaGo": "由jfa-go发起的",
-        "activityID": "活动ID",
-        "title": "标题",
-        "actor": "角色",
-        "accountCreationFilter": "账户创建",
-        "accountDeletionFilter": "账户删除",
-        "accountDisabledFilter": "账户禁用",
-        "accountEnabledFilter": "账户启用",
-        "contactLinkedFilter": "联系方式已关联",
-        "contactUnlinkedFilter": "联系方式未关联",
-        "passwordChangeFilter": "密码已更改",
-        "passwordResetFilter": "密码重置",
-        "inviteCreatedFilter": "邀请已创建",
-        "inviteDeletedFilter": "邀请已删除/过期",
-        "loadMore": "加载更多",
-        "loadAll": "加载全部",
-        "noMoreResults": "没有更多结果了。",
-        "totalRecords": "{n} 总记录数",
-        "loadedRecords": "已加载{n}",
-        "shownRecords": "已显示{n}"
     },
     "notifications": {
         "changedEmailAddress": "更改了 {n} 的电子邮件地址。",
@@ -214,13 +155,7 @@
         "updateAvailable": "有新更新可用，请检查设置。",
         "noUpdatesAvailable": "没有可用的更新。",
         "setOmbiProfile": "保存ombi配置文件。",
-        "errorSetOmbiProfile": "无法保存ombi配置文件。",
+        "errorSetOmbiProfile": "无法保存ombi配置文件。"
-        "activityDeleted": "活动已删除。",
-        "errorNoReferralTemplate": "个人资料不包含推荐模板，请在设置中添加一个。",
-        "referralsEnabled": "已启用推荐。",
-        "errorInviteNoLongerExists": "邀请已不存在。",
-        "errorInviteNotFound": "未找到邀请。",
-        "errorLoadActivities": "无法加载活动。"
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -278,10 +213,6 @@
         "setExpiry": {
             "plural": "为{n}用户设置到期时间",
             "singular": "为{n}用户设置到期时间"
-        },
-        "enableReferralsFor": {
-            "singular": "为{n}用户启用推荐功能",
-            "plural": "为{n}个用户启用推荐功能"
         }
     }
 }

lang/common/zh-hans.json

@@ -29,7 +29,7 @@
         "logout": "登出",
         "admin": "管理员",
         "enabled": "已启用",
-        "disabled": "禁用",
+        "disabled": "已禁用",
         "reEnable": "重新启用",
         "disable": "禁用",
         "expiry": "到期",
@@ -40,8 +40,7 @@
         "contactMethods": "联系方式",
         "accountStatus": "帐户状态",
         "notSet": "未设置",
-        "myAccount": "我的帐户",
+        "myAccount": "我的帐户"
-        "referrals": "推荐"
     },
     "notifications": {
         "errorLoginBlank": "用户名/密码留空。",

lang/form/zh-hans.json

@@ -34,10 +34,7 @@
         "welcomeUser": "欢迎，{user}！",
         "editContactMethod": "修改联系方式",
         "joinTheServer": "加入服务器：",
-        "customMessagePlaceholderHeader": "自定义此卡",
+        "customMessagePlaceholderHeader": "自定义此卡"
-        "referralsDescription": "使用此链接邀请朋友和家人加入Jellyfin。如果链接过期，请回到这里获取一个新的。",
-        "copyReferral": "复制链接",
-        "invitedBy": "您是由用户{user}邀请的。"
     },
     "notifications": {
         "errorUserExists": "用户已经存在。",

lang/setup/nl-nl.json

@@ -22,8 +22,7 @@
         "errorNotAdmin": "Gebruiker heeft geen beheersrechten.",
         "errorConnectionRefused": "Verbinding geweigerd.",
         "errorUnknown": "Onbekende fout, bekijk de logs.",
-        "error": "Fout",
+        "error": "Fout"
-        "errorProxy": "Proxy-instellingen onjuist."
     },
     "startPage": {
         "welcome": "Welkom!",
@@ -157,11 +156,5 @@
         "title": "Gebruikerspagina",
         "customizeMessages": "Gebruik de bewerken knop naast \"Gebruikerspagina\" in de instellingen om dit later in te stellen.",
         "requiredSettings": "Inloggen bij jfa-go via Jellyfin moet ingesteld zijn. Controleer dat \"reset wachtwoord via link\" later wordt gekozen voor zelfservice wachtwoord-resets."
-    },
-    "proxy": {
-        "title": "Proxy",
-        "description": "Laat jfa-go alle verbindingen via een HTTP/SOCKS5 proxy maken. De verbinding met Jellyfin wordt hierdoorheen getest.",
-        "protocol": "Protocol",
-        "address": "Adres (inclusief poort)"
     }
 }

lang/setup/zh-hans.json

@@ -8,7 +8,7 @@
         "back": "上一步",
         "optional": "可选的",
         "serverType": "服务类型",
-        "disabled": "禁用",
+        "disabled": "已禁用",
         "enabled": "已启用",
         "port": "端口",
         "message": "信息",
@@ -17,13 +17,12 @@
         "URL": "链接",
         "apiKey": "API 密钥",
         "errorInvalidUserPass": "无效的用户名/密码。",
-        "errorNotAdmin": "用户没有权限管理服务器。",
+        "errorNotAdmin": "此用户不允许管理服务。",
         "errorUserDisabled": "此永固可能已被禁用。",
         "error404": "404，请检查内部URL。",
         "errorConnectionRefused": "连接被拒绝。",
         "error": "错误",
-        "errorUnknown": "未知错误，请检查应用程序日志。",
+        "errorUnknown": "未知错误，请检查应用程序日志。"
-        "errorProxy": "代理配置无效。"
     },
     "startPage": {
         "welcome": "欢迎！",
@@ -71,8 +70,7 @@
         "adminOnly": "仅允许管理员账户(推荐)",
         "emailNotice": "您的电子邮件地址可以用来接收通知。",
         "allowAllDescription": "不建议，您应该允许单个用户在设置后登录。",
-        "allowAll": "允许所有Jellyfin用户登录",
+        "allowAll": "允许所有Jellyfin用户登录"
-        "authorizeManualUserPageNotice": "使用此选项将禁用“用户页面”功能。"
     },
     "jellyfinEmby": {
         "title": "Jellyfin/Emby",
@@ -128,8 +126,7 @@
         "resetLinksNotice": "如果启用了 Ombi 集成，请使用它与 Ombi 同步 Jellyfin 密码重置。",
         "resetLinksLanguage": "默认重置链接语言",
         "setPassword": "通过链接设置密码",
-        "setPasswordNotice": "启用此功能意味着用户无需在重置后通过 PIN 更改其密码。并将强制执行密码验证。",
+        "setPasswordNotice": "启用此功能意味着用户无需在重置后通过 PIN 更改其密码。并将强制执行密码验证。"
-        "resetLinksRequiredForUserPage": "对于用户页面上的自助密码重置，这是必需的。"
     },
     "passwordValidation": {
         "title": "密码验证",
@@ -151,17 +148,5 @@
         "successMessageNotice": "在用户创建账户时显示。",
         "emailMessage": "电子邮件",
         "emailMessageNotice": "显示在电子邮件的底部。"
-    },
-    "proxy": {
-        "description": "让jfa-go通过HTTP/SOCKS5代理进行所有连接。连接到Jellyfin将通过此代理进行测试。",
-        "title": "代理",
-        "protocol": "协议",
-        "address": "地址（包括端口）"
-    },
-    "userPage": {
-        "description": "用户页面（显示为“我的帐户”）允许用户访问有关他们帐户的信息，如其联系方式和账户过期日期。他们还可以更改密码、启动密码重置，并在无需询问您的情况下链接/更改联系方式。此外，用户还可以在登录前后看到自定义的Markdown消息。",
-        "title": "用户页面",
-        "customizeMessages": "在设置中，单击“用户页面”旁边的编辑按钮以稍后进行设置。",
-        "requiredSettings": "通过Jellyfin登录到jfa-go必须设置。确保稍后选择“通过链接重置密码”以进行自助密码重置。"
     }
 }

lang/telegram/zh-hans.json

@@ -11,8 +11,6 @@
         "discordStartMessage": "您好！\n请输入 `/pin <PIN码>`以验证您的账户。",
         "languageMessageDiscord": "提示：使用 `/lang <语言>` 设置语言。",
         "languageSet": "语言改成 {language}。",
-        "discordDMs": "请检查您的DM找回答。",
+        "discordDMs": "请检查您的DM找回答。"
-        "sentInvite": "已发送邀请。",
-        "sentInviteFailure": "发送邀请失败，请检查日志。"
     }
 }

main.go

@@ -557,16 +557,7 @@ func start(asDaemon, firstCall bool) {
 			cert := app.config.Section("advanced").Key("tls_cert").MustString("")
 			key := app.config.Section("advanced").Key("tls_key").MustString("")
 			if err := SRV.ListenAndServeTLS(cert, key); err != nil {
-				filesToCheck := []string{cert, key}
+				app.err.Printf("Failure serving: %s", err)
-				fileNames := []string{"Certificate", "Key"}
-				for i, v := range filesToCheck {
-					_, err := os.Stat(v)
-					if err != nil {
-						app.err.Printf("SSL/TLS %s: %v\n", fileNames[i], err)
-					}
-				}
-
-				app.err.Fatalf("Failure serving with SSL/TLS: %s", err)
 			}
 		} else {
 			if err := SRV.ListenAndServe(); err != nil {

site/Makefile

@@ -7,11 +7,11 @@ all:
 	cp -r ts tempts
 	../scripts/dark-variant.sh tempts
 	npx esbuild --target=es6 --bundle tempts/main.ts --outfile=out/main.js --minify
-	npx esbuild --bundle base.css --outfile=out/bundle.css --external:remixicon.css --external:modal.css --external:../fonts/hanken* --minify
+	npx esbuild --bundle base.css --outfile=out/bundle.css --external:remixicon.css --external:modal.css --minify
 	npx tailwindcss -c tailwind.config.js -i out/bundle.css -o out/bundle.css
 	cd out && npx uncss index.html --stylesheets remixicon.css > _remixicon.css; cd ..
 	mv out/_remixicon.css out/remixicon.css
-	cp -r ../static/* out/
+	cp ../static/* out/
 	node inject.js
 
 debug:
@@ -22,10 +22,10 @@ debug:
 	-rm -r tempts
 	cp -r ts tempts
 	../scripts/dark-variant.sh tempts
-	npx esbuild --bundle base.css --outfile=out/bundle.css --external:remixicon.css --external:../fonts/hanken* --minify
+	npx esbuild --bundle base.css --outfile=out/bundle.css --external:remixicon.css --minify
 	npx esbuild --target=es6 --bundle ts/main.ts --sourcemap --outfile=out/main.js --minify
 	npx tailwindcss -c tailwind.config.js -i out/bundle.css -o out/bundle.css
-	cp -r ../static/* out/
+	cp ../static/* out/
 
 monitor:
 	npx live-server --watch=out --open=out/index.html &

site/index.html

@@ -21,8 +21,7 @@
             <div class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content card">
                 <span class="heading"> Debian/Ubuntu (apt)</span>
                 <div class="mt-1">
-                    <pre style="margin: 0; line-height: 125%">sudo apt-get update && sudo apt-get install curl apt-transport-https gnupg
+                    <pre style="margin: 0; line-height: 125%">curl https://apt.hrfee.dev/hrfee.pubkey.gpg | sudo apt-key add -
-curl https://apt.hrfee.dev/hrfee.pubkey.gpg | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.hrfee.dev.gpg
 
 echo <span style="color: #aa5500">&quot;deb https://apt.hrfee.dev trusty<span id="deb-unstable" class="unfocused">-unstable</span> main&quot;</span> | sudo tee /etc/apt/sources.list.d/hrfee.list