[common] Handle channels using database

1 files changed, 10 insertions, 20 deletions

diff --git a/server/server.go b/server/server.go
index b5840df..af43e3a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -11,14 +11,12 @@ import (
 )
 
 type Server struct {
-	cfg        Config
-	users      map[string]User // TODO: Use full address instead of just name
-	servers    map[string]RemoteServer
-	channels   map[string]*Channel
-	usersMu    sync.RWMutex
-	serversMu  sync.RWMutex
-	channelsMu sync.RWMutex
-	Storage    Storage
+	cfg       Config
+	users     map[string]User // TODO: Use full address instead of just name
+	servers   map[string]RemoteServer
+	usersMu   sync.RWMutex
+	serversMu sync.RWMutex
+	Storage   Storage
 }
 
 type Config struct {
@@ -31,11 +29,10 @@ type Config struct {
 
 func NewServer(cfg Config, storage Storage) *Server {
 	return &Server{
-		cfg:      cfg,
-		Storage:  storage,
-		users:    make(map[string]User),
-		servers:  make(map[string]RemoteServer),
-		channels: make(map[string]*Channel),
+		cfg:     cfg,
+		Storage: storage,
+		users:   make(map[string]User),
+		servers: make(map[string]RemoteServer),
 	}
 }
 
@@ -47,13 +44,6 @@ func (s *Server) Start() error {
 	return s.listenPlain()
 }
 
-func (s *Server) AddChannel(name string) {
-	s.channelsMu.Lock()
-	defer s.channelsMu.Unlock()
-	s.channels[name] = NewChannel(name)
-	log.Println("created channel", name)
-}
-
 func (s *Server) listenPlain() error {
 	ln, err := net.Listen("tcp", s.cfg.ListenAddr)
 	if err != nil {