summaryrefslogtreecommitdiff
path: root/internal/client
diff options
context:
space:
mode:
authorKyren223 <Kyren223@proton.me>2025-02-10 19:01:30 +0200
committerKyren223 <Kyren223@proton.me>2025-02-10 19:01:30 +0200
commitc0e615133ceee47c0d1c42139e267f3a54e84b2b (patch)
tree01bf277f7d914f21c6087ffc43417c1c90d1ea1f /internal/client
parent6c54b5fe62d56eca0deca1fa4c660d0f16df1aa6 (diff)
Renamed instances of "trusteds" to "trusted users" to be grammatically
correct
Diffstat (limited to 'internal/client')
-rw-r--r--internal/client/ui/core/banlist/banlist.go2
-rw-r--r--internal/client/ui/core/chat/chat.go8
-rw-r--r--internal/client/ui/core/memberlist/memberlist.go4
-rw-r--r--internal/client/ui/core/signallist/signallist.go4
-rw-r--r--internal/client/ui/core/state/state.go22
5 files changed, 20 insertions, 20 deletions
diff --git a/internal/client/ui/core/banlist/banlist.go b/internal/client/ui/core/banlist/banlist.go
index 4924f40..286d453 100644
--- a/internal/client/ui/core/banlist/banlist.go
+++ b/internal/client/ui/core/banlist/banlist.go
@@ -82,7 +82,7 @@ func (m Model) View() string {
}
user := state.State.Users[member.UserID]
- trustedPublicKey, isTrusted := state.State.Trusteds[user.ID]
+ trustedPublicKey, isTrusted := state.State.TrustedUsers[user.ID]
keysMatch := bytes.Equal(trustedPublicKey, user.PublicKey)
var userStyle lipgloss.Style
diff --git a/internal/client/ui/core/chat/chat.go b/internal/client/ui/core/chat/chat.go
index 8b1f4fe..09b3872 100644
--- a/internal/client/ui/core/chat/chat.go
+++ b/internal/client/ui/core/chat/chat.go
@@ -439,7 +439,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
return m, nil
}
- _, isTrusting := state.State.Trusteds[senderId]
+ _, isTrusting := state.State.TrustedUsers[senderId]
return m, gateway.Send(&packet.TrustUser{
User: senderId,
@@ -1339,7 +1339,7 @@ func (m *Model) renderHeader(message data.Message, selected bool) []byte {
members := state.State.Members[*networkId]
member := members[message.SenderID]
user := state.State.Users[message.SenderID]
- trustedPublicKey, isTrusted := state.State.Trusteds[user.ID]
+ trustedPublicKey, isTrusted := state.State.TrustedUsers[user.ID]
keysMatch := bytes.Equal(trustedPublicKey, user.PublicKey)
if isTrusted && !keysMatch {
@@ -1374,7 +1374,7 @@ func (m *Model) renderHeader(message data.Message, selected bool) []byte {
} else if m.receiverIndex != -1 {
user := state.State.Users[message.SenderID]
- trustedPublicKey, isTrusted := state.State.Trusteds[user.ID]
+ trustedPublicKey, isTrusted := state.State.TrustedUsers[user.ID]
keysMatch := bytes.Equal(trustedPublicKey, user.PublicKey)
if isTrusted && !keysMatch {
@@ -1505,7 +1505,7 @@ func (m *Model) renderFrequencyName() string {
} else if m.receiverIndex != -1 {
signal := state.Data.Signals[m.receiverIndex]
user := state.State.Users[signal]
- trustedPublicKey, isTrusted := state.State.Trusteds[user.ID]
+ trustedPublicKey, isTrusted := state.State.TrustedUsers[user.ID]
keysMatch := bytes.Equal(trustedPublicKey, user.PublicKey)
color = colors.Purple
diff --git a/internal/client/ui/core/memberlist/memberlist.go b/internal/client/ui/core/memberlist/memberlist.go
index 1ed8c5e..1978e29 100644
--- a/internal/client/ui/core/memberlist/memberlist.go
+++ b/internal/client/ui/core/memberlist/memberlist.go
@@ -92,7 +92,7 @@ func (m Model) View() string {
}
user := state.State.Users[member.UserID]
- trustedPublicKey, isTrusted := state.State.Trusteds[user.ID]
+ trustedPublicKey, isTrusted := state.State.TrustedUsers[user.ID]
keysMatch := bytes.Equal(trustedPublicKey, user.PublicKey)
var userStyle lipgloss.Style
@@ -210,7 +210,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
return m, nil
}
- _, isTrusting := state.State.Trusteds[member.UserID]
+ _, isTrusting := state.State.TrustedUsers[member.UserID]
return m, gateway.Send(&packet.TrustUser{
User: member.UserID,
diff --git a/internal/client/ui/core/signallist/signallist.go b/internal/client/ui/core/signallist/signallist.go
index 410cb6b..075f0f8 100644
--- a/internal/client/ui/core/signallist/signallist.go
+++ b/internal/client/ui/core/signallist/signallist.go
@@ -73,7 +73,7 @@ func (m Model) View() string {
maxUserWidth := maxUserWidth
user := state.State.Users[signal]
- trustedPublicKey, isTrusted := state.State.Trusteds[user.ID]
+ trustedPublicKey, isTrusted := state.State.TrustedUsers[user.ID]
keysMatch := bytes.Equal(trustedPublicKey, user.PublicKey)
var userStyle lipgloss.Style
@@ -191,7 +191,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
}
userId := state.Data.Signals[m.index]
- _, isTrusting := state.State.Trusteds[userId]
+ _, isTrusting := state.State.TrustedUsers[userId]
return m, gateway.Send(&packet.TrustUser{
User: userId,
diff --git a/internal/client/ui/core/state/state.go b/internal/client/ui/core/state/state.go
index 8c6dfeb..514d118 100644
--- a/internal/client/ui/core/state/state.go
+++ b/internal/client/ui/core/state/state.go
@@ -26,12 +26,12 @@ type state struct {
ChatState map[snowflake.ID]ChatState // key is frequency id or receiver id
LastFrequency map[snowflake.ID]snowflake.ID // key is network id
- Messages map[snowflake.ID]*btree.BTreeG[data.Message] // key is frequency id or receiver id
- Networks map[snowflake.ID]data.Network // key is network id
- Frequencies map[snowflake.ID][]data.Frequency // key is network id
- Members map[snowflake.ID]map[snowflake.ID]data.Member // key is network id then user id
- Users map[snowflake.ID]data.User // key is user id
- Trusteds map[snowflake.ID]ed25519.PublicKey // key is user id
+ Messages map[snowflake.ID]*btree.BTreeG[data.Message] // key is frequency id or receiver id
+ Networks map[snowflake.ID]data.Network // key is network id
+ Frequencies map[snowflake.ID][]data.Frequency // key is network id
+ Members map[snowflake.ID]map[snowflake.ID]data.Member // key is network id then user id
+ Users map[snowflake.ID]data.User // key is user id
+ TrustedUsers map[snowflake.ID]ed25519.PublicKey // key is user id
LastReadMessages map[snowflake.ID]*snowflake.ID // key is frequency id or receiver id
Notifications map[snowflake.ID]int // key is frequency id or receiver id
@@ -45,7 +45,7 @@ var State state = state{
Frequencies: map[snowflake.ID][]data.Frequency{},
Members: map[snowflake.ID]map[snowflake.ID]data.Member{},
Users: map[snowflake.ID]data.User{},
- Trusteds: map[snowflake.ID]ed25519.PublicKey{},
+ TrustedUsers: map[snowflake.ID]ed25519.PublicKey{},
Notifications: map[snowflake.ID]int{},
LastReadMessages: map[snowflake.ID]*snowflake.ID{},
}
@@ -232,12 +232,12 @@ func FromJsonUserData(s string) {
}
func UpdateTrusteds(info *packet.TrustInfo) {
- for _, removed := range info.RemovedTrusteds {
- delete(State.Trusteds, removed)
+ for _, removed := range info.RemovedTrustedUsers {
+ delete(State.TrustedUsers, removed)
}
- for i, trusted := range info.Trusteds {
- State.Trusteds[trusted] = info.TrustedPublicKeys[i]
+ for i, trusted := range info.TrustedUsers {
+ State.TrustedUsers[trusted] = info.TrustedPublicKeys[i]
}
}