Mirror/ergo
1
0
Fork 0
mirror of https://github.com/jeremyd/ergo.git synced 2026-07-08 09:28:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

first pass at renaming Oragono to Ergo

Browse Source
This commit is contained in:
Shivaram Lingamneni
2021-05-25 00:34:38 -04:00
parent 7a1695c628
commit 23c7218bf1
63 changed files with 253 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
irc/accounts.go
+6 -6
View File
@@ -15,12 +15,12 @@ import (
"time"
"unicode"
"github.com/oragono/oragono/irc/connection_limits"
"github.com/oragono/oragono/irc/email"
"github.com/oragono/oragono/irc/migrations"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/passwd"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/connection_limits"
"github.com/ergochat/ergo/irc/email"
"github.com/ergochat/ergo/irc/migrations"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/passwd"
"github.com/ergochat/ergo/irc/utils"
"github.com/tidwall/buntdb"
)
irc/authscript.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"fmt"
"net"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
// JSON-serializable input and output types for the script
irc/caps/set.go
+1 -1
View File
@@ -5,7 +5,7 @@ package caps
import (
"fmt"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
// Set holds a set of enabled capabilities.
irc/channel.go
+4 -4
View File
@@ -15,10 +15,10 @@ import (
"github.com/goshuirc/irc-go/ircutils"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
type ChannelSettings struct {
irc/channelmanager.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"sort"
"sync"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
type channelManagerEntry struct {
irc/channelreg.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/tidwall/buntdb"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
// this is exclusively the *persistence* layer for channel registration;
irc/chanserv.go
+3 -3
View File
@@ -10,10 +10,10 @@ import (
"strings"
"time"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
)
const chanservHelp = `ChanServ lets you register and manage channels.`
irc/client.go
+7 -7
View File
@@ -21,13 +21,13 @@ import (
"github.com/goshuirc/irc-go/ircreader"
ident "github.com/oragono/go-ident"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/connection_limits"
"github.com/oragono/oragono/irc/flatip"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/connection_limits"
"github.com/ergochat/ergo/irc/flatip"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/client_lookup_set.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"strings"
"sync"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
// ClientManager keeps track of clients by nick, enforcing uniqueness of casefolded nicks
irc/client_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ package irc
import (
"testing"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
func TestGenerateBatchID(t *testing.T) {
irc/cloaks/cloaks.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"golang.org/x/crypto/sha3"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
type CloakConfig struct {
irc/config.go
+18 -15
View File
@@ -27,19 +27,19 @@ import (
"github.com/goshuirc/irc-go/ircfmt"
"gopkg.in/yaml.v2"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/cloaks"
"github.com/oragono/oragono/irc/connection_limits"
"github.com/oragono/oragono/irc/custime"
"github.com/oragono/oragono/irc/email"
"github.com/oragono/oragono/irc/isupport"
"github.com/oragono/oragono/irc/jwt"
"github.com/oragono/oragono/irc/languages"
"github.com/oragono/oragono/irc/logger"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/mysql"
"github.com/oragono/oragono/irc/passwd"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/cloaks"
"github.com/ergochat/ergo/irc/connection_limits"
"github.com/ergochat/ergo/irc/custime"
"github.com/ergochat/ergo/irc/email"
"github.com/ergochat/ergo/irc/isupport"
"github.com/ergochat/ergo/irc/jwt"
"github.com/ergochat/ergo/irc/languages"
"github.com/ergochat/ergo/irc/logger"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/mysql"
"github.com/ergochat/ergo/irc/passwd"
"github.com/ergochat/ergo/irc/utils"
)
// here's how this works: exported (capitalized) members of the config structs
@@ -1025,10 +1025,13 @@ func (ce *configPathError) Error() string {
func mungeFromEnvironment(config *Config, envPair string) (applied bool, err *configPathError) {
equalIdx := strings.IndexByte(envPair, '=')
name, value := envPair[:equalIdx], envPair[equalIdx+1:]
if !strings.HasPrefix(name, "ORAGONO__") {
if strings.HasPrefix(name, "ERGO__") {
name = strings.TrimPrefix(name, "ERGO__")
} else if strings.HasPrefix(name, "ORAGONO__") {
name = strings.TrimPrefix(name, "ORAGONO__")
} else {
return false, nil
}
name = strings.TrimPrefix(name, "ORAGONO__")
pathComponents := strings.Split(name, "__")
for i, pathComponent := range pathComponents {
pathComponents[i] = screamingSnakeToKebab(pathComponent)
irc/config_test.go
+3 -3
View File
@@ -19,12 +19,12 @@ func TestEnvironmentOverrides(t *testing.T) {
env := []string{
`USER=shivaram`, // unrelated var
`ORAGONO_USER=oragono`, // this should be ignored as well
`ORAGONO__NETWORK__NAME=example.com`,
`ERGO__NETWORK__NAME=example.com`,
`ORAGONO__SERVER__COMPATIBILITY__FORCE_TRAILING=false`,
`ORAGONO__SERVER__COERCE_IDENT="~user"`,
`ORAGONO__SERVER__MOTD=short.motd.txt`,
`ERGO__SERVER__MOTD=short.motd.txt`,
`ORAGONO__ACCOUNTS__NICK_RESERVATION__ENABLED=true`,
`ORAGONO__ACCOUNTS__DEFAULT_USER_MODES="+iR"`,
`ERGO__ACCOUNTS__DEFAULT_USER_MODES="+iR"`,
`ORAGONO__SERVER__IP_CLOAKING={"enabled": true, "enabled-for-always-on": true, "netname": "irc", "cidr-len-ipv4": 32, "cidr-len-ipv6": 64, "num-bits": 64}`,
}
for _, envPair := range env {
irc/connection_limits/limiter.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"sync"
"time"
"github.com/oragono/oragono/irc/flatip"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/flatip"
"github.com/ergochat/ergo/irc/utils"
)
var (
irc/connection_limits/limiter_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"testing"
"time"
"github.com/oragono/oragono/irc/flatip"
"github.com/ergochat/ergo/irc/flatip"
)
func easyParseIP(ipstr string) (result flatip.IP) {
irc/database.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"strings"
"time"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
"github.com/tidwall/buntdb"
)
irc/dline.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"sync"
"time"
"github.com/oragono/oragono/irc/flatip"
"github.com/ergochat/ergo/irc/flatip"
"github.com/tidwall/buntdb"
)
irc/email/email.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"regexp"
"strings"
"github.com/oragono/oragono/irc/smtp"
"github.com/ergochat/ergo/irc/smtp"
)
var (
irc/errors.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"fmt"
"time"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
// Runtime Errors
irc/gateways.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"errors"
"net"
"github.com/oragono/oragono/irc/flatip"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/flatip"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
var (
irc/getters.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"time"
"unsafe"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/languages"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/languages"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
func (server *Server) Config() (config *Config) {
irc/handlers.go
+13 -13
View File
@@ -25,14 +25,14 @@ import (
"github.com/goshuirc/irc-go/ircutils"
"golang.org/x/crypto/bcrypt"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/custime"
"github.com/oragono/oragono/irc/flatip"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/jwt"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/custime"
"github.com/ergochat/ergo/irc/flatip"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/jwt"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
)
// helper function to parse ACC callbacks, e.g., mailto:person@example.com, tel:16505551234
@@ -710,7 +710,7 @@ func debugHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respon
rb.Notice(fmt.Sprintf("num goroutines: %d", count))
case "PROFILEHEAP":
profFile := server.Config().getOutputPath("oragono.mprof")
profFile := server.Config().getOutputPath("ergo.mprof")
file, err := os.Create(profFile)
if err != nil {
rb.Notice(fmt.Sprintf("error: %s", err))
@@ -721,7 +721,7 @@ func debugHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respon
rb.Notice(fmt.Sprintf("written to %s", profFile))
case "STARTCPUPROFILE":
profFile := server.Config().getOutputPath("oragono.prof")
profFile := server.Config().getOutputPath("ergo.prof")
file, err := os.Create(profFile)
if err != nil {
rb.Notice(fmt.Sprintf("error: %s", err))
@@ -1082,13 +1082,13 @@ func infoHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
for _, line := range infoString1 {
rb.Add(nil, server.name, RPL_INFO, nick, line)
}
rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("This is Oragono version %s."), SemVer))
rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("This is Ergo version %s."), SemVer))
if Commit != "" {
rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("It was built from git hash %s."), Commit))
}
rb.Add(nil, server.name, RPL_INFO, nick, fmt.Sprintf(client.t("It was compiled using %s."), runtime.Version()))
rb.Add(nil, server.name, RPL_INFO, nick, "")
rb.Add(nil, server.name, RPL_INFO, nick, client.t("Oragono is released under the MIT license."))
rb.Add(nil, server.name, RPL_INFO, nick, client.t("Ergo is released under the MIT license."))
rb.Add(nil, server.name, RPL_INFO, nick, "")
rb.Add(nil, server.name, RPL_INFO, nick, client.t("Core Developers:"))
for _, line := range infoString2 {
@@ -1099,7 +1099,7 @@ func infoHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
rb.Add(nil, server.name, RPL_INFO, nick, line)
}
rb.Add(nil, server.name, RPL_INFO, nick, client.t("For a more complete list of contributors, see our changelog:"))
rb.Add(nil, server.name, RPL_INFO, nick, " https://github.com/oragono/oragono/blob/master/CHANGELOG.md")
rb.Add(nil, server.name, RPL_INFO, nick, " https://github.com/ergochat/ergo/blob/master/CHANGELOG.md")
rb.Add(nil, server.name, RPL_INFO, nick, "")
// show translators for languages other than good ole' regular English
tlines := server.Languages().Translators()
irc/help.go
+8 -8
View File
@@ -9,7 +9,7 @@ import (
"strings"
"sync"
"github.com/oragono/oragono/irc/languages"
"github.com/ergochat/ergo/irc/languages"
)
// HelpEntryType represents the different sorts of help entries that can exist.
@@ -37,7 +37,7 @@ type HelpEntry struct {
var (
cmodeHelpText = `== Channel Modes ==
Oragono supports the following channel modes:
Ergo supports the following channel modes:
+b | Client masks that are banned from the channel (e.g. *!*@127.0.0.1)
+e | Client masks that are exempted from bans.
@@ -68,7 +68,7 @@ Oragono supports the following channel modes:
+v (+) | Voice channel mode.`
umodeHelpText = `== User Modes ==
Oragono supports the following user modes:
Ergo supports the following user modes:
+a | User is marked as being away. This mode is set with the /AWAY command.
+i | User is marked as invisible (their channels are hidden from whois replies).
@@ -81,7 +81,7 @@ Oragono supports the following user modes:
+T | CTCP messages to the user are blocked.`
snomaskHelpText = `== Server Notice Masks ==
Oragono supports the following server notice masks for operators:
Ergo supports the following server notice masks for operators:
a | Local announcements.
c | Local client connections.
@@ -502,7 +502,7 @@ given, views the current topic on the channel.`,
"uban": {
text: `UBAN <subcommand> [arguments]
Oragono's "unified ban" system. Accepts the following subcommands:
Ergo's "unified ban" system. Accepts the following subcommands:
1. UBAN ADD <target> [REQUIRE-SASL] [DURATION <duration>] [REASON...]
2. UBAN DEL <target>
@@ -638,15 +638,15 @@ for direct use by end users.`,
"casemapping": {
text: `RPL_ISUPPORT CASEMAPPING
Oragono supports an experimental unicode casemapping designed for extended
Ergo supports an experimental unicode casemapping designed for extended
Unicode support. This casemapping is based off RFC 7613 and the draft rfc7613
casemapping spec here: https://oragono.io/specs.html`,
casemapping spec here: https://ergo.chat/specs.html`,
helpType: ISupportHelpEntry,
},
"prefix": {
text: `RPL_ISUPPORT PREFIX
Oragono supports the following channel membership prefixes:
Ergo supports the following channel membership prefixes:
+q (~) | Founder channel mode.
+a (&) | Admin channel mode.
irc/history/history.go
+1 -1
View File
@@ -4,7 +4,7 @@
package history
import (
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
"sync"
"time"
)
irc/histserv.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"strconv"
"time"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/hostserv.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/import.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/tidwall/buntdb"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/ircconn.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/goshuirc/irc-go/ircmsg"
"github.com/goshuirc/irc-go/ircreader"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/kline.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"github.com/tidwall/buntdb"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/listeners.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"github.com/gorilla/websocket"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
var (
irc/message_cache.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/goshuirc/irc-go/ircmsg"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/utils"
)
// MessageCache caches serialized IRC messages.
irc/modes.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"strconv"
"strings"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
)
var (
irc/modes/modes.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"sort"
"strings"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
var (
irc/modes_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"reflect"
"testing"
"github.com/oragono/oragono/irc/modes"
"github.com/ergochat/ergo/irc/modes"
)
func TestParseDefaultChannelModes(t *testing.T) {
irc/mysql/history.go
+3 -3
View File
@@ -16,10 +16,10 @@ import (
"sync/atomic"
"time"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/logger"
"github.com/ergochat/ergo/irc/utils"
_ "github.com/go-sql-driver/mysql"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/logger"
"github.com/oragono/oragono/irc/utils"
)
var (
irc/mysql/serialization.go
+2 -2
View File
@@ -3,8 +3,8 @@ package mysql
import (
"encoding/json"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/utils"
)
// 123 / '{' is the magic number that means JSON;
irc/nickname.go
+4 -4
View File
@@ -9,11 +9,11 @@ import (
"fmt"
"strings"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
)
var (
irc/nickserv.go
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/custime"
"github.com/oragono/oragono/irc/passwd"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/custime"
"github.com/ergochat/ergo/irc/passwd"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
)
// "enabled" callbacks for specific nickserv commands
irc/responsebuffer.go
+2 -2
View File
@@ -7,9 +7,9 @@ import (
"runtime/debug"
"time"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/utils"
"github.com/goshuirc/irc-go/ircmsg"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/utils"
)
const (
irc/roleplay.go
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"fmt"
"strings"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/semaphores.go
+1 -1
View File
@@ -5,7 +5,7 @@ package irc
import (
"runtime"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
// See #237 for context. Operations that might allocate large amounts of temporary
irc/server.go
+13 -13
View File
@@ -22,15 +22,15 @@ import (
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/connection_limits"
"github.com/oragono/oragono/irc/flatip"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/logger"
"github.com/oragono/oragono/irc/modes"
"github.com/oragono/oragono/irc/mysql"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/caps"
"github.com/ergochat/ergo/irc/connection_limits"
"github.com/ergochat/ergo/irc/flatip"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/logger"
"github.com/ergochat/ergo/irc/modes"
"github.com/ergochat/ergo/irc/mysql"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
"github.com/tidwall/buntdb"
)
@@ -356,9 +356,9 @@ func (server *Server) tryRegister(c *Client, session *Session) (exiting bool) {
func (server *Server) playSTSBurst(session *Session) {
nick := utils.SafeErrorParam(session.client.preregNick)
session.Send(nil, server.name, RPL_WELCOME, nick, fmt.Sprintf("Welcome to the Internet Relay Network %s", nick))
session.Send(nil, server.name, RPL_YOURHOST, nick, fmt.Sprintf("Your host is %[1]s, running version %[2]s", server.name, "oragono"))
session.Send(nil, server.name, RPL_YOURHOST, nick, fmt.Sprintf("Your host is %[1]s, running version %[2]s", server.name, "ergo"))
session.Send(nil, server.name, RPL_CREATED, nick, fmt.Sprintf("This server was created %s", time.Time{}.Format(time.RFC1123)))
session.Send(nil, server.name, RPL_MYINFO, nick, server.name, "oragono", "o", "o", "o")
session.Send(nil, server.name, RPL_MYINFO, nick, server.name, "ergo", "o", "o", "o")
session.Send(nil, server.name, RPL_ISUPPORT, nick, "CASEMAPPING=ascii", "are supported by this server")
session.Send(nil, server.name, ERR_NOMOTD, nick, "MOTD is unavailable")
for _, line := range server.Config().Server.STS.bannerLines {
@@ -1059,8 +1059,8 @@ var (
▐█▌.▐▌▐█•█▌▐█ ▪▐▌▐█▄▪▐█▐█▌ ▐▌██▐█▌▐█▌.▐▌
▀█▄▀▪.▀ ▀ ▀ ▀ ·▀▀▀▀ ▀█▄▀ ▀▀ █▪ ▀█▄▀▪
https://oragono.io/
https://github.com/oragono/oragono
https://ergo.chat/
https://github.com/ergochat/ergo
https://crowdin.com/project/oragono
`, "\n")
infoString2 = strings.Split(` Daniel Oakley, DanielOaks, <daniel@danieloaks.net>
irc/services.go
+1 -1
View File
@@ -11,9 +11,9 @@ import (
"strings"
"time"
"github.com/ergochat/ergo/irc/utils"
"github.com/goshuirc/irc-go/ircfmt"
"github.com/goshuirc/irc-go/ircmsg"
"github.com/oragono/oragono/irc/utils"
)
// defines an IRC service, e.g., NICKSERV
irc/snomanager.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"sync"
"github.com/ergochat/ergo/irc/sno"
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/sno"
)
// SnoManager keeps track of which clients to send snomasks to.
irc/socket.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"io"
"sync"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
var (
irc/strings.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"golang.org/x/text/unicode/norm"
"golang.org/x/text/width"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
const (
irc/types.go
+1 -1
View File
@@ -8,7 +8,7 @@ package irc
import (
"time"
"github.com/oragono/oragono/irc/modes"
"github.com/ergochat/ergo/irc/modes"
)
type empty struct{}
irc/uban.go
+4 -4
View File
@@ -11,10 +11,10 @@ import (
"github.com/goshuirc/irc-go/ircmsg"
"github.com/oragono/oragono/irc/custime"
"github.com/oragono/oragono/irc/flatip"
"github.com/oragono/oragono/irc/sno"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/custime"
"github.com/ergochat/ergo/irc/flatip"
"github.com/ergochat/ergo/irc/sno"
"github.com/ergochat/ergo/irc/utils"
)
func consumeDuration(params []string, rb *ResponseBuffer) (duration time.Duration, requireSASL bool, remainingParams []string, err error) {
irc/usermaskset.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"time"
"unsafe"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/utils"
)
type MaskInfo struct {
irc/version.go
+5 -5
View File
@@ -6,13 +6,13 @@ package irc
import "fmt"
const (
// SemVer is the semantic version of Oragono.
// SemVer is the semantic version of Ergo.
SemVer = "2.7.0-unreleased"
)
var (
// Ver is the full version of Oragono, used in responses to clients.
Ver = fmt.Sprintf("oragono-%s", SemVer)
// Ver is the full version of Ergo, used in responses to clients.
Ver = fmt.Sprintf("ergo-%s", SemVer)
// Commit is the full git hash, if available
Commit string
)
@@ -21,8 +21,8 @@ var (
func SetVersionString(version, commit string) {
Commit = commit
if version != "" {
Ver = fmt.Sprintf("oragono-%s", version)
Ver = fmt.Sprintf("ergo-%s", version)
} else if len(Commit) == 40 {
Ver = fmt.Sprintf("oragono-%s-%s", SemVer, Commit[:16])
Ver = fmt.Sprintf("ergo-%s-%s", SemVer, Commit[:16])
}
}
irc/znc.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"strings"
"time"
"github.com/oragono/oragono/irc/history"
"github.com/oragono/oragono/irc/utils"
"github.com/ergochat/ergo/irc/history"
"github.com/ergochat/ergo/irc/utils"
)
const (