Skip to content
This repository was archived by the owner on Jan 31, 2023. It is now read-only.

Commit 9799552

Browse files
JustHumanzJustHumanz
committed
v3.3.5
1 parent e655068 commit 9799552

File tree

4 files changed

+64
-52
lines changed

4 files changed

+64
-52
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
v3.3.5
2+
- Fix name not showed in upcoming livestream
3+
14
v3.3.4
25
- Fix bug on `setup`
36
- Add color on pixiv image

‎service/frontend/register_handler.go

+53-44
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func Answer(s *discordgo.Session, m *discordgo.MessageReactionAdd) {
6262
log.Error(err)
6363
}
6464
Register.ChannelState.TypeTag = def
65+
Register.Clear()
6566
}
6667

6768
NillType := func() {
@@ -96,57 +97,75 @@ func Answer(s *discordgo.Session, m *discordgo.MessageReactionAdd) {
9697

9798
if m.Emoji.MessageFormat() == config.Art {
9899
if Register.ChannelState.TypeTag == config.LiveType {
100+
Message("[Info] you enable Livestream and Art type on this channel")
99101
Register.UpdateType(config.ArtNLiveType)
102+
err := Register.UpdateChannel("type")
103+
if err != nil {
104+
s.ChannelMessageSend(m.ChannelID, err.Error())
105+
log.Error(err)
106+
}
107+
Register.Clear()
108+
return
100109
} else if Register.ChannelState.TypeTag == config.LewdType {
110+
Message("[Info] you enable Lewd and Art type on this channel")
101111
Register.UpdateType(config.LewdNArtType)
102112
} else if Register.ChannelState.TypeTag == config.ArtType {
103113
NillType()
104114
return
105115
} else if Register.ChannelState.TypeTag == config.ArtNLiveType {
106116
Message("[Info] you disable Art type on this channel")
107117
Register.UpdateType(config.LiveType)
108-
err := Register.UpdateChannel()
118+
err := Register.UpdateChannel("type")
109119
if err != nil {
120+
s.ChannelMessageSend(m.ChannelID, err.Error())
110121
log.Error(err)
111122
}
123+
Register.Clear()
112124
return
113125
} else {
126+
Message("[Info] you enable Art type on this channel")
114127
Register.UpdateType(config.ArtType)
115128
}
116129
} else if m.Emoji.MessageFormat() == config.Live {
117130
if Register.ChannelState.TypeTag == config.ArtType {
131+
Message("[Info] you enable Livestream and Art type on this channel")
118132
Register.UpdateType(config.ArtNLiveType)
119133
} else if Register.ChannelState.TypeTag == config.LewdType {
120134
LewdLive(config.LewdType)
135+
return
121136
} else if Register.ChannelState.TypeTag == config.LiveType {
122137
NillType()
123138
return
124139
} else if Register.ChannelState.TypeTag == config.ArtNLiveType {
125140
Message("[Info] you disable Live type on this channel")
126141
Register.UpdateType(config.ArtType)
127-
err := Register.UpdateChannel()
142+
err := Register.UpdateChannel("type")
128143
if err != nil {
144+
s.ChannelMessageSend(m.ChannelID, err.Error())
129145
log.Error(err)
130146
}
131147
return
132148
} else {
149+
Message("[Info] you enable Livestream type on this channel")
133150
Register.UpdateType(config.LiveType)
134151
}
135152
} else if m.Emoji.MessageFormat() == config.Lewd {
136153
if Register.ChannelState.TypeTag == config.LiveType {
137154
LewdLive(config.LiveType)
155+
return
138156
} else if Register.ChannelState.TypeTag == config.ArtType {
139157
Register.UpdateType(config.LewdNArtType)
140158
} else if Register.ChannelState.TypeTag == config.ArtNLiveType {
141159
LewdLive(config.ArtNLiveType)
160+
return
142161
} else if Register.ChannelState.TypeTag == config.LewdType {
143162
NillType()
144163
return
145164
} else if Register.ChannelState.TypeTag == config.LewdNArtType {
146165
Message("[Info] you disable Lewd type on this channel")
147166
Register.UpdateType(config.ArtType)
148167
} else {
149-
Register.UpdateType(config.LewdType) //nice
168+
Register.UpdateType(config.LewdType)
150169
}
151170
}
152171

@@ -168,8 +187,12 @@ func Answer(s *discordgo.Session, m *discordgo.MessageReactionAdd) {
168187
}
169188
}
170189

171-
Register.UpdateChannel()
172-
_, err := s.ChannelMessageSend(m.ChannelID, "Done")
190+
err := Register.UpdateChannel("all")
191+
if err != nil {
192+
s.ChannelMessageSend(m.ChannelID, err.Error())
193+
log.Error(err)
194+
}
195+
_, err = s.ChannelMessageSend(m.ChannelID, "Done")
173196
if err != nil {
174197
log.Error(err)
175198
}
@@ -183,8 +206,12 @@ func Answer(s *discordgo.Session, m *discordgo.MessageReactionAdd) {
183206
Register.DelRegion(s)
184207
} else if m.Emoji.MessageFormat() == config.Four {
185208
LiveChange()
186-
Register.UpdateChannel()
187-
_, err := s.ChannelMessageSend(m.ChannelID, "Done")
209+
err := Register.UpdateChannel("all")
210+
if err != nil {
211+
s.ChannelMessageSend(m.ChannelID, err.Error())
212+
log.Error(err)
213+
}
214+
_, err = s.ChannelMessageSend(m.ChannelID, "Done")
188215
if err != nil {
189216
log.Error(err)
190217
}
@@ -367,11 +394,12 @@ func RegisterFunc(s *discordgo.Session, m *discordgo.MessageCreate) {
367394
Register.SetAdmin(m.Author.ID).SetChannel(m.ChannelID)
368395
Register.ChannelStates = ChannelData
369396

370-
Register.UpdateState("SelectChannel")
371397
_, err = s.ChannelMessageSend(m.ChannelID, "Select ID : ")
372398
if err != nil {
373399
log.Error(err)
374400
}
401+
402+
Register.UpdateState("SelectChannel")
375403
} else {
376404
_, err := s.ChannelMessageSend(m.ChannelID, "You don't have permission to enable/disable/update")
377405
if err != nil {
@@ -702,61 +730,42 @@ func (Data *Regis) IndieNotif(s *discordgo.Session) *Regis {
702730
return Data
703731
}
704732

705-
func (Data *Regis) UpdateChannel() error {
706-
ChannelID := Data.ChannelState.ChannelID
707-
708-
err := Data.ChannelState.UpdateChannel("Type")
709-
if err != nil {
710-
_, err := Bot.ChannelMessageSend(ChannelID, err.Error())
733+
func (Data *Regis) UpdateChannel(s string) error {
734+
if s == "type" {
735+
err := Data.ChannelState.UpdateChannel("Type")
711736
if err != nil {
712-
log.Error(err)
737+
return err
713738
}
714-
}
715-
716-
err = Data.ChannelState.UpdateChannel("LiveOnly")
717-
if err != nil {
718-
_, err := Bot.ChannelMessageSend(ChannelID, err.Error())
739+
} else {
740+
err := Data.ChannelState.UpdateChannel("LiveOnly")
719741
if err != nil {
720-
log.Error(err)
742+
return err
721743
}
722-
}
723744

724-
err = Data.ChannelState.UpdateChannel("Dynamic")
725-
if err != nil {
726-
_, err := Bot.ChannelMessageSend(ChannelID, err.Error())
745+
err = Data.ChannelState.UpdateChannel("Dynamic")
727746
if err != nil {
728-
log.Error(err)
747+
return err
729748
}
730-
}
731749

732-
if !Register.ChannelState.LiveOnly {
733-
err = Data.ChannelState.UpdateChannel("NewUpcoming")
734-
if err != nil {
735-
_, err := Bot.ChannelMessageSend(ChannelID, err.Error())
750+
if !Register.ChannelState.LiveOnly {
751+
err = Data.ChannelState.UpdateChannel("NewUpcoming")
736752
if err != nil {
737-
log.Error(err)
753+
return err
738754
}
739755
}
740-
}
741756

742-
err = Data.ChannelState.UpdateChannel("LiteMode")
743-
if err != nil {
744-
_, err := Bot.ChannelMessageSend(ChannelID, err.Error())
757+
err = Data.ChannelState.UpdateChannel("LiteMode")
745758
if err != nil {
746-
log.Error(err)
759+
return err
747760
}
748-
}
749761

750-
if Register.ChannelState.Group.GroupName == config.Indie {
751-
err = Data.ChannelState.UpdateChannel("IndieNotif")
752-
if err != nil {
753-
_, err := Bot.ChannelMessageSend(ChannelID, err.Error())
762+
if Register.ChannelState.Group.GroupName == config.Indie {
763+
err = Data.ChannelState.UpdateChannel("IndieNotif")
754764
if err != nil {
755-
log.Error(err)
765+
return err
756766
}
757767
}
758768
}
759-
760769
return nil
761770
}
762771

‎service/livestream/youtube/getdata.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,11 @@ func StartCheckYT(Group database.Group, wg *sync.WaitGroup) {
220220
if err != nil {
221221
log.Error(err)
222222
}
223-
//YoutubeData.SetYoutubeID(ID).SendNude()
223+
224+
err = SendNude(*NewYoutubeData)
225+
if err != nil {
226+
log.Error(err)
227+
}
224228

225229
} else if Items.Snippet.VideoStatus == config.LiveStatus {
226230
log.WithFields(log.Fields{
@@ -254,14 +258,13 @@ func StartCheckYT(Group database.Group, wg *sync.WaitGroup) {
254258
"MemberName": Member.EnName,
255259
}).Info("New MV or Cover")
256260

257-
NewYoutubeData.UpdateStatus(config.PastStatus)
261+
NewYoutubeData.UpdateStatus(config.PastStatus).InputYt()
262+
258263
err := SendNude(*NewYoutubeData)
259264
if err != nil {
260265
log.Error(err)
261266
}
262267

263-
NewYoutubeData.InputYt()
264-
265268
} else if !Items.Snippet.PublishedAt.IsZero() && Items.Snippet.VideoStatus == "none" {
266269
log.WithFields(log.Fields{
267270
"YtID": YtVideoID,
@@ -271,14 +274,12 @@ func StartCheckYT(Group database.Group, wg *sync.WaitGroup) {
271274
NewYoutubeData.UpdateSchdule(NewYoutubeData.Published)
272275
}
273276

274-
NewYoutubeData.UpdateStatus(config.PastStatus)
277+
NewYoutubeData.UpdateStatus(config.PastStatus).InputYt()
275278
err := SendNude(*NewYoutubeData)
276279
if err != nil {
277280
log.Error(err)
278281
}
279282

280-
NewYoutubeData.InputYt()
281-
282283
} else {
283284
log.WithFields(log.Fields{
284285
"YtID": YtVideoID,

‎service/livestream/youtube/youtube.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func Start(a *discordgo.Session, b *cron.Cron, c database.VtubersPayload, d conf
3636
b.AddFunc(config.YoutubePrivateSlayer, CheckPrivate)
3737
VtubersData = c
3838
log.Info("Enable youtube module")
39-
//CheckYtScheduleTest("Hololive")
4039
}
4140

4241
func CheckYtSchedule() {

0 commit comments

Comments
 (0)