Skip to content

Commit

Permalink
Merge branch 'autostream_permissions' into CustomThee
Browse files Browse the repository at this point in the history
  • Loading branch information
TheerapakG committed Oct 1, 2018
2 parents a907ac9 + 6cd34ff commit 96e885a
Show file tree
Hide file tree
Showing 5 changed files with 362 additions and 195 deletions.
14 changes: 14 additions & 0 deletions config/example_permissions.ini
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@
;
;;;;;;;;;;;;;;;;;;;

; This group is for owner. Any options not specified will fallback to permissive default value. Don't remove/rename this group.
; You cannot assign users or roles to this group. Those options are ignored.
[Owner (auto)]
; MaxSongLength = 0
; MaxSongs = 0
; MaxPlaylistLength = 0
; AllowPlaylists = yes
; InstaSkip = yes
; Remove = yes
; SkipWhenAbsent = no
; BypassKaraokeMode = yes
; ToggleAutoPlaylists = yes
; Extractors =

; This is the fallback group for any users that don't get assigned to another group. Don't remove/rename this group.
; You cannot assign users or roles to this group. Those options are ignored.
[Default]
Expand Down
9 changes: 6 additions & 3 deletions config/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
"cmd-save-exists": "This song is already in the autoplaylist.",
"cmd-save-invalid": "There is no valid song playing.",
"cmd-save-success": "Added <{0}> to the autoplaylist.",
"cmd-savestream-exists": "This stream is already in the autostream.",
"cmd-savestream-invalid": "There is no valid stream playing.",
"cmd-savestram-success": "Added <{0}> to the autostream.",
"cmd-addstream-exists": "This stream is already in the autostream.",
"cmd-addstream-success": "Added <{0}> to the autostream.",
"cmd-removestream-notexists": "This stream is already not in the autostream.",
"cmd-removestream-success": "Removed <{0}> from the autostream.",
"cmd-autostream-invalid": "There is no valid stream playing.",
"cmd-autostream-nooption": "Check your specified option argument. It needs to be +, -, add or remove.",
"cmd-toggleplaylist-wrongmode": "Mode for dealing with autoplaylists is not set to 'toggle', currently set to {0}",
"cmd-toggleplaylist-nolist": "There is not any autoplaylist to toggle to",
"cmd-toggleplaylist-success": "Switched autoplaylist to {0}",
Expand Down
Loading

0 comments on commit 96e885a

Please sign in to comment.