Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
729 Commits 1 Branch 0 Tags
1f9af8df89fbf6279ced5f435569bd48d2bf113b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Harvey Tindall 1f9af8df89 Discord: Add option to provide server invite 
When enabled, a temporary one-use invite is created and shown to the
user on the account creation form.
 2021-05-23 19:50:03 +01:00
Harvey Tindall 0676b6c41f Discord: Display channel on account creation form 2021-05-23 17:31:20 +01:00
Harvey Tindall ce8cdced4d Discord: Fix GetUsers, add invite messages 
The "Send to" box on the invite tab now accepts username#discriminator,
and a search icon has been added which opens a search window similar to
the one on the accounts tab. DiscordDaemon.GetUsers was also very broken
and wouldn't work with full username#discriminator, that's been fixed.
 2021-05-23 16:16:31 +01:00
Harvey Tindall b8e3fc636c Accounts: Fix cog on telegram when no discord linked 
Also, disable telegram & discord if an auth/initialization error occurs.
 2021-05-23 14:48:36 +01:00
Harvey Tindall 519a5615cc Accounts: Fix email check on dropdown 2021-05-23 14:35:01 +01:00
Harvey Tindall 168b217553 Discord: fix user links 2021-05-23 14:32:35 +01:00
Harvey Tindall 7d698d63e3 Discord: split discord search into own module 
Will also be used for "Send to" on the invite page.
 2021-05-23 14:22:18 +01:00
Harvey Tindall 035dbde819 last image 2021-05-23 02:11:48 +01:00
Harvey Tindall c373d8b2d6 add final oauth tab image 2021-05-23 02:08:02 +01:00
Harvey Tindall 8698c3c6a4 add oauth2 section to bot instructions 2021-05-23 02:03:55 +01:00
Harvey Tindall 0edd2ba68b add settings image for bot setup 2021-05-23 01:51:59 +01:00
Harvey Tindall b91f0b5a18 Discord: add images for bot creation instructions 2021-05-23 01:38:40 +01:00
Harvey Tindall 24fa841c0d Discord: Wait for non-nil pointer to bot data 
While testing others things, I had quite a few nil pointer dereference
errors from accessing bot data right after initializing. A for loop now
waits until the first of the pointers is non-nil, which should
hopefully avoid crashes.
 2021-05-23 01:09:03 +01:00
Harvey Tindall 44558b8109 Discord: Remove extra newlines around links 
Since links are converted into embeds, links put on their own line often
lead to extra newlines that looks pretty weird. They should now be
stripped.
 2021-05-23 01:05:53 +01:00
Harvey Tindall e98c9b46f1 Accounts: no wrapping for contact dropdown 2021-05-22 23:18:43 +01:00
Harvey Tindall b3ce7acfcb Accounts: Always inline icons, only one settings cog 
Admin chip, email edit bot and contact method cog icon are now always inline.
Only one cog icon is shown now.
 2021-05-22 23:05:53 +01:00
Harvey Tindall 9fac79b1f0 Discord: Add users via accounts tab 
Doesn't require a PIN like Telegram, as we can access a list of guild
users with the GuildMembers intent set. This has to be enabled under
Bot > Priviliged Gateway intents on the developer portal.
 2021-05-22 21:42:15 +01:00
Harvey Tindall 591e3c5ca1 Discord: embed images 
![alt](image link) is now converted to an image embed.
 2021-05-22 15:32:51 +01:00
Harvey Tindall 35d407afef Discord: remove @ from username 2021-05-22 15:31:25 +01:00
Harvey Tindall a6447165b7 add email notify enable/disable; remove (de)hyphening 
hyphen/dehyphen conflicted with new migration for email contact
preference, and it's been a while since this has been an issue so i've
just commented it out for now.
 2021-05-21 22:46:46 +01:00
Harvey Tindall 3bf722c5fe Discord: send links as embeds 
Kind of janky but works. This kind of messes up the layout if you write
links in-line.
 2021-05-21 21:59:50 +01:00
Harvey Tindall f8f5f35cc1 PIN verification, notifications, multiple notif providers 
Discord, Email & Telegram can be enabled, although email is always
enabled right now (will fix). Also apparently markdown hyperlinks don't
work in Discord, eventually will implement something to convert them to
embeds.
 2021-05-21 21:35:25 +01:00
Harvey Tindall 524941da0c fix heading size with sm 2021-05-21 21:10:32 +01:00
Harvey Tindall 22bba922f9 Discord: Add !lang command 2021-05-18 18:41:42 +01:00
Harvey Tindall d928df7ab2 Discord: Start bot, add !start and pin validity check 
The bot should be created by the admin and added to a discord server
mutual to the intended new user(s). On !start in the server,
communication is moved to DMs. Currently !start works, and validity of a
given PIN is checked although nothing it done with this yet.
 2021-05-17 23:42:33 +01:00
Harvey Tindall 4b11bbe21f remove leaked telegram token 
token has been revoked, but it doesn't look like it was used anyway.
 2021-05-17 11:43:58 +01:00
Harvey Tindall 18bcd55972 remove debug println 2021-05-17 01:32:22 +01:00
Harvey Tindall 057f306ed9 hide/ignore ssl_cert when on windows 
x509.SystemCertPool is unavailable on windows, so any value is ignored
and the setting is hidden on the web UI.
 2021-05-17 01:16:59 +01:00
Harvey Tindall 76bbb3f147 consistent naming for tray builds 2021-05-16 23:02:09 +01:00
Harvey Tindall 0f3ad8bb69 fix generate_ini for multiline descriptions 2021-05-16 23:00:37 +01:00
Harvey Tindall 1d47b9074f change notray/tray naming, add deb/rpm/apk 
Since Tray support requires dependencies, it won't be the default for
releases. deb/rpm/apk support may be broken still.
 2021-05-16 22:44:04 +01:00
Harvey Tindall 5167fde080 change tar.gz to zip in drone 2021-05-16 21:12:18 +01:00
Harvey Tindall a62648ee68 fix cross compilation in goreleaser/drone 
Necessary for go-autostart to work on windows. Tray will be enabled by
default for x86_64 windows/linux binaries.
 2021-05-16 21:01:31 +01:00
Harvey Tindall 5dee414596 add "autostart on login" option to tray 2021-05-16 17:40:03 +01:00
Harvey Tindall 8cf9b1f905 add basic tray functionality 
enable with `make TRAY=on ...`. Cross compilation apparently should work
from linux to linux & windows.
 2021-05-16 16:23:28 +01:00
Harvey Tindall 6bf1920160 merge dependabot bump 2021-05-16 15:00:30 +01:00
Harvey Tindall 33f8070e57 cleanup; fix stripping with DEBUG=on 2021-05-16 15:00:13 +01:00
Harvey Tindall 30736a055d add example bot settings for wiki 2021-05-08 16:37:40 +01:00
Harvey Tindall d0905a29be add example bot creation for wiki 2021-05-08 16:29:16 +01:00
Harvey Tindall 71554e0c85 Telegram: Change user's contact method in accounts 
By clicking the cog next to the telegram username, one can select
whether to contact through telegram or email.
 2021-05-08 15:53:42 +01:00
Harvey Tindall 0efd7c5718 Telegram: add language files 
somehow these were included in the .gitignore.
 2021-05-07 23:45:53 +01:00
Harvey Tindall 901ad7529e mention wiki in telegram settings description 2021-05-07 23:36:46 +01:00
Harvey Tindall b64bcc9738 include telegram verif in images 2021-05-07 23:30:32 +01:00
Harvey Tindall fddb7b7584 Mention telegram in readme 2021-05-07 23:18:44 +01:00
Harvey Tindall b91302ddf8 Invite: fix "none yet" message on users created 2021-05-07 22:41:51 +01:00
Harvey Tindall ea0293bd4e Split some settings into new "messages" section 
Most email dependant sections now depend on this. Also renamed more
email things.
 2021-05-07 21:53:29 +01:00
Harvey Tindall 51f2f4cc6a Telegram: close updates channel on restart 
Also removed some references to email.
 2021-05-07 18:29:56 +01:00
Harvey Tindall 2d93b3b7ee Telegram: Allow admin to add telegram contact 
Works in the same way as on the form, but can now be done in the
accounts tab.
 2021-05-07 18:20:35 +01:00
Harvey Tindall 0f41d1e6cf Telegram: Display username on accounts tab 2021-05-07 17:01:22 +01:00
Harvey Tindall 36edd4ab0d Telegram: Use markdown for custom emails/announcements 
Had no idea telegram supported this, pretty cool.
 2021-05-07 16:33:44 +01:00
Harvey Tindall 716d6a931a Telegram: Send messages via telegram 
Most messages are now sent as plaintext via telegram when suitable.
 2021-05-07 16:06:47 +01:00
Harvey Tindall 72bf280e2d telegram: Fix UI and store useful Telegram info 
Creation now works, and language preferences made before signup are
kept. telegram file storage now uses the Jellyfin ID as a key, which
makes much more sense. Also added radios to select preferred notification
method (email/telegram) as well, which the admin will soon be able to
change also.
 2021-05-07 14:32:51 +01:00
Harvey Tindall 326c2cf70a modal: use arrow function to avoid 'this' naming collision 2021-05-07 14:30:30 +01:00
Harvey Tindall 2816c6277d modal: add onopen/onclose 2021-05-07 13:22:07 +01:00
Harvey Tindall 99875b9176 almost complete telegram user verification 
When signing up, the user is given a pin code which they send to a
telegram bot. This provides user verification, but more importantly
allows the bot to message the user, as the Telegram API requires the
user to interact with the bot before it can do the opposite.

The bot should recognize the correct language, but a /lang command is
also provided to change it.

The verification process is pretty much functional but ui is still
broken, and it isn't properly integrated yet.
 2021-05-07 01:08:12 +01:00
Harvey Tindall 0e21942cd6 add hard restart for updates on *nix 
reincarnates app.Restart() removed in
bbb0568cc4 as app.HardRestart().
 2021-05-03 20:08:23 +01:00
Harvey Tindall b2b5083102 fix checkCheckCount on accounts reload 2021-05-03 18:55:46 +01:00
Harvey Tindall c0f316d049 add preview to Announcements 2021-05-03 18:35:27 +01:00
Harvey Tindall 2c6d08319b add typechecking step to Makefile when DEBUG=on 2021-05-03 18:32:56 +01:00
Harvey Tindall 5d8f139356 fix race condition; rename route functions; fix swagger params 
fix race condition when notifying of invite expiry, rename custom email
related functions as to reduce confusion, and add proper path params for
some swagger routes. Also moved some stuff around in api.go.
 2021-05-02 20:42:37 +01:00
Harvey Tindall 87ef71b415 lowercase lang 2021-05-02 15:25:09 +01:00
Harvey Tindall 382a0f4c3c add donate button to about 2021-05-02 15:16:28 +01:00
Harvey Tindall 488c2f5df5 fix broken url in welcome email 2021-05-02 14:44:19 +01:00
Harvey Tindall 43effd0c32 add reset link option to setup 2021-05-02 14:15:03 +01:00
Harvey Tindall af61549bf1 ombi: reset password when using pwr links 
When password reset links are enabled, the ombi password will be reset
to the PIN along with Jellyfin.
 2021-05-02 13:23:59 +01:00
Harvey Tindall 22a0d8925d Remove unused typescript, update config readme 2021-05-02 13:23:33 +01:00
Harvey Tindall 59a014f681 fix title for invite emails 2021-05-02 12:50:04 +01:00
Harvey Tindall 9944cc2db9 refactor; move logger to module 2021-05-01 00:13:57 +01:00
Harvey Tindall 570e3a1e54 fix en-es name and filename 2021-04-30 13:54:53 +01:00
Harvey Tindall a2c344de83 add shorthand flag names 
along with an ugly wrapper for the help message that merges the
descriptions for the short & long versions.
 2021-04-24 23:54:56 +01:00
Harvey Tindall 886ae64feb add "systemd" command to generate a .service file 
never got around to adding this from jellyfin-accounts for some reason.
 2021-04-24 18:54:31 +01:00
Harvey Tindall 90a2c1f2e7 Fix email editor for other email types 2021-04-22 19:16:41 +01:00
Harvey Tindall d772e43e44 merge language changes 2021-04-15 15:34:52 +01:00
Harvey Tindall 8fdab39b18 use templateEmail and show conditionals in editor 2021-04-15 15:34:17 +01:00
Harvey Tindall f7d2771263 add email templater with basic if statements 
at this point I really should've just used text/template, but I guess
this way compatibility is kept with existing custom emails. If statement
works as so:

{if variable}variable was true{endif}
{if !variable}variable was false{endif}

no else yet, just do as above (two if statements).
 2021-04-14 23:58:54 +01:00
Harvey Tindall 3273607fc3 translation: add fallback option to langMeta 
If set to a language code (e.g fr-fr), any missing strings will be
filled in from that language (if possible) rather than from the default
en-us. Currently not used, but could be useful in the future for
variations of the same language.
 2021-04-13 18:34:13 +01:00
Harvey Tindall 55e21f8be3 accounts: add user enable/disable & emails 2021-04-12 21:28:36 +01:00
Harvey Tindall 3dc0df0ac2 fix user expiry when only month field set 2021-04-09 13:35:46 +01:00
Harvey Tindall d701c5f27d add months field to invites & expiry 2021-04-08 20:43:01 +01:00
Harvey Tindall a8f71c83da store language preference as cookie 2021-04-08 16:03:46 +01:00
Harvey Tindall 7a3e0d60f9 add expiry to welcome email, add dummy emailer for debugging 
the "yourAccountWillExpire" has also been added to the editor for #81.
To use the dummy emailer, set [email]/method to "dummy".
 2021-04-08 14:20:13 +01:00
Harvey Tindall 2687af31ca updater: immediately store executable 
for some reason I kept the response body and downloaded file in memory,
which led to timeouts and failed updates.
 2021-04-07 18:17:18 +01:00
Harvey Tindall d51a6abb02 remove cl.md 2021-04-07 17:45:31 +01:00
Harvey Tindall 374ffbf01f fix incomplete lang patching, add en-gb stub 
en-gb is empty, so it's patched with en-us strings. Added so DD/MM/YY
date formatting was possible in the ui.
 2021-04-07 17:42:15 +01:00
Harvey Tindall 871bc9f396 use proper date formatting on form for expiry 2021-04-07 15:17:15 +01:00
Harvey Tindall 66b7df7cde use selected language for time format, add manual selector 
You can now choose between 12h and 24h time in the top left language
menu. Your preference is stored by the browser for future visits.
 2021-04-07 15:09:44 +01:00
Harvey Tindall bc76770ca4 move 12h/24h time strings to common 2021-04-07 15:09:25 +01:00
Harvey Tindall 7196361cf6 (hopefully) get proper locale from browser 2021-04-07 14:05:17 +01:00
Harvey Tindall 3e73d16cce merge language changes 2021-04-06 21:30:14 +01:00
Harvey Tindall 3f8414c70a use unix timestamp for inv created & usedBy 
usedBy is still stored as a string in invites.json to cope with existing
invites with times stored formatted. knz/strtime requires cgo for
strptime, so it has been replaced with the native itchyny/timefmt-go.
 2021-04-06 21:25:44 +01:00
Harvey Tindall 6ec2186bdf switch accounts tab to unix times 
should now respect the client's locale.
 2021-04-06 20:53:30 +01:00
Harvey Tindall 7dcc9b20a1 clear user cache when user expires 2021-04-06 18:39:12 +01:00
Harvey Tindall 754b956206 remove extra logs 2021-04-06 18:32:32 +01:00
Harvey Tindall 47ac505cac shutdown your background workers! 
I believe everything #74 was caused by not shutting down the userDaemon
when we do a pseudo-restart. shutdown of it and the invite daemon are
now deferred so this should fix any problems and reduce log spam.
 2021-04-06 18:12:06 +01:00
Harvey Tindall e6e5231f63 add extra logging 2021-04-06 18:02:15 +01:00
Harvey Tindall 78049d4a33 hyphenate/dehyphenate users.json if necessary 
doubt this would have caused problems anyway but why not.
 2021-04-06 15:46:28 +01:00
Harvey Tindall 8a6cfe0b4d disallow negative values in ExtendExpiry, fix nil map err 2021-04-06 14:00:32 +01:00
Harvey Tindall afedc78113 only load users if they don't exist already 
another guess for #77.
 2021-04-06 13:53:07 +01:00
Harvey Tindall 76b822213e add more error logging; mutex for app.storage.users 2021-04-06 13:44:52 +01:00
Harvey Tindall ab3d5f3321 fix logging for expiry extension 
also delete expiries for users that no longer exist.
 2021-04-06 13:31:42 +01:00