diff options
Diffstat (limited to 'teleirc')
| -rw-r--r-- | teleirc/deploy.sh | 9 | ||||
| -rw-r--r-- | teleirc/matterbridge/bridge/telegram/handlers.go | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/teleirc/deploy.sh b/teleirc/deploy.sh index e390c1d..f03335f 100644 --- a/teleirc/deploy.sh +++ b/teleirc/deploy.sh @@ -1,2 +1,7 @@ -scp config.toml root@raye:/etc/matterbridge/ -ssh root@raye 'nitroctl restart teleirc' +# cd matterbridge +# go build -tags netgo -ldflags '-extldflags "-static"' && \ +# cd .. && \ +# proxychains -q scp ./matterbridge/matterbridge root@raye:/usr/local/bin/ && \ +proxychains -q ssh root@raye 'nitroctl stop teleirc' && \ +proxychains -q scp config.toml root@raye:/etc/matterbridge/ && \ +proxychains -q ssh root@raye 'nitroctl start teleirc' diff --git a/teleirc/matterbridge/bridge/telegram/handlers.go b/teleirc/matterbridge/bridge/telegram/handlers.go index a9d9bd6..31ca78f 100644 --- a/teleirc/matterbridge/bridge/telegram/handlers.go +++ b/teleirc/matterbridge/bridge/telegram/handlers.go @@ -163,8 +163,15 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa b.handleDownloadAvatar(message.SenderChat.ID, rmsg.Channel) } } - - // if we really didn't find a username, set it to unknown + if rmsg.Username == "" { + rmsg.Username = unknownUser + } + rmsg.Username = strings.TrimSpace(rmsg.Username); + if rmsg.Username == "" { + if message.SenderChat != nil && message.SenderChat.UserName != "" { + rmsg.Username = message.SenderChat.UserName + } + } if rmsg.Username == "" { rmsg.Username = unknownUser } |