Fijxu/justlog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

range selection

Browse source
This commit is contained in:
gempir 2018-12-03 22:58:45 +01:00
parent ec148ed8f6
commit 197b89a2e5
4 changed files with 151 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
api/channel.go Normal file
View file

@ -0,0 +1,107 @@
package api
import (
"fmt"
"net/http"
"strconv"
"strings"
"time"
twitch "github.com/gempir/go-twitch-irc"
"github.com/labstack/echo"
log "github.com/sirupsen/logrus"
)
func (s *Server) getCurrentChannelLogs(c echo.Context) error {
channelID := c.Param("channelid")
year := time.Now().Year()
month := int(time.Now().Month())
day := time.Now().Day()
redirectURL := fmt.Sprintf("/channelid/%s/%d/%d/%d", channelID, year, month, day)
return c.Redirect(http.StatusSeeOther, redirectURL)
}
func (s *Server) getCurrentChannelLogsByName(c echo.Context) error {
channel := c.Param("channel")
year := time.Now().Year()
month := int(time.Now().Month())
day := time.Now().Day()
redirectURL := fmt.Sprintf("/channel/%s/%d/%d/%d", channel, year, month, day)
return c.Redirect(http.StatusSeeOther, redirectURL)
}
func (s *Server) getChannelLogsByName(c echo.Context) error {
channel := strings.ToLower(c.Param("channel"))
userMap, err := s.helixClient.GetUsersByUsernames([]string{channel})
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Failure fetching userID")
}
names := c.ParamNames()
names = append(names, "channelid")
values := c.ParamValues()
values = append(values, userMap[channel].ID)
c.SetParamNames(names...)
c.SetParamValues(values...)
return s.getChannelLogs(c)
}
func (s *Server) getChannelLogs(c echo.Context) error {
channelID := c.Param("channelid")
yearStr := c.Param("year")
monthStr := c.Param("month")
dayStr := c.Param("day")
year, err := strconv.Atoi(yearStr)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Invalid year")
}
month, err := strconv.Atoi(monthStr)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Invalid month")
}
day, err := strconv.Atoi(dayStr)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Invalid day")
}
logMessages, err := s.fileLogger.ReadLogForChannel(channelID, year, month, day)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Failure reading log")
}
var logResult chatLog
for _, rawMessage := range logMessages {
channel, user, parsedMessage := twitch.ParseMessage(rawMessage)
message := chatMessage{
Timestamp: timestamp{parsedMessage.Time},
Username: user.Username,
DisplayName: user.DisplayName,
Text: parsedMessage.Text,
Type: parsedMessage.Type,
Channel: channel,
}
logResult.Messages = append(logResult.Messages, message)
}
if shouldRespondWithJson(c) {
return writeJSONResponse(c, &logResult)
}
return writeTextResponse(c, &logResult)
}

19
api/server.go
View file

@ -57,6 +57,9 @@ func (s *Server) Init() {
})
e.GET("/channelid", s.getAllChannels)
e.GET("/channel/:channel/user/:username/range", s.getUserLogsRangeByName)
e.GET("/channelid/:channelid/userid/:userid/range", s.getUserLogsRange)
e.GET("/channel/:channel/user/:username", s.getCurrentUserLogsByName)
e.GET("/channel/:channel/user/:username/:year/:month", s.getUserLogsByName)
e.GET("/channel/:channel/user/:username/random", s.getRandomQuoteByName)
@ -76,10 +79,15 @@ func (s *Server) Init() {
type order string
var (
orderDesc order = "DESC"
orderAsc order = "ASC"
orderDesc order = "DESC"
orderAsc order = "ASC"
userHourLimit = 744.0
)
type AllChannelsJSON struct {
Channels []string `json:"channels"`
}
type chatLog struct {
Messages []chatMessage `json:"messages"`
}
@ -97,6 +105,13 @@ type timestamp struct {
time.Time
}
func (s *Server) getAllChannels(c echo.Context) error {
response := new(AllChannelsJSON)
response.Channels = s.channels
return c.JSON(http.StatusOK, response)
}
func (t timestamp) MarshalJSON() ([]byte, error) {
return []byte("\"" + t.UTC().Format(time.RFC3339) + "\""), nil
}

84
api/logs.go → api/user.go
View file

@ -25,10 +25,6 @@ type RandomQuoteJSON struct {
Timestamp timestamp `json:"timestamp"`
}
type AllChannelsJSON struct {
Channels []string `json:"channels"`
}
func (s *Server) getCurrentUserLogs(c echo.Context) error {
channelID := c.Param("channelid")
userID := c.Param("userid")
@ -51,52 +47,28 @@ func (s *Server) getCurrentUserLogsByName(c echo.Context) error {
return c.Redirect(303, redirectURL)
}
func (s *Server) getAllChannels(c echo.Context) error {
response := new(AllChannelsJSON)
response.Channels = s.channels
return c.JSON(http.StatusOK, response)
}
func (s *Server) getCurrentChannelLogs(c echo.Context) error {
channelID := c.Param("channelid")
year := time.Now().Year()
month := int(time.Now().Month())
day := time.Now().Day()
redirectURL := fmt.Sprintf("/channelid/%s/%d/%d/%d", channelID, year, month, day)
return c.Redirect(http.StatusSeeOther, redirectURL)
}
func (s *Server) getCurrentChannelLogsByName(c echo.Context) error {
channel := c.Param("channel")
year := time.Now().Year()
month := int(time.Now().Month())
day := time.Now().Day()
redirectURL := fmt.Sprintf("/channel/%s/%d/%d/%d", channel, year, month, day)
return c.Redirect(http.StatusSeeOther, redirectURL)
}
func (s *Server) getChannelLogsByName(c echo.Context) error {
func (s *Server) getUserLogsRangeByName(c echo.Context) error {
channel := strings.ToLower(c.Param("channel"))
username := strings.ToLower(c.Param("username"))
userMap, err := s.helixClient.GetUsersByUsernames([]string{channel})
userMap, err := s.helixClient.GetUsersByUsernames([]string{channel, username})
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Failure fetching userID")
return c.JSON(http.StatusInternalServerError, "Failure fetching userIDs")
}
names := c.ParamNames()
names = append(names, "channelid")
names = append(names, "userid")
values := c.ParamValues()
values = append(values, userMap[channel].ID)
values = append(values, userMap[username].ID)
c.SetParamNames(names...)
c.SetParamValues(values...)
return s.getChannelLogs(c)
return s.getUserLogsRange(c)
}
func (s *Server) getUserLogsByName(c echo.Context) error {
@ -256,33 +228,27 @@ func (s *Server) getUserLogs(c echo.Context) error {
return writeTextResponse(c, &logResult)
}
func (s *Server) getChannelLogs(c echo.Context) error {
func (s *Server) getUserLogsRange(c echo.Context) error {
channelID := c.Param("channelid")
userID := c.Param("userid")
yearStr := c.Param("year")
monthStr := c.Param("month")
dayStr := c.Param("day")
year, err := strconv.Atoi(yearStr)
fromTime, toTime, err := parseFromTo(c.QueryParam("from"), c.QueryParam("to"), userHourLimit)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Invalid year")
}
month, err := strconv.Atoi(monthStr)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Invalid month")
}
day, err := strconv.Atoi(dayStr)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Invalid day")
return c.JSON(http.StatusInternalServerError, err.Error())
}
logMessages, err := s.fileLogger.ReadLogForChannel(channelID, year, month, day)
if err != nil {
log.Error(err)
return c.JSON(http.StatusInternalServerError, "Failure reading log")
var logMessages []string
logMessages, _ = s.fileLogger.ReadLogForUser(channelID, userID, fromTime.Year(), int(fromTime.Month()))
if fromTime.Month() != toTime.Month() {
additionalMessages, _ := s.fileLogger.ReadLogForUser(channelID, userID, toTime.Year(), int(toTime.Month()))
logMessages = append(logMessages, additionalMessages...)
}
if len(logMessages) == 0 {
return c.JSON(http.StatusNotFound, "No logs found")
}
var logResult chatLog
@ -290,6 +256,10 @@ func (s *Server) getChannelLogs(c echo.Context) error {
for _, rawMessage := range logMessages {
channel, user, parsedMessage := twitch.ParseMessage(rawMessage)
if parsedMessage.Time.Unix() < fromTime.Unix() || parsedMessage.Time.Unix() > toTime.Unix() {
continue
}
message := chatMessage{
Timestamp: timestamp{parsedMessage.Time},
Username: user.Username,

1
filelog/userlog.go
View file

@ -79,7 +79,6 @@ func (l *Logger) ReadLogForUser(channelID string, userID string, year int, month
for scanner.Scan() {
line := scanner.Text()
log.Debug(line)
content = append(content, line)
}