Commit Graph

241 Commits

Author SHA1 Message Date
Salanto
96396d3404 Apply some suggested changes 2021-04-29 01:02:47 +02:00
Salanto
b689c71533 Revert "Apply code suggestions"
This reverts commit e00e7b571d.
2021-04-28 23:53:03 +02:00
Salanto
e00e7b571d Apply code suggestions
Non-functional as of now.
2021-04-28 23:32:48 +02:00
Salanto
32e88d6be1 Merge remote-tracking branch 'upstream/master' into discord 2021-04-27 23:42:14 +02:00
Salanto
8aed2989f2 Add file upload if modcall logging is used
+ Configurable option if no log should be send
+ Fix  logger not flushing to file if modcall is used
+ Update sample\config.ini
2021-04-27 23:28:45 +02:00
MangosArentLiterature
e75b80aaae Add modcall webhook support
This is the worst code I have ever contributed to this project. This commit is the result of several days of attempting to decipher Qt's documentation. This is the best I can write. Qt has broken me. God help us all.

- Allows sending modcalls to a discord webhook, containing the name of the sender, the area, and the reason.
- Adds configurable options to config.ini for enabling/disabling webhooks and specifying the webhook url.
2021-04-25 15:49:47 -05:00
MangosArentLiterature
2f69b51280 Limit the amount of data the server will read
Set a hard limit on 30KB that the server is willing to read, over two sequential reads. If the client sends more than 30KB combined, the server will disconnect the client.
2021-04-20 11:51:22 -05:00
MangosArentLiterature
9c3cd12202 Add a size limit to packets and a configurable maximum character limit for messages
- Limits packets to under 16KB
- Adds a configurable option to config.ini for setting the maximum amount of characters in an IC/OOC message
- Limits the size of OOC names to 30 chars
   - The client already limits this, but this is an added precaution.
- Limits the length of shownames to 30 chars
- Implements shownames_allowed for areas, for toggling whether shownames are allowed for messages in that area
2021-04-19 19:44:46 -05:00
scatterflower
e252ed04e9 make it configurable 2021-04-19 02:09:24 -05:00
Marisa P
0454ac114c
Merge pull request #88 from AttorneyOnline/messaging-commands
Add /charcurse and /uncharcurse
2021-04-18 21:23:35 -05:00
MangosArentLiterature
fcce8d9699 Document charcurse_list, fix /charcurse 2021-04-18 20:50:44 -05:00
MangosArentLiterature
8933ec2809 Clean up documentation, remove RollType
- Cleans up documentation for cmdRoll cmdRollP and diceThrower()
- Removes the obsolete enum RollType
2021-04-18 20:30:11 -05:00
MangosArentLiterature
75fe0a86f1 Merge branch 'master' into dice-roller-and-togglemusic 2021-04-18 20:22:57 -05:00
MangosArentLiterature
cf1e1cfc95 Add /togglemusic
- Adds /togglemusic to toggle whether music can be played in an area. CM's can still play music.
- Add toggle_music option to area.ini to set the default value in an area. Default value is set to true.
- Also fixes a missing period in the documentation for force_immediate. Because I noticed it.
2021-04-18 20:21:17 -05:00
MangosArentLiterature
a32cc0e27f Refactor AOClient::diceThrower() 2021-04-18 19:56:03 -05:00
scatterflower
5d1094c12d fix messed up merge conflict resolution 2021-04-18 19:44:34 -05:00
Marisa P
647c3cb398
Merge branch 'master' into messaging-commands 2021-04-18 19:41:56 -05:00
scatterflower
08ba6ef278 change curse list to int list, marked unavailable chars as taken 2021-04-18 18:57:33 -05:00
Salanto
40552b1602 Add /a and /s 2021-04-19 00:48:51 +02:00
MangosArentLiterature
6dfd7d173a Merge branch 'master' into messaging-commands 2021-04-18 16:18:05 -05:00
scatterflower
8156ae6515 add /charselect 2021-04-18 16:04:20 -05:00
Salanto
bddbafb87e Merge remote-tracking branch 'upstream/master' into Testimony-Loading/Saving 2021-04-18 22:34:56 +02:00
Marisa P
97b3ea24cd
Merge pull request #86 from AttorneyOnline/messaging-commands
Add /mutepm and /toggleadverts
2021-04-18 15:33:21 -05:00
MangosArentLiterature
760d46b206 add /charcurse and /uncharcurse
this code makes me want to die. please end my suffering.
2021-04-18 14:45:53 -05:00
Salanto
5eabcc191e Add /testimony 2021-04-18 20:52:27 +02:00
Salanto
73cd8f1eb9 Account for older server settings 2021-04-18 13:42:08 +02:00
MangosArentLiterature
bcaf9a1f29 Merge branch 'master' into messaging-commands 2021-04-17 22:34:31 -05:00
MangosArentLiterature
3700524af7 Update documentation for cmdRandomChar
forgot to do this lol
2021-04-17 22:15:16 -05:00
Salanto
558dcc3378 Merge remote-tracking branch 'upstream/master' into Testimony-Loading/Saving 2021-04-18 04:03:07 +02:00
Salanto
3c5659af22 Add testimony loading and saving 2021-04-18 03:59:12 +02:00
Marisa P
c70d2afbeb
Merge pull request #78 from AttorneyOnline/fix-ooc-mute
add missing commands to the command table
2021-04-17 20:42:16 -05:00
Marisa P
068f605c64
Merge pull request #79 from AttorneyOnline/command-split
Move cmdAfk to messaging category
2021-04-17 20:41:50 -05:00
Marisa P
b3872aa888
Merge pull request #81 from AttorneyOnline/testimony-decoding
Decode MS packet before testimony recorder regex
2021-04-17 20:41:24 -05:00
MangosArentLiterature
b99660d9c3 Decode MS packet before testimony recorder regex
- Fixes an issue with the testimony recorder checking for >[statement], where due to AO encoding, special characters would improperly match the regex. For example, "%[statement]" would become "<percent>[statement]", thus matching against >[statement]. This commit decodes those characters first.

- Adds AOClient::decodeMessage() for decoding a QString.
2021-04-17 18:45:05 -05:00
MangosArentLiterature
e52d85c01a Add /toggleadverts 2021-04-17 15:20:28 -05:00
MangosArentLiterature
388ad345a5 Add /mutepm 2021-04-17 14:15:04 -05:00
MangosArentLiterature
b7f8f78690 Allow moderators to uncm other clients
- Adds "UNCM" permissions for uncming
2021-04-16 18:25:12 -05:00
MangosArentLiterature
67f7acc34a Move cmdAfk to messaging category
cmdAfk is a command that changes the clients status to AFK. As such, it belongs under the messaging category, which includes commands that handle a clients self-management.
2021-04-16 13:57:33 -05:00
MangosArentLiterature
96407ad4bd Add /blockdj and /unblockdj
- More commands that never got added to the table.
- Also fixes /blockdj incorrectly blocking a client from changing areas.
- Checks if a client is DJ blocked when using /play
2021-04-16 13:22:42 -05:00
MangosArentLiterature
37e91708f7 Add /blockwtce and /unblockwtce
more finished commands that never got put on the commands table
2021-04-16 01:37:50 -05:00
MangosArentLiterature
3589d706ef add /oocmute and /oocunmute to the command table
people really need to stop forgetting to do this lmao
2021-04-16 01:24:24 -05:00
MangosArentLiterature
ea50100acf Sort out new commands from master, delete commands.cpp
🦀 🦀
2021-04-15 18:13:15 -05:00
MangosArentLiterature
577e2b5095 Revert "Revert "Merge branch 'master' into command-split""
This reverts commit 58f2d1e2b7.
2021-04-15 18:01:51 -05:00
MangosArentLiterature
58f2d1e2b7 Revert "Merge branch 'master' into command-split"
This reverts commit b3d170c019, reversing
changes made to 885de71417.
2021-04-15 18:00:04 -05:00
MangosArentLiterature
b3d170c019 Merge branch 'master' into command-split 2021-04-15 17:57:21 -05:00
MangosArentLiterature
885de71417 Split up commands.cpp
the beast has been vanquished
2021-04-15 17:55:15 -05:00
in1tiate
93c4f19bfb
Merge branch 'master' into afk 2021-04-15 14:30:20 -05:00
in1tiate
b1dfeec8f5 euthanize morton, code cleanup 2021-04-15 13:58:41 -05:00
in1tiate
12bba40a99 implement case announcements 2021-04-15 10:25:25 -05:00
in1tiate
a32b33d957 even more elegant repeat afk fix 2021-04-15 06:44:14 -05:00