Mike 7 месяцев назад
Родитель
Сommit
0a8237b863
100 измененных файлов с 190 добавлено и 202 удалено
  1. 5 5
      .mockery.yaml
  2. 4 4
      Makefile
  3. 1 13
      README.md
  4. 1 1
      cmd/config_generator/main.go
  5. 11 11
      cmd/server/factory.go
  6. 1 1
      cmd/server/main.go
  7. 1 1
      cmd/snac_buster/main.go
  8. 1 1
      cmd/webapi_keygen/main.go
  9. 2 2
      config/ssl/stunnel.conf
  10. 1 1
      docker-compose.yaml
  11. 1 1
      docs/CLIENT_ICQ.md
  12. 1 1
      docs/RENDEZVOUS.md
  13. 2 2
      foodgroup/admin.go
  14. 3 3
      foodgroup/admin_test.go
  15. 3 3
      foodgroup/auth.go
  16. 3 3
      foodgroup/auth_test.go
  17. 2 2
      foodgroup/bart.go
  18. 2 2
      foodgroup/bart_test.go
  19. 2 2
      foodgroup/buddy.go
  20. 2 2
      foodgroup/buddy_test.go
  21. 2 2
      foodgroup/chat.go
  22. 2 2
      foodgroup/chat_nav.go
  23. 2 2
      foodgroup/chat_nav_test.go
  24. 2 2
      foodgroup/chat_test.go
  25. 2 2
      foodgroup/feedbag.go
  26. 2 2
      foodgroup/feedbag_test.go
  27. 2 2
      foodgroup/helpers_test.go
  28. 2 2
      foodgroup/icbm.go
  29. 2 2
      foodgroup/icbm_test.go
  30. 2 2
      foodgroup/icq.go
  31. 2 2
      foodgroup/icq_test.go
  32. 2 2
      foodgroup/locate.go
  33. 2 2
      foodgroup/locate_test.go
  34. 1 1
      foodgroup/mock_account_manager_test.go
  35. 2 2
      foodgroup/mock_bart_item_manager_test.go
  36. 2 2
      foodgroup/mock_buddy_broadcaster_test.go
  37. 2 2
      foodgroup/mock_chat_message_relayer_test.go
  38. 1 1
      foodgroup/mock_chat_room_registry_test.go
  39. 1 1
      foodgroup/mock_chat_session_registry_test.go
  40. 2 2
      foodgroup/mock_client_side_buddy_list_manager_test.go
  41. 2 2
      foodgroup/mock_feedbag_manager_test.go
  42. 1 1
      foodgroup/mock_icq_user_finder_test.go
  43. 1 1
      foodgroup/mock_icq_user_updater_test.go
  44. 2 2
      foodgroup/mock_message_relayer_test.go
  45. 1 1
      foodgroup/mock_offline_message_manager_test.go
  46. 2 2
      foodgroup/mock_profile_manager_test.go
  47. 1 1
      foodgroup/mock_relationship_fetcher_test.go
  48. 1 1
      foodgroup/mock_session_registry_test.go
  49. 1 1
      foodgroup/mock_session_retriever_test.go
  50. 1 1
      foodgroup/mock_user_manager_manager_test.go
  51. 2 2
      foodgroup/odir.go
  52. 2 2
      foodgroup/odir_test.go
  53. 3 3
      foodgroup/oservice.go
  54. 3 3
      foodgroup/oservice_test.go
  55. 2 2
      foodgroup/permit_deny.go
  56. 2 2
      foodgroup/permit_deny_test.go
  57. 1 1
      foodgroup/stats.go
  58. 1 1
      foodgroup/stats_test.go
  59. 2 2
      foodgroup/types.go
  60. 2 2
      foodgroup/user_lookup.go
  61. 2 2
      foodgroup/user_lookup_test.go
  62. 1 1
      go.mod
  63. 1 1
      scripts/docker-setup.sh
  64. 1 1
      scripts/run_stunnel.sh
  65. 2 2
      server/http/helpers_test.go
  66. 3 3
      server/http/mgmt_api.go
  67. 3 3
      server/http/mgmt_api_test.go
  68. 1 1
      server/http/mock_account_manager_test.go
  69. 1 1
      server/http/mock_bart_asset_manager_test.go
  70. 1 1
      server/http/mock_chat_room_creator_test.go
  71. 1 1
      server/http/mock_chat_room_retriever_test.go
  72. 1 1
      server/http/mock_chat_session_retriever_test.go
  73. 1 1
      server/http/mock_directory_manager_test.go
  74. 2 2
      server/http/mock_feedbag_retriever_test.go
  75. 2 2
      server/http/mock_message_relayer_test.go
  76. 1 1
      server/http/mock_profile_retriever_test.go
  77. 1 1
      server/http/mock_session_retriever_test.go
  78. 1 1
      server/http/mock_user_manager_test.go
  79. 2 2
      server/http/types.go
  80. 1 1
      server/http/webapi_admin.go
  81. 3 3
      server/kerberos/kerberos.go
  82. 2 2
      server/kerberos/kerberos_test.go
  83. 2 2
      server/kerberos/mock_auth_test.go
  84. 4 4
      server/oscar/handler.go
  85. 4 4
      server/oscar/handler_test.go
  86. 2 2
      server/oscar/middleware/logger.go
  87. 2 2
      server/oscar/mock_admin_service_test.go
  88. 2 2
      server/oscar/mock_auth_test.go
  89. 2 2
      server/oscar/mock_bart_service_test.go
  90. 1 1
      server/oscar/mock_buddy_list_registry_test.go
  91. 2 2
      server/oscar/mock_buddy_service_test.go
  92. 2 2
      server/oscar/mock_chat_nav_service_test.go
  93. 2 2
      server/oscar/mock_chat_service_test.go
  94. 1 1
      server/oscar/mock_chat_session_manager_test.go
  95. 2 2
      server/oscar/mock_departure_notifier_test.go
  96. 2 2
      server/oscar/mock_feedbag_service_test.go
  97. 2 2
      server/oscar/mock_icbm_service_test.go
  98. 2 2
      server/oscar/mock_icq_service_test.go
  99. 2 2
      server/oscar/mock_locate_service_test.go
  100. 1 1
      server/oscar/mock_odir_service_test.go

+ 5 - 5
.mockery.yaml

@@ -4,7 +4,7 @@ template: testify
 template-data:
   unroll-variadic: true
 packages:
-  github.com/mk6i/retro-aim-server/server/oscar:
+  github.com/mk6i/open-oscar-server/server/oscar:
     interfaces:
       AuthService:
         config:
@@ -69,7 +69,7 @@ packages:
       UserLookupService:
         config:
           filename: "mock_user_lookup_service_test.go"
-  github.com/mk6i/retro-aim-server/server/http:
+  github.com/mk6i/open-oscar-server/server/http:
     interfaces:
       AccountManager:
         config:
@@ -104,7 +104,7 @@ packages:
       UserManager:
         config:
           filename: "mock_user_manager_test.go"
-  github.com/mk6i/retro-aim-server/foodgroup:
+  github.com/mk6i/open-oscar-server/foodgroup:
     interfaces:
       AccountManager:
         config:
@@ -160,7 +160,7 @@ packages:
       UserManager:
         config:
           filename: "mock_user_manager_manager_test.go"
-  github.com/mk6i/retro-aim-server/server/toc:
+  github.com/mk6i/open-oscar-server/server/toc:
     interfaces:
       AdminService:
         config:
@@ -201,7 +201,7 @@ packages:
       CookieBaker:
         config:
           filename: "mock_cookie_baker_test.go"
-  github.com/mk6i/retro-aim-server/server/kerberos:
+  github.com/mk6i/open-oscar-server/server/kerberos:
     interfaces:
       AuthService:
         config:

+ 4 - 4
Makefile

@@ -7,8 +7,8 @@ DOCKER_RUN_GO_RELEASER := @docker run \
 	--env CGO_ENABLED=0 \
 	--env GITHUB_TOKEN=$(GITHUB_TOKEN) \
 	--rm \
-	--volume `pwd`:/go/src/retro-aim-server \
-	--workdir /go/src/retro-aim-server \
+	--volume `pwd`:/go/src/open-oscar-server \
+	--workdir /go/src/open-oscar-server \
 	$(DOCKER_IMAGE_TAG_GO_RELEASER)
 OSCAR_HOST ?= ras.dev
 
@@ -46,11 +46,11 @@ docker-images: docker-image-ras docker-image-stunnel docker-image-certgen
 
 .PHONY: docker-run
 docker-run:
-	OSCAR_HOST=$(OSCAR_HOST) docker compose up retro-aim-server stunnel
+	OSCAR_HOST=$(OSCAR_HOST) docker compose up open-oscar-server stunnel
 
 .PHONY: docker-run-bg
 docker-run-bg: ## Run Open OSCAR Server in background with docker-compose
-	OSCAR_HOST=$(OSCAR_HOST) docker compose up -d retro-aim-server stunnel
+	OSCAR_HOST=$(OSCAR_HOST) docker compose up -d open-oscar-server stunnel
 
 .PHONY: docker-run-stop
 docker-run-stop: ## Stop Open OSCAR Server docker-compose services

+ 1 - 13
README.md

@@ -7,7 +7,7 @@
 
 </div>
 
-**Open OSCAR Server** (formerly known as Retro AIM Server) is an open-source instant messaging server compatible with classic AIM and ICQ clients.
+**Open OSCAR Server** is an open-source instant messaging server compatible with classic AIM and ICQ clients.
 
 | Disclaimer                                                                                                                                                                                                                           |
 |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -60,11 +60,6 @@ This project is under active development. Contributions are welcome!
 
 Follow [this guide](./docs/BUILD.md) to learn how to compile and run Open OSCAR Server.
 
-## 🌍 Community
-
-Check out the Open OSCAR Server [Discord server](https://discord.gg/2Xy4nF3Uh9) to get help or find out how to get
-involved.
-
 ## 👤 Management API
 
 The Management API provides functionality for administering the server (see [OpenAPI spec](./api.yml)). The following
@@ -184,13 +179,6 @@ curl -d'{"name":"Office Hijinks"}' http://localhost:8080/chat/room/public
 curl http://localhost:8080/chat/room/public
 ```
 
-## 🔗 Acknowledgements
-
-- [aim-oscar-server](https://github.com/ox/aim-oscar-server) is another cool open source AIM server project.
-- [NINA Wiki](https://web.archive.org/web/20250910233011/https://wiki.nina.chat/wiki/Main_Page) is an indispensable source for figuring out the OSCAR API.
-- [libpurple](https://developer.pidgin.im/wiki/WhatIsLibpurple) is also an invaluable OSCAR reference (especially
-  version [2.10.6-1](https://github.com/Tasssadar/libpurple)).
-
 ## 📄 License
 
 Open OSCAR Server is licensed under the [MIT license](./LICENSE).

+ 1 - 1
cmd/config_generator/main.go

@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/mk6i/retro-aim-server/config"
+	"github.com/mk6i/open-oscar-server/config"
 
 	"github.com/mitchellh/go-wordwrap"
 )

+ 11 - 11
cmd/server/factory.go

@@ -12,17 +12,17 @@ import (
 	"github.com/kelseyhightower/envconfig"
 	"golang.org/x/time/rate"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/foodgroup"
-	"github.com/mk6i/retro-aim-server/server/http"
-	"github.com/mk6i/retro-aim-server/server/kerberos"
-	"github.com/mk6i/retro-aim-server/server/oscar"
-	oscarmiddleware "github.com/mk6i/retro-aim-server/server/oscar/middleware"
-	"github.com/mk6i/retro-aim-server/server/toc"
-	"github.com/mk6i/retro-aim-server/server/webapi"
-	"github.com/mk6i/retro-aim-server/server/webapi/handlers"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/foodgroup"
+	"github.com/mk6i/open-oscar-server/server/http"
+	"github.com/mk6i/open-oscar-server/server/kerberos"
+	"github.com/mk6i/open-oscar-server/server/oscar"
+	oscarmiddleware "github.com/mk6i/open-oscar-server/server/oscar/middleware"
+	"github.com/mk6i/open-oscar-server/server/toc"
+	"github.com/mk6i/open-oscar-server/server/webapi"
+	"github.com/mk6i/open-oscar-server/server/webapi/handlers"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // Container groups together common dependencies.

+ 1 - 1
cmd/server/main.go

@@ -12,7 +12,7 @@ import (
 	"github.com/joho/godotenv"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/mk6i/retro-aim-server/server/webapi"
+	"github.com/mk6i/open-oscar-server/server/webapi"
 )
 
 var (

+ 1 - 1
cmd/snac_buster/main.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func main() {

+ 1 - 1
cmd/webapi_keygen/main.go

@@ -17,7 +17,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/joho/godotenv"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 )
 
 const (

+ 2 - 2
config/ssl/stunnel.conf

@@ -7,7 +7,7 @@ options = NO_SSLv3
 options = NO_TLSv1_1
 ciphers = ALL
 accept = 443
-connect = retro-aim-server:1088
+connect = open-oscar-server:1088
 cert = /etc/stunnel/certs/server.pem
 
 [oscar_proxy]
@@ -16,5 +16,5 @@ options = NO_SSLv3
 options = NO_TLSv1_1
 ciphers = ALL
 accept = 5193
-connect = retro-aim-server:5190
+connect = open-oscar-server:5190
 cert = /etc/stunnel/certs/server.pem

+ 1 - 1
docker-compose.yaml

@@ -28,7 +28,7 @@ services:
          && certutil -N -d nss --empty-password
          && certutil -A -n \"RAS\" -t \"CT,,C\" -i server.pem -d nss"
 
-  retro-aim-server:
+  open-oscar-server:
     image: ras:latest
     ports:
       - "5190:5190"

+ 1 - 1
docs/CLIENT_ICQ.md

@@ -116,7 +116,7 @@ using [WineskinServer](https://github.com/Gcenx/WineskinServer), a wrapper for W
 
 ## Post-install Configuration
 
-In this step, we'll replace ICQ's default server hostname with your Retro AIM
+In this step, we'll replace ICQ's default server hostname with your Open OSCAR
 Server's hostname in the Windows Registry.
 
 > Do not attempt to set the ICQ hostname via the registration Window. If you do

+ 1 - 1
docs/RENDEZVOUS.md

@@ -22,7 +22,7 @@ feature. If you only need to **receive** a file, no additional setup is required
 ### Caveats
 
 - **Same LAN Scenario**  
-  If both Retro AIM server and your AIM client are on the same local network (LAN), you do **not** need these steps.
+  If both Open OSCAR Server and your AIM client are on the same local network (LAN), you do **not** need these steps.
 
 - **Mixed LAN and Internet**  
   If the sending client and the server are on the same LAN while the receiver is on the Internet, this guide may not

+ 2 - 2
foodgroup/admin.go

@@ -6,8 +6,8 @@ import (
 	"log/slog"
 	"net/mail"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // NewAdminService creates an instance of AdminService.

+ 3 - 3
foodgroup/admin_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestAdminService_ConfirmRequest(t *testing.T) {

+ 3 - 3
foodgroup/auth.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/google/uuid"
 )

+ 3 - 3
foodgroup/auth_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"

+ 2 - 2
foodgroup/bart.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // blankGIF is a blank, transparent 50x50p GIF that takes the place of a

+ 2 - 2
foodgroup/bart_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestBARTService_UpsertItem(t *testing.T) {

+ 2 - 2
foodgroup/buddy.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // NewBuddyService creates a new instance of BuddyService.

+ 2 - 2
foodgroup/buddy_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestBuddyService_RightsQuery(t *testing.T) {

+ 2 - 2
foodgroup/chat.go

@@ -14,8 +14,8 @@ import (
 
 	"golang.org/x/net/html"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 var (

+ 2 - 2
foodgroup/chat_nav.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 var defaultExchangeCfg = wire.TLVBlock{

+ 2 - 2
foodgroup/chat_nav_test.go

@@ -6,8 +6,8 @@ import (
 	"log/slog"
 	"testing"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 )

+ 2 - 2
foodgroup/chat_test.go

@@ -5,8 +5,8 @@ import (
 	"math"
 	"testing"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

+ 2 - 2
foodgroup/feedbag.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // NewFeedbagService creates a new instance of FeedbagService.

+ 2 - 2
foodgroup/feedbag_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

+ 2 - 2
foodgroup/helpers_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // mockParams is a helper struct that centralizes mock function call parameters

+ 2 - 2
foodgroup/icbm.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/patrickmn/go-cache"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 const (

+ 2 - 2
foodgroup/icbm_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

+ 2 - 2
foodgroup/icq.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 var errICQBadRequest = errors.New("bad ICQ request")

+ 2 - 2
foodgroup/icq_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestICQService_DeleteMsgReq(t *testing.T) {

+ 2 - 2
foodgroup/locate.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // omitCaps is the map of to filter out of the client's capability list

+ 2 - 2
foodgroup/locate_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestLocateService_UserInfoQuery(t *testing.T) {

+ 1 - 1
foodgroup/mock_account_manager_test.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"net/mail"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_bart_item_manager_test.go

@@ -7,8 +7,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_buddy_broadcaster_test.go

@@ -7,8 +7,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_chat_message_relayer_test.go

@@ -7,8 +7,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_chat_room_registry_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_chat_session_registry_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_client_side_buddy_list_manager_test.go

@@ -7,8 +7,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_feedbag_manager_test.go

@@ -8,8 +8,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_icq_user_finder_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_icq_user_updater_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_message_relayer_test.go

@@ -7,8 +7,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_offline_message_manager_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/mock_profile_manager_test.go

@@ -7,8 +7,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_relationship_fetcher_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_session_registry_test.go

@@ -7,7 +7,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_session_retriever_test.go

@@ -5,7 +5,7 @@
 package foodgroup
 
 import (
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
foodgroup/mock_user_manager_manager_test.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
foodgroup/odir.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // NewODirService creates a new instance of ODirService.

+ 2 - 2
foodgroup/odir_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestODirService_KeywordListQuery(t *testing.T) {

+ 3 - 3
foodgroup/oservice.go

@@ -8,9 +8,9 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // OServiceService provides functionality for the OService food group, which

+ 3 - 3
foodgroup/oservice_test.go

@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestOServiceService_ServiceRequest(t *testing.T) {

+ 2 - 2
foodgroup/permit_deny.go

@@ -3,8 +3,8 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // NewPermitDenyService creates an instance of PermitDenyService.

+ 2 - 2
foodgroup/permit_deny_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestPermitDenyService_RightsQuery(t *testing.T) {

+ 1 - 1
foodgroup/stats.go

@@ -3,7 +3,7 @@ package foodgroup
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func NewStatsService() StatsService {

+ 1 - 1
foodgroup/stats_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestStatsService_ReportEvents(t *testing.T) {

+ 2 - 2
foodgroup/types.go

@@ -38,8 +38,8 @@ import (
 	"net/mail"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // AccountManager is the interface for managing a user's account settings.

+ 2 - 2
foodgroup/user_lookup.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // NewUserLookupService returns a new instance of UserLookupService.

+ 2 - 2
foodgroup/user_lookup_test.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 )

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module github.com/mk6i/retro-aim-server
+module github.com/mk6i/open-oscar-server
 
 go 1.24.2
 

+ 1 - 1
scripts/docker-setup.sh

@@ -83,7 +83,7 @@ resolve_repo_root() {
     if git -C "$SCRIPT_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
         REPO_ROOT=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel)
     else
-        TMP_DIR="retro-aim-server"
+        TMP_DIR="open-oscar-server"
         if [ -d "$TMP_DIR/.git" ]; then
             warn "Directory '$TMP_DIR' is already a git repo. Using existing directory."
         else

+ 1 - 1
scripts/run_stunnel.sh

@@ -11,7 +11,7 @@ PEM_PATH="$1"
 
 docker run --rm -it \
   --add-host=host.docker.internal:host-gateway \
-  --add-host=retro-aim-server:host-gateway \
+  --add-host=open-oscar-server:host-gateway \
   -v "$PEM_PATH:/etc/stunnel/certs/server.pem:ro" \
   -v "$(pwd)/config/ssl/stunnel.conf:/etc/stunnel/stunnel.conf:ro" \
   -p 443:443 \

+ 2 - 2
server/http/helpers_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 type mockParams struct {

+ 3 - 3
server/http/mgmt_api.go

@@ -17,9 +17,9 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func NewManagementAPI(bld config.Build, listener string, userManager UserManager, sessionRetriever SessionRetriever, chatRoomRetriever ChatRoomRetriever, chatRoomCreator ChatRoomCreator, chatRoomDeleter ChatRoomDeleter, chatSessionRetriever ChatSessionRetriever, directoryManager DirectoryManager, messageRelayer MessageRelayer, bartAssetManager BARTAssetManager, feedbagRetriever FeedBagRetriever, accountManager AccountManager, profileRetriever ProfileRetriever, webAPIKeyManager WebAPIKeyManager, logger *slog.Logger) *Server {

+ 3 - 3
server/http/mgmt_api_test.go

@@ -17,9 +17,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 func TestSessionHandler_GET(t *testing.T) {

+ 1 - 1
server/http/mock_account_manager_test.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"net/mail"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_bart_asset_manager_test.go

@@ -7,7 +7,7 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_chat_room_creator_test.go

@@ -7,7 +7,7 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_chat_room_retriever_test.go

@@ -7,7 +7,7 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_chat_session_retriever_test.go

@@ -5,7 +5,7 @@
 package http
 
 import (
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_directory_manager_test.go

@@ -7,7 +7,7 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/http/mock_feedbag_retriever_test.go

@@ -7,8 +7,8 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/http/mock_message_relayer_test.go

@@ -7,8 +7,8 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_profile_retriever_test.go

@@ -7,7 +7,7 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_session_retriever_test.go

@@ -5,7 +5,7 @@
 package http
 
 import (
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/http/mock_user_manager_test.go

@@ -7,7 +7,7 @@ package http
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/http/types.go

@@ -5,8 +5,8 @@ import (
 	"net/mail"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 // AccountManager defines methods for managing user account attributes

+ 1 - 1
server/http/webapi_admin.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 )
 
 // WebAPIKeyManager defines methods for managing Web API authentication keys.

+ 3 - 3
server/kerberos/kerberos.go

@@ -11,9 +11,9 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 type AuthService interface {

+ 2 - 2
server/kerberos/kerberos_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

+ 2 - 2
server/kerberos/mock_auth_test.go

@@ -7,8 +7,8 @@ package kerberos
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 4 - 4
server/oscar/handler.go

@@ -9,10 +9,10 @@ import (
 	"io"
 	"log/slog"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/server/oscar/middleware"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/server/oscar/middleware"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 var (

+ 4 - 4
server/oscar/handler_test.go

@@ -7,10 +7,10 @@ import (
 	"math"
 	"testing"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/server/oscar/middleware"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/server/oscar/middleware"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

+ 2 - 2
server/oscar/middleware/logger.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mk6i/retro-aim-server/config"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/config"
+	"github.com/mk6i/open-oscar-server/wire"
 )
 
 const (

+ 2 - 2
server/oscar/mock_admin_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_auth_test.go

@@ -8,8 +8,8 @@ import (
 	"context"
 
 	"github.com/google/uuid"
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_bart_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/oscar/mock_buddy_list_registry_test.go

@@ -7,7 +7,7 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_buddy_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_chat_nav_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_chat_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/oscar/mock_chat_session_manager_test.go

@@ -5,7 +5,7 @@
 package oscar
 
 import (
-	"github.com/mk6i/retro-aim-server/state"
+	"github.com/mk6i/open-oscar-server/state"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_departure_notifier_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_feedbag_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_icbm_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_icq_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 2 - 2
server/oscar/mock_locate_service_test.go

@@ -7,8 +7,8 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/state"
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/state"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

+ 1 - 1
server/oscar/mock_odir_service_test.go

@@ -7,7 +7,7 @@ package oscar
 import (
 	"context"
 
-	"github.com/mk6i/retro-aim-server/wire"
+	"github.com/mk6i/open-oscar-server/wire"
 	mock "github.com/stretchr/testify/mock"
 )
 

Некоторые файлы не были показаны из-за большого количества измененных файлов