Skip to content

Commit c932f81

Browse files
Merge pull request #76 from nullinside-development-group/feat/dup
Feat/dup
2 parents 0592a4c + 4734835 commit c932f81

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

src/Nullinside.Api.TwitchBot/ChatRules/TwitchChatMessageMonitorConsumer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,13 @@ private async void MainLoop() {
111111
// Try to get a message from one of the two queues.
112112
ChatMessage? message;
113113
_queue.TryTake(out message);
114-
114+
115115
// If we didn't get a message, loop.
116116
if (null == message) {
117117
Thread.Sleep(LOOP_TIMEOUT);
118118
continue;
119119
}
120120

121-
LOG.Info("Message received: " + message.Id);
122121
string? channel = message.Channel;
123122
try {
124123
// Sanity check.

src/Nullinside.Api.TwitchBot/Model/NullinsideContextExtensions.cs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,19 +168,15 @@ await db.TwitchUser.UpsertRange(
168168
.On(v => new { v.TwitchId })
169169
.RunAsync(stoppingToken);
170170

171-
db.TwitchBan.AddRange(
172-
bannedUsers.Select(i => new TwitchBan {
173-
ChannelId = channelId,
174-
BannedUserTwitchId = i.Id,
175-
Reason = reason,
176-
Timestamp = DateTime.UtcNow
177-
}).ToList());
178-
179-
// Trying to fix bug?
180-
foreach (TwitchBan twitchBan in db.TwitchBan) {
181-
db.Entry(twitchBan).State = EntityState.Added;
182-
}
183-
184-
await db.SaveChangesAsync(stoppingToken);
171+
await db.TwitchBan.UpsertRange(
172+
bannedUsers.Select(i => new TwitchBan {
173+
ChannelId = channelId,
174+
BannedUserTwitchId = i.Id,
175+
Reason = reason,
176+
Timestamp = DateTime.UtcNow
177+
}).ToList()
178+
)
179+
.On(v => new { v.ChannelId, v.BannedUserTwitchId, v.Timestamp })
180+
.RunAsync(stoppingToken);
185181
}
186182
}

0 commit comments

Comments
 (0)