colin/abaddon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update invite regex

Browse Source
This commit is contained in:
ouwou
2020-10-12 15:55:39 -04:00
parent 21fdada41c
commit d48fe29da9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dialogs/joinguild.cpp
View File

@@ -42,11 +42,11 @@ JoinGuildDialog::JoinGuildDialog(Gtk::Window &parent)
void JoinGuildDialog::on_entry_changed() { void JoinGuildDialog::on_entry_changed() {
std::string s = m_entry.get_text(); std::string s = m_entry.get_text();
std::regex invite_regex(R"~(discord\.(gg|com)\/([a-zA-Z0-9]+)$)~", std::regex_constants::ECMAScript); std::regex invite_regex(R"((https?:\/\/)?discord\.(gg(\/invite)?\/|com\/invite\/)([A-Za-z0-9\-]+))", std::regex_constants::ECMAScript);
std::smatch match; std::smatch match;
bool full_url = std::regex_search(s, match, invite_regex); bool full_url = std::regex_search(s, match, invite_regex);
if (full_url || IsCode(s)) { if (full_url || IsCode(s)) {
m_code = full_url ? match[2].str() : s; m_code = full_url ? match[4].str() : s;
m_needs_request = true; m_needs_request = true;
m_ok.set_sensitive(false); m_ok.set_sensitive(false);
} else { } else {