kenobi/jellyfin-discord-bot
2
1
Fork 0
Code Issues 17 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

announcements #18

Merged
kenobi merged 13 commits from feat/announce into master 2023-06-15 22:05:20 +02:00
Conversation 2 Commits 13 Files Changed 12 +291 -79
magnetotail commented 2023-06-12 22:22:01 +02:00
Collaborator
Copy Link
No description provided.
magnetotail added 1 commit 2023-06-12 22:22:01 +02:00
implement slash command for announcement e50cb10c5b
magnetotail added 1 commit 2023-06-12 22:34:55 +02:00
restrict announcements to admins a2c55ad676
magnetotail added 2 commits 2023-06-13 18:59:03 +02:00
implement announcement role management by reaction 24754decf4
Put role handling in background task scheduled at startup e774474a55
magnetotail added 1 commit 2023-06-13 20:13:22 +02:00
fix bug that reactions are not loaded after restart a5eab2f7be 
the message needed to be fetched again. Probably something with caches..
magnetotail added 2 commits 2023-06-13 23:15:10 +02:00
add options for announcements baefcf9bb9
ping watch role when voting starts and closes 198a25d145
magnetotail requested review from kenobi 2023-06-13 23:15:19 +02:00
magnetotail changed title from [WIP] announcements to announcements 2023-06-13 23:15:23 +02:00
magnetotail commented 2023-06-13 23:24:10 +02:00
Author
Collaborator
Copy Link

closes #17

closes #17
magnetotail added 1 commit 2023-06-14 19:45:43 +02:00
undo fetching role to get roleID 220f9dc8ef 
We already have the role id?!?!?
magnetotail added 1 commit 2023-06-14 22:24:44 +02:00
Change announcements 9420eb4366 
All announcements but initial will be deleted upon event end.
Vote announcement will be deleted upon vote end
Vote and vote end announcement now contain date and time
kenobi requested changes 2023-06-15 20:39:27 +02:00
server/commands/closepoll.ts
@ -59,0 +60,4 @@
await lastMessage.delete()
const event = await getEvent(guild, guild.id, requestId)
if(event) {
updateEvent(event, votes, guild!, guildId, requestId)
kenobi commented 2023-06-15 20:38:10 +02:00
Owner
Copy Link

If guild is already used and necessary in line 61, it should already be present and usable, so the non-null-assertion should not be needed.

If `guild` is already used and necessary in line 61, it should already be present and usable, so the non-null-assertion should not be needed.
magnetotail commented 2023-06-15 21:05:14 +02:00
Author
Collaborator
Copy Link

➕

➕
👀 1 🚀 1
kenobi marked this conversation as resolved
server/events/guildScheduledEventUpdate.ts Outdated
@ -27,6 +28,8 @@ export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildSche
if (newEvent.status === GuildScheduledEventStatus.Active)
createJFUsers(members, newEvent.name, requestId)
else {
const announcements = (await client.getAnnouncementChannelForGuild(newEvent.guild!.id).messages.fetch()).filter(message => !message.pinned)
kenobi commented 2023-06-15 20:31:33 +02:00
Owner
Copy Link

check for presence of newEvent.guild at the start of the execute function.
That way we can also log the absence if it occurs.

check for presence of `newEvent.guild` at the start of the `execute` function. That way we can also log the absence if it occurs.
🚀 1
kenobi marked this conversation as resolved
server/structures/client.ts
@ -120,0 +135,4 @@
if (messages.size > 1) {
logger.error("More than one pinned announcement Messages found. Unable to know which one people react to. Please fix!", { guildId: guild.id, requestId })
} else if (messages.size == 0) {
logger.error("Could not find any pinned announcement messages. Unable to manage roles!", { guildId: guild.id, requestId })
kenobi commented 2023-06-15 20:25:46 +02:00
Owner
Copy Link

Unable to continue, should result in a return.

Unable to continue, should result in a return.
🚀 1
kenobi marked this conversation as resolved
server/structures/client.ts Outdated
@ -120,0 +138,4 @@
logger.error("Could not find any pinned announcement messages. Unable to manage roles!", { guildId: guild.id, requestId })
}
const message = await messages.at(0)!.fetch()
kenobi commented 2023-06-15 20:25:06 +02:00
Owner
Copy Link
const message = await messages.at(0)?.fetch()
if (!message) {
  logger.error(`No pinned message found`,{requestId,guildId})
  return
}
``` const message = await messages.at(0)?.fetch() if (!message) { logger.error(`No pinned message found`,{requestId,guildId}) return } ```
🚀 1
kenobi marked this conversation as resolved
server/structures/client.ts Outdated
@ -120,0 +152,4 @@
}
}
public stopAnnouncementRoleBackgroundTask(guild: string | Guild, requestId: string) {
kenobi commented 2023-06-15 20:29:43 +02:00
Owner
Copy Link

Would it be possible to just use string as type for guild so we don't have to check multiple times if we have a guild object?

Would it be possible to just use string as type for `guild` so we don't have to check multiple times if we have a guild object?
🚀 1
kenobi marked this conversation as resolved
magnetotail added 1 commit 2023-06-15 21:56:20 +02:00
Fix PR and linting issues 5b99c843b4
kenobi added 1 commit 2023-06-15 21:59:28 +02:00
Merge branch 'master' into feat/announce
Some checks failed
Build a docker image for node-jellyfin-role-bot / build-docker-image (push) Failing after 1m1s
Details
68662e72ad
magnetotail added 2 commits 2023-06-15 22:02:51 +02:00
fix build d22e38efbf
Merge branch 'feat/announce' of ssh://gitea.brudi.xyz:222/kenobi/jellyfin-discord-bot into feat/announce
All checks were successful
Build a docker image for node-jellyfin-role-bot / build-docker-image (push) Successful in 1m26s
Details
1ccb1a7cae
kenobi merged commit 8caf80f54e into master 2023-06-15 22:05:20 +02:00
kenobi deleted branch feat/announce 2023-06-15 22:05:21 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
kenobi
Labels
Clear labels
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
investigation
question
More information is needed
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
R2 magnetotail kenobi
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: kenobi/jellyfin-discord-bot#18
No description provided.
Delete Branch "feat/announce"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?