diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..02c96fa --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "locale"] + path = locale + url = https://github.com/TicketsBot/locale.git diff --git a/app/http/endpoints/api/transcripts/queryoptions.go b/app/http/endpoints/api/transcripts/queryoptions.go index 0a14390..efd67e2 100644 --- a/app/http/endpoints/api/transcripts/queryoptions.go +++ b/app/http/endpoints/api/transcripts/queryoptions.go @@ -11,6 +11,7 @@ type wrappedQueryOptions struct { Id int `json:"id,string"` Username string `json:"username"` UserId uint64 `json:"user_id,string"` + PanelId int `json:"panel_id"` Page int `json:"page"` } @@ -43,6 +44,7 @@ func (o *wrappedQueryOptions) toQueryOptions(guildId uint64) (database.TicketQue GuildId: guildId, UserIds: userIds, Open: utils.BoolPtr(false), + PanelId: o.PanelId, Order: database.OrderTypeDescending, Limit: pageLimit, Offset: offset, diff --git a/cmd/panel/main.go b/cmd/panel/main.go index aab5f06..5becc37 100644 --- a/cmd/panel/main.go +++ b/cmd/panel/main.go @@ -15,7 +15,7 @@ import ( "github.com/TicketsBot/archiverclient" "github.com/TicketsBot/common/chatrelay" "github.com/TicketsBot/common/premium" - "github.com/TicketsBot/worker/bot/i18n" + "github.com/TicketsBot/worker/i18n" "github.com/apex/log" "github.com/rxdn/gdl/rest/request" "math/rand" @@ -40,9 +40,8 @@ func main() { utils.ArchiverClient = archiverclient.NewArchiverClientWithTimeout(config.Conf.Bot.ObjectStore, time.Second*15, []byte(config.Conf.Bot.AesKey)) utils.LoadEmoji() - if err := i18n.LoadMessages(database.Client); err != nil { - panic(err) - } + + i18n.LoadMessages() if config.Conf.Bot.ProxyUrl != "" { request.RegisterHook(utils.ProxyHook) diff --git a/frontend/rollup.config.js b/frontend/rollup.config.js index 5a6b8de..5248928 100644 --- a/frontend/rollup.config.js +++ b/frontend/rollup.config.js @@ -58,7 +58,7 @@ export default { browser: true, dedupe: ['svelte'] }), - commonjs(), + commonjs({ sourceMap: false }), babel({ babelHelpers: 'bundled', extensions: ['.js', '.mjs', '.html', '.svelte'], diff --git a/frontend/src/components/PanelDropdown.svelte b/frontend/src/components/PanelDropdown.svelte index 5e0a84f..9fd7698 100644 --- a/frontend/src/components/PanelDropdown.svelte +++ b/frontend/src/components/PanelDropdown.svelte @@ -1,10 +1,8 @@ - -