Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More lobby tips #354

Merged
merged 4 commits into from
Aug 12, 2024
Merged

More lobby tips #354

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ad8d2c
More lobby tips
jauggy Jul 10, 2024
5b9eeb2
Merge remote-tracking branch 'upstream/master' into jauggy/more-tips
jauggy Jul 22, 2024
0c62fa2
Update based on GeekingFrog feedback
jauggy Jul 22, 2024
37d58d8
Use ! instead of $
jauggy Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 55 additions & 28 deletions lib/teiserver/lobby/libs/lobby_restrictions.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defmodule Teiserver.Lobby.LobbyRestrictions do

@rank_upper_bound 1000
@rating_upper_bound 1000
@splitter "---------------------------"
@splitter "------------------------------------------------------"
@spec rank_upper_bound() :: number
def rank_upper_bound, do: @rank_upper_bound
def rating_upper_bound, do: @rating_upper_bound
Expand Down Expand Up @@ -193,24 +193,57 @@ defmodule Teiserver.Lobby.LobbyRestrictions do
{:error,
"* You cannot declare a lobby to be all welcome if there are player restrictions"}

is_noob_title?(name) ->
{:ok, get_noob_looby_tips()}
true ->
{:ok, get_tips(name)}
end
end

defp get_tips(name) do
tips = [] ++ get_noob_looby_tips(name) ++ get_rotato_tips(name)

case length(tips) do
0 -> nil
_ -> tips
end
end

defp get_noob_looby_tips(lobby_title) do
case is_noob_title?(lobby_title) do
true ->
{:ok, nil}
[
@splitter,
"Useful commands for Noob lobbies",
@splitter,
"To restrict this lobby to players who are new, use either:",
"!maxchevlevel <chevlevel>",
"!maxratinglevel <rating>",
"",
"To ensure new players are distributed evenly across teams:",
"!balancealgorithm split_one_chevs",
""
]

false ->
[]
end
end

defp get_noob_looby_tips() do
[
@splitter,
"Noob lobby tips",
@splitter,
"To restrict this lobby to players who are new, use command:",
"$maxchevlevel <chevlevel>",
"To ensure new players are distributed evenly across teams, use command:",
"$balancemode split_one_chevs"
]
defp get_rotato_tips(lobby_title) do
case is_rotato_title?(lobby_title) do
true ->
[
# Temporary tips until this is part of Chobby UI
@splitter,
"Useful commands for map rotation",
@splitter,
"To turn on/off auto map rotation at end of each match:",
"!rotationEndGame <(random|off)>",
""
]

false ->
[]
end
end

# Check if lobby has restrictions for playing
Expand Down Expand Up @@ -260,22 +293,16 @@ defmodule Teiserver.Lobby.LobbyRestrictions do
"""
@spec is_noob_title?(String.t()) :: boolean()
def is_noob_title?(title) do
title =
title
|> String.downcase()
anti_noob_regex = ~r/no (noob|newb|nub)/i
noob_regex = ~r/\b(noob|newb|nub(s|\b))/i
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does \b do?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a word boundary. So nub or nubs would be a match. But a player named "Anubis" who has their name in the room title would not be a match.


anti_noob_regex = ~r/no (noob|newb|nub)/
noob_regex = ~r/\b(noob|newb|nub(s|\b))/

noob_matches =
Regex.scan(noob_regex, title)
|> Enum.count()
Regex.match?(noob_regex, title) && !Regex.match?(anti_noob_regex, title)
end

anti_noob_matches =
Regex.scan(anti_noob_regex, title)
|> Enum.count()
@spec is_rotato_title?(String.t()) :: boolean()
def is_rotato_title?(title) do
regex = ~r/\b(rotat)/i

# Returns true if both critera met
noob_matches > 0 && anti_noob_matches == 0
Regex.match?(regex, title)
end
end
Loading