reg-only changes

Author: Distortions81

cfg/lcfg.go

@@ -62,7 +62,7 @@ type localOptions struct {
 	HideAutosaves   bool
 	HideResearch    bool
 	RegularsOnly    bool
-	Whitelist       bool
+	MembersOnly     bool
 	CustomWhitelist bool
 	ModUpdate       bool
 	SkipReset       bool
@@ -165,8 +165,10 @@ func setLocalDefaults() {
 
 		os.Mkdir(path, os.ModePerm)
 	}
-	if !Local.Options.Whitelist {
+	if !Local.Options.RegularsOnly {
 		Local.Settings.AdminOnlyPause = true
+	} else {
+		Local.Settings.AdminOnlyPause = false
 	}
 }
 
@@ -215,7 +217,9 @@ func ReadLCfg() bool {
 				cwlog.DoLogCW("ReadLCfg: MapPreset not valid, setting to " + Local.Settings.MapPreset)
 			}
 
-			if newcfg.Options.Whitelist {
+			if newcfg.Options.RegularsOnly {
+				ServerPrefix = constants.RegularsPrefix
+			} else if newcfg.Options.MembersOnly {
 				ServerPrefix = constants.MembersPrefix
 			} else {
 				ServerPrefix = ""

commands/moderator/util.go

@@ -286,7 +286,17 @@ var SettingList = []SettingListData{
 
 		DefBool: false,
 
-		BData: &cfg.Local.Options.Whitelist,
+		BData: &cfg.Local.Options.MembersOnly,
+	},
+	{
+		Name:      "regulars-only",
+		ShortDesc: "regulars only",
+		Desc:      "Only regulars and moderators can connect.",
+		Type:      TYPE_BOOL,
+
+		DefBool: false,
+
+		BData: &cfg.Local.Options.RegularsOnly,
 	},
 	{
 		Name:      "restrict-new-players",

commands/user/newRegister.go

@@ -64,7 +64,9 @@ func Register(s *discordgo.Session, i *discordgo.InteractionCreate) {
 	}
 
 	buf = buf + "\nThe reason this is necessary:\nYour Discord and Factorio names can be different, so this is the only way to find your player-level in Factorio.\n"
-	if cfg.Local.Options.Whitelist {
+	if cfg.Local.Options.RegularsOnly {
+		buf = buf + "**NOTICE: This is a REGULARS-ONLY server, if you haven't reached the REGULAR level in-game, you will be unable to connect. If this is the case, use the /register command on a PUBLIC server.**\n"
+	} else if cfg.Local.Options.MembersOnly {
 		buf = buf + "**NOTICE: This is a MEMBERS-ONLY server, if you haven't reached the MEMBER level in-game, you will be unable to connect. If this is the case, use the /register command on a PUBLIC server.**\n"
 	}
 

fact/factConfGen.go

@@ -57,7 +57,7 @@ func GenerateFactorioConfig() bool {
 		constants.ServSettingsName
 
 	var servName string
-	if cfg.Local.Options.Whitelist {
+	if cfg.Local.Options.MembersOnly || cfg.Local.Options.RegularsOnly {
 		if cfg.Local.Options.RegularsOnly {
 			cfg.ServerPrefix = constants.RegularsPrefix
 		} else {
@@ -96,7 +96,9 @@ func GenerateFactorioConfig() bool {
 
 	if cfg.Local.Options.CustomWhitelist {
 		descrLines = append(descrLines, AddFactColor("red", "INVITE-ONLY"))
-	} else if cfg.Local.Options.Whitelist {
+	} else if cfg.Local.Options.RegularsOnly {
+		descrLines = append(descrLines, AddFactColor("red", "REGULARS-ONLY"))
+	} else if cfg.Local.Options.MembersOnly {
 		descrLines = append(descrLines, AddFactColor("red", "MEMBERS-ONLY"))
 	}
 
@@ -136,12 +138,10 @@ func GenerateFactorioConfig() bool {
 
 	if cfg.Local.Options.CustomWhitelist {
 		tags = append(tags, "INVITE-ONLY")
-	} else if cfg.Local.Options.Whitelist {
-		if cfg.Local.Options.RegularsOnly {
-			tags = append(tags, "REGULARS-ONLY")
-		} else {
-			tags = append(tags, "MEMBERS-ONLY")
-		}
+	} else if cfg.Local.Options.MembersOnly {
+		tags = append(tags, "MEMBERS-ONLY")
+	} else if cfg.Local.Options.RegularsOnly {
+		tags = append(tags, "REGULARS-ONLY")
 	}
 	tags = append(tags, cfg.Global.Paths.URLs.Domain)
 

fact/factUtils.go

@@ -260,11 +260,19 @@ func GetGuildName() string {
 /* Whitelist a specifc player. */
 func WhitelistPlayer(pname string, level int) {
 	if FactorioBooted && FactIsRunning {
-		if cfg.Local.Options.Whitelist && !cfg.Local.Options.CustomWhitelist {
+		if !cfg.Local.Options.CustomWhitelist {
+			return
+		}
+		if cfg.Local.Options.MembersOnly {
 			if level > 0 {
 				WriteFact(fmt.Sprintf("/whitelist add %s", pname))
 			}
 		}
+		if cfg.Local.Options.RegularsOnly {
+			if level > 1 {
+				WriteFact(fmt.Sprintf("/whitelist add %s", pname))
+			}
+		}
 	}
 }
 
@@ -326,7 +334,7 @@ func WriteWhitelist() int {
 		cfg.Global.Paths.Folders.FactorioDir + "/" +
 		constants.WhitelistName
 
-	if cfg.Local.Options.Whitelist {
+	if cfg.Local.Options.MembersOnly || cfg.Local.Options.RegularsOnly {
 		glob.PlayerListLock.RLock()
 
 		var count = 0
@@ -576,10 +584,16 @@ func UpdateChannelName() {
 
 	var newchname string
 	nump := NumPlayers
-	icon := "🔵"
+	icon := "⚪"
 
-	if cfg.Local.Options.Whitelist {
-		icon = "🟣"
+	if cfg.Local.Options.CustomWhitelist {
+		icon = "🔴"
+	}
+	if cfg.Local.Options.MembersOnly {
+		icon = "🟢"
+	}
+	if cfg.Local.Options.RegularsOnly {
+		icon = "🟠"
 	}
 	if nump == 0 {
 		icon = "⚫"

support/factLauncher.go

@@ -343,15 +343,15 @@ func launchFactorio() {
 	}
 
 	/* Whitelist */
-	if cfg.Local.Options.Whitelist || cfg.Local.Options.CustomWhitelist {
+	if cfg.Local.Options.MembersOnly || cfg.Local.Options.RegularsOnly || cfg.Local.Options.CustomWhitelist {
 		tempargs = append(tempargs, "--use-server-whitelist")
 		tempargs = append(tempargs, "true")
 	}
 
 	/* Write or delete whitelist */
 	if !cfg.Local.Options.CustomWhitelist {
 		count := fact.WriteWhitelist()
-		if count > 0 && cfg.Local.Options.Whitelist {
+		if count > 0 && (cfg.Local.Options.MembersOnly || cfg.Local.Options.RegularsOnly) {
 			cwlog.DoLogCW(fmt.Sprintf("Whitelist of %v players written.", count))
 		}
 	}