Commit Graph

607 Commits

Author SHA1 Message Date
MangosArentLiterature
6e2a3a0fca Fix crash relating to ConfigManager changes 2021-06-21 22:05:59 -05:00
MangosArentLiterature
5d63ce7a2a Merge branch 'master' into discord-refactor 2021-06-21 21:52:24 -05:00
scatterflower
4f4b64e662
Merge pull request #140 from AttorneyOnline/fix-logging
Log commands and OOC messages separately
2021-06-21 21:46:29 -05:00
scatterflower
86e8d4dd7b
Merge pull request #141 from AttorneyOnline/fix-ban-crash
Fix crash with /ban
2021-06-21 21:45:53 -05:00
scatterflower
3d0b954536
Merge pull request #142 from AttorneyOnline/case-sens
Make iniswap detection case-insensitive
2021-06-21 21:45:18 -05:00
scatterflower
ac8bdd41dc
Merge pull request #144 from AttorneyOnline/config-rewrite
Rewrite ConfigManager and introduce new types for auth and logging.
2021-06-21 21:44:50 -05:00
MangosArentLiterature
624202beba Add comments to the sample config 2021-06-19 23:41:56 -05:00
MangosArentLiterature
0e6efb18c0 Use QSettings instead of settings struct
As it turns out, I am not intelligent.
2021-06-19 23:05:33 -05:00
MangosArentLiterature
c4db245bec Rewrite ConfigManager and server configs
- Rewrites ConfigManager
- Adds DataTypes
- Changes "auth" and "logging" to use new AuthType and LogType types.
- ConfigManager now handles all config loading
- Remove AreaData and Server config.ini and command config loading.
2021-06-18 18:06:32 -05:00
MangosArentLiterature
4f7d5cd045 Discord webhook refactor
Completely refactors the Discord class, breaking it up into separate functions and slots, removing circular dependencies, and replacing most pointers with const references.
2021-06-17 19:21:37 -05:00
in1tiate
bdd5ad745c Make iniswap detection ignore case 2021-06-17 03:32:01 -05:00
MangosArentLiterature
da7aa12b90 Fix crash with /ban
Sets /ban to require 3 arguments instead of 2
2021-06-14 11:24:18 -05:00
MangosArentLiterature
c7a1bc3ec9 fix documentation part 2 2021-06-12 12:15:20 -05:00
MangosArentLiterature
bfe5c8c733 fix documentation
def. didn't forget to do this
2021-06-12 12:13:26 -05:00
MangosArentLiterature
8416232ff9 Log commands and OOC messages separately
Now every OOC message won't be treated as if it were a command, only commands will be sent to the command logger.
Also, much needed .gitignore update
2021-06-12 12:05:47 -05:00
scatterflower
4c32cf86cc
Merge pull request #128 from AttorneyOnline/password-requirements
Add password requirements
2021-06-06 14:08:33 -05:00
scatterflower
1a0cb3c6ef
Merge pull request #125 from AttorneyOnline/ban-updating
Add /updateban
2021-06-06 14:07:57 -05:00
MangosArentLiterature
e4ba01c27b Fix area test
Co-Authored-By: Cerapter <43446478+Cerapter@users.noreply.github.com>
2021-06-03 16:48:25 -05:00
MangosArentLiterature
526ebcf635 Fix testimony recorder
Fixes the entirely broken testimony recorder and makes it work like intended.

Co-Authored-By: Cerapter <43446478+Cerapter@users.noreply.github.com>
Co-Authored-By: Salanto <62221668+Salanto@users.noreply.github.com>
2021-06-03 16:10:28 -05:00
MangosArentLiterature
17cd92bc5b Fix character being considered taken upon changing areas
Fixes a bug that would cause the server to consider your character taken when switching to a new area, booting you to char select and preventing your original character from being reselected.
2021-06-03 14:16:52 -05:00
MangosArentLiterature
65467df4ba Merge branch 'master' into password-requirements 2021-06-03 11:56:27 -05:00
MangosArentLiterature
6cf9f2dd23 Merge branch 'master' into ban-updating 2021-06-03 11:44:07 -05:00
MangosArentLiterature
44519c0db3 Fix character selection
- Fix an issue allowing you to select taken characters
- Fix a regression of #64

Co-Authored-By: Cerapter <43446478+Cerapter@users.noreply.github.com>
2021-06-02 16:17:07 -05:00
MangosArentLiterature
17ab971e85 Fix command UID crash
Fix several commands targeting clients by UID crashing the server by not properly checking if the client they want exists.
2021-05-31 20:50:46 -05:00
scatterflower
eb834a639d
Merge pull request #131 from Salanto/discord_content
Discord content
2021-05-24 14:22:35 -05:00
Salanto
d52c069df2 Merge branch 'master' into discord_content 2021-05-15 16:53:05 +02:00
scatterflower
ad993c1616
Merge pull request #104 from Cerapter/tests-beginning
Tests, Subdirs, AreaData rework
2021-05-15 09:48:35 -05:00
Salanto
ec4e9cc9f2 Update discord.cpp 2021-05-13 17:07:15 +02:00
Cerapter
e6b00575d8 Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-13 07:15:18 +02:00
Rebecca
ade32a9f4f
Update src/server.cpp
Co-authored-by: Rose <32779090+in1tiate@users.noreply.github.com>
2021-05-11 18:17:23 -05:00
Rebecca
93de5d3860
Update bin/config_sample/config.ini
Co-authored-by: Rose <32779090+in1tiate@users.noreply.github.com>
2021-05-11 18:17:13 -05:00
Salanto
53290b0d53 Apparently Linux does not like this. 2021-05-12 00:25:13 +02:00
Salanto
d55f4b58cf Somehow this got not commited 2021-05-12 00:13:22 +02:00
Salanto
fb1caf6cee Add optional content field for Webhook
Allows the usage of pings with the webhook. Only added to the hook message if configured.
2021-05-12 00:12:46 +02:00
MangosArentLiterature
c0b9aa2edd Merge branch 'master' into ban-updating 2021-05-11 12:15:54 -05:00
scatterflower
1696d13b18
Merge pull request #126 from AttorneyOnline/password-changing
Add /changepass
2021-05-11 08:48:04 -05:00
scatterflower
afa6b67085
Merge branch 'master' into password-changing 2021-05-11 08:46:08 -05:00
scatterflower
9e0d121fa4
Merge pull request #122 from AttorneyOnline/ban-table-additions
Add a moderator field to the ban table, add DB versioning, and fix /baninfo and /bans
2021-05-11 08:45:07 -05:00
scatterflower
f01db9b22e
Merge pull request #120 from Salanto/add-asset-packet
Add asset packet + network encoding
2021-05-11 08:44:09 -05:00
Cerapter
de085461d9 Fix testimony problems, simplify statement hops, add tests for testimony 2021-05-09 18:02:50 +02:00
Cerapter
4ed0c1e238
Disable use of cringe cmd in test running on Windows 2021-05-09 17:03:14 +02:00
Cerapter
0655294ae4 Add static config for Windows 2021-05-09 16:58:01 +02:00
Cerapter
ba3d20186d Merge remote-tracking branch 'refs/remotes/scatter/master'
Conflicts:
	akashi.pro
	core/src/aoclient.cpp
	core/src/commands/authentication.cpp
	core/src/packets.cpp
	src/aoclient.cpp
	src/commands/authentication.cpp
	src/packets.cpp
2021-05-09 15:11:02 +02:00
Cerapter
7a0fe78836 Add more tests, document tests 2021-05-09 15:02:14 +02:00
Cerapter
f12567cd07 Document remaining AreaData functions 2021-05-09 14:25:30 +02:00
MangosArentLiterature
bedf24a7d6 Merge branch 'password-changing' into password-requirements 2021-05-08 23:28:53 -05:00
MangosArentLiterature
7b100ba2ad Inform clients they are not logged in 2021-05-08 23:28:27 -05:00
MangosArentLiterature
7c09ce6b5c Add password requirements
* Adds several configurable options for server owners to set requirements for passwords.
* This system can be enabled/disabled with the password_requirements option.
* Checks new and updated passwords against these requirements.
2021-05-08 21:15:16 -05:00
MangosArentLiterature
b7d95de9dc Add /changepass
* Adds a command allowing moderators to change their password.
* Users with SUPER permissions can change the password of other moderators.
* Resolves #124
2021-05-08 14:58:22 -05:00
MangosArentLiterature
7c85dd4408 Add /updateban
* Adds a command to allow a moderator to update a ban, changing its reason or duration.
* Resolves #123
2021-05-08 12:27:16 -05:00