From 29bdc1aa45c8143e7f188e2341221377d035ff21 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 4 Jul 2024 21:28:11 +0200 Subject: [PATCH] Migrate to Codeberg --- .b4-config | 2 -- .build.yml | 2 +- Makefile | 4 ++-- README.md | 8 +++----- auth/auth.go | 2 +- auth/internal.go | 2 +- auth/oauth2.go | 2 +- auth/pam.go | 2 +- cmd/soju/main.go | 12 ++++++------ cmd/sojuctl/main.go | 2 +- cmd/sojudb/main.go | 4 ++-- contrib/migrate-db/main.go | 2 +- contrib/migrate-logs/main.go | 6 +++--- contrib/znc-import/main.go | 4 ++-- database/postgres.go | 2 +- database/sqlite.go | 2 +- doc/soju.1.scd | 2 +- doc/sojuctl.1.scd | 2 +- downstream.go | 8 ++++---- fileupload/fileupload.go | 4 ++-- go.mod | 2 +- irc.go | 2 +- msgstore/db.go | 2 +- msgstore/fs.go | 6 +++--- msgstore/memory.go | 2 +- msgstore/msgstore.go | 2 +- msgstore/znclog/reader.go | 4 ++-- msgstore/znclog/writer.go | 2 +- server.go | 10 +++++----- server_test.go | 4 ++-- service.go | 2 +- upstream.go | 4 ++-- user.go | 6 +++--- 33 files changed, 59 insertions(+), 63 deletions(-) delete mode 100644 .b4-config diff --git a/.b4-config b/.b4-config deleted file mode 100644 index 2f03ec8..0000000 --- a/.b4-config +++ /dev/null @@ -1,2 +0,0 @@ -[b4] - send-series-to = ~emersion/soju-dev@lists.sr.ht diff --git a/.build.yml b/.build.yml index a3e2846..d3a04cc 100644 --- a/.build.yml +++ b/.build.yml @@ -4,7 +4,7 @@ packages: - scdoc - postgresql sources: - - https://git.sr.ht/~emersion/soju + - https://codeberg.org/emersion/soju.git tasks: - build: | cd soju diff --git a/Makefile b/Makefile index 1cc924e..2058411 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ RUNDIR ?= /run sharedstatedir := /var/lib config_path := $(SYSCONFDIR)/soju/config admin_socket_path := $(RUNDIR)/soju/admin -goldflags := -X 'git.sr.ht/~emersion/soju/config.DefaultPath=$(config_path)' \ - -X 'git.sr.ht/~emersion/soju/config.DefaultUnixAdminPath=$(admin_socket_path)' +goldflags := -X 'codeberg.org/emersion/soju/config.DefaultPath=$(config_path)' \ + -X 'codeberg.org/emersion/soju/config.DefaultUnixAdminPath=$(admin_socket_path)' goflags := $(GOFLAGS) -ldflags="$(goldflags)" commands := soju sojuctl sojudb man_pages := doc/soju.1 doc/sojuctl.1 diff --git a/README.md b/README.md index c41a949..ca2fc81 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # [soju] -[![builds.sr.ht status](https://builds.sr.ht/~emersion/soju/commits/master.svg)](https://builds.sr.ht/~emersion/soju/commits/master?) - soju is a user-friendly IRC bouncer. soju connects to upstream IRC servers on behalf of the user to provide extra functionality. soju supports many features such as multiple users, numerous [IRCv3] extensions, chat history playback and @@ -35,8 +33,8 @@ build with PAM authentication support, set `GOFLAGS="-tags=pam"`. ## Contributing -Send patches on the [mailing list] or on [GitHub], report bugs on the -[issue tracker]. Discuss in [#soju on Libera Chat][IRC channel]. +Send patches on [Codeberg] or on [GitHub], report bugs on the [issue tracker]. +Discuss in [#soju on Libera Chat][IRC channel]. ## License @@ -47,7 +45,7 @@ Copyright (C) 2020 The soju Contributors [soju]: https://soju.im [Getting started]: doc/getting-started.md [Man page]: https://soju.im/doc/soju.1.html -[mailing list]: https://lists.sr.ht/~emersion/soju-dev +[Codeberg]: https://codeberg.org/emersion/soju [GitHub]: https://github.com/emersion/soju [issue tracker]: https://todo.sr.ht/~emersion/soju [IRC channel]: ircs://irc.libera.chat/#soju diff --git a/auth/auth.go b/auth/auth.go index 188e149..cd53864 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) type Authenticator interface{} diff --git a/auth/internal.go b/auth/internal.go index 70b4e80..bd975de 100644 --- a/auth/internal.go +++ b/auth/internal.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) type internal struct{} diff --git a/auth/oauth2.go b/auth/oauth2.go index 2ae519a..1476291 100644 --- a/auth/oauth2.go +++ b/auth/oauth2.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) type oauth2 struct { diff --git a/auth/pam.go b/auth/pam.go index a7f3663..2b75f08 100644 --- a/auth/pam.go +++ b/auth/pam.go @@ -8,7 +8,7 @@ import ( "github.com/msteinert/pam/v2" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) type pamAuth struct{} diff --git a/cmd/soju/main.go b/cmd/soju/main.go index 1718f9e..26c5f77 100644 --- a/cmd/soju/main.go +++ b/cmd/soju/main.go @@ -22,12 +22,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "git.sr.ht/~emersion/soju" - "git.sr.ht/~emersion/soju/auth" - "git.sr.ht/~emersion/soju/config" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/fileupload" - "git.sr.ht/~emersion/soju/identd" + "codeberg.org/emersion/soju" + "codeberg.org/emersion/soju/auth" + "codeberg.org/emersion/soju/config" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/fileupload" + "codeberg.org/emersion/soju/identd" ) // TCP keep-alive interval for downstream TCP connections diff --git a/cmd/sojuctl/main.go b/cmd/sojuctl/main.go index 39252fd..24f4c28 100644 --- a/cmd/sojuctl/main.go +++ b/cmd/sojuctl/main.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "git.sr.ht/~emersion/soju/config" + "codeberg.org/emersion/soju/config" ) const usage = `usage: sojuctl [-config path] diff --git a/cmd/sojudb/main.go b/cmd/sojudb/main.go index 87bf6f6..9dca36e 100644 --- a/cmd/sojudb/main.go +++ b/cmd/sojudb/main.go @@ -11,8 +11,8 @@ import ( "golang.org/x/crypto/ssh/terminal" - "git.sr.ht/~emersion/soju/config" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/config" + "codeberg.org/emersion/soju/database" ) const usage = `usage: sojudb [-config path] [options...] diff --git a/contrib/migrate-db/main.go b/contrib/migrate-db/main.go index bb45c9d..9e5a744 100644 --- a/contrib/migrate-db/main.go +++ b/contrib/migrate-db/main.go @@ -7,7 +7,7 @@ import ( "log" "strings" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) const usage = `usage: migrate-db diff --git a/contrib/migrate-logs/main.go b/contrib/migrate-logs/main.go index 59992d5..b7605f6 100644 --- a/contrib/migrate-logs/main.go +++ b/contrib/migrate-logs/main.go @@ -14,9 +14,9 @@ import ( "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/msgstore" - "git.sr.ht/~emersion/soju/msgstore/znclog" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/msgstore" + "codeberg.org/emersion/soju/msgstore/znclog" ) const usage = `usage: migrate-logs diff --git a/contrib/znc-import/main.go b/contrib/znc-import/main.go index 3f6be45..afbc2fa 100644 --- a/contrib/znc-import/main.go +++ b/contrib/znc-import/main.go @@ -12,8 +12,8 @@ import ( "strings" "unicode" - "git.sr.ht/~emersion/soju/config" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/config" + "codeberg.org/emersion/soju/database" ) const usage = `usage: znc-import [options...] diff --git a/database/postgres.go b/database/postgres.go index c401119..22c99eb 100644 --- a/database/postgres.go +++ b/database/postgres.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/xirc" _ "github.com/lib/pq" "github.com/prometheus/client_golang/prometheus" promcollectors "github.com/prometheus/client_golang/prometheus/collectors" diff --git a/database/sqlite.go b/database/sqlite.go index f251f03..e37301f 100644 --- a/database/sqlite.go +++ b/database/sqlite.go @@ -13,7 +13,7 @@ import ( "time" "unicode" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/xirc" "github.com/prometheus/client_golang/prometheus" promcollectors "github.com/prometheus/client_golang/prometheus/collectors" "gopkg.in/irc.v4" diff --git a/doc/soju.1.scd b/doc/soju.1.scd index a356f96..02b855b 100644 --- a/doc/soju.1.scd +++ b/doc/soju.1.scd @@ -556,7 +556,7 @@ character. Maintained by Simon Ser , who is assisted by other open-source contributors. For more information about soju development, see -. +. # SEE ALSO diff --git a/doc/sojuctl.1.scd b/doc/sojuctl.1.scd index 735188c..2870e48 100644 --- a/doc/sojuctl.1.scd +++ b/doc/sojuctl.1.scd @@ -29,7 +29,7 @@ file. sojuctl needs to be run with write permissions on the soju admin socket. Maintained by Simon Ser , who is assisted by other open-source contributors. For more information about soju development, see -. +. # SEE ALSO diff --git a/downstream.go b/downstream.go index bcc2f55..c3bfec8 100644 --- a/downstream.go +++ b/downstream.go @@ -17,10 +17,10 @@ import ( "github.com/emersion/go-sasl" "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/auth" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/msgstore" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/auth" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/msgstore" + "codeberg.org/emersion/soju/xirc" ) type ircError struct { diff --git a/fileupload/fileupload.go b/fileupload/fileupload.go index 12897d8..ebce0be 100644 --- a/fileupload/fileupload.go +++ b/fileupload/fileupload.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "git.sr.ht/~emersion/soju/auth" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/auth" + "codeberg.org/emersion/soju/database" ) const maxSize = 50 * 1024 * 1024 // 50 MiB diff --git a/go.mod b/go.mod index d7638d2..03d0b26 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.sr.ht/~emersion/soju +module codeberg.org/emersion/soju go 1.19 diff --git a/irc.go b/irc.go index 9a7735b..b0f70e8 100644 --- a/irc.go +++ b/irc.go @@ -9,7 +9,7 @@ import ( "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/xirc" ) // TODO: generalize and move helpers to the xirc package diff --git a/msgstore/db.go b/msgstore/db.go index fbdb167..30ff349 100644 --- a/msgstore/db.go +++ b/msgstore/db.go @@ -4,7 +4,7 @@ import ( "context" "time" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" "git.sr.ht/~sircmpwn/go-bare" "gopkg.in/irc.v4" ) diff --git a/msgstore/fs.go b/msgstore/fs.go index 00f0e00..8198fbc 100644 --- a/msgstore/fs.go +++ b/msgstore/fs.go @@ -14,9 +14,9 @@ import ( "git.sr.ht/~sircmpwn/go-bare" "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/msgstore/znclog" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/msgstore/znclog" + "codeberg.org/emersion/soju/xirc" ) const ( diff --git a/msgstore/memory.go b/msgstore/memory.go index b2f1aee..b37b074 100644 --- a/msgstore/memory.go +++ b/msgstore/memory.go @@ -8,7 +8,7 @@ import ( "git.sr.ht/~sircmpwn/go-bare" "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) const messageRingBufferCap = 4096 diff --git a/msgstore/msgstore.go b/msgstore/msgstore.go index fb32ddd..fb23058 100644 --- a/msgstore/msgstore.go +++ b/msgstore/msgstore.go @@ -10,7 +10,7 @@ import ( "git.sr.ht/~sircmpwn/go-bare" "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) type LoadMessageOptions struct { diff --git a/msgstore/znclog/reader.go b/msgstore/znclog/reader.go index 5d7fe1f..92196a3 100644 --- a/msgstore/znclog/reader.go +++ b/msgstore/znclog/reader.go @@ -7,8 +7,8 @@ import ( "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/xirc" ) var timestampPrefixLen = len("[01:02:03] ") diff --git a/msgstore/znclog/writer.go b/msgstore/znclog/writer.go index b955edf..aadabd8 100644 --- a/msgstore/znclog/writer.go +++ b/msgstore/znclog/writer.go @@ -7,7 +7,7 @@ import ( "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/xirc" ) func MarshalLine(msg *irc.Message, t time.Time) string { diff --git a/server.go b/server.go index e6646d6..1f56205 100644 --- a/server.go +++ b/server.go @@ -20,11 +20,11 @@ import ( "gopkg.in/irc.v4" "nhooyr.io/websocket" - "git.sr.ht/~emersion/soju/auth" - "git.sr.ht/~emersion/soju/config" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/fileupload" - "git.sr.ht/~emersion/soju/identd" + "codeberg.org/emersion/soju/auth" + "codeberg.org/emersion/soju/config" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/fileupload" + "codeberg.org/emersion/soju/identd" ) var ( diff --git a/server_test.go b/server_test.go index bccaff4..44f8c94 100644 --- a/server_test.go +++ b/server_test.go @@ -10,8 +10,8 @@ import ( "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/xirc" ) var testServerPrefix = &irc.Prefix{Name: "soju-test-server"} diff --git a/service.go b/service.go index cda7eec..35c3e49 100644 --- a/service.go +++ b/service.go @@ -17,7 +17,7 @@ import ( "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" + "codeberg.org/emersion/soju/database" ) const serviceNick = "BouncerServ" diff --git a/upstream.go b/upstream.go index 025646e..0d6cccd 100644 --- a/upstream.go +++ b/upstream.go @@ -21,8 +21,8 @@ import ( "github.com/emersion/go-sasl" "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/xirc" ) // permanentUpstreamCaps is the static list of upstream capabilities always diff --git a/user.go b/user.go index c3a3931..c2d2da5 100644 --- a/user.go +++ b/user.go @@ -14,13 +14,13 @@ import ( "sync/atomic" "time" - "git.sr.ht/~emersion/soju/xirc" + "codeberg.org/emersion/soju/xirc" "github.com/SherClockHolmes/webpush-go" "gopkg.in/irc.v4" - "git.sr.ht/~emersion/soju/database" - "git.sr.ht/~emersion/soju/msgstore" + "codeberg.org/emersion/soju/database" + "codeberg.org/emersion/soju/msgstore" ) type UserUpdateFunc func(record *database.User) error