mirror of
https://gitea.phreedom.club/localhost_frssoft/bloat.git
synced 2025-05-05 11:28:45 +00:00
Refactor everything
This commit is contained in:
r
parent
57d2a4288b
commit
2af37d4778
26 changed files with 1320 additions and 1361 deletions
314
service/auth.go
314
service/auth.go
|
|
@ -3,7 +3,6 @@ package service
|
|||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"mime/multipart"
|
||||
|
||||
"bloat/model"
|
||||
|
|
@ -11,28 +10,28 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
ErrInvalidSession = errors.New("invalid session")
|
||||
ErrInvalidCSRFToken = errors.New("invalid csrf token")
|
||||
errInvalidSession = errors.New("invalid session")
|
||||
errInvalidCSRFToken = errors.New("invalid csrf token")
|
||||
)
|
||||
|
||||
type authService struct {
|
||||
sessionRepo model.SessionRepository
|
||||
appRepo model.AppRepository
|
||||
type as struct {
|
||||
sessionRepo model.SessionRepo
|
||||
appRepo model.AppRepo
|
||||
Service
|
||||
}
|
||||
|
||||
func NewAuthService(sessionRepo model.SessionRepository, appRepo model.AppRepository, s Service) Service {
|
||||
return &authService{sessionRepo, appRepo, s}
|
||||
func NewAuthService(sessionRepo model.SessionRepo, appRepo model.AppRepo, s Service) Service {
|
||||
return &as{sessionRepo, appRepo, s}
|
||||
}
|
||||
|
||||
func (s *authService) getClient(ctx context.Context) (c *model.Client, err error) {
|
||||
func (s *as) authenticateClient(ctx context.Context, c *model.Client) (err error) {
|
||||
sessionID, ok := ctx.Value("session_id").(string)
|
||||
if !ok || len(sessionID) < 1 {
|
||||
return nil, ErrInvalidSession
|
||||
return errInvalidSession
|
||||
}
|
||||
session, err := s.sessionRepo.Get(sessionID)
|
||||
if err != nil {
|
||||
return nil, ErrInvalidSession
|
||||
return errInvalidSession
|
||||
}
|
||||
client, err := s.appRepo.Get(session.InstanceDomain)
|
||||
if err != nil {
|
||||
|
|
@ -44,31 +43,146 @@ func (s *authService) getClient(ctx context.Context) (c *model.Client, err error
|
|||
ClientSecret: client.ClientSecret,
|
||||
AccessToken: session.AccessToken,
|
||||
})
|
||||
c = &model.Client{Client: mc, Session: session}
|
||||
return c, nil
|
||||
if c == nil {
|
||||
c = &model.Client{}
|
||||
}
|
||||
c.Client = mc
|
||||
c.Session = session
|
||||
return nil
|
||||
}
|
||||
|
||||
func checkCSRF(ctx context.Context, c *model.Client) (err error) {
|
||||
csrfToken, ok := ctx.Value("csrf_token").(string)
|
||||
if !ok || csrfToken != c.Session.CSRFToken {
|
||||
return ErrInvalidCSRFToken
|
||||
token, ok := ctx.Value("csrf_token").(string)
|
||||
if !ok || token != c.Session.CSRFToken {
|
||||
return errInvalidCSRFToken
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *authService) GetAuthUrl(ctx context.Context, instance string) (
|
||||
redirectUrl string, sessionID string, err error) {
|
||||
return s.Service.GetAuthUrl(ctx, instance)
|
||||
func (s *as) ServeErrorPage(ctx context.Context, c *model.Client, err error) {
|
||||
s.authenticateClient(ctx, c)
|
||||
s.Service.ServeErrorPage(ctx, c, err)
|
||||
}
|
||||
|
||||
func (s *authService) GetUserToken(ctx context.Context, sessionID string, c *model.Client,
|
||||
func (s *as) ServeSigninPage(ctx context.Context, c *model.Client) (err error) {
|
||||
return s.Service.ServeSigninPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *as) ServeTimelinePage(ctx context.Context, c *model.Client, tType string,
|
||||
maxID string, minID string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeTimelinePage(ctx, c, tType, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *as) ServeThreadPage(ctx context.Context, c *model.Client, id string, reply bool) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeThreadPage(ctx, c, id, reply)
|
||||
}
|
||||
|
||||
func (s *as) ServeLikedByPage(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeLikedByPage(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *as) ServeRetweetedByPage(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeRetweetedByPage(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *as) ServeFollowingPage(ctx context.Context, c *model.Client, id string,
|
||||
maxID string, minID string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeFollowingPage(ctx, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *as) ServeFollowersPage(ctx context.Context, c *model.Client, id string,
|
||||
maxID string, minID string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeFollowersPage(ctx, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *as) ServeNotificationPage(ctx context.Context, c *model.Client,
|
||||
maxID string, minID string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeNotificationPage(ctx, c, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *as) ServeUserPage(ctx context.Context, c *model.Client, id string,
|
||||
maxID string, minID string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeUserPage(ctx, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *as) ServeAboutPage(ctx context.Context, c *model.Client) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeAboutPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *as) ServeEmojiPage(ctx context.Context, c *model.Client) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeEmojiPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *as) ServeSearchPage(ctx context.Context, c *model.Client, q string,
|
||||
qType string, offset int) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeSearchPage(ctx, c, q, qType, offset)
|
||||
}
|
||||
|
||||
func (s *as) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeSettingsPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *as) NewSession(ctx context.Context, instance string) (redirectUrl string,
|
||||
sessionID string, err error) {
|
||||
return s.Service.NewSession(ctx, instance)
|
||||
}
|
||||
|
||||
func (s *as) Signin(ctx context.Context, c *model.Client, sessionID string,
|
||||
code string) (token string, err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
token, err = s.Service.GetUserToken(ctx, c.Session.ID, c, code)
|
||||
token, err = s.Service.Signin(ctx, c, c.Session.ID, code)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -82,114 +196,10 @@ func (s *authService) GetUserToken(ctx context.Context, sessionID string, c *mod
|
|||
return
|
||||
}
|
||||
|
||||
func (s *authService) ServeErrorPage(ctx context.Context, client io.Writer, c *model.Client, err error) {
|
||||
c, _ = s.getClient(ctx)
|
||||
s.Service.ServeErrorPage(ctx, client, c, err)
|
||||
}
|
||||
|
||||
func (s *authService) ServeSigninPage(ctx context.Context, client io.Writer) (err error) {
|
||||
return s.Service.ServeSigninPage(ctx, client)
|
||||
}
|
||||
|
||||
func (s *authService) ServeTimelinePage(ctx context.Context, client io.Writer,
|
||||
c *model.Client, timelineType string, maxID string, sinceID string, minID string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeTimelinePage(ctx, client, c, timelineType, maxID, sinceID, minID)
|
||||
}
|
||||
|
||||
func (s *authService) ServeThreadPage(ctx context.Context, client io.Writer, c *model.Client, id string, reply bool) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeThreadPage(ctx, client, c, id, reply)
|
||||
}
|
||||
|
||||
func (s *authService) ServeNotificationPage(ctx context.Context, client io.Writer, c *model.Client, maxID string, minID string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeNotificationPage(ctx, client, c, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *authService) ServeUserPage(ctx context.Context, client io.Writer, c *model.Client, id string, maxID string, minID string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeUserPage(ctx, client, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *authService) ServeAboutPage(ctx context.Context, client io.Writer, c *model.Client) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeAboutPage(ctx, client, c)
|
||||
}
|
||||
|
||||
func (s *authService) ServeEmojiPage(ctx context.Context, client io.Writer, c *model.Client) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeEmojiPage(ctx, client, c)
|
||||
}
|
||||
|
||||
func (s *authService) ServeLikedByPage(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeLikedByPage(ctx, client, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) ServeRetweetedByPage(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeRetweetedByPage(ctx, client, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) ServeFollowingPage(ctx context.Context, client io.Writer, c *model.Client, id string, maxID string, minID string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeFollowingPage(ctx, client, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *authService) ServeFollowersPage(ctx context.Context, client io.Writer, c *model.Client, id string, maxID string, minID string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeFollowersPage(ctx, client, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *authService) ServeSearchPage(ctx context.Context, client io.Writer, c *model.Client, q string, qType string, offset int) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeSearchPage(ctx, client, c, q, qType, offset)
|
||||
}
|
||||
|
||||
func (s *authService) ServeSettingsPage(ctx context.Context, client io.Writer, c *model.Client) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.ServeSettingsPage(ctx, client, c)
|
||||
}
|
||||
|
||||
func (s *authService) SaveSettings(ctx context.Context, client io.Writer, c *model.Client, settings *model.Settings) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) Post(ctx context.Context, c *model.Client, content string,
|
||||
replyToID string, format string, visibility string, isNSFW bool,
|
||||
files []*multipart.FileHeader) (id string, err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -197,11 +207,11 @@ func (s *authService) SaveSettings(ctx context.Context, client io.Writer, c *mod
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.SaveSettings(ctx, client, c, settings)
|
||||
return s.Service.Post(ctx, c, content, replyToID, format, visibility, isNSFW, files)
|
||||
}
|
||||
|
||||
func (s *authService) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) Like(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -209,11 +219,11 @@ func (s *authService) Like(ctx context.Context, client io.Writer, c *model.Clien
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.Like(ctx, client, c, id)
|
||||
return s.Service.Like(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) UnLike(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -221,11 +231,11 @@ func (s *authService) UnLike(ctx context.Context, client io.Writer, c *model.Cli
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.UnLike(ctx, client, c, id)
|
||||
return s.Service.UnLike(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) Retweet(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -233,11 +243,11 @@ func (s *authService) Retweet(ctx context.Context, client io.Writer, c *model.Cl
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.Retweet(ctx, client, c, id)
|
||||
return s.Service.Retweet(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) UnRetweet(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -245,11 +255,11 @@ func (s *authService) UnRetweet(ctx context.Context, client io.Writer, c *model.
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.UnRetweet(ctx, client, c, id)
|
||||
return s.Service.UnRetweet(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) Follow(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -257,11 +267,11 @@ func (s *authService) PostTweet(ctx context.Context, client io.Writer, c *model.
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.PostTweet(ctx, client, c, content, replyToID, format, visibility, isNSFW, files)
|
||||
return s.Service.Follow(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) Follow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) UnFollow(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -269,11 +279,11 @@ func (s *authService) Follow(ctx context.Context, client io.Writer, c *model.Cli
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.Follow(ctx, client, c, id)
|
||||
return s.Service.UnFollow(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *authService) UnFollow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
c, err = s.getClient(ctx)
|
||||
func (s *as) SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error) {
|
||||
err = s.authenticateClient(ctx, c)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
|
@ -281,5 +291,5 @@ func (s *authService) UnFollow(ctx context.Context, client io.Writer, c *model.C
|
|||
if err != nil {
|
||||
return
|
||||
}
|
||||
return s.Service.UnFollow(ctx, client, c, id)
|
||||
return s.Service.SaveSettings(ctx, c, settings)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package service
|
|||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"log"
|
||||
"mime/multipart"
|
||||
"time"
|
||||
|
|
@ -10,206 +9,215 @@ import (
|
|||
"bloat/model"
|
||||
)
|
||||
|
||||
type loggingService struct {
|
||||
type ls struct {
|
||||
logger *log.Logger
|
||||
Service
|
||||
}
|
||||
|
||||
func NewLoggingService(logger *log.Logger, s Service) Service {
|
||||
return &loggingService{logger, s}
|
||||
return &ls{logger, s}
|
||||
}
|
||||
|
||||
func (s *loggingService) GetAuthUrl(ctx context.Context, instance string) (
|
||||
redirectUrl string, sessionID string, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, instance=%v, took=%v, err=%v\n",
|
||||
"GetAuthUrl", instance, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.GetAuthUrl(ctx, instance)
|
||||
}
|
||||
|
||||
func (s *loggingService) GetUserToken(ctx context.Context, sessionID string, c *model.Client,
|
||||
code string) (token string, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, session_id=%v, code=%v, took=%v, err=%v\n",
|
||||
"GetUserToken", sessionID, code, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.GetUserToken(ctx, sessionID, c, code)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeErrorPage(ctx context.Context, client io.Writer, c *model.Client, err error) {
|
||||
func (s *ls) ServeErrorPage(ctx context.Context, c *model.Client, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, err=%v, took=%v\n",
|
||||
"ServeErrorPage", err, time.Since(begin))
|
||||
}(time.Now())
|
||||
s.Service.ServeErrorPage(ctx, client, c, err)
|
||||
s.Service.ServeErrorPage(ctx, c, err)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeSigninPage(ctx context.Context, client io.Writer) (err error) {
|
||||
func (s *ls) ServeSigninPage(ctx context.Context, c *model.Client) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeSigninPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeSigninPage(ctx, client)
|
||||
return s.Service.ServeSigninPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeTimelinePage(ctx context.Context, client io.Writer,
|
||||
c *model.Client, timelineType string, maxID string, sinceID string, minID string) (err error) {
|
||||
func (s *ls) ServeTimelinePage(ctx context.Context, c *model.Client, tType string,
|
||||
maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, timeline_type=%v, max_id=%v, since_id=%v, min_id=%v, took=%v, err=%v\n",
|
||||
"ServeTimelinePage", timelineType, maxID, sinceID, minID, time.Since(begin), err)
|
||||
s.logger.Printf("method=%v, type=%v, took=%v, err=%v\n",
|
||||
"ServeTimelinePage", tType, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeTimelinePage(ctx, client, c, timelineType, maxID, sinceID, minID)
|
||||
return s.Service.ServeTimelinePage(ctx, c, tType, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeThreadPage(ctx context.Context, client io.Writer, c *model.Client, id string, reply bool) (err error) {
|
||||
func (s *ls) ServeThreadPage(ctx context.Context, c *model.Client, id string,
|
||||
reply bool) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, reply=%v, took=%v, err=%v\n",
|
||||
"ServeThreadPage", id, reply, time.Since(begin), err)
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"ServeThreadPage", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeThreadPage(ctx, client, c, id, reply)
|
||||
return s.Service.ServeThreadPage(ctx, c, id, reply)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeNotificationPage(ctx context.Context, client io.Writer, c *model.Client, maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, max_id=%v, min_id=%v, took=%v, err=%v\n",
|
||||
"ServeNotificationPage", maxID, minID, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeNotificationPage(ctx, client, c, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeUserPage(ctx context.Context, client io.Writer, c *model.Client, id string, maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, max_id=%v, min_id=%v, took=%v, err=%v\n",
|
||||
"ServeUserPage", id, maxID, minID, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeUserPage(ctx, client, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeAboutPage(ctx context.Context, client io.Writer, c *model.Client) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeAboutPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeAboutPage(ctx, client, c)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeEmojiPage(ctx context.Context, client io.Writer, c *model.Client) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeEmojiPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeEmojiPage(ctx, client, c)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeLikedByPage(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
func (s *ls) ServeLikedByPage(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"ServeLikedByPage", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeLikedByPage(ctx, client, c, id)
|
||||
return s.Service.ServeLikedByPage(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeRetweetedByPage(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
func (s *ls) ServeRetweetedByPage(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"ServeRetweetedByPage", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeRetweetedByPage(ctx, client, c, id)
|
||||
return s.Service.ServeRetweetedByPage(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeFollowingPage(ctx context.Context, client io.Writer, c *model.Client, id string, maxID string, minID string) (err error) {
|
||||
func (s *ls) ServeFollowingPage(ctx context.Context, c *model.Client, id string,
|
||||
maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, max_id=%v, min_id=%v, took=%v, err=%v\n",
|
||||
"ServeFollowingPage", id, maxID, minID, time.Since(begin), err)
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"ServeFollowingPage", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeFollowingPage(ctx, client, c, id, maxID, minID)
|
||||
return s.Service.ServeFollowingPage(ctx, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeFollowersPage(ctx context.Context, client io.Writer, c *model.Client, id string, maxID string, minID string) (err error) {
|
||||
func (s *ls) ServeFollowersPage(ctx context.Context, c *model.Client, id string,
|
||||
maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, max_id=%v, min_id=%v, took=%v, err=%v\n",
|
||||
"ServeFollowersPage", id, maxID, minID, time.Since(begin), err)
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"ServeFollowersPage", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeFollowersPage(ctx, client, c, id, maxID, minID)
|
||||
return s.Service.ServeFollowersPage(ctx, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeSearchPage(ctx context.Context, client io.Writer, c *model.Client, q string, qType string, offset int) (err error) {
|
||||
func (s *ls) ServeNotificationPage(ctx context.Context, c *model.Client,
|
||||
maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, q=%v, type=%v, offset=%v, took=%v, err=%v\n",
|
||||
"ServeSearchPage", q, qType, offset, time.Since(begin), err)
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeNotificationPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeSearchPage(ctx, client, c, q, qType, offset)
|
||||
return s.Service.ServeNotificationPage(ctx, c, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *loggingService) ServeSettingsPage(ctx context.Context, client io.Writer, c *model.Client) (err error) {
|
||||
func (s *ls) ServeUserPage(ctx context.Context, c *model.Client, id string,
|
||||
maxID string, minID string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"ServeUserPage", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeUserPage(ctx, c, id, maxID, minID)
|
||||
}
|
||||
|
||||
func (s *ls) ServeAboutPage(ctx context.Context, c *model.Client) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeAboutPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeAboutPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *ls) ServeEmojiPage(ctx context.Context, c *model.Client) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeEmojiPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeEmojiPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *ls) ServeSearchPage(ctx context.Context, c *model.Client, q string,
|
||||
qType string, offset int) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeSearchPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeSearchPage(ctx, c, q, qType, offset)
|
||||
}
|
||||
|
||||
func (s *ls) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"ServeSettingsPage", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.ServeSettingsPage(ctx, client, c)
|
||||
return s.Service.ServeSettingsPage(ctx, c)
|
||||
}
|
||||
|
||||
func (s *loggingService) SaveSettings(ctx context.Context, client io.Writer, c *model.Client, settings *model.Settings) (err error) {
|
||||
func (s *ls) NewSession(ctx context.Context, instance string) (redirectUrl string,
|
||||
sessionID string, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, instance=%v, took=%v, err=%v\n",
|
||||
"NewSession", instance, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.NewSession(ctx, instance)
|
||||
}
|
||||
|
||||
func (s *ls) Signin(ctx context.Context, c *model.Client, sessionID string,
|
||||
code string) (token string, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, session_id=%v, took=%v, err=%v\n",
|
||||
"Signin", sessionID, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.Signin(ctx, c, sessionID, code)
|
||||
}
|
||||
|
||||
func (s *ls) Post(ctx context.Context, c *model.Client, content string,
|
||||
replyToID string, format string, visibility string, isNSFW bool,
|
||||
files []*multipart.FileHeader) (id string, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"SaveSettings", time.Since(begin), err)
|
||||
"Post", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.SaveSettings(ctx, client, c, settings)
|
||||
return s.Service.Post(ctx, c, content, replyToID, format,
|
||||
visibility, isNSFW, files)
|
||||
}
|
||||
|
||||
func (s *loggingService) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
func (s *ls) Like(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"Like", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.Like(ctx, client, c, id)
|
||||
return s.Service.Like(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
func (s *ls) UnLike(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"UnLike", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.UnLike(ctx, client, c, id)
|
||||
return s.Service.UnLike(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
func (s *ls) Retweet(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"Retweet", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.Retweet(ctx, client, c, id)
|
||||
return s.Service.Retweet(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
|
||||
func (s *ls) UnRetweet(ctx context.Context, c *model.Client, id string) (count int64, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"UnRetweet", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.UnRetweet(ctx, client, c, id)
|
||||
return s.Service.UnRetweet(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, content=%v, reply_to_id=%v, format=%v, visibility=%v, is_nsfw=%v, took=%v, err=%v\n",
|
||||
"PostTweet", content, replyToID, format, visibility, isNSFW, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.PostTweet(ctx, client, c, content, replyToID, format, visibility, isNSFW, files)
|
||||
}
|
||||
|
||||
func (s *loggingService) Follow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
func (s *ls) Follow(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"Follow", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.Follow(ctx, client, c, id)
|
||||
return s.Service.Follow(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *loggingService) UnFollow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
|
||||
func (s *ls) UnFollow(ctx context.Context, c *model.Client, id string) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||
"UnFollow", id, time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.UnFollow(ctx, client, c, id)
|
||||
return s.Service.UnFollow(ctx, c, id)
|
||||
}
|
||||
|
||||
func (s *ls) SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error) {
|
||||
defer func(begin time.Time) {
|
||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||
"SaveSettings", time.Since(begin), err)
|
||||
}(time.Now())
|
||||
return s.Service.SaveSettings(ctx, c, settings)
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
1016
service/transport.go
1016
service/transport.go
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue