Adding on_join message

CHANGELOG.md

@@ -8,6 +8,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Released]
 
+## [0.1.6] - 2022-09-26
+
+### Added
+- Version file that exports the current version number.
+- Welcome message (on join).
+- Handler folder for all the event handlers.
+
+### Changed
+- File structure of the "extensions" (the various commands) to differentiate semantically. (moderation actions, management, etc)
+
+### Removed
+- Duplicate logging initialization in `main.go`.
+- Various debug functions/experiments that are now sunset.
+
 ## `0.1.5-hotfix` - 2022-09-22
 ### Fixes
 - Issue #5: [Link to issue](https://github.com/digital-overdose/digital-overdose-bot/issues/5s)
@@ -102,7 +116,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial run code.
 
-[Unreleased]: https://github.com/digital-overdose/digital-overdose-bot/compare/v0.1.5...HEAD
+[Unreleased]: https://github.com/digital-overdose/digital-overdose-bot/compare/v0.1.6...HEAD
+[0.1.6]: https://github.com/digital-overdose/digital-overdose-bot/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/digital-overdose/digital-overdose-bot/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/digital-overdose/digital-overdose-bot/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/digital-overdose/digital-overdose-bot/compare/v0.1.2...v0.1.3

README.md

@@ -36,8 +36,18 @@ UPGRADE=https://github.com/digital-overdose/digital-overdose-bot/releases/downlo
 ## TODO
 
 ### Features (Future)
+
+- [x] On Join message.
+- [ ] `/warn` ⇾ Warn a user for a behavior (user, reason)
+- [ ] `/unwarn` ⇾ Remove an attributed warn.
+- [ ] `/ban` ⇾ Ban a user for a behavior (user, reason) + DM.
+- [ ] `/unban` ⇾ Unban someone
 - [ ] `/stats` ⇾ Number of people interacting over 2 weeks. Channel usage. Keep message ID in a file? (Cron)
 
+#### Reqs
+
+- Small DBMS, sqlite?
+
 ### Features (Important ⇾ Critical)
 
 - [x] Ability to download new binary

build-all-architectures.bat

@@ -1,52 +1,52 @@
-@echo off
-echo Building artifacts in /build
-set VERSION=%1
-
-:: call :build darwin				amd64
-:: call :build darwin				arm64
-
-:: call :build dragonfly		amd64
-
-:: call :build freebsd			386
-:: call :build freebsd			amd64
-:: call :build freebsd			arm
-
-:: call :build linux				386
-call :build linux amd64
-call :build linux arm
-call :build linux arm64
-:: call :build linux 		ppc64    
-:: call :build linux 		ppc64le  
-:: call :build linux 		mips     
-:: call :build linux 		mipsle   
-:: call :build linux 		mips64   
-:: call :build linux 		mips64le 
-
-:: call :build netbsd 	386      
-:: call :build netbsd 	amd64    
-:: call :build netbsd 	arm      
-
-:: call :build openbsd 	386    
-:: call :build openbsd 	amd64  
-:: call :build openbsd 	arm    
-
-:: call :build plan9 		386      
-:: call :build plan9 		amd64    
-
-:: call :build solaris 	amd64  
-
-call :build windows 386
-call :build windows amd64
-
-echo Done!
-exit /b
-
-:build
-set GOOS=%~1
-set GOARCH=%~2
-set EXT=
-if "%GOOS%"=="windows" (
-	set EXT=.exe
-)
-go build -o build/digital-overdose-bot-v%VERSION%-%GOOS%-%GOARCH%%EXT% .
+@echo off
+echo Building artifacts in /build
+set VERSION=%1
+
+:: call :build darwin				amd64
+:: call :build darwin				arm64
+
+:: call :build dragonfly		amd64
+
+:: call :build freebsd			386
+:: call :build freebsd			amd64
+:: call :build freebsd			arm
+
+:: call :build linux				386
+call :build linux amd64
+call :build linux arm
+call :build linux arm64
+:: call :build linux 		ppc64    
+:: call :build linux 		ppc64le  
+:: call :build linux 		mips     
+:: call :build linux 		mipsle   
+:: call :build linux 		mips64   
+:: call :build linux 		mips64le 
+
+:: call :build netbsd 	386      
+:: call :build netbsd 	amd64    
+:: call :build netbsd 	arm      
+
+:: call :build openbsd 	386    
+:: call :build openbsd 	amd64  
+:: call :build openbsd 	arm    
+
+:: call :build plan9 		386      
+:: call :build plan9 		amd64    
+
+:: call :build solaris 	amd64  
+
+call :build windows 386
+call :build windows amd64
+
+echo Done!
+exit /b
+
+:build
+set GOOS=%~1
+set GOARCH=%~2
+set EXT=
+if "%GOOS%"=="windows" (
+	set EXT=.exe
+)
+go build -o build/digital-overdose-bot-v%VERSION%-%GOOS%-%GOARCH%%EXT% .
 echo Built build/digital-overdose-bot-v%VERSION%-%GOOS%-%GOARCH%%EXT%

common/logging.go

@@ -17,7 +17,8 @@ var (
 	canWriteToFile bool
 )
 
-// Creates the logging infrastrure for the program.
+// Creates the logging infrastructure for the program.
+// Initializes logging to a ./log/<datetime>.log file (if it can).
 func InitializeLogging() {
 	log.SetOutput(os.Stdout)
 

common/version.go

@@ -0,0 +1,3 @@
+package common
+
+var VERSION = "0.1.6"

cron/cron.go

@@ -1,8 +1,9 @@
 package cron
 
 import (
+	commands_management "atomicnicos.me/digital-overdose-bot/extensions/commands/management"
+
 	"atomicnicos.me/digital-overdose-bot/common"
-	ext "atomicnicos.me/digital-overdose-bot/ext/commands"
 	"github.com/bwmarrin/discordgo"
 )
 
@@ -21,7 +22,7 @@ var CronJobs = []*CronJob{
 	{
 		Name:       "Automod: Verification Prune",
 		CronString: "0 12 */1 * *",
-		Job:        ext.PurgeVerification,
+		Job:        commands_management.PurgeVerification,
 	},
 	{
 		Name:       "Management: Log cycling",

ext/commands.go → extensions/commands.go

@@ -1,7 +1,9 @@
-package ext
+package extensions
 
 import (
-	ext "atomicnicos.me/digital-overdose-bot/ext/commands"
+	commands "atomicnicos.me/digital-overdose-bot/extensions/commands"
+	commands_management "atomicnicos.me/digital-overdose-bot/extensions/commands/management"
+	commands_moderation "atomicnicos.me/digital-overdose-bot/extensions/commands/moderation"
 	"github.com/bwmarrin/discordgo"
 )
 
@@ -39,6 +41,30 @@ var Commands = []*discordgo.ApplicationCommand{
 			},
 		},
 	},
+	{
+		Name:        "warn",
+		Description: "Warns a user.",
+		Options: []*discordgo.ApplicationCommandOption{
+			{
+				Type:        discordgo.ApplicationCommandOptionUser,
+				Name:        "user",
+				Description: "The user to be warned.",
+				Required:    true,
+			},
+		},
+	},
+	{
+		Name:        "unwarn",
+		Description: "Unwarns a user.",
+		Options: []*discordgo.ApplicationCommandOption{
+			{
+				Type:        discordgo.ApplicationCommandOptionUser,
+				Name:        "user",
+				Description: "The user to have their last warning removed.",
+				Required:    true,
+			},
+		},
+	},
 	/*{
 		Name:        "is-user-admin",
 		Description: "Checks whether the user has the Manage Server permission",
@@ -63,10 +89,12 @@ var Commands = []*discordgo.ApplicationCommand{
 
 // Command to bot function map.
 var CommandHandlers = map[string]func(s *discordgo.Session, i *discordgo.InteractionCreate){
-	"purge-verification":   ext.PurgeVerification,
-	"welcome":              ext.WelcomeUser,
-	"test-current-feature": ext.TestCurrentFeature,
-	"upgrade":              ext.UpgradeBot,
+	"purge-verification":   commands_management.PurgeVerification,
+	"welcome":              commands_moderation.WelcomeUser,
+	"test-current-feature": commands.TestCurrentFeature,
+	"upgrade":              commands_management.UpgradeBot,
+	"warn":                 commands_moderation.Warn,
+	"unwarn":               commands_moderation.Unwarn,
 	//"warn-user":            ext.WarnUserTest,
 	//"is-user-admin":         ext.IsUserAdmin,
 	//"test-dm-requester":     ext.TestDMRequester,

ext/commands/purge-verification.go → extensions/commands/management/purge-verification.go

@@ -1,4 +1,4 @@
-package ext
+package extensions
 
 import (
 	"fmt"
@@ -12,6 +12,9 @@ import (
 
 // Purges the Verification channel of lurkers (> 7 days) or warns them (> 5 days)
 func PurgeVerification(s *discordgo.Session, i *discordgo.InteractionCreate) {
+	if ok := common.ShouldExecutionBeSkippedIfDev(true); ok {
+		return
+	}
 	// If triggered by user-interaction
 	if i != nil {
 		if ok, _ := common.CheckHasPermissions(i, s, discordgo.PermissionManageRoles); !ok {
@@ -20,9 +23,6 @@ func PurgeVerification(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	} else {
 		common.LogAndSend(":robot: :rotating_light: `/purge-verification` triggered by cron.", s)
 	}
-	if ok := common.ShouldExecutionBeSkippedIfDev(true); ok {
-		return
-	}
 
 	var (
 		listing           = true // Loop controller.

ext/commands/upgrade.go → extensions/commands/management/upgrade.go

@@ -1,4 +1,4 @@
-package ext
+package extensions
 
 import (
 	"fmt"

extensions/commands/moderation/ban.go

@@ -0,0 +1 @@
+package extensions