temporarily revert versioning

fix netcafe time reset
update versioning
2025-12-13 15:34:38 +01:00 · 2022-11-10 14:43:58 +11:00 · 2022-11-10 14:43:23 +11:00 · 2022-11-07 08:43:46 +11:00 · 2022-11-07 08:38:06 +11:00 · 2022-11-07 08:37:40 +11:00
38 changed files with 653 additions and 714 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,7 @@

 www/jp/
 vendor/
-bin/*.bin
-bin/*.bak
-bin/quests/*.bin
-bin/questlists/*.bin
-bin/scenarios/*.bin
-bin/debug/*.bin
+*.bin
 savedata/*/
 *.exe
 *.lnk
--- a/bin/questlists/.gitkeep
+++ b/bin/questlists/.gitkeep
--- a/common/token/token.go
+++ b/common/token/token.go
@@ -0,0 +1,13 @@
+package token
+
+import "math/rand"
+
+// Generate returns an alphanumeric token of specified length
+func Generate(length int) string {
+	var chars = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+	b := make([]rune, length)
+	for i := range b {
+		b[i] = chars[rand.Intn(len(chars))]
+	}
+	return string(b)
+}
--- a/config.json
+++ b/config.json
@@ -3,14 +3,14 @@
  "BinPath": "bin",
  "DisableSoftCrash": false,
  "FeaturedWeapons": 1,
-  "DevMode": true,
-  "DevModeOptions": {
+  "HideLoginNotice": true,
+  "LoginNotice": "<BODY><CENTER><SIZE_3><C_4>Welcome to Erupe SU9.1!<BR><BODY><LEFT><SIZE_2><C_5>Erupe is experimental software<C_7>, we are not liable for any<BR><BODY>issues caused by installing the software!<BR><BODY><BR><BODY><C_4>■Report bugs on Discord!<C_7><BR><BODY><BR><BODY><C_4>■Test everything!<C_7><BR><BODY><BR><BODY><C_4>■Don't talk to softlocking NPCs!<C_7><BR><BODY><BR><BODY><C_4>■Fork the code on GitHub!<C_7><BR><BODY><BR><BODY>Thank you to all of the contributors,<BR><BODY><BR><BODY>this wouldn't exist without you.",
  "PatchServerManifest": "",
  "PatchServerFile": "",
+  "ScreenshotAPIURL": "",
+  "DevMode": true,
+  "DevModeOptions": {
    "AutoCreateAccount": true,
-    "EnableLauncherServer": false,
-    "HideLoginNotice": false,
-    "LoginNotice": "<BODY><CENTER><SIZE_3><C_4>Welcome to Erupe SU9.1 Beta!<BR><BODY><LEFT><SIZE_2><C_5>Erupe is experimental software<C_7>, we are not liable for any<BR><BODY>issues caused by installing the software!<BR><BODY><BR><BODY><C_4>■Report bugs on Discord!<C_7><BR><BODY><BR><BODY><C_4>■Test everything!<C_7><BR><BODY><BR><BODY><C_4>■Don't talk to softlocking NPCs!<C_7><BR><BODY><BR><BODY><C_4>■Fork the code on GitHub!<C_7><BR><BODY><BR><BODY>Thank you to all of the contributors,<BR><BODY><BR><BODY>this wouldn't exist without you.",
    "CleanDB": false,
    "MaxLauncherHR": false,
    "LogInboundMessages": false,
@@ -71,9 +71,8 @@
    {"Name": "HunterSupport", "Enabled": false},
    {"Name": "NBoost", "Enabled": false},
    {"Name": "NetCafe", "Enabled": true},
-    {"Name": "HLContinue", "Enabled": true},
-    {"Name": "EXContinue", "Enabled": true},
-    {"Name": "Free", "Enabled": true}
+    {"Name": "HLRenewing", "Enabled": true},
+    {"Name": "EXRenewing", "Enabled": true}
  ],
  "Database": {
    "Host": "localhost",
@@ -91,6 +90,10 @@
    "Enabled": true,
    "Port": 53312
  },
+  "SignV2": {
+    "Enabled": false,
+    "Port": 8080
+  },
  "Channel": {
    "Enabled": true
  },
--- a/config/config.go
+++ b/config/config.go
@@ -16,6 +16,11 @@ type Config struct {
 	BinPath             string `mapstructure:"BinPath"`
 	DisableSoftCrash    bool   // Disables the 'Press Return to exit' dialog allowing scripts to reboot the server automatically
 	FeaturedWeapons     int    // Number of Active Feature weapons to generate daily
+	HideLoginNotice     bool   // Hide the Erupe notice on login
+	LoginNotice         string // MHFML string of the login notice displayed
+	PatchServerManifest string // Manifest patch server override
+	PatchServerFile     string // File patch server override
+	ScreenshotAPIURL    string // Destination for screenshots uploaded to BBS
 	DevMode             bool

 	DevModeOptions DevModeOptions
@@ -25,17 +30,14 @@ type Config struct {
 	Database       Database
 	Launcher       Launcher
 	Sign           Sign
+	SignV2         SignV2
 	Channel        Channel
 	Entrance       Entrance
 }

 // DevModeOptions holds various debug/temporary options for use while developing Erupe.
 type DevModeOptions struct {
-	PatchServerManifest string // Manifest patch server override
-	PatchServerFile     string // File patch server override
 	AutoCreateAccount   bool // Automatically create accounts if they don't exist
-	HideLoginNotice     bool   // Hide the Erupe notice on login
-	LoginNotice         string // MHFML string of the login notice displayed
 	CleanDB             bool // Automatically wipes the DB on server reset.
 	MaxLauncherHR       bool // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
 	LogInboundMessages  bool // Log all messages sent to the server
@@ -99,6 +101,12 @@ type Sign struct {
 	Port    int
 }

+// SignV2 holds the new sign server config
+type SignV2 struct {
+	Enabled bool
+	Port    int
+}
+
 type Channel struct {
 	Enabled bool
 }
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
 	"erupe-ce/server/entranceserver"
 	"erupe-ce/server/launcherserver"
 	"erupe-ce/server/signserver"
+	"erupe-ce/server/signv2server"

 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
@@ -35,7 +36,7 @@ func main() {
 	defer zapLogger.Sync()
 	logger := zapLogger.Named("main")

-	logger.Info("Starting Erupe (9.1b)")
+	logger.Info("Starting Erupe (9.2b)")

 	if config.ErupeConfig.Database.Password == "" {
 		preventClose("Database password is blank")
@@ -166,6 +167,22 @@ func main() {
 		logger.Info("Started sign server")
 	}

+	// New Sign server
+	var newSignServer *signv2server.Server
+	if config.ErupeConfig.SignV2.Enabled {
+		newSignServer = signv2server.NewServer(
+			&signv2server.Config{
+				Logger:      logger.Named("sign"),
+				ErupeConfig: config.ErupeConfig,
+				DB:          db,
+			})
+		err = newSignServer.Start()
+		if err != nil {
+			preventClose(fmt.Sprintf("Failed to start sign-v2 server: %s", err.Error()))
+		}
+		logger.Info("Started new sign server")
+	}
+
 	var channels []*channelserver.Server

 	if config.ErupeConfig.Channel.Enabled {
@@ -229,6 +246,10 @@ func main() {
 		signServer.Shutdown()
 	}

+	if config.ErupeConfig.SignV2.Enabled {
+		newSignServer.Shutdown()
+	}
+
 	if config.ErupeConfig.Entrance.Enabled {
 		entranceServer.Shutdown()
 	}
--- a/network/mhfpacket/msg_mhf_apply_bbs_article.go
+++ b/network/mhfpacket/msg_mhf_apply_bbs_article.go
@@ -2,14 +2,23 @@ package mhfpacket

 import (
 	"errors"
+	"erupe-ce/common/bfutil"
+	"erupe-ce/common/stringsupport"

- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )

 // MsgMhfApplyBbsArticle represents the MSG_MHF_APPLY_BBS_ARTICLE
-type MsgMhfApplyBbsArticle struct{}
+type MsgMhfApplyBbsArticle struct {
+	AckHandle   uint32
+	Unk0        uint32
+	Unk1        []byte
+	Name        string
+	Title       string
+	Description string
+}

 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfApplyBbsArticle) Opcode() network.PacketID {
@@ -18,7 +27,13 @@ func (m *MsgMhfApplyBbsArticle) Opcode() network.PacketID {

 // Parse parses the packet from binary
 func (m *MsgMhfApplyBbsArticle) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint32()
+	m.Unk1 = bf.ReadBytes(16)
+	m.Name = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(32)))
+	m.Title = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(128)))
+	m.Description = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(256)))
+	return nil
 }

 // Build builds a binary packet from the current data.
--- a/network/mhfpacket/msg_mhf_enumerate_quest.go
+++ b/network/mhfpacket/msg_mhf_enumerate_quest.go
@@ -3,18 +3,18 @@ package mhfpacket
 import (
 	"errors"

- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )

 // MsgMhfEnumerateQuest represents the MSG_MHF_ENUMERATE_QUEST
 type MsgMhfEnumerateQuest struct {
 	AckHandle uint32
 	Unk0      uint8 // Hardcoded 0 in the binary
-	Unk1      uint8
-	Unk2      uint16
-	QuestList uint16 // Increments to request following batches of quests
+	World     uint8
+	Counter   uint16
+	Offset    uint16 // Increments to request following batches of quests
 	Unk4      uint8  // Hardcoded 0 in the binary
 }

@@ -27,9 +27,9 @@ func (m *MsgMhfEnumerateQuest) Opcode() network.PacketID {
 func (m *MsgMhfEnumerateQuest) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint8()
-	m.Unk1 = bf.ReadUint8()
-	m.Unk2 = bf.ReadUint16()
-	m.QuestList = bf.ReadUint16()
+	m.World = bf.ReadUint8()
+	m.Counter = bf.ReadUint16()
+	m.Offset = bf.ReadUint16()
 	m.Unk4 = bf.ReadUint8()
 	return nil
 }
--- a/network/mhfpacket/msg_mhf_get_bbs_sns_status.go
+++ b/network/mhfpacket/msg_mhf_get_bbs_sns_status.go
@@ -3,13 +3,16 @@ package mhfpacket
 import (
 	"errors"

- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )

 // MsgMhfGetBbsSnsStatus represents the MSG_MHF_GET_BBS_SNS_STATUS
-type MsgMhfGetBbsSnsStatus struct{}
+type MsgMhfGetBbsSnsStatus struct {
+	AckHandle uint32
+	Unk       []byte
+}

 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfGetBbsSnsStatus) Opcode() network.PacketID {
@@ -18,7 +21,9 @@ func (m *MsgMhfGetBbsSnsStatus) Opcode() network.PacketID {

 // Parse parses the packet from binary
 func (m *MsgMhfGetBbsSnsStatus) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk = bf.ReadBytes(12)
+	return nil
 }

 // Build builds a binary packet from the current data.
--- a/network/mhfpacket/msg_mhf_get_bbs_user_status.go
+++ b/network/mhfpacket/msg_mhf_get_bbs_user_status.go
@@ -3,13 +3,16 @@ package mhfpacket
 import (
 	"errors"

- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )

 // MsgMhfGetBbsUserStatus represents the MSG_MHF_GET_BBS_USER_STATUS
-type MsgMhfGetBbsUserStatus struct{}
+type MsgMhfGetBbsUserStatus struct {
+	AckHandle uint32
+	Unk       []byte
+}

 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfGetBbsUserStatus) Opcode() network.PacketID {
@@ -18,7 +21,9 @@ func (m *MsgMhfGetBbsUserStatus) Opcode() network.PacketID {

 // Parse parses the packet from binary
 func (m *MsgMhfGetBbsUserStatus) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk = bf.ReadBytes(12)
+	return nil
 }

 // Build builds a binary packet from the current data.
--- a/network/mhfpacket/msg_sys_update_right.go
+++ b/network/mhfpacket/msg_sys_update_right.go
@@ -91,8 +91,8 @@ func Courses() []Course {
 		{Aliases: []string{"NBoost", "NetCafeBoost", "Boost"}, ID: 12},
 		// 13-25 do nothing
 		{Aliases: []string{"NetCafe", "Cafe", "InternetCafe"}, ID: 26},
-		{Aliases: []string{"HLContinue", "HLC"}, ID: 27},
-		{Aliases: []string{"EXContinue", "EXC"}, ID: 28},
+		{Aliases: []string{"HLRenewing", "HLR", "HLRenewal", "HLRenew"}, ID: 27},
+		{Aliases: []string{"EXRenewing", "EXR", "EXRenewal", "EXRenew"}, ID: 28},
 		{Aliases: []string{"Free"}, ID: 29},
 		// 30 = real netcafe bit
 	}
--- a/patch-schema/achievements.sql
+++ b/patch-schema/achievements.sql
@@ -1,41 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.achievements
-(
-    id int NOT NULL PRIMARY KEY ,
-    ach0 int DEFAULT 0,
-    ach1 int DEFAULT 0,
-    ach2 int DEFAULT 0,
-    ach3 int DEFAULT 0,
-    ach4 int DEFAULT 0,
-    ach5 int DEFAULT 0,
-    ach6 int DEFAULT 0,
-    ach7 int DEFAULT 0,
-    ach8 int DEFAULT 0,
-    ach9 int DEFAULT 0,
-    ach10 int DEFAULT 0,
-    ach11 int DEFAULT 0,
-    ach12 int DEFAULT 0,
-    ach13 int DEFAULT 0,
-    ach14 int DEFAULT 0,
-    ach15 int DEFAULT 0,
-    ach16 int DEFAULT 0,
-    ach17 int DEFAULT 0,
-    ach18 int DEFAULT 0,
-    ach19 int DEFAULT 0,
-    ach20 int DEFAULT 0,
-    ach21 int DEFAULT 0,
-    ach22 int DEFAULT 0,
-    ach23 int DEFAULT 0,
-    ach24 int DEFAULT 0,
-    ach25 int DEFAULT 0,
-    ach26 int DEFAULT 0,
-    ach27 int DEFAULT 0,
-    ach28 int DEFAULT 0,
-    ach29 int DEFAULT 0,
-    ach30 int DEFAULT 0,
-    ach31 int DEFAULT 0,
-    ach32 int DEFAULT 0
-);
-
-END;
--- a/patch-schema/active-feature.sql
+++ b/patch-schema/active-feature.sql
@@ -1,9 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.feature_weapon
-(
-    start_time timestamp without time zone NOT NULL,
-    featured integer NOT NULL
-);
-
-END;
--- a/patch-schema/festa.sql
+++ b/patch-schema/festa.sql
@@ -1,311 +0,0 @@
-BEGIN;
-
-CREATE TYPE event_type AS ENUM ('festa', 'diva', 'vs', 'mezfes');
-
-DROP TABLE IF EXISTS public.event_week;
-
-ALTER TABLE IF EXISTS public.guild_characters
-    ADD COLUMN IF NOT EXISTS souls int DEFAULT 0;
-
-ALTER TABLE IF EXISTS public.guilds
-    DROP COLUMN IF EXISTS festival_colour;
-
-CREATE TABLE IF NOT EXISTS public.events
-(
-    id serial NOT NULL PRIMARY KEY,
-    event_type event_type NOT NULL,
-    start_time timestamp without time zone NOT NULL DEFAULT now()
-);
-
-CREATE TABLE IF NOT EXISTS public.festa_registrations
-(
-    guild_id int NOT NULL,
-    team festival_colour NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS public.festa_trials
-(
-    id serial NOT NULL PRIMARY KEY,
-    objective int NOT NULL,
-    goal_id int NOT NULL,
-    times_req int NOT NULL,
-    locale_req int NOT NULL DEFAULT 0,
-    reward int NOT NULL
-);
-
-CREATE TYPE prize_type AS ENUM ('personal', 'guild');
-
-CREATE TABLE IF NOT EXISTS public.festa_prizes
-(
-    id serial NOT NULL PRIMARY KEY,
-    type prize_type NOT NULL,
-    tier int NOT NULL,
-    souls_req int NOT NULL,
-    item_id int NOT NULL,
-    num_item int NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS public.festa_prizes_accepted
-(
-    prize_id int NOT NULL,
-    character_id int NOT NULL
-);
-
-- Ripped prizes
-INSERT INTO public.festa_prizes
-    (type, tier, souls_req, item_id, num_item)
-VALUES
-    ('personal', 1, 1, 9647, 7),
-    ('personal', 2, 1, 9647, 7),
-    ('personal', 3, 1, 9647, 7),
-    ('personal', 1, 200, 11284, 4),
-    ('personal', 2, 200, 11284, 4),
-    ('personal', 3, 200, 11284, 4),
-    ('personal', 1, 400, 11381, 3),
-    ('personal', 2, 400, 11381, 3),
-    ('personal', 3, 400, 11381, 3),
-    ('personal', 1, 600, 11284, 8),
-    ('personal', 2, 600, 11284, 8),
-    ('personal', 3, 600, 11284, 8),
-    ('personal', 1, 800, 11384, 3),
-    ('personal', 2, 800, 11384, 3),
-    ('personal', 3, 800, 11384, 3),
-    ('personal', 1, 1000, 11284, 12),
-    ('personal', 2, 1000, 11284, 12),
-    ('personal', 3, 1000, 11284, 12),
-    ('personal', 1, 1200, 11381, 5),
-    ('personal', 2, 1200, 11381, 5),
-    ('personal', 3, 1200, 11381, 5),
-    ('personal', 1, 1400, 11284, 16),
-    ('personal', 2, 1400, 11284, 16),
-    ('personal', 3, 1400, 11284, 16),
-    ('personal', 1, 1700, 11384, 5),
-    ('personal', 2, 1700, 11384, 5),
-    ('personal', 3, 1700, 11384, 5),
-    ('personal', 1, 2000, 11284, 16),
-    ('personal', 2, 2000, 11284, 16),
-    ('personal', 3, 2000, 11284, 16),
-    ('personal', 1, 2500, 11382, 4),
-    ('personal', 2, 2500, 11382, 4),
-    ('personal', 3, 2500, 11382, 4),
-    ('personal', 1, 3000, 11284, 24),
-    ('personal', 2, 3000, 11284, 24),
-    ('personal', 3, 3000, 11284, 24),
-    ('personal', 1, 4000, 11385, 4),
-    ('personal', 2, 4000, 11385, 4),
-    ('personal', 3, 4000, 11385, 4),
-    ('personal', 1, 5000, 11381, 11),
-    ('personal', 2, 5000, 11381, 11),
-    ('personal', 3, 5000, 11381, 11),
-    ('personal', 1, 6000, 5177, 5),
-    ('personal', 2, 6000, 5177, 5),
-    ('personal', 3, 6000, 5177, 5),
-    ('personal', 1, 7000, 11384, 11),
-    ('personal', 2, 7000, 11384, 11),
-    ('personal', 3, 7000, 11384, 11),
-    ('personal', 1, 10000, 11382, 8),
-    ('personal', 2, 10000, 11382, 8),
-    ('personal', 3, 10000, 11382, 8),
-    ('personal', 1, 15000, 11385, 4),
-    ('personal', 2, 15000, 11385, 4),
-    ('personal', 3, 15000, 11385, 4),
-    ('personal', 1, 20000, 11381, 13),
-    ('personal', 2, 20000, 11381, 13),
-    ('personal', 3, 20000, 11381, 13),
-    ('personal', 1, 25000, 11385, 4),
-    ('personal', 2, 25000, 11385, 4),
-    ('personal', 3, 25000, 11385, 4),
-    ('personal', 1, 30000, 11383, 1),
-    ('personal', 2, 30000, 11383, 1),
-    ('personal', 3, 30000, 11383, 1);
-
-INSERT INTO public.festa_prizes
-(type, tier, souls_req, item_id, num_item)
-VALUES
-    ('guild', 1, 100, 7468, 5),
-    ('guild', 2, 100, 7468, 5),
-    ('guild', 3, 100, 7465, 5),
-    ('guild', 1, 300, 7469, 5),
-    ('guild', 2, 300, 7469, 5),
-    ('guild', 3, 300, 7466, 5),
-    ('guild', 1, 700, 7470, 5),
-    ('guild', 2, 700, 7470, 5),
-    ('guild', 3, 700, 7467, 5),
-    ('guild', 1, 1500, 13405, 14),
-    ('guild', 1, 1500, 1520, 3),
-    ('guild', 2, 1500, 13405, 14),
-    ('guild', 2, 1500, 1520, 3),
-    ('guild', 3, 1500, 7011, 3),
-    ('guild', 3, 1500, 13405, 14),
-    ('guild', 1, 3000, 10201, 10),
-    ('guild', 2, 3000, 10201, 10),
-    ('guild', 3, 3000, 10201, 10),
-    ('guild', 1, 6000, 13895, 14),
-    ('guild', 1, 6000, 1520, 6),
-    ('guild', 2, 6000, 13895, 14),
-    ('guild', 2, 6000, 1520, 6),
-    ('guild', 3, 6000, 13895, 14),
-    ('guild', 3, 6000, 7011, 4),
-    ('guild', 1, 12000, 13406, 14),
-    ('guild', 1, 12000, 1520, 9),
-    ('guild', 2, 12000, 13406, 14),
-    ('guild', 2, 12000, 1520, 9),
-    ('guild', 3, 12000, 13406, 14),
-    ('guild', 3, 12000, 7011, 5),
-    ('guild', 1, 25000, 10207, 10),
-    ('guild', 2, 25000, 10207, 10),
-    ('guild', 3, 25000, 10207, 10),
-    ('guild', 1, 50000, 1520, 12),
-    ('guild', 1, 50000, 13896, 14),
-    ('guild', 2, 50000, 1520, 12),
-    ('guild', 2, 50000, 13896, 14),
-    ('guild', 3, 50000, 7011, 6),
-    ('guild', 3, 50000, 13896, 14),
-    ('guild', 1, 100000, 10201, 10),
-    ('guild', 2, 100000, 10201, 10),
-    ('guild', 3, 100000, 10201, 10),
-    ('guild', 1, 200000, 13406, 16),
-    ('guild', 2, 200000, 13406, 16),
-    ('guild', 3, 200000, 13406, 16),
-    ('guild', 1, 300000, 13896, 16),
-    ('guild', 2, 300000, 13896, 16),
-    ('guild', 3, 300000, 13896, 16),
-    ('guild', 1, 400000, 10207, 10),
-    ('guild', 2, 400000, 10207, 10),
-    ('guild', 3, 400000, 10207, 10),
-    ('guild', 1, 500000, 13407, 6),
-    ('guild', 1, 500000, 13897, 6),
-    ('guild', 2, 500000, 13407, 6),
-    ('guild', 2, 500000, 13897, 6),
-    ('guild', 3, 500000, 13407, 6),
-    ('guild', 3, 500000, 13897, 6);
-
-- Ripped trials
-INSERT INTO public.festa_trials
-    (objective, goal_id, times_req, locale_req, reward)
-VALUES
-    (1,27,1,0,1),
-    (5,53034,0,0,400),
-    (5,22042,0,0,89),
-    (5,23397,0,0,89),
-    (1,28,1,0,1),
-    (1,68,1,0,1),
-    (1,6,1,0,2),
-    (1,38,1,0,2),
-    (1,20,1,0,3),
-    (1,39,1,0,4),
-    (1,48,1,0,4),
-    (1,67,1,0,4),
-    (1,93,1,0,4),
-    (1,22,1,0,5),
-    (1,52,1,0,5),
-    (1,101,1,0,5),
-    (1,1,1,0,5),
-    (1,37,1,0,5),
-    (1,15,1,0,5),
-    (1,45,1,0,5),
-    (1,74,1,0,5),
-    (1,78,1,0,5),
-    (1,103,1,0,5),
-    (1,51,1,0,6),
-    (1,17,1,0,6),
-    (1,21,1,0,6),
-    (1,92,1,0,6),
-    (1,47,1,0,7),
-    (1,46,1,0,7),
-    (1,26,1,0,7),
-    (1,14,1,0,7),
-    (1,11,1,0,7),
-    (1,44,1,0,8),
-    (1,43,1,0,8),
-    (1,49,1,0,8),
-    (1,40,1,0,8),
-    (1,76,1,0,8),
-    (1,89,1,0,8),
-    (1,94,1,0,8),
-    (1,96,1,0,8),
-    (1,75,1,0,8),
-    (1,91,1,0,8),
-    (1,53,1,0,9),
-    (1,80,1,0,9),
-    (1,42,1,0,9),
-    (1,79,1,0,9),
-    (1,81,1,0,10),
-    (1,41,1,0,10),
-    (1,82,1,0,10),
-    (1,90,1,0,10),
-    (1,149,1,0,10),
-    (1,85,1,0,11),
-    (1,95,1,0,11),
-    (1,121,1,0,11),
-    (1,142,1,0,11),
-    (1,141,1,0,11),
-    (1,146,1,0,12),
-    (1,147,1,0,12),
-    (1,148,1,0,12),
-    (1,151,1,0,12),
-    (1,152,1,0,12),
-    (1,159,1,0,12),
-    (1,153,1,0,12),
-    (1,162,1,0,12),
-    (1,111,1,0,13),
-    (1,110,1,0,13),
-    (1,112,1,0,13),
-    (1,109,1,0,14),
-    (1,169,1,0,15),
-    (2,33,1,0,6),
-    (2,104,1,0,8),
-    (2,119,1,0,8),
-    (2,120,1,0,8),
-    (2,54,1,0,8),
-    (2,59,1,0,8),
-    (2,64,1,0,8),
-    (2,65,1,0,8),
-    (2,99,1,0,9),
-    (2,83,1,0,9),
-    (2,84,1,0,10),
-    (2,77,1,0,10),
-    (2,106,1,0,10),
-    (2,55,1,0,10),
-    (2,58,1,0,10),
-    (2,7,1,0,10),
-    (2,50,1,0,11),
-    (2,131,1,0,11),
-    (2,129,1,0,11),
-    (2,140,1,0,11),
-    (2,122,1,0,11),
-    (2,126,1,0,11),
-    (2,127,1,0,11),
-    (2,128,1,0,11),
-    (2,130,1,0,11),
-    (2,139,1,0,11),
-    (2,144,1,0,11),
-    (2,150,1,0,11),
-    (2,158,1,0,11),
-    (2,164,1,0,15),
-    (2,165,1,0,15),
-    (2,2,1,7,15),
-    (2,36,1,0,15),
-    (2,71,1,0,15),
-    (2,108,1,0,15),
-    (2,116,1,0,15),
-    (2,107,1,0,15),
-    (2,154,1,0,17),
-    (2,166,1,0,17),
-    (2,170,1,0,18),
-    (3,31,1,0,1),
-    (3,8,1,0,3),
-    (3,123,1,0,8),
-    (3,105,1,0,9),
-    (3,125,1,0,11),
-    (3,115,1,0,12),
-    (3,114,1,0,12),
-    (3,161,1,0,12),
-    (4,670,1,0,1),
-    (4,671,1,0,1),
-    (4,672,1,0,1),
-    (4,675,1,0,1),
-    (4,673,1,0,1),
-    (4,674,1,0,1);
-
-END;
--- a/patch-schema/guild-enumeration.sql
+++ b/patch-schema/guild-enumeration.sql
@@ -1,9 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.guilds
-    ADD COLUMN IF NOT EXISTS recruiting bool NOT NULL DEFAULT true;
-
-ALTER TABLE IF EXISTS public.guild_characters
-    ADD COLUMN IF NOT EXISTS recruiter bool NOT NULL DEFAULT false;
-
-END;
--- a/patch-schema/guild-poogie-outfits.sql
+++ b/patch-schema/guild-poogie-outfits.sql
@@ -1,15 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.guilds
-    ADD COLUMN IF NOT EXISTS pugi_outfit_1 int NOT NULL DEFAULT 0;
-
-ALTER TABLE IF EXISTS public.guilds
-    ADD COLUMN IF NOT EXISTS pugi_outfit_2 int NOT NULL DEFAULT 0;
-
-ALTER TABLE IF EXISTS public.guilds
-    ADD COLUMN IF NOT EXISTS pugi_outfit_3 int NOT NULL DEFAULT 0;
-
-ALTER TABLE IF EXISTS public.guilds
-    ADD COLUMN IF NOT EXISTS pugi_outfits int NOT NULL DEFAULT 0;
-
-END;
--- a/patch-schema/mail-system-messages.sql
+++ b/patch-schema/mail-system-messages.sql
@@ -1,13 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.mail
-    ADD COLUMN IF NOT EXISTS is_sys_message bool DEFAULT false;
-
-UPDATE mail SET is_sys_message=false;
-
-ALTER TABLE IF EXISTS public.mail
-    DROP CONSTRAINT IF EXISTS mail_sender_id_fkey;
-
-INSERT INTO public.characters (id, name) VALUES (0, '');
-
-END;
--- a/patch-schema/mercenary.sql
+++ b/patch-schema/mercenary.sql
@@ -1,7 +0,0 @@
-BEGIN;
-
-CREATE SEQUENCE IF NOT EXISTS public.rasta_id_seq;
-
-UPDATE characters SET savemercenary=NULL;
-
-END;
--- a/patch-schema/missing-mail.sql
+++ b/patch-schema/missing-mail.sql
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.mail
-    ADD COLUMN IF NOT EXISTS locked boolean NOT NULL DEFAULT false;
-
-END;
--- a/patch-schema/netcafe-2.sql
+++ b/patch-schema/netcafe-2.sql
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN cafe_reset timestamp without time zone;
-
-END;
--- a/patch-schema/netcafe.sql
+++ b/patch-schema/netcafe.sql
@@ -1,30 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN IF NOT EXISTS cafe_time integer DEFAULT 0;
-
-ALTER TABLE IF EXISTS public.characters
-    DROP COLUMN IF EXISTS netcafe_points;
-
-ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN IF NOT EXISTS netcafe_points int DEFAULT 0;
-
-ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN IF NOT EXISTS boost_time timestamp without time zone;
-
-CREATE TABLE IF NOT EXISTS public.cafebonus
-(
-    id serial NOT NULL PRIMARY KEY,
-    time_req integer NOT NULL,
-    item_type integer NOT NULL,
-    item_id integer NOT NULL,
-    quantity integer NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS public.cafe_accepted
-(
-    cafe_id integer NOT NULL,
-    character_id integer NOT NULL
-);
-
-END;
--- a/patch-schema/persistent-house.sql
+++ b/patch-schema/persistent-house.sql
@@ -1,37 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.user_binary
-(
-    id serial NOT NULL PRIMARY KEY,
-    type2 bytea,
-    type3 bytea,
-    house_tier bytea,
-    house_state int,
-    house_password text,
-    house_data bytea,
-    house_furniture bytea,
-    bookshelf bytea,
-    gallery bytea,
-    tore bytea,
-    garden bytea,
-    mission bytea
-);
-
-- Create entries for existing users
-INSERT INTO public.user_binary (id) SELECT c.id FROM characters c;
-
-- Copy existing data
-UPDATE public.user_binary
-    SET house_furniture = (SELECT house FROM characters WHERE user_binary.id = characters.id);
-
-UPDATE public.user_binary
-    SET mission = (SELECT trophy FROM characters WHERE user_binary.id = characters.id);
-
-- Drop old data location
-ALTER TABLE public.characters
-    DROP COLUMN house;
-
-ALTER TABLE public.characters
-    DROP COLUMN trophy;
-
-END;
--- a/patch-schema/return.sql
+++ b/patch-schema/return.sql
@@ -1,9 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.users
-    ADD COLUMN IF NOT EXISTS last_login timestamp without time zone;
-
-ALTER TABLE IF EXISTS public.users
-    ADD COLUMN IF NOT EXISTS return_expires timestamp without time zone;
-
-END;
--- a/patch-schema/revert-road-shop.sql
+++ b/patch-schema/revert-road-shop.sql
@@ -1,9 +0,0 @@
-BEGIN;
-
-ALTER TABLE IF EXISTS public.normal_shop_items
-    DROP COLUMN IF EXISTS enable_weeks;
-
-ALTER TABLE IF EXISTS public.shop_item_state
-    DROP COLUMN IF EXISTS week;
-
-END;
--- a/patch-schema/road-leaderboard.sql
+++ b/patch-schema/road-leaderboard.sql
@@ -1,11 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS rengoku_score (
-    character_id integer PRIMARY KEY,
-    max_stages_mp integer,
-    max_points_mp integer,
-    max_stages_sp integer,
-    max_points_sp integer
-);
-
-END;
--- a/patch-schema/servers_info.sql
+++ b/patch-schema/servers_info.sql
@@ -1,23 +0,0 @@
--adds world_name and land columns
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.servers
-(
-    server_id integer NOT NULL,
-    season integer NOT NULL,
-    current_players integer NOT NULL,
-    world_name text COLLATE pg_catalog."default",
-    world_description text,
-    land integer
-);
-
-ALTER TABLE public.servers
-    ADD COLUMN IF NOT EXISTS land integer;
-
-ALTER TABLE public.servers
-    ADD COLUMN IF NOT EXISTS world_name text COLLATE pg_catalog."default";
-
-ALTER TABLE public.servers
-    ADD COLUMN IF NOT EXISTS world_description text;
-
-END;
--- a/patch-schema/stamps.sql
+++ b/patch-schema/stamps.sql
@@ -1,13 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.stamps (
-    character_id integer PRIMARY KEY,
-    hl_total integer DEFAULT 0,
-    hl_redeemed integer DEFAULT 0,
-    hl_next timestamp without time zone,
-    ex_total integer DEFAULT 0,
-    ex_redeemed integer DEFAULT 0,
-    ex_next timestamp without time zone
-);
-
-END;
--- a/patch-schema/titles.sql
+++ b/patch-schema/titles.sql
@@ -1,11 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.titles
-(
-    id int NOT NULL,
-    char_id int NOT NULL,
-    unlocked_at timestamp without time zone,
-    updated_at timestamp without time zone
-);
-
-END;
--- a/patch-schema/warehouse.sql
+++ b/patch-schema/warehouse.sql
@@ -1,49 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.warehouse (
-    character_id integer PRIMARY KEY,
-    item0 bytea,
-    item1 bytea,
-    item2 bytea,
-    item3 bytea,
-    item4 bytea,
-    item5 bytea,
-    item6 bytea,
-    item7 bytea,
-    item8 bytea,
-    item9 bytea,
-    item10 bytea,
-    item0name text,
-    item1name text,
-    item2name text,
-    item3name text,
-    item4name text,
-    item5name text,
-    item6name text,
-    item7name text,
-    item8name text,
-    item9name text,
-    equip0 bytea,
-    equip1 bytea,
-    equip2 bytea,
-    equip3 bytea,
-    equip4 bytea,
-    equip5 bytea,
-    equip6 bytea,
-    equip7 bytea,
-    equip8 bytea,
-    equip9 bytea,
-    equip10 bytea,
-    equip0name text,
-    equip1name text,
-    equip2name text,
-    equip3name text,
-    equip4name text,
-    equip5name text,
-    equip6name text,
-    equip7name text,
-    equip8name text,
-    equip9name text
-);
-
-END;
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -1495,10 +1495,6 @@ func handleMsgMhfInfoScenarioCounter(s *Session, p mhfpacket.MHFPacket) {
 	doAckBufSucceed(s, pkt.AckHandle, resp.Data())
 }

-func handleMsgMhfGetBbsSnsStatus(s *Session, p mhfpacket.MHFPacket) {}
-
-func handleMsgMhfApplyBbsArticle(s *Session, p mhfpacket.MHFPacket) {}
-
 func handleMsgMhfGetEtcPoints(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfGetEtcPoints)

--- a/server/channelserver/handlers_bbs.go
+++ b/server/channelserver/handlers_bbs.go
@@ -0,0 +1,41 @@
+package channelserver
+
+import (
+	"erupe-ce/common/byteframe"
+	"erupe-ce/common/stringsupport"
+	"erupe-ce/common/token"
+	"erupe-ce/network/mhfpacket"
+)
+
+func handleMsgMhfGetBbsUserStatus(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfGetBbsUserStatus)
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint32(200)
+	bf.WriteUint32(0)
+	bf.WriteUint32(0)
+	bf.WriteUint32(0)
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+}
+
+func handleMsgMhfGetBbsSnsStatus(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfGetBbsSnsStatus)
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint32(200)
+	bf.WriteUint32(401)
+	bf.WriteUint32(401)
+	bf.WriteUint32(0)
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+}
+
+func handleMsgMhfApplyBbsArticle(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfApplyBbsArticle)
+	bf := byteframe.NewByteFrame()
+	articleToken := token.Generate(40)
+	bf.WriteUint32(200)
+	bf.WriteUint32(80)
+	bf.WriteUint32(0)
+	bf.WriteUint32(0)
+	bf.WriteBytes(stringsupport.PaddedString(articleToken, 64, false))
+	bf.WriteBytes(stringsupport.PaddedString(s.server.erupeConfig.ScreenshotAPIURL, 64, false))
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
+}
--- a/server/channelserver/handlers_cafe.go
+++ b/server/channelserver/handlers_cafe.go
@@ -74,9 +74,14 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {

 	var cafeReset time.Time
 	err := s.server.db.QueryRow(`SELECT cafe_reset FROM characters WHERE id=$1`, s.charID).Scan(&cafeReset)
+	if err != nil {
+		cafeReset = TimeWeekNext()
+		s.server.db.Exec(`UPDATE characters SET cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID)
+	}
 	if Time_Current_Adjusted().After(cafeReset) {
 		cafeReset = TimeWeekNext()
-		s.server.db.Exec(`UPDATE characters SET cafe_time=0, cafe_reset=$1 WHERE id=$2; DELETE FROM cafe_accepted WHERE character_id=$2`, cafeReset, s.charID)
+		s.server.db.Exec(`UPDATE characters SET cafe_time=0, cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID)
+		s.server.db.Exec(`DELETE FROM cafe_accepted WHERE character_id=$1`, s.charID)
 	}

 	var cafeTime uint32
--- a/server/channelserver/handlers_quest.go
+++ b/server/channelserver/handlers_quest.go
@@ -2,13 +2,13 @@ package channelserver

 import (
 	"fmt"
-	"go.uber.org/zap"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"

 	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"go.uber.org/zap"
 )

 func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
@@ -26,7 +26,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 		}
 		filename := fmt.Sprintf("%d_0_0_0_S%d_T%d_C%d", pkt.ScenarioIdentifer.CategoryID, pkt.ScenarioIdentifer.MainID, pkt.ScenarioIdentifer.Flags, pkt.ScenarioIdentifer.ChapterID)
 		// Read the scenario file.
-		data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("scenarios/%s.bin", filename)))
+		data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("scenarios/%s.bin", filename)))
 		if err != nil {
 			s.logger.Error(fmt.Sprintf("Failed to open file: %s/scenarios/%s.bin", s.server.erupeConfig.BinPath, filename))
 			// This will crash the game.
@@ -36,7 +36,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 		doAckBufSucceed(s, pkt.AckHandle, data)
 	} else {
 		if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin")); err == nil {
-			data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin"))
+			data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "quest_override.bin"))
 			if err != nil {
 				panic(err)
 			}
@@ -49,7 +49,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 				)
 			}
 			// Get quest file.
-			data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))
+			data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))
 			if err != nil {
 				s.logger.Error(fmt.Sprintf("Failed to open file: %s/quests/%s.bin", s.server.erupeConfig.BinPath, pkt.Filename))
 				// This will crash the game.
@@ -80,15 +80,47 @@ func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
 }

 func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
-	// local files are easier for now, probably best would be to generate dynamically
 	pkt := p.(*mhfpacket.MsgMhfEnumerateQuest)
-	data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("questlists/list_%d.bin", pkt.QuestList)))
+	var totalCount, returnedCount uint16
+	bf := byteframe.NewByteFrame()
+	bf.WriteUint16(0)
+	err := filepath.Walk(fmt.Sprintf("%s/events/", s.server.erupeConfig.BinPath), func(path string, info os.FileInfo, err error) error {
 		if err != nil {
-		fmt.Printf("questlists/list_%d.bin", pkt.QuestList)
-		stubEnumerateNoResults(s, pkt.AckHandle)
-	} else {
-		doAckBufSucceed(s, pkt.AckHandle, data)
+			return err
+		} else if info.IsDir() {
+			return nil
 		}
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		} else {
+			if len(data) > 850 || len(data) < 400 {
+				return nil // Could be more or less strict with size limits
+			} else {
+				totalCount++
+				if totalCount > pkt.Offset && len(bf.Data()) < 64000 {
+					returnedCount++
+					bf.WriteBytes(data)
+					return nil
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil || totalCount == 0 {
+		doAckBufSucceed(s, pkt.AckHandle, make([]byte, 18))
+		return
+	}
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint32(0) // Unk
+	bf.WriteUint16(0) // Unk
+	bf.WriteUint16(totalCount)
+	bf.WriteUint16(pkt.Offset)
+	bf.Seek(0, io.SeekStart)
+	bf.WriteUint16(returnedCount)
+	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }

 func handleMsgMhfEnterTournamentQuest(s *Session, p mhfpacket.MHFPacket) {}
--- a/server/channelserver/handlers_users.go
+++ b/server/channelserver/handlers_users.go
@@ -54,5 +54,3 @@ func handleMsgSysGetUserBinary(s *Session, p mhfpacket.MHFPacket) {
 }

 func handleMsgSysNotifyUserBinary(s *Session, p mhfpacket.MHFPacket) {}
-
-func handleMsgMhfGetBbsUserStatus(s *Session, p mhfpacket.MHFPacket) {}
--- a/server/signserver/dsgn_resp.go
+++ b/server/signserver/dsgn_resp.go
@@ -4,6 +4,7 @@ import (
 	"erupe-ce/common/byteframe"
 	ps "erupe-ce/common/pascalstring"
 	"erupe-ce/common/stringsupport"
+	"erupe-ce/common/token"
 	"erupe-ce/server/channelserver"
 	"fmt"
 	"math/rand"
@@ -18,15 +19,6 @@ func makeSignInFailureResp(respID RespID) []byte {
 	return bf.Data()
 }

-func randSeq(n int) string {
-	var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(b)
-}
-
 func (s *Session) makeSignInResp(uid int) []byte {
 	returnExpiry := s.server.getReturnExpiry(uid)

@@ -37,13 +29,13 @@ func (s *Session) makeSignInResp(uid int) []byte {
 	}

 	rand.Seed(time.Now().UnixNano())
-	token := randSeq(16)
-	s.server.registerToken(uid, token)
+	sessToken := token.Generate(16)
+	s.server.registerToken(uid, sessToken)

 	bf := byteframe.NewByteFrame()

 	bf.WriteUint8(1) // resp_code
-	if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.PatchServerManifest != "" && s.server.erupeConfig.DevModeOptions.PatchServerFile != "" {
+	if s.server.erupeConfig.DevMode && s.server.erupeConfig.PatchServerManifest != "" && s.server.erupeConfig.PatchServerFile != "" {
 		bf.WriteUint8(2)
 	} else {
 		bf.WriteUint8(0)
@@ -51,12 +43,12 @@ func (s *Session) makeSignInResp(uid int) []byte {
 	bf.WriteUint8(1)                          // entrance server count
 	bf.WriteUint8(uint8(len(chars)))          // character count
 	bf.WriteUint32(0xFFFFFFFF)                // login_token_number
-	bf.WriteBytes([]byte(token))              // login_token
+	bf.WriteBytes([]byte(sessToken))          // login_token
 	bf.WriteUint32(uint32(time.Now().Unix())) // current time
 	if s.server.erupeConfig.DevMode {
-		if s.server.erupeConfig.DevModeOptions.PatchServerManifest != "" && s.server.erupeConfig.DevModeOptions.PatchServerFile != "" {
-			ps.Uint8(bf, s.server.erupeConfig.DevModeOptions.PatchServerManifest, false)
-			ps.Uint8(bf, s.server.erupeConfig.DevModeOptions.PatchServerFile, false)
+		if s.server.erupeConfig.PatchServerManifest != "" && s.server.erupeConfig.PatchServerFile != "" {
+			ps.Uint8(bf, s.server.erupeConfig.PatchServerManifest, false)
+			ps.Uint8(bf, s.server.erupeConfig.PatchServerFile, false)
 		}
 	}
 	ps.Uint8(bf, fmt.Sprintf("%s:%d", s.server.erupeConfig.Host, s.server.erupeConfig.Entrance.Port), false)
@@ -111,11 +103,11 @@ func (s *Session) makeSignInResp(uid int) []byte {
 		}
 	}

-	if s.server.erupeConfig.DevModeOptions.HideLoginNotice {
+	if s.server.erupeConfig.HideLoginNotice {
 		bf.WriteUint8(0)
 	} else {
 		bf.WriteUint8(1) // Notice count
-		noticeText := s.server.erupeConfig.DevModeOptions.LoginNotice
+		noticeText := s.server.erupeConfig.LoginNotice
 		ps.Uint32(bf, noticeText, true)
 	}

--- a/server/signv2server/dbutils.go
+++ b/server/signv2server/dbutils.go
@@ -0,0 +1,122 @@
+package signv2server
+
+import (
+	"context"
+	"database/sql"
+	"erupe-ce/common/token"
+	"fmt"
+	"time"
+
+	"golang.org/x/crypto/bcrypt"
+)
+
+func (s *Server) createNewUser(ctx context.Context, username string, password string) (int, error) {
+	// Create salted hash of user password
+	passwordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		return 0, err
+	}
+
+	var id int
+	err = s.db.QueryRowContext(
+		ctx, `
+		INSERT INTO users (username, password, return_expires)
+		VALUES ($1, $2, $3)
+		RETURNING id
+		`,
+		username, string(passwordHash), time.Now().Add(time.Hour*24*30),
+	).Scan(&id)
+	return id, err
+}
+
+func (s *Server) createLoginToken(ctx context.Context, uid int) (string, error) {
+	loginToken := token.Generate(16)
+	_, err := s.db.ExecContext(ctx, "INSERT INTO sign_sessions (user_id, token) VALUES ($1, $2)", uid, loginToken)
+	if err != nil {
+		return "", err
+	}
+	return loginToken, nil
+}
+
+func (s *Server) userIDFromToken(ctx context.Context, token string) (int, error) {
+	var userID int
+	err := s.db.QueryRowContext(ctx, "SELECT user_id FROM sign_sessions WHERE token = $1", token).Scan(&userID)
+	if err == sql.ErrNoRows {
+		return 0, fmt.Errorf("invalid login token")
+	} else if err != nil {
+		return 0, err
+	}
+	return userID, nil
+}
+
+func (s *Server) createCharacter(ctx context.Context, userID int) (int, error) {
+	var charID int
+	err := s.db.QueryRowContext(ctx,
+		"SELECT id FROM characters WHERE is_new_character = true AND user_id = $1",
+		userID,
+	).Scan(&charID)
+	if err == sql.ErrNoRows {
+		err = s.db.QueryRowContext(ctx, `
+			INSERT INTO characters (
+				user_id, is_female, is_new_character, name, unk_desc_string,
+				hrp, gr, weapon_type, last_login
+			)
+			VALUES ($1, false, true, '', '', 0, 0, 0, $2)
+			RETURNING id`,
+			userID, uint32(time.Now().Unix()),
+		).Scan(&charID)
+	}
+	return charID, err
+}
+
+func (s *Server) deleteCharacter(ctx context.Context, userID int, charID int) error {
+	tx, err := s.db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+
+	_, err = tx.ExecContext(
+		ctx, `
+		DELETE FROM login_boost_state
+		WHERE char_id = $1`,
+		charID,
+	)
+	if err != nil {
+		return err
+	}
+	_, err = tx.ExecContext(
+		ctx, `
+		DELETE FROM guild_characters
+		WHERE character_id = $1`,
+		charID,
+	)
+	if err != nil {
+		return err
+	}
+	_, err = tx.ExecContext(
+		ctx, `
+		DELETE FROM characters
+		WHERE user_id = $1 AND id = $2`,
+		userID, charID,
+	)
+	if err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
+func (s *Server) getCharactersForUser(ctx context.Context, uid int) ([]Character, error) {
+	characters := make([]Character, 0)
+	err := s.db.SelectContext(
+		ctx, &characters, `
+		SELECT id, name, is_female, weapon_type, hrp, gr, last_login
+		FROM characters
+		WHERE user_id = $1 AND deleted = false AND is_new_character = false ORDER BY id ASC`,
+		uid,
+	)
+	if err != nil {
+		return nil, err
+	}
+	return characters, nil
+}
--- a/server/signv2server/endpoints.go
+++ b/server/signv2server/endpoints.go
@@ -0,0 +1,208 @@
+package signv2server
+
+import (
+	"database/sql"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"time"
+
+	"github.com/lib/pq"
+	"go.uber.org/zap"
+	"golang.org/x/crypto/bcrypt"
+)
+
+type LauncherMessage struct {
+	Message string `json:"message"`
+	Date    int64  `json:"date"`
+	Link    string `json:"link"`
+}
+
+type Character struct {
+	ID        int    `json:"id"`
+	Name      string `json:"name"`
+	IsFemale  bool   `json:"isFemale" db:"is_female"`
+	Weapon    int    `json:"weapon" db:"weapon_type"`
+	HR        int    `json:"hr" db:"hrp"`
+	GR        int    `json:"gr"`
+	LastLogin int64  `json:"lastLogin" db:"last_login"`
+}
+
+func (s *Server) Launcher(w http.ResponseWriter, r *http.Request) {
+	var respData struct {
+		Important []LauncherMessage `json:"important"`
+		Normal    []LauncherMessage `json:"normal"`
+	}
+	respData.Important = []LauncherMessage{
+		{
+			Message: "Server Update 9 Released!",
+			Date:    time.Date(2022, 8, 2, 0, 0, 0, 0, time.UTC).Unix(),
+			Link:    "https://discord.com/channels/368424389416583169/929509970624532511/1003985850255818762",
+		},
+		{
+			Message: "Eng 2.0 & Ravi Patch Released!",
+			Date:    time.Date(2022, 5, 3, 0, 0, 0, 0, time.UTC).Unix(),
+			Link:    "https://discord.com/channels/368424389416583169/929509970624532511/969305400795078656",
+		},
+		{
+			Message: "Launcher Patch V1.0 Released!",
+			Date:    time.Date(2022, 4, 24, 0, 0, 0, 0, time.UTC).Unix(),
+			Link:    "https://discord.com/channels/368424389416583169/929509970624532511/969286397301248050",
+		},
+	}
+	respData.Normal = []LauncherMessage{
+		{
+			Message: "Join the community Discord for updates!",
+			Date:    time.Date(2022, 4, 24, 0, 0, 0, 0, time.UTC).Unix(),
+			Link:    "https://discord.gg/CFnzbhQ",
+		},
+	}
+	w.WriteHeader(200)
+	w.Header().Add("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(respData)
+}
+
+func (s *Server) Login(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	var reqData struct {
+		Username string `json:"username"`
+		Password string `json:"password"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&reqData); err != nil {
+		s.logger.Error("JSON decode error", zap.Error(err))
+		w.WriteHeader(400)
+		w.Write([]byte("Invalid data received"))
+		return
+	}
+	var (
+		userID   int
+		password string
+	)
+	err := s.db.QueryRow("SELECT id, password FROM users WHERE username = $1", reqData.Username).Scan(&userID, &password)
+	if err == sql.ErrNoRows {
+		w.WriteHeader(400)
+		w.Write([]byte("Username does not exist"))
+		return
+	} else if err != nil {
+		s.logger.Warn("SQL query error", zap.Error(err))
+		w.WriteHeader(500)
+		return
+	}
+	if bcrypt.CompareHashAndPassword([]byte(password), []byte(reqData.Password)) != nil {
+		w.WriteHeader(400)
+		w.Write([]byte("Your password is incorrect"))
+		return
+	}
+
+	var respData struct {
+		Token      string      `json:"token"`
+		Characters []Character `json:"characters"`
+	}
+	respData.Token, err = s.createLoginToken(ctx, userID)
+	if err != nil {
+		s.logger.Warn("Error registering login token", zap.Error(err))
+		w.WriteHeader(500)
+		return
+	}
+	respData.Characters, err = s.getCharactersForUser(ctx, userID)
+	if err != nil {
+		s.logger.Warn("Error getting characters from DB", zap.Error(err))
+		w.WriteHeader(500)
+		return
+	}
+	w.WriteHeader(200)
+	w.Header().Add("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(respData)
+}
+
+func (s *Server) Register(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	var reqData struct {
+		Username string `json:"username"`
+		Password string `json:"password"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&reqData); err != nil {
+		s.logger.Error("JSON decode error", zap.Error(err))
+		w.WriteHeader(400)
+		w.Write([]byte("Invalid data received"))
+		return
+	}
+	s.logger.Info("Creating account", zap.String("username", reqData.Username))
+	userID, err := s.createNewUser(ctx, reqData.Username, reqData.Password)
+	if err != nil {
+		var pqErr *pq.Error
+		if errors.As(err, &pqErr) && pqErr.Constraint == "users_username_key" {
+			w.WriteHeader(400)
+			w.Write([]byte("User already exists"))
+			return
+		}
+		s.logger.Error("Error checking user", zap.Error(err), zap.String("username", reqData.Username))
+		w.WriteHeader(500)
+		return
+	}
+
+	var respData struct {
+		Token string `json:"token"`
+	}
+	respData.Token, err = s.createLoginToken(ctx, userID)
+	if err != nil {
+		s.logger.Error("Error registering login token", zap.Error(err))
+		w.WriteHeader(500)
+		return
+	}
+	json.NewEncoder(w).Encode(respData)
+}
+
+func (s *Server) CreateCharacter(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	var reqData struct {
+		Token string `json:"token"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&reqData); err != nil {
+		s.logger.Error("JSON decode error", zap.Error(err))
+		w.WriteHeader(400)
+		w.Write([]byte("Invalid data received"))
+		return
+	}
+
+	var respData struct {
+		CharID int `json:"id"`
+	}
+	userID, err := s.userIDFromToken(ctx, reqData.Token)
+	if err != nil {
+		w.WriteHeader(401)
+		return
+	}
+	respData.CharID, err = s.createCharacter(ctx, userID)
+	if err != nil {
+		s.logger.Error("Failed to create character", zap.Error(err), zap.String("token", reqData.Token))
+		w.WriteHeader(500)
+		return
+	}
+	json.NewEncoder(w).Encode(respData)
+}
+
+func (s *Server) DeleteCharacter(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	var reqData struct {
+		Token  string `json:"token"`
+		CharID int    `json:"id"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&reqData); err != nil {
+		s.logger.Error("JSON decode error", zap.Error(err))
+		w.WriteHeader(400)
+		w.Write([]byte("Invalid data received"))
+		return
+	}
+	userID, err := s.userIDFromToken(ctx, reqData.Token)
+	if err != nil {
+		w.WriteHeader(401)
+		return
+	}
+	if err := s.deleteCharacter(ctx, userID, reqData.CharID); err != nil {
+		s.logger.Error("Failed to delete character", zap.Error(err), zap.String("token", reqData.Token), zap.Int("charID", reqData.CharID))
+		w.WriteHeader(500)
+		return
+	}
+	json.NewEncoder(w).Encode(struct{}{})
+}
--- a/server/signv2server/signv2_server.go
+++ b/server/signv2server/signv2_server.go
@@ -0,0 +1,89 @@
+package signv2server
+
+import (
+	"context"
+	"erupe-ce/config"
+	"fmt"
+	"net/http"
+	"os"
+	"sync"
+	"time"
+
+	"github.com/gorilla/handlers"
+	"github.com/gorilla/mux"
+	"github.com/jmoiron/sqlx"
+	"go.uber.org/zap"
+)
+
+type Config struct {
+	Logger      *zap.Logger
+	DB          *sqlx.DB
+	ErupeConfig *config.Config
+}
+
+// Server is the MHF custom launcher sign server.
+type Server struct {
+	sync.Mutex
+	logger         *zap.Logger
+	erupeConfig    *config.Config
+	db             *sqlx.DB
+	httpServer     *http.Server
+	isShuttingDown bool
+}
+
+// NewServer creates a new Server type.
+func NewServer(config *Config) *Server {
+	s := &Server{
+		logger:      config.Logger,
+		erupeConfig: config.ErupeConfig,
+		db:          config.DB,
+		httpServer:  &http.Server{},
+	}
+	return s
+}
+
+// Start starts the server in a new goroutine.
+func (s *Server) Start() error {
+	// Set up the routes responsible for serving the launcher HTML, serverlist, unique name check, and JP auth.
+	r := mux.NewRouter()
+	r.HandleFunc("/launcher", s.Launcher)
+	r.HandleFunc("/login", s.Login)
+	r.HandleFunc("/register", s.Register)
+	r.HandleFunc("/character/create", s.CreateCharacter)
+	r.HandleFunc("/character/delete", s.DeleteCharacter)
+	handler := handlers.CORS(handlers.AllowedHeaders([]string{"Content-Type"}))(r)
+	s.httpServer.Handler = handlers.LoggingHandler(os.Stdout, handler)
+	s.httpServer.Addr = fmt.Sprintf(":%d", s.erupeConfig.SignV2.Port)
+
+	serveError := make(chan error, 1)
+	go func() {
+		if err := s.httpServer.ListenAndServe(); err != nil {
+			// Send error if any.
+			serveError <- err
+		}
+	}()
+
+	// Get the error from calling ListenAndServe, otherwise assume it's good after 250 milliseconds.
+	select {
+	case err := <-serveError:
+		return err
+	case <-time.After(250 * time.Millisecond):
+		return nil
+	}
+}
+
+// Shutdown exits the server gracefully.
+func (s *Server) Shutdown() {
+	s.logger.Debug("Shutting down")
+
+	s.Lock()
+	s.isShuttingDown = true
+	s.Unlock()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := s.httpServer.Shutdown(ctx); err != nil {
+		// Just warn because we are shutting down the server anyway.
+		s.logger.Warn("Got error on httpServer shutdown", zap.Error(err))
+	}
+}
Author	SHA1	Message	Date
wish	9fb8165be0	temporarily revert versioning	2022-11-10 14:43:58 +11:00
wish	c7ba4bd3fa	fix netcafe time reset	2022-11-10 14:43:23 +11:00
wish	ec2ff61199	update versioning	2022-11-07 08:43:46 +11:00
wish	f52f50a0d6	Merge pull request #52 from rockisch/newsign implement new sign server	2022-11-07 08:38:06 +11:00
wish	492e64d0d0	rename sign server and merge conflicts	2022-11-07 08:37:40 +11:00
wish	4682988442	Merge branch 'main' into pr/sign-v2	2022-11-07 08:28:37 +11:00
wish	6c3be9c32e	decode and support screenshot sharing	2022-11-07 00:31:42 +11:00
wish	6605c6f28a	rearrange config options	2022-11-07 00:30:24 +11:00
wish	d3e9d6971f	rearrange config options	2022-11-07 00:28:43 +11:00
wish	f19dcf7483	rearrange config options	2022-11-07 00:24:11 +11:00
wish	181ea56837	convert token to library	2022-11-07 00:22:16 +11:00
rockisch	7f45d09d96	implement new sign server	2022-11-05 20:28:52 -03:00
wish	c9955a724f	post-9.1 cleanup	2022-11-05 00:23:07 +11:00
wish	bce9838790	remove obsolete EnableLauncherServer option	2022-11-04 19:31:41 +11:00
wish	a99fa78fc2	change recurring course names	2022-11-04 18:02:41 +11:00
wish	e4ac849309	remove free course from config	2022-11-04 12:54:11 +11:00
wish	77f8f2019d	finalise 9.1	2022-11-02 23:44:35 +11:00
wish	226f785c1b	repository cleanup	2022-11-02 23:41:58 +11:00
wish	faee3a3513	Merge pull request #51 from ZeruLight/feature/quest-enum feature/quest-enum	2022-11-02 23:36:26 +11:00
wish	cace0bb829	Merge branch 'main' into feature/quest-enum	2022-11-02 23:31:57 +11:00
wish	1085f54c0f	merge fixes	2022-11-01 12:41:45 +11:00
wish	f435c97f67	Merge branch 'main' into feature/quest-enum # Conflicts: # server/channelserver/handlers_quest.go	2022-11-01 12:24:23 +11:00
wish	a32040eaac	Merge branch 'main' into feature/quest-enum	2022-09-01 01:22:44 +10:00
wish	d993a095a0	update gitignore	2022-08-07 20:49:15 +10:00
wish	057e598cbc	retire questlists dir	2022-08-06 21:54:22 +10:00
wish	40f5744a7b	recurse quest enum into dirs	2022-08-06 19:59:45 +10:00
wish	e84bdd5adf	initial quest enumeration concept	2022-08-06 07:02:38 +10:00