Compare commits
9 commits
Author | SHA1 | Date | |
---|---|---|---|
6ef040b2f8 | |||
878c47b453 | |||
4ab4daa762 | |||
d55d81f0a3 | |||
46dbb7049c | |||
81766ac5df | |||
d962df9e4b | |||
bd24838ae6 | |||
052c335cb2 |
4 changed files with 49 additions and 11 deletions
16
History.md
16
History.md
|
@ -1,3 +1,19 @@
|
||||||
|
# 0.3.3 / 2024-03-24
|
||||||
|
|
||||||
|
* Fix: Improve wording
|
||||||
|
|
||||||
|
# 0.3.2 / 2024-03-24
|
||||||
|
|
||||||
|
* Fix: Move database logging to stderr
|
||||||
|
|
||||||
|
# 0.3.1 / 2024-03-24
|
||||||
|
|
||||||
|
* Fix: Reduce storage size also for status
|
||||||
|
|
||||||
|
# 0.3.0 / 2024-03-24
|
||||||
|
|
||||||
|
* Reduce field storage size by passing max length
|
||||||
|
|
||||||
# 0.2.0 / 2024-03-24
|
# 0.2.0 / 2024-03-24
|
||||||
|
|
||||||
* Switch to properly tested database interface
|
* Switch to properly tested database interface
|
||||||
|
|
26
message.tpl
26
message.tpl
|
@ -1,13 +1,25 @@
|
||||||
{{- if eq .StreamsCount 1 -}}
|
@{{ .Username }},
|
||||||
@{{ .Username }} du hast dich das erste Mal registriert.
|
{{ if eq .StreamsCount 1 -}}
|
||||||
|
|
||||||
|
du hast dich zum ersten Mal registriert und damit
|
||||||
|
deinen Streak gestartet. Denke daran, ihn regelmäßig zu verlängern!
|
||||||
|
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
|
|
||||||
{{- if eq .CurrentStreak 1 -}}
|
{{- if eq .CurrentStreak 1 -}}
|
||||||
@{{ .Username }} deine Stream-Serie ist leider gebrochen, du bist
|
deine Stream-Serie ist leider unterbrochen. Du bist nun wieder bei
|
||||||
zurück bei einem Stream.
|
einem Stream.
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
@{{ .Username }} du hast deine Stream-Serie auf {{ .CurrentStreak }}
|
du hast deine Stream-Serie auf {{ .CurrentStreak }} Streams
|
||||||
verlängert.
|
verlängert.
|
||||||
{{- end }}
|
{{- end }}
|
||||||
Insgesamt hast du dich {{ .StreamsCount }}x registriert und deine
|
|
||||||
längste Serie ist {{ .MaxStreak }} Streams.
|
{{ if lt .CurrentStreak .StreamsCount }}
|
||||||
|
Insgesamt hast du dich {{ .StreamsCount }} Mal registriert.
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if lt .CurrentStreak .MaxStreak }}
|
||||||
|
Deine längste Serie beträgt {{ .MaxStreak }} Streams.
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
|
@ -2,12 +2,16 @@ package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/glebarez/sqlite"
|
"github.com/glebarez/sqlite"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"gorm.io/driver/mysql"
|
"gorm.io/driver/mysql"
|
||||||
"gorm.io/driver/postgres"
|
"gorm.io/driver/postgres"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
@ -36,6 +40,12 @@ func New(driverName, connString string) (d *DB, err error) {
|
||||||
|
|
||||||
db, err := gorm.Open(innerDB, &gorm.Config{
|
db, err := gorm.Open(innerDB, &gorm.Config{
|
||||||
DisableForeignKeyConstraintWhenMigrating: true,
|
DisableForeignKeyConstraintWhenMigrating: true,
|
||||||
|
Logger: logger.New(log.New(os.Stderr, "\r\n", log.LstdFlags), logger.Config{
|
||||||
|
SlowThreshold: time.Second,
|
||||||
|
LogLevel: logger.Warn,
|
||||||
|
IgnoreRecordNotFoundError: true,
|
||||||
|
Colorful: false,
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "connecting database")
|
return nil, errors.Wrap(err, "connecting database")
|
||||||
|
|
|
@ -2,17 +2,17 @@ package database
|
||||||
|
|
||||||
type (
|
type (
|
||||||
StreakMeta struct {
|
StreakMeta struct {
|
||||||
Name string `gorm:"primaryKey"`
|
Name string `gorm:"primaryKey;size:128"`
|
||||||
Value string
|
Value string `gorm:"size:128"`
|
||||||
}
|
}
|
||||||
|
|
||||||
StreakUser struct {
|
StreakUser struct {
|
||||||
TwitchID uint64 `gorm:"primaryKey"`
|
TwitchID uint64 `gorm:"primaryKey"`
|
||||||
Username string
|
Username string `gorm:"size:128"`
|
||||||
StreamsCount uint64
|
StreamsCount uint64
|
||||||
CurrentStreak uint64
|
CurrentStreak uint64
|
||||||
MaxStreak uint64
|
MaxStreak uint64
|
||||||
StreakStatus Status
|
StreakStatus Status `gorm:"size:16"`
|
||||||
}
|
}
|
||||||
|
|
||||||
Status string
|
Status string
|
||||||
|
|
Loading…
Reference in a new issue