Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

staticcheck: fix all issues #418

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

staticcheck: fix all issues #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fbdaa3
staticcheck: fix S1021: merge variable declaration with assignment on…
sumnerevans Jan 7, 2024
c456d6e
staticcheck: fix S1012,S1024: use time.Until and time.Since
sumnerevans Jan 7, 2024
6892b7a
staticcheck: remove unused variables and functions
sumnerevans Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion disappearing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (dmm *DisappearingMessagesManager) StartDisappearingLoop(ctx context.Contex
log.Err(err).Msg("Failed to get next disappearing message")
continue
} else if nextMsg != nil {
duration = nextMsg.ExpireAt.Sub(time.Now())
duration = time.Until(nextMsg.ExpireAt)
}

select {
Expand Down
8 changes: 4 additions & 4 deletions metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (mh *MetricsHandler) TrackMatrixEvent(eventType event.Type) func() {
}
start := time.Now()
return func() {
duration := time.Now().Sub(start)
duration := time.Since(start)
mh.matrixEventHandling.
With(prometheus.Labels{"event_type": eventType.Type}).
Observe(duration.Seconds())
Expand All @@ -160,11 +160,11 @@ func (mh *MetricsHandler) TrackSignalMessage(timestamp time.Time, messageType st

start := time.Now()
return func() {
duration := time.Now().Sub(start)
duration := time.Since(start)
mh.signalMessageHandling.
With(prometheus.Labels{"message_type": messageType}).
Observe(duration.Seconds())
mh.signalMessageAge.Observe(time.Now().Sub(timestamp).Seconds())
mh.signalMessageAge.Observe(time.Since(timestamp).Seconds())
}
}

Expand Down Expand Up @@ -271,7 +271,7 @@ func (mh *MetricsHandler) updateStats() {
mh.unencryptedGroupCount.Set(float64(unencryptedGroupCount))
mh.unencryptedPrivateCount.Set(float64(encryptedPrivateCount))
}
mh.countCollection.Observe(time.Now().Sub(start).Seconds())
mh.countCollection.Observe(time.Since(start).Seconds())
}

func (mh *MetricsHandler) startUpdatingStats() {
Expand Down
17 changes: 0 additions & 17 deletions pkg/signalmeow/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"crypto/aes"
"crypto/cipher"
"crypto/rand"
"encoding/base64"
"encoding/hex"
"encoding/json"
Expand Down Expand Up @@ -300,22 +299,6 @@ func decryptString(key *libsignalgo.ProfileKey, encryptedText []byte) (string, e
return string(data), err
}

func encryptString(key libsignalgo.ProfileKey, plaintext string, paddedLength int) ([]byte, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably shouldn't remove this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was it not used?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll be needed when we want to modify profiles, but we don't do that yet

inputLength := len(plaintext)
if inputLength > paddedLength {
return nil, errors.New("plaintext longer than paddedLength")
}
padded := append([]byte(plaintext), make([]byte, paddedLength-inputLength)...)
nonce := make([]byte, NONCE_LENGTH)
rand.Read(nonce)
keyBytes := key[:]
ciphertext, err := AesgcmEncrypt(keyBytes, nonce, padded)
if err != nil {
return nil, err
}
return append(nonce, ciphertext...), nil
}

const NONCE_LENGTH = 12
const TAG_LENGTH_BYTES = 16

Expand Down
5 changes: 0 additions & 5 deletions pkg/signalmeow/sending.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,6 @@ type GroupMessageSendResult struct {
FailedToSendTo []FailedSendResult
}

func contentFromDataMessage(dataMessage *signalpb.DataMessage) *signalpb.Content {
return &signalpb.Content{
DataMessage: dataMessage,
}
}
func syncMessageFromGroupDataMessage(dataMessage *signalpb.DataMessage, results []SuccessfulSendResult) *signalpb.Content {
unidentifiedStatuses := []*signalpb.SyncMessage_Sent_UnidentifiedDeliveryStatus{}
for _, result := range results {
Expand Down
3 changes: 1 addition & 2 deletions portal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,7 @@ func (portal *Portal) getBridgeInfo() (string, CustomBridgeInfoContent) {
AvatarURL: portal.AvatarURL.CUString(),
},
}
var bridgeInfoStateKey string
bridgeInfoStateKey = fmt.Sprintf("fi.mau.signal://signal/%s", portal.ChatID)
bridgeInfoStateKey := fmt.Sprintf("fi.mau.signal://signal/%s", portal.ChatID)
bridgeInfo.Channel.ExternalURL = fmt.Sprintf("https://signal.me/#p/%s", portal.ChatID)
var roomType string
if portal.IsPrivateChat() {
Expand Down
3 changes: 0 additions & 3 deletions puppet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"fmt"
"net/http"
"regexp"
"sync"

"github.com/google/uuid"
"github.com/rs/zerolog"
Expand Down Expand Up @@ -191,8 +190,6 @@ type Puppet struct {

customIntent *appservice.IntentAPI
customUser *User

syncLock sync.Mutex
}

var userIDRegex *regexp.Regexp
Expand Down
3 changes: 1 addition & 2 deletions user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ type User struct {

Client *signalmeow.Client

BridgeState *bridge.BridgeStateQueue
bridgeStateLock sync.Mutex
BridgeState *bridge.BridgeStateQueue

spaceMembershipChecked bool
spaceCreateLock sync.Mutex
Expand Down