summaryrefslogtreecommitdiff
path: root/src/papod.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/papod.go')
-rw-r--r--src/papod.go172
1 files changed, 86 insertions, 86 deletions
diff --git a/src/papod.go b/src/papod.go
index fc2d10d..7e422f7 100644
--- a/src/papod.go
+++ b/src/papod.go
@@ -18,7 +18,7 @@ import (
"cracha"
"fiinha"
"golite"
- "guuid"
+ "uuid"
"pds"
"stm"
g "gobang"
@@ -51,11 +51,11 @@ type queryT struct{
type queriesT struct{
createUser func(newUserT) (userT, error)
- userByUUID func(guuid.UUID) (userT, error)
+ userByUUID func(uuid.UUID) (userT, error)
updateUser func(userT) error
- deleteUser func(guuid.UUID) error
- addNetwork func(userT, newNetworkT, guuid.UUID) (networkT, error)
- getNetwork func(userT, guuid.UUID) (networkT, error)
+ deleteUser func(uuid.UUID) error
+ addNetwork func(userT, newNetworkT, uuid.UUID) (networkT, error)
+ getNetwork func(userT, uuid.UUID) (networkT, error)
networks func(userT, func(networkT) error) error
setNetwork func(memberT, networkT) error
nipNetwork func(memberT) error
@@ -63,26 +63,26 @@ type queriesT struct{
addMember func(memberT, newMemberT) (memberT, error)
addRole func(memberT, string, memberT) error
dropRole func(memberT, string, memberT) error
- showMember func(memberT, guuid.UUID) (memberT, error)
+ showMember func(memberT, uuid.UUID) (memberT, error)
members func(memberT, func(memberT) error) error
editMember func(memberT, memberT) error
- dropMember func(memberT, guuid.UUID) error
+ dropMember func(memberT, uuid.UUID) error
addChannel func(memberT, newChannelT) (channelT, error)
chanByName func(memberT, string) (channelT, error)
channels func(memberT, func(channelT) error) error
setChannel func(memberT, channelT) error
- endChannel func(memberT, guuid.UUID) error
- join func(memberT, guuid.UUID) error
+ endChannel func(memberT, uuid.UUID) error
+ join func(memberT, uuid.UUID) error
part func(memberT, channelT) error
- names func(memberT, guuid.UUID, func(memberT) error) error
+ names func(memberT, uuid.UUID, func(memberT) error) error
addEvent func(newEventT) (eventT, error)
- allAfter func(memberT, guuid.UUID, func(eventT) error) error
+ allAfter func(memberT, uuid.UUID, func(eventT) error) error
logMessage func(userT, messageT) error
close func() error
}
type newUserT struct{
- uuid guuid.UUID
+ uuid uuid.UUID
username string
displayName string
}
@@ -90,10 +90,10 @@ type newUserT struct{
type userT struct{
id int64
timestamp time.Time
- uuid guuid.UUID
+ uuid uuid.UUID
username string
displayName string
- pictureID *guuid.UUID
+ pictureID *uuid.UUID
}
type NetworkType string
@@ -111,7 +111,7 @@ const (
)
type newNetworkT struct{
- uuid guuid.UUID
+ uuid uuid.UUID
name string
description string
type_ NetworkType
@@ -120,25 +120,25 @@ type newNetworkT struct{
type networkT struct{
id int64
timestamp time.Time
- uuid guuid.UUID
+ uuid uuid.UUID
name string
description string
type_ NetworkType
}
type newMemberT struct{
- userID guuid.UUID
- memberID guuid.UUID
+ userID uuid.UUID
+ memberID uuid.UUID
username string
}
type memberT struct{
id int64
timestamp time.Time
- uuid guuid.UUID
+ uuid uuid.UUID
username string
displayName string
- pictureID *guuid.UUID
+ pictureID *uuid.UUID
status MemberStatus
roles []string
}
@@ -146,7 +146,7 @@ type memberT struct{
type newChannelT struct{
id int64
timestamp time.Time
- uuid guuid.UUID
+ uuid uuid.UUID
publicName *string
label string
description string
@@ -156,7 +156,7 @@ type newChannelT struct{
type channelT struct{
id int64
timestamp time.Time
- uuid guuid.UUID
+ uuid uuid.UUID
publicName *string
label string
description string
@@ -169,7 +169,7 @@ const (
)
type sourceT struct{
- uuid guuid.UUID
+ uuid uuid.UUID
type_ SourceType
metadata *map[string]interface{}
}
@@ -181,8 +181,8 @@ const (
)
type newEventT struct{
- eventID guuid.UUID
- channelID guuid.UUID
+ eventID uuid.UUID
+ channelID uuid.UUID
source sourceT
type_ EventType
payload string
@@ -192,8 +192,8 @@ type newEventT struct{
type eventT struct{
id int64
timestamp time.Time
- uuid guuid.UUID
- channelID guuid.UUID
+ uuid uuid.UUID
+ channelID uuid.UUID
source sourceT
type_ EventType
payload string
@@ -237,7 +237,7 @@ type netConnI interface{
}
type connectionT struct{
- uuid guuid.UUID
+ uuid uuid.UUID
user *userT
conn netConnI
send func(messageT)
@@ -258,15 +258,15 @@ type stateMutableT struct{
type stateT struct{
members *pds.Map[string, []string]
- users *pds.Map[string, []guuid.UUID]
- connections *pds.Map[guuid.UUID, connectionT]
+ users *pds.Map[string, []uuid.UUID]
+ connections *pds.Map[uuid.UUID, connectionT]
}
// TODO: key for members should be the channelID, not its name
type stateMutableDataT struct{
- connections map[guuid.UUID]*connectionT
- users map[string][]guuid.UUID
- members map[string]map[string][]guuid.UUID
+ connections map[uuid.UUID]*connectionT
+ users map[string][]uuid.UUID
+ members map[string]map[string][]uuid.UUID
}
type papodT struct{
@@ -1238,7 +1238,7 @@ func userByUUIDSQL(prefix string) queryT {
func userByUUIDStmt(
cfg dbconfigT,
-) (func(guuid.UUID) (userT, error), func() error, error) {
+) (func(uuid.UUID) (userT, error), func() error, error) {
q := userByUUIDSQL(cfg.prefix)
readStmt, err := cfg.shared.Prepare(q.read)
@@ -1246,7 +1246,7 @@ func userByUUIDStmt(
return nil, nil, err
}
- fn := func(userID guuid.UUID) (userT, error) {
+ fn := func(userID uuid.UUID) (userT, error) {
user := userT{
uuid: userID,
}
@@ -1266,7 +1266,7 @@ func userByUUIDStmt(
return userT{}, err
}
if picture_id_bytes != nil {
- pictureID := guuid.UUID(picture_id_bytes)
+ pictureID := uuid.UUID(picture_id_bytes)
user.pictureID = &pictureID
}
@@ -1341,7 +1341,7 @@ func deleteUserSQL(prefix string) queryT {
func deleteUserStmt(
cfg dbconfigT,
-) (func(guuid.UUID) error, func() error, error) {
+) (func(uuid.UUID) error, func() error, error) {
q := deleteUserSQL(cfg.prefix)
writeStmt, err := cfg.shared.Prepare(q.write)
@@ -1349,7 +1349,7 @@ func deleteUserStmt(
return nil, nil, err
}
- fn := func(userID guuid.UUID) error {
+ fn := func(userID uuid.UUID) error {
var _id int64
return writeStmt.QueryRow(userID[:]).Scan(&_id)
}
@@ -1426,7 +1426,7 @@ func addNetworkSQL(prefix string) queryT {
func addNetworkStmt(
cfg dbconfigT,
) (
- func(userT, newNetworkT, guuid.UUID) (networkT, error),
+ func(userT, newNetworkT, uuid.UUID) (networkT, error),
func() error,
error,
) {
@@ -1448,7 +1448,7 @@ func addNetworkStmt(
fn := func(
user userT,
newNetwork newNetworkT,
- memberID guuid.UUID,
+ memberID uuid.UUID,
) (networkT, error) {
network := networkT{
uuid: newNetwork.uuid,
@@ -1559,7 +1559,7 @@ func getNetworkSQL(prefix string) queryT {
func getNetworkStmt(
cfg dbconfigT,
-) (func(userT, guuid.UUID) (networkT, error), func() error, error) {
+) (func(userT, uuid.UUID) (networkT, error), func() error, error) {
q := getNetworkSQL(cfg.prefix)
readStmt, err := cfg.shared.Prepare(q.read)
@@ -1567,7 +1567,7 @@ func getNetworkStmt(
return nil, nil, err
}
- fn := func(user userT, networkID guuid.UUID) (networkT, error) {
+ fn := func(user userT, networkID uuid.UUID) (networkT, error) {
network := networkT{
uuid: networkID,
}
@@ -1626,7 +1626,7 @@ func networkEach(rows *sql.Rows, callback func(networkT) error) error {
if err != nil {
return g.WrapErrors(rows.Close(), err)
}
- network.uuid = guuid.UUID(network_id_bytes)
+ network.uuid = uuid.UUID(network_id_bytes)
if deleted {
return sql.ErrNoRows
@@ -1905,7 +1905,7 @@ func membershipStmt(
if err != nil {
return memberT{}, err
}
- member.uuid = guuid.UUID(member_id_bytes)
+ member.uuid = uuid.UUID(member_id_bytes)
member.timestamp, err = time.Parse(time.RFC3339Nano, timestr)
if err != nil {
@@ -2041,7 +2041,7 @@ func addMemberStmt(
return memberT{}, err
}
if picture_id_bytes != nil {
- pictureID := guuid.UUID(picture_id_bytes)
+ pictureID := uuid.UUID(picture_id_bytes)
member.pictureID = &pictureID
}
@@ -2163,7 +2163,7 @@ func showMemberSQL(prefix string) queryT {
func showMemberStmt(
cfg dbconfigT,
-) (func(memberT, guuid.UUID) (memberT, error), func() error, error) {
+) (func(memberT, uuid.UUID) (memberT, error), func() error, error) {
q := showMemberSQL(cfg.prefix)
readStmt, err := cfg.shared.Prepare(q.read)
@@ -2177,7 +2177,7 @@ func showMemberStmt(
return nil, nil, err
}
- fn := func(actor memberT, memberID guuid.UUID) (memberT, error) {
+ fn := func(actor memberT, memberID uuid.UUID) (memberT, error) {
member := memberT{
uuid: memberID,
}
@@ -2198,7 +2198,7 @@ func showMemberStmt(
return memberT{}, err
}
if picture_id_bytes != nil {
- pictureID := guuid.UUID(picture_id_bytes)
+ pictureID := uuid.UUID(picture_id_bytes)
// FIXME: test this
member.pictureID = &pictureID
}
@@ -2255,9 +2255,9 @@ func memberEach(rows *sql.Rows, callback func(memberT) error) error {
if err != nil {
return g.WrapErrors(rows.Close(), err)
}
- member.uuid = guuid.UUID(member_id_bytes)
+ member.uuid = uuid.UUID(member_id_bytes)
if picture_id_bytes != nil {
- pictureID := guuid.UUID(picture_id_bytes)
+ pictureID := uuid.UUID(picture_id_bytes)
member.pictureID = &pictureID
}
@@ -2385,7 +2385,7 @@ func dropMemberSQL(prefix string) queryT {
func dropMemberStmt(
cfg dbconfigT,
-) (func(memberT, guuid.UUID) error, func() error, error) {
+) (func(memberT, uuid.UUID) error, func() error, error) {
q := dropMemberSQL(cfg.prefix)
privateDB, err := sql.Open(golite.DriverName, cfg.dbpath)
@@ -2395,7 +2395,7 @@ func dropMemberStmt(
writeFn, writeFnClose := execSerialized(q.write, privateDB)
- fn := func(actor memberT, memberID guuid.UUID) error {
+ fn := func(actor memberT, memberID uuid.UUID) error {
err := writeFn(memberID[:], memberID[:])
if err != nil {
return err
@@ -2566,7 +2566,7 @@ func channelEach(rows *sql.Rows, callback func(channelT) error) error {
if err != nil {
return g.WrapErrors(rows.Close(), err)
}
- channel.uuid = guuid.UUID(channel_id_bytes)
+ channel.uuid = uuid.UUID(channel_id_bytes)
if publicName.Valid {
channel.publicName = &publicName.String
}
@@ -2731,7 +2731,7 @@ func endChannelSQL(prefix string) queryT {
func endChannelStmt(
cfg dbconfigT,
-) (func(memberT, guuid.UUID) error, func() error, error) {
+) (func(memberT, uuid.UUID) error, func() error, error) {
q := endChannelSQL(cfg.prefix)
writeStmt, err := cfg.shared.Prepare(q.write)
@@ -2739,7 +2739,7 @@ func endChannelStmt(
return nil, nil, err
}
- fn := func(actor memberT, channelID guuid.UUID) error {
+ fn := func(actor memberT, channelID uuid.UUID) error {
_, err := writeStmt.Exec(channelID[:])
return err
}
@@ -2782,7 +2782,7 @@ func joinSQL(prefix string) queryT {
func joinStmt(
cfg dbconfigT,
-) (func(memberT, guuid.UUID) error, func() error, error) {
+) (func(memberT, uuid.UUID) error, func() error, error) {
q := joinSQL(cfg.prefix)
readStmt, err := cfg.shared.Prepare(q.read)
@@ -2796,7 +2796,7 @@ func joinStmt(
return nil, nil, err
}
- fn := func(actor memberT, channelID guuid.UUID) error {
+ fn := func(actor memberT, channelID uuid.UUID) error {
var (
netid1 sql.NullInt64
netid2 sql.NullInt64
@@ -2885,7 +2885,7 @@ func nameEach(rows *sql.Rows, callback func(memberT) error) error {
if err != nil {
return g.WrapErrors(rows.Close(), err)
}
- member.uuid = guuid.UUID(member_id_bytes)
+ member.uuid = uuid.UUID(member_id_bytes)
member.timestamp, err = time.Parse(time.RFC3339Nano, timestr)
if err != nil {
@@ -2912,7 +2912,7 @@ func namesSQL(prefix string) queryT {
func namesStmt(
cfg dbconfigT,
-) (func(memberT, guuid.UUID) (*sql.Rows, error), func() error, error) {
+) (func(memberT, uuid.UUID) (*sql.Rows, error), func() error, error) {
q := namesSQL(cfg.prefix)
readStmt, err := cfg.shared.Prepare(q.read)
@@ -2920,7 +2920,7 @@ func namesStmt(
return nil, nil, err
}
- fn := func(actor memberT, channelID guuid.UUID) (*sql.Rows, error) {
+ fn := func(actor memberT, channelID uuid.UUID) (*sql.Rows, error) {
return readStmt.Query(channelID[:])
}
@@ -3018,8 +3018,8 @@ func eventEach(rows *sql.Rows, callback func(eventT) error) error {
rows.Close()
return err
}
- event.uuid = guuid.UUID(event_id_bytes)
- event.channelID = guuid.UUID(channel_id_bytes)
+ event.uuid = uuid.UUID(event_id_bytes)
+ event.channelID = uuid.UUID(channel_id_bytes)
event.timestamp, err = time.Parse(time.RFC3339Nano, timestr)
if err != nil {
@@ -3084,7 +3084,7 @@ func allAfterSQL(prefix string) queryT {
func allAfterStmt(
cfg dbconfigT,
-) (func (memberT, guuid.UUID) (*sql.Rows, error), func() error, error) {
+) (func (memberT, uuid.UUID) (*sql.Rows, error), func() error, error) {
q := allAfterSQL(cfg.prefix)
readStmt, err := cfg.shared.Prepare(q.read)
@@ -3092,7 +3092,7 @@ func allAfterStmt(
return nil, nil, err
}
- fn := func(actor memberT, eventID guuid.UUID) (*sql.Rows, error) {
+ fn := func(actor memberT, eventID uuid.UUID) (*sql.Rows, error) {
return readStmt.Query(eventID[:])
}
@@ -3251,7 +3251,7 @@ func initDB(
defer connMutex.RUnlock()
return createUser(a)
},
- userByUUID: func(a guuid.UUID) (userT, error) {
+ userByUUID: func(a uuid.UUID) (userT, error) {
connMutex.RLock()
defer connMutex.RUnlock()
return userByUUID(a)
@@ -3261,7 +3261,7 @@ func initDB(
defer connMutex.RUnlock()
return updateUser(a)
},
- deleteUser: func(a guuid.UUID) error {
+ deleteUser: func(a uuid.UUID) error {
connMutex.RLock()
defer connMutex.RUnlock()
return deleteUser(a)
@@ -3269,13 +3269,13 @@ func initDB(
addNetwork: func(
a userT,
b newNetworkT,
- c guuid.UUID,
+ c uuid.UUID,
) (networkT, error) {
connMutex.RLock()
defer connMutex.RUnlock()
return addNetwork(a, b, c)
},
- getNetwork: func(a userT, b guuid.UUID) (networkT, error) {
+ getNetwork: func(a userT, b uuid.UUID) (networkT, error) {
connMutex.RLock()
defer connMutex.RUnlock()
return getNetwork(a, b)
@@ -3329,7 +3329,7 @@ func initDB(
defer connMutex.RUnlock()
return dropRole(a, b, c)
},
- showMember: func(a memberT, b guuid.UUID) (memberT, error) {
+ showMember: func(a memberT, b uuid.UUID) (memberT, error) {
connMutex.RLock()
defer connMutex.RUnlock()
return showMember(a, b)
@@ -3355,7 +3355,7 @@ func initDB(
defer connMutex.RUnlock()
return editMember(a, b)
},
- dropMember: func(a memberT, b guuid.UUID) error {
+ dropMember: func(a memberT, b uuid.UUID) error {
connMutex.RLock()
defer connMutex.RUnlock()
return dropMember(a, b)
@@ -3391,12 +3391,12 @@ func initDB(
defer connMutex.RUnlock()
return setChannel(a, b)
},
- endChannel: func(a memberT, b guuid.UUID) error {
+ endChannel: func(a memberT, b uuid.UUID) error {
connMutex.RLock()
defer connMutex.RUnlock()
return endChannel(a, b)
},
- join: func(a memberT, b guuid.UUID) error {
+ join: func(a memberT, b uuid.UUID) error {
connMutex.RLock()
defer connMutex.RUnlock()
return join(a, b)
@@ -3408,7 +3408,7 @@ func initDB(
},
names: func(
a memberT,
- b guuid.UUID,
+ b uuid.UUID,
callback func(memberT) error,
) error {
var (
@@ -3433,7 +3433,7 @@ func initDB(
},
allAfter: func(
a memberT,
- b guuid.UUID,
+ b uuid.UUID,
callback func(eventT) error,
) error {
var (
@@ -3536,9 +3536,9 @@ func initListeners(
func newStateMutable() stateMutableT {
var rwmutex sync.RWMutex
state := stateMutableDataT{
- connections: map[guuid.UUID]*connectionT{},
- users: map[string][]guuid.UUID{},
- members: map[string]map[string][]guuid.UUID{},
+ connections: map[uuid.UUID]*connectionT{},
+ users: map[string][]uuid.UUID{},
+ members: map[string]map[string][]uuid.UUID{},
}
return stateMutableT{
/*
@@ -3570,7 +3570,7 @@ func newStateMutable() stateMutableT {
rwmutex.Lock()
defer rwmutex.Unlock()
if state.users[username] == nil {
- state.users[username] = []guuid.UUID{}
+ state.users[username] = []uuid.UUID{}
}
state.users[username] = append(
state.users[username],
@@ -3587,7 +3587,7 @@ func newStateMutable() stateMutableT {
for _, channelName := range channelNames {
if state.members[channelName] == nil {
state.members[channelName] =
- map[string][]guuid.UUID{}
+ map[string][]uuid.UUID{}
}
state.members[channelName][username] =
state.users[username]
@@ -3608,17 +3608,17 @@ func newStateMutable() stateMutableT {
}
return usernames
},
- connections: func(username string) []guuid.UUID {
+ connections: func(username string) []uuid.UUID {
rwmutex.RLock()
defer rwmutex.RUnlock()
connections := make(
- []guuid.UUID,
+ []uuid.UUID,
len(state.users[username]),
)
copy(connections, state.users[username])
return connections
},
- connection: func(connectionID guuid.UUID) *connectionT {
+ connection: func(connectionID uuid.UUID) *connectionT {
rwmutex.RLock()
defer rwmutex.RUnlock()
return state.connections[connectionID]
@@ -3630,8 +3630,8 @@ func newStateMutable() stateMutableT {
func newState() *stateT {
return &stateT{
members: pds.NewMap[string, []string](nil),
- users: pds.NewMap[string, []guuid.UUID](nil),
- connections: pds.NewMap[guuid.UUID, connectionT](nil),
+ users: pds.NewMap[string, []uuid.UUID](nil),
+ connections: pds.NewMap[uuid.UUID, connectionT](nil),
}
}
@@ -4444,7 +4444,7 @@ func processMessage(
func handleConnection(papod papodT, conn net.Conn) {
connection := connectionT{
- uuid: guuid.New(),
+ uuid: uuid.New(),
user: &userT{}, // TODO: SASL shenanigan probably goes here
conn: conn,
}
@@ -4527,7 +4527,7 @@ func (papod papodT) Start() error {
"cracha", cracha.Version,
"fiinha", fiinha.Version,
"golite", golite.Version,
- "guuid", guuid.Version,
+ "uuid", uuid.Version,
"papod", Version,
),
)
generated by cgit v1.2.3 (git 2.49.0) at 2025-07-06 10:24:27 +0000