arch/soju
1
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Migrate to Codeberg

Browse source
This commit is contained in:
Simon Ser 2024-07-04 21:28:11 +02:00
parent 0ced56a155
commit 29bdc1aa45
33 changed files with 59 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.b4-config
View file

@ -1,2 +0,0 @@
[b4]
send-series-to = ~emersion/soju-dev@lists.sr.ht

2
.build.yml
View file

@ -4,7 +4,7 @@ packages:
- scdoc
- postgresql
sources:
- https://git.sr.ht/~emersion/soju
- https://codeberg.org/emersion/soju.git
tasks:
- build: |
cd soju

4
Makefile
View file

@ -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

8
README.md
View file

@ -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

2
auth/auth.go
View file

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"git.sr.ht/~emersion/soju/database"
"codeberg.org/emersion/soju/database"
)
type Authenticator interface{}

2
auth/internal.go
View file

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"git.sr.ht/~emersion/soju/database"
"codeberg.org/emersion/soju/database"
)
type internal struct{}

2
auth/oauth2.go
View file

@ -10,7 +10,7 @@ import (
"strings"
"time"
"git.sr.ht/~emersion/soju/database"
"codeberg.org/emersion/soju/database"
)
type oauth2 struct {

2
auth/pam.go
View file

@ -8,7 +8,7 @@ import (
"github.com/msteinert/pam/v2"
"git.sr.ht/~emersion/soju/database"
"codeberg.org/emersion/soju/database"
)
type pamAuth struct{}

12
cmd/soju/main.go
View file

@ -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

2
cmd/sojuctl/main.go
View file

@ -11,7 +11,7 @@ import (
"strconv"
"strings"
"git.sr.ht/~emersion/soju/config"
"codeberg.org/emersion/soju/config"
)
const usage = `usage: sojuctl [-config path] <command>

4
cmd/sojudb/main.go
View file

@ -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] <action> [options...]

2
contrib/migrate-db/main.go
View file

@ -7,7 +7,7 @@ import (
"log"
"strings"
"git.sr.ht/~emersion/soju/database"
"codeberg.org/emersion/soju/database"
)
const usage = `usage: migrate-db <source database> <destination database>

6
contrib/migrate-logs/main.go
View file

@ -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 <source logs> <destination database>

4
contrib/znc-import/main.go
View file

@ -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...] <znc config path>

2
database/postgres.go
View file

@ -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"

2
database/sqlite.go
View file

@ -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"

2
doc/soju.1.scd
View file

@ -556,7 +556,7 @@ character.
Maintained by Simon Ser <contact@emersion.fr>, who is assisted by other
open-source contributors. For more information about soju development, see
<https://sr.ht/~emersion/soju>.
<https://soju.im>.
# SEE ALSO

2
doc/sojuctl.1.scd
View file

@ -29,7 +29,7 @@ file. sojuctl needs to be run with write permissions on the soju admin socket.
Maintained by Simon Ser <contact@emersion.fr>, who is assisted by other
open-source contributors. For more information about soju development, see
<https://sr.ht/~emersion/soju>.
<https://soju.im>.
# SEE ALSO

8
downstream.go
View file

@ -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 {

4
fileupload/fileupload.go
View file

@ -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

2
go.mod
View file

@ -1,4 +1,4 @@
module git.sr.ht/~emersion/soju
module codeberg.org/emersion/soju
go 1.19

2
irc.go
View file

@ -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

2
msgstore/db.go
View file

@ -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"
)

6
msgstore/fs.go
View file

@ -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 (

2
msgstore/memory.go
View file

@ -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

2
msgstore/msgstore.go
View file

@ -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 {

4
msgstore/znclog/reader.go
View file

@ -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] ")

2
msgstore/znclog/writer.go
View file

@ -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 {

10
server.go
View file

@ -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 (

4
server_test.go
View file

@ -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"}

2
service.go
View file

@ -17,7 +17,7 @@ import (
"gopkg.in/irc.v4"
"git.sr.ht/~emersion/soju/database"
"codeberg.org/emersion/soju/database"
)
const serviceNick = "BouncerServ"

4
upstream.go
View file

@ -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

6
user.go
View file

@ -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