IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-07 05:35:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for violations on horse profile, ranch info, and player profile

Browse source
This commit is contained in:
SilicaAndPina 2021-07-07 00:03:56 +12:00
parent 03c2b8e5a1
commit 8e483708b0
4 changed files with 64 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DataCollection/gamedata.json
View file

@ -54,10 +54,6 @@
"too_long":"Profile TOO LONG, 4,000 char max!", "too_long":"Profile TOO LONG, 4,000 char max!",
"blocked":"Profile NOT SAVED, Chat Violations Present! (%REASON%)", "blocked":"Profile NOT SAVED, Chat Violations Present! (%REASON%)",
}, },
"prof_reasons":{
"profanity":"Profanity detected.",
"personal_info":"No giving out personal info/websites.",
},
"private_notes_save":"Saved Private Notes.", "private_notes_save":"Saved Private Notes.",
"buddy_request":"Attempting to Add Buddy. The other player must click ADD BUDDY as well. (Many players reserve this for just a couple players so don't feel insulted if they do not).", "buddy_request":"Attempting to Add Buddy. The other player must click ADD BUDDY as well. (Many players reserve this for just a couple players so don't feel insulted if they do not).",
"click_nothing_message":"Nothing interesting here...", "click_nothing_message":"Nothing interesting here...",

20
Horse Isle Server/HorseIsleServer/Game/Messages.cs
View file

@ -607,10 +607,9 @@ namespace HISP.Game
public static string ProfileSavedMessage; public static string ProfileSavedMessage;
public static string ProfileTooLongMessage; public static string ProfileTooLongMessage;
public static string ProfileSaveBlockedFormat;
public static string ProfileViolationFormat; public static string ProfileViolationFormat;
public static string ProfileViolationPersonalInfo;
public static string ProfileViolationProfanity;
// Hay Pile // Hay Pile
public static string HasPitchforkMeta; public static string HasPitchforkMeta;
@ -1103,6 +1102,8 @@ namespace HISP.Game
public static string PlayerListIconFormat; public static string PlayerListIconFormat;
public static string PlayerListIconInformation; public static string PlayerListIconInformation;
// Meta // Meta
public static string IsleFormat; public static string IsleFormat;
public static string TownFormat; public static string TownFormat;
@ -1206,8 +1207,19 @@ namespace HISP.Game
// Click // Click
public static string NothingInterestingHere; public static string NothingInterestingHere;
// Violations
public static string FormatProfileSavedBlocked(string reasons)
{
return ProfileViolationFormat.Replace("%REASON%", reasons);
}
public static string FormatRanchDesriptionBlocked(string reasons)
{
return RanchSavedDescrptionViolationsErrorFormat.Replace("%REASON%", reasons);
}
public static string FormatHorseProfileBlocked(string reasons)
{
return HorseProfileMessageProfileError.Replace("%REASON%", reasons);
}
// Throwables // Throwables
public static string FormatModSplatterBallAwardedOther(string username) public static string FormatModSplatterBallAwardedOther(string username)

4
Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs
View file

@ -1384,9 +1384,6 @@ namespace HISP.Server
Messages.ProfileTooLongMessage = gameData.messages.profile.too_long; Messages.ProfileTooLongMessage = gameData.messages.profile.too_long;
Messages.ProfileViolationFormat = gameData.messages.profile.blocked; Messages.ProfileViolationFormat = gameData.messages.profile.blocked;
Messages.ProfileViolationProfanity = gameData.messages.profile.profanity;
Messages.ProfileViolationPersonalInfo = gameData.messages.profile.personal_info;
// Announcements // Announcements
Messages.WelcomeFormat = gameData.messages.welcome_format; Messages.WelcomeFormat = gameData.messages.welcome_format;
@ -1963,6 +1960,7 @@ namespace HISP.Server
Messages.PlayerListAllHeader = gameData.messages.meta.player_list.all_players_header; Messages.PlayerListAllHeader = gameData.messages.meta.player_list.all_players_header;
Messages.PlayerListIconFormat = gameData.messages.meta.player_list.icon_format; Messages.PlayerListIconFormat = gameData.messages.meta.player_list.icon_format;
Messages.PlayerListIconInformation = gameData.messages.meta.player_list.icon_info; Messages.PlayerListIconInformation = gameData.messages.meta.player_list.icon_info;
// Consume // Consume
Messages.ConsumeItemFormat = gameData.messages.consume.consumed_item_format; Messages.ConsumeItemFormat = gameData.messages.consume.consumed_item_format;

49
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -2448,11 +2448,28 @@ namespace HISP.Server
break; break;
} }
object filterReason = Chat.FilterMessage(name);
if (filterReason != null)
{
byte[] msg = PacketBuilder.CreateChat(Messages.HorseNameViolationsError, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msg);
return;
}
filterReason = Chat.FilterMessage(desc);
if (filterReason != null)
{
Chat.Reason reason = (Chat.Reason)filterReason;
byte[] msg = PacketBuilder.CreateChat(Messages.FormatHorseProfileBlocked(reason.Message), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msg);
return;
}
sender.LoggedinUser.MetaPriority = true; sender.LoggedinUser.MetaPriority = true;
sender.LoggedinUser.LastViewedHorse.Name = dynamicInput[1]; sender.LoggedinUser.LastViewedHorse.Name = dynamicInput[1];
sender.LoggedinUser.LastViewedHorse.Description = dynamicInput[2]; sender.LoggedinUser.LastViewedHorse.Description = dynamicInput[2];
byte[] horseNameSavedPacket = PacketBuilder.CreateChat(Messages.FormatHorseSavedProfileMessage(sender.LoggedinUser.LastViewedHorse.Name), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] horseProfileSavedPacket = PacketBuilder.CreateChat(Messages.FormatHorseSavedProfileMessage(sender.LoggedinUser.LastViewedHorse.Name), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(horseNameSavedPacket); sender.SendPacket(horseProfileSavedPacket);
UpdateHorseMenu(sender, sender.LoggedinUser.LastViewedHorse); UpdateHorseMenu(sender, sender.LoggedinUser.LastViewedHorse);
} }
break; break;
@ -2546,6 +2563,25 @@ namespace HISP.Server
sender.SendPacket(tooLongPacket); sender.SendPacket(tooLongPacket);
break; break;
} }
object filterReason = Chat.FilterMessage(title);
if (filterReason != null)
{
byte[] msg = PacketBuilder.CreateChat(Messages.RanchSavedTitleViolationsError, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msg);
return;
}
filterReason = Chat.FilterMessage(desc);
if (filterReason != null)
{
Chat.Reason reason = (Chat.Reason)filterReason;
byte[] msg = PacketBuilder.CreateChat(Messages.FormatRanchDesriptionBlocked(reason.Message), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msg);
return;
}
sender.LoggedinUser.OwnedRanch.Title = title; sender.LoggedinUser.OwnedRanch.Title = title;
sender.LoggedinUser.OwnedRanch.Description = desc; sender.LoggedinUser.OwnedRanch.Description = desc;
} }
@ -4353,6 +4389,15 @@ namespace HISP.Server
return; return;
} }
object filterReason = Chat.FilterMessage(profilePage);
if(filterReason != null)
{
Chat.Reason reason = (Chat.Reason)filterReason;
byte[] msg = PacketBuilder.CreateChat(Messages.FormatProfileSavedBlocked(reason.Message), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(msg);
return;
}
sender.LoggedinUser.ProfilePage = profilePage; sender.LoggedinUser.ProfilePage = profilePage;
Logger.DebugPrint(sender.LoggedinUser.Username + " Changed to character id: " + characterId + " and set there Profile Description to '" + profilePage + "'"); Logger.DebugPrint(sender.LoggedinUser.Username + " Changed to character id: " + characterId + " and set there Profile Description to '" + profilePage + "'");