idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 00:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(irc): view announces per channel (#948)

Browse source 
* feat(irc): add sse to handler

* feat(irc): view and send irc messages per network

* refactor(irc): use id as handlerkey

* refactor(irc): use id as handlerkey

* feat(web): add irc context

* refactor: create sse stream per network channel

* fix(irc): remove non-working wildcard callback handler

* feat: use fork of sse

* chore(deps): update ergo/irc-go to v0.3.0

* fix: clean irc msg before sse publish

* feat: add view channel button

* feat: styling improvements

* feat: show time
This commit is contained in:
ze0s 2023-05-21 15:51:40 +02:00 • committed by GitHub
parent bbfcf303ef
commit ccabe96bdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 446 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

82
internal/http/irc.go
View file

@ -9,9 +9,10 @@ import (
"net/http"
"strconv"
"github.com/go-chi/chi/v5"
"github.com/autobrr/autobrr/internal/domain"
"github.com/go-chi/chi/v5"
"github.com/r3labs/sse/v2"
)
type ircService interface {
@ -21,18 +22,22 @@ type ircService interface {
GetNetworkByID(ctx context.Context, id int64) (*domain.IrcNetwork, error)
StoreNetwork(ctx context.Context, network *domain.IrcNetwork) error
UpdateNetwork(ctx context.Context, network *domain.IrcNetwork) error
StoreChannel(networkID int64, channel *domain.IrcChannel) error
StoreChannel(ctx context.Context, networkID int64, channel *domain.IrcChannel) error
RestartNetwork(ctx context.Context, id int64) error
SendCmd(ctx context.Context, req *domain.SendIrcCmdRequest) error
}
type ircHandler struct {
encoder encoder
sse *sse.Server
service ircService
}
func newIrcHandler(encoder encoder, service ircService) *ircHandler {
func newIrcHandler(encoder encoder, sse *sse.Server, service ircService) *ircHandler {
return &ircHandler{
encoder: encoder,
sse: sse,
service: service,
}
}
@ -40,11 +45,29 @@ func newIrcHandler(encoder encoder, service ircService) *ircHandler {
func (h ircHandler) Routes(r chi.Router) {
r.Get("/", h.listNetworks)
r.Post("/", h.storeNetwork)
r.Put("/network/{networkID}", h.updateNetwork)
r.Post("/network/{networkID}/channel", h.storeChannel)
r.Get("/network/{networkID}/restart", h.restartNetwork)
r.Get("/network/{networkID}", h.getNetworkByID)
r.Delete("/network/{networkID}", h.deleteNetwork)
r.Route("/network/{networkID}", func(r chi.Router) {
r.Put("/", h.updateNetwork)
r.Get("/", h.getNetworkByID)
r.Delete("/", h.deleteNetwork)
r.Post("/cmd", h.sendCmd)
r.Post("/channel", h.storeChannel)
r.Get("/restart", h.restartNetwork)
})
r.HandleFunc("/events", func(w http.ResponseWriter, r *http.Request) {
// inject CORS headers to bypass checks
h.sse.Headers = map[string]string{
"Content-Type": "text/event-stream",
"Cache-Control": "no-cache",
"Connection": "keep-alive",
"X-Accel-Buffering": "no",
}
h.sse.ServeHTTP(w, r)
})
}
func (h ircHandler) listNetworks(w http.ResponseWriter, r *http.Request) {
@ -97,8 +120,7 @@ func (h ircHandler) storeNetwork(w http.ResponseWriter, r *http.Request) {
return
}
err := h.service.StoreNetwork(r.Context(), &data)
if err != nil {
if err := h.service.StoreNetwork(r.Context(), &data); err != nil {
h.encoder.Error(w, err)
return
}
@ -117,8 +139,7 @@ func (h ircHandler) updateNetwork(w http.ResponseWriter, r *http.Request) {
return
}
err := h.service.UpdateNetwork(ctx, &data)
if err != nil {
if err := h.service.UpdateNetwork(ctx, &data); err != nil {
h.encoder.Error(w, err)
return
}
@ -126,10 +147,11 @@ func (h ircHandler) updateNetwork(w http.ResponseWriter, r *http.Request) {
h.encoder.NoContent(w)
}
func (h ircHandler) storeChannel(w http.ResponseWriter, r *http.Request) {
func (h ircHandler) sendCmd(w http.ResponseWriter, r *http.Request) {
var (
data domain.IrcChannel
ctx = r.Context()
networkID = chi.URLParam(r, "networkID")
data domain.SendIrcCmdRequest
)
id, _ := strconv.Atoi(networkID)
@ -139,8 +161,31 @@ func (h ircHandler) storeChannel(w http.ResponseWriter, r *http.Request) {
return
}
err := h.service.StoreChannel(int64(id), &data)
if err != nil {
data.NetworkId = int64(id)
if err := h.service.SendCmd(ctx, &data); err != nil {
h.encoder.Error(w, err)
return
}
h.encoder.NoContent(w)
}
func (h ircHandler) storeChannel(w http.ResponseWriter, r *http.Request) {
var (
ctx = r.Context()
networkID = chi.URLParam(r, "networkID")
data domain.IrcChannel
)
id, _ := strconv.Atoi(networkID)
if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
h.encoder.Error(w, err)
return
}
if err := h.service.StoreChannel(ctx, int64(id), &data); err != nil {
h.encoder.Error(w, err)
return
}
@ -156,8 +201,7 @@ func (h ircHandler) deleteNetwork(w http.ResponseWriter, r *http.Request) {
id, _ := strconv.Atoi(networkID)
err := h.service.DeleteNetwork(ctx, int64(id))
if err != nil {
if err := h.service.DeleteNetwork(ctx, int64(id)); err != nil {
h.encoder.Error(w, err)
return
}

2
internal/http/server.go
View file

@ -121,7 +121,7 @@ func (s Server) Handler() http.Handler {
r.Route("/download_clients", newDownloadClientHandler(encoder, s.downloadClientService).Routes)
r.Route("/filters", newFilterHandler(encoder, s.filterService).Routes)
r.Route("/feeds", newFeedHandler(encoder, s.feedService).Routes)
r.Route("/irc", newIrcHandler(encoder, s.ircService).Routes)
r.Route("/irc", newIrcHandler(encoder, s.sse, s.ircService).Routes)
r.Route("/indexer", newIndexerHandler(encoder, s.indexerService, s.ircService).Routes)
r.Route("/keys", newAPIKeyHandler(encoder, s.apiService).Routes)
r.Route("/logs", newLogsHandler(s.config).Routes)