lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Make golangci-lint happy

Browse Source
This commit is contained in:
s3lph
2020-10-01 23:18:12 +02:00
parent bd4281c200
commit 227f9496ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridge/nctalk/nctalk.go
View File

@@ -76,7 +76,7 @@ func (b *Btalk) JoinChannel(channel config.ChannelInfo) error {
if b.IsKeySet("GuestSuffix") { if b.IsKeySet("GuestSuffix") {
guestSuffix = b.GetString("GuestSuffix") guestSuffix = b.GetString("GuestSuffix")
} }
userIdAsNick := b.GetBool("UserIdAsNick") userIDAsNick := b.GetBool("UserIdAsNick")
go func() { go func() {
for msg := range c { for msg := range c {
@@ -89,7 +89,7 @@ func (b *Btalk) JoinChannel(channel config.ChannelInfo) error {
remoteMessage := config.Message{ remoteMessage := config.Message{
Text: formatRichObjectString(msg.Message, msg.MessageParameters), Text: formatRichObjectString(msg.Message, msg.MessageParameters),
Channel: newRoom.room.Token, Channel: newRoom.room.Token,
Username: DisplayName(msg, guestSuffix, userIdAsNick), Username: DisplayName(msg, guestSuffix, userIDAsNick),
UserID: msg.ActorID, UserID: msg.ActorID,
Account: b.Account, Account: b.Account,
} }
@@ -153,7 +153,7 @@ func formatRichObjectString(message string, parameters map[string]ocs.RichObject
return message return message
} }
func DisplayName(msg ocs.TalkRoomMessageData, suffix string, userIdAsName bool) string { func DisplayName(msg ocs.TalkRoomMessageData, suffix string, userIDAsName bool) string {
if msg.ActorType == ocs.ActorGuest { if msg.ActorType == ocs.ActorGuest {
if msg.ActorDisplayName == "" { if msg.ActorDisplayName == "" {
return "Guest" return "Guest"
@@ -162,7 +162,7 @@ func DisplayName(msg ocs.TalkRoomMessageData, suffix string, userIdAsName bool)
return msg.ActorDisplayName + suffix return msg.ActorDisplayName + suffix
} }
// Use the user ID instead of the display name for non-guest users // Use the user ID instead of the display name for non-guest users
if userIdAsName { if userIDAsName {
return msg.ActorID return msg.ActorID
} }
return msg.ActorDisplayName return msg.ActorDisplayName