Skip to content
This repository was archived by the owner on Jul 17, 2020. It is now read-only.

Commit 742a910

Browse files
author
Zirak
committed
welcome no longer uses regexps to parse html. huzzah!
1 parent 0822a90 commit 742a910

File tree

3 files changed

+34
-32
lines changed

3 files changed

+34
-32
lines changed

master.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7477,8 +7477,6 @@ var message = "Welcome to the JavaScript chat! Please review the " +
74777477
". Please don't ask if you can ask or if anyone's around; just ask " +
74787478
"your question, and if anyone's free and interested they'll help.";
74797479

7480-
var messageCountRe = /transcript\/17(?:'|")>([\d\.]+)(k?)/i;
7481-
74827480
function welcome ( name, room ) {
74837481
bot.adapter.out.add(
74847482
bot.adapter.reply( name ) + " " + message, room );
@@ -7501,20 +7499,23 @@ IO.register( 'userregister', function ( user, room ) {
75017499
method : 'GET',
75027500
url : '/users/' + user.id,
75037501

7502+
document : true,
75047503
complete : complete
75057504
});
75067505

7507-
function complete ( resp ) {
7508-
//I'm parsing html with regexps. hopefully Cthulu won't eat me.
7509-
// <a href="/transcript/17">7</a>
7510-
// [..., "17", null]
7511-
// <a href="/transcript/17">2.1k</a>
7512-
// [..., "2.1", "k"]
7513-
var chatMessages = messageCountRe.exec( resp ),
7506+
function complete ( doc ) {
7507+
//<div id='room-17'>
7508+
// ...
7509+
// <div class='room-message-count' title='72279 all time messages (by Zirak)
7510+
// ...
7511+
// </div>
7512+
// ...
7513+
//</div>
7514+
var messageCount = doc.querySelector( '#room-17 .room-message-count' ),
75147515
newUser;
75157516

7516-
if ( chatMessages ) {
7517-
newUser = !chatMessages[ 2 ] && Number( chatMessages[1] ) < 2;
7517+
if ( messageCount ) {
7518+
newUser = Number( /^\d+/.exec(messageCount.title) ) < 2;
75187519
}
75197520
else {
75207521
newUser = true;

0 commit comments

Comments
 (0)