Chat bans & admin cooldowns #13248
Merged
Chat bans & admin cooldowns #13248
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changelog status: 🔘 No changelog |
volas
added
the
Test Merge Candidate
KIBORG04
reviewed
Jul 4, 2024
KIBORG04
reviewed
Jul 4, 2024
KIBORG04
reviewed
Jul 4, 2024
Comment on lines
63
to
64
| else | ||
| return |
KIBORG04
reviewed
Jul 4, 2024
code/modules/admin/verbs/deadsay.dm
Outdated
Comment on lines
10
to
19
| if(prefs.muted & MUTE_IC || IS_ON_ADMIN_CD(src, ADMIN_CD_IC)) | ||
| to_chat(src, "<span class='warning'>You cannot send DSAY messages (muted).</span>") | ||
| return | ||
|
|
||
| if(!(prefs.chat_toggles & CHAT_DEAD)) | ||
| to_chat(src, "<span class='warning'>You have deadchat muted.</span>") | ||
| return | ||
|
|
||
| if (handle_spam_prevention(msg,MUTE_DEADCHAT)) | ||
| if (handle_spam_prevention(msg,ADMIN_CD_IC)) | ||
| return |
There was a problem hiding this comment.
В описании ПРа написано, что дедчат объединен с ООЦ, а не с ИЦ-мутом. Так и должен быть код?
KIBORG04
reviewed
Jul 4, 2024
code/modules/client/preferences.dm
Outdated
| @@ -18,14 +18,15 @@ var/global/list/datum/preferences/preferences_datums = list() | |||
| var/savefile_version = 0 | |||
|
|
|||
| //non-preference stuff | |||
| var/permamuted = 0 | |||
| var/muted = 0 | |||
| var/muted = 0 // cache for chat bans, you should not touch it outside bans | |||
There was a problem hiding this comment.
Может тут добавить какой-то дефайн и поместить рядом с дефайнами MUTE_IC MUTE_OOC MUTE_PRAY? Ну, чтобы было сразу видно при просмотре класса, что такое muted и с какой системой дефайнов он используется?
Ну и не обязательно, пофиг
#define MUTE_NONE 0
Suggested change
| var/muted = 0 // cache for chat bans, you should not touch it outside bans | |
| var/muted = MUTE_NONE // cache for chat bans, you should not touch it outside bans |
KIBORG04
reviewed
Jul 4, 2024
code/modules/client/preferences.dm
Outdated
| var/DBQuery/query = dbcon.NewQuery("SELECT job FROM erro_ban WHERE ckey = '[ckey(parent.ckey)]' AND (bantype = 'CHAT_PERMABAN' OR (bantype = 'CHAT_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)") | ||
| if(!query.Execute()) | ||
| return | ||
| muted = 0 |
There was a problem hiding this comment.
Если захочешь тот дефайн делать, про который я писал выше, то тут не забыть
KIBORG04
reviewed
Jul 4, 2024
Comment on lines
16
to
20
| if(client.prefs.muted & MUTE_IC || IS_ON_ADMIN_CD(client, ADMIN_CD_IC)) | ||
| to_chat(src, "<span class='alert'>You cannot emote in deadchat (muted).</span>") | ||
| return | ||
|
|
||
| if(client.handle_spam_prevention(message, MUTE_DEADCHAT)) | ||
| if(client.handle_spam_prevention(message, ADMIN_CD_IC)) |
There was a problem hiding this comment.
то же, почему дедчат забанен через мут_иц, а не мут_ооц?
KIBORG04
reviewed
Jul 4, 2024
code/modules/mob/emote.dm
Outdated
| @@ -7,7 +7,7 @@ | |||
|
|
|||
| /mob/proc/emote_dead(message) | |||
|
|
|||
| if(client.prefs.muted & MUTE_DEADCHAT) | |||
| if(client.prefs.muted & MUTE_IC || IS_ON_ADMIN_CD(client, ADMIN_CD_IC)) | |||
KIBORG04
reviewed
Jul 4, 2024
code/modules/mob/say.dm
Outdated
| @@ -67,11 +67,11 @@ | |||
| to_chat(src, "<span class='red'> You have deadchat muted.</span>") | |||
| return | |||
|
|
|||
| if(client.prefs.muted & MUTE_DEADCHAT) // Admin/autospam mute check | |||
| if(client.prefs.muted & MUTE_IC || IS_ON_ADMIN_CD(client, ADMIN_CD_IC)) // Admin/autospam mute check | |||
AzzyDreemurr13
added
the
Admin
Co-authored-by: KIBORG04 <bossmira4@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание изменений
Еще одна часть #13141, вынесенная отдельно. В целом, вместе с чисткой префов небольшой реворк мутов.
И небольшая амнистия - я не конвертирую старые пермамуты в новые чат баны, это будет слишком запарно. Хедсостав одобрил, какие-то муты они в ручную перенесут. Но даже если кого пропустят, нотесы о мутах никуда не денутся.
Почему и что этот ПР улучшит
Авторство
Чеинжлог