Merge pull request #61 from niwaniwa/bugfix/emoji-note-system

fix: properly reflect values
niri-la · Jul 22, 2023 · cae4ea0 · cae4ea0
2 parents 98948f6 + 3318536
commit cae4ea0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/emoji.go b/emoji.go
@@ -65,7 +65,7 @@ func GetEmoji(id string) (*Emoji, error) {
 	return nil, errors.New("emoji not found")
 }
 
-func approve(emoji Emoji) {
+func (emoji *Emoji) approve() {
 	if emoji.IsAccepted {
 		u, _ := Session.User(emoji.RequestUser)
 		logger.WithFields(debug.Fields{
@@ -77,19 +77,19 @@ func approve(emoji Emoji) {
 	}
 	uploadToMisskey(emoji)
 	emoji.IsFinish = true
-	sendDirectMessage(emoji, "申請された絵文字は登録されました。"+emoji.ID)
-	deleteChannel(emoji)
+	sendDirectMessage(*emoji, "申請された絵文字は登録されました。"+emoji.ID)
+	deleteChannel(*emoji)
 }
 
-func disapprove(emoji Emoji) {
+func (emoji *Emoji) disapprove() {
 	if emoji.IsAccepted {
 		return
 	}
 
 	emoji.IsAccepted = false
 	emoji.IsFinish = true
-	sendDirectMessage(emoji, "申請された絵文字は却下されました。 "+emoji.ID)
-	deleteChannel(emoji)
+	sendDirectMessage(*emoji, "申請された絵文字は却下されました。 "+emoji.ID)
+	deleteChannel(*emoji)
 }
 
 func deleteChannel(emoji Emoji) {
@@ -125,7 +125,7 @@ func emojiReconstruction() []Emoji {
 		}
 	}
 	emojiProcessList = reconstruction
-	return reconstruction
+	return accepted
 }
 
 func noteEmojiAdded(emojis []Emoji) {
@@ -144,24 +144,24 @@ func noteEmojiAdded(emojis []Emoji) {
 	})
 }
 
-func (e Emoji) reset() {
-	e.RequestState = workflow[0]
-	e.ResponseState = workflow[0]
-	e.IsSensitive = false
-	e.IsAccepted = false
-	e.IsRequested = false
+func (emoji *Emoji) reset() {
+	emoji.RequestState = workflow[0]
+	emoji.ResponseState = workflow[0]
+	emoji.IsSensitive = false
+	emoji.IsAccepted = false
+	emoji.IsRequested = false
 }
 
-func (e Emoji) abort() {
-	remove(e)
-	e.reset()
-	e.IsFinish = true
+func (emoji *Emoji) abort() {
+	remove(*emoji)
+	emoji.reset()
+	emoji.IsFinish = true
 }
 
 func remove(val Emoji) {
 	var newSlice []Emoji
 	for _, v := range emojiProcessList {
-		if v != val {
+		if v.ID != val.ID {
 			newSlice = append(newSlice, v)
 		}
 	}

diff --git a/main.go b/main.go
@@ -155,7 +155,7 @@ func main() {
 
 	defer Session.Close()
 
-	ticker := time.NewTicker(24 * time.Hour)
+	ticker := time.NewTicker(12 * time.Hour)
 	go func() {
 		for {
 			select {

diff --git a/misskey.go b/misskey.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 )
 
-func uploadToMisskey(e Emoji) error {
+func uploadToMisskey(e *Emoji) error {
 	client, err := misskey.NewClientWithOptions(
 		misskey.WithAPIToken(misskeyToken),
 		misskey.WithBaseURL("https", misskeyHost, ""),

diff --git a/request-handler.go b/request-handler.go
@@ -595,14 +595,14 @@ func emojiModerationReaction(s *discordgo.Session, m *discordgo.MessageReactionA
 	emoji.DisapproveCount = dsCount
 
 	if emoji.DisapproveCount-1 >= roleCount || (isDebug && emoji.DisapproveCount-1 >= 1) {
-		disapprove(*emoji)
+		emoji.disapprove()
 		s.ChannelMessageSend(m.ChannelID, "申請は却下されました")
 		closeThread(m.ChannelID, emoji.ModerationMessageID)
 		return
 	}
 
 	if emoji.ApproveCount-1 >= roleCount || (isDebug && emoji.ApproveCount-1 >= 1) {
-		approve(*emoji)
+		emoji.approve()
 		s.ChannelMessageSend(m.ChannelID, "絵文字はアップロードされました")
 		closeThread(m.ChannelID, emoji.ModerationMessageID)
 		return