Refactor lastAttackedBy to hurtBy

chat-commands.js

@@ -777,9 +777,7 @@ const commands = {
  let roomid = target.trim();
  if (!roomid) {
  // allow deleting personal rooms without typing out the room name
- if (room.isPersonal && cmd === "deletegroupchat") {
- roomid = room.id;
- } else {
+ if (!room.isPersonal || cmd !== "deletegroupchat") {
  return this.parse(`/help deleteroom`);
  }
  } else {
@@ -1063,7 +1061,7 @@ const commands = {
  }
  if (!this.can('declare')) return false;
  if (target.length > 80) return this.errorReply(`Error: Room description is too long (must be at most 80 characters).`);
- let normalizedTarget = ' ' + target.toLowerCase().replace('[^a-zA-Z0-9]+', ' ').trim() + ' ';
+ let normalizedTarget = ' ' + target.toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim() + ' ';
 
  if (normalizedTarget.includes(' welcome ')) {
  return this.errorReply(`Error: Room description must not contain the word "welcome".`);
@@ -1263,6 +1261,7 @@ const commands = {
  }
  if (!target) return this.parse('/help roomowner');
  target = this.splitTarget(target, true);
+ if (target) return this.errorReply(`This command does not support specifying a reason.`);
  let targetUser = this.targetUser;
  let name = this.targetUsername;
  let userid = toId(name);
@@ -1551,8 +1550,7 @@ const commands = {
  this.privateModAction(displayMessage);
  }
  }
- this.add(`|unlink|hide|${userid}`);
- if (userid !== toId(this.inputUsername)) this.add(`|unlink|hide|${toId(this.inputUsername)}`);
+ room.hideText([userid, toId(this.inputUsername)]);
 
  if (room.isPrivate !== true && room.chatRoomData) {
  this.globalModlog("ROOMBAN", targetUser, ` by ${user.userid} ${(target ? `: ${target}` : ``)}`);
@@ -1737,6 +1735,7 @@ const commands = {
  unmute: function (target, room, user) {
  if (!target) return this.parse('/help unmute');
  target = this.splitTarget(target);
+ if (target) return this.errorReply(`This command does not support specifying a reason.`);
  if (!this.canTalk()) return;
  if (!this.can('mute', null, room)) return false;
 
@@ -1860,8 +1859,7 @@ const commands = {
  displayMessage = `(${name}'s ac account: ${acAccount})`;
  this.privateModAction(displayMessage);
  }
- this.add(`|unlink|hide|${userid}`);
- if (userid !== toId(this.inputUsername)) this.add(`|unlink|hide|${toId(this.inputUsername)}`);
+ room.hideText([userid, toId(this.inputUsername)]);
 
  const globalReason = (target ? `: ${userReason} ${proof}` : '');
  this.globalModlog((week ? "WEEKLOCK" : "LOCK"), targetUser || userid, ` by ${user.userid}${globalReason}`);
@@ -1904,7 +1902,58 @@ const commands = {
  this.errorReply(`User '${target}' is not locked.`);
  }
  },
- unlockhelp: [`/unlock [username] - Unlocks the user. Requires: % @ * & ~`],
+ unlockname: function (target, room, user) {
+ if (!target) return this.parse('/help unlock');
+ if (!this.can('lock')) return false;
+
+ const userid = toId(target);
+ const punishment = Punishments.userids.get(userid);
+ if (!punishment) return this.errorReply("This name isn't locked.");
+ if (punishment[1] === userid) return this.errorReply(`"${userid}" was specifically locked by a staff member (check the global modlog). Use /unlock if you really want to unlock this name.`);
+
+ Punishments.userids.delete(userid);
+ Punishments.savePunishments();
+
+ for (const curUser of Users.findUsers([userid], [])) {
+ if (curUser.locked && !curUser.locked.startsWith('#') && !Punishments.getPunishType(curUser.userid)) {
+ curUser.locked = false;
+ curUser.namelocked = false;
+ curUser.updateIdentity();
+ }
+ }
+ this.globalModlog("UNLOCKNAME", userid, ` by ${user.name}`);
+ this.addModAction(`The name '${target}' was unlocked by ${user.name}.`);
+ },
+ unlockip: function (target, room, user) {
+ target = target.trim();
+ if (!target) return this.parse('/help unlock');
+ if (!this.can('ban')) return false;
+ const range = target.charAt(target.length - 1) === '*';
+ if (range && !this.can('rangeban')) return false;
+
+ if (!/^[0-9.*]+$/.test(target)) return this.errorReply("Please enter a valid IP address.");
+
+ const punishment = Punishments.ips.get(target);
+ if (!punishment) return this.errorReply(`${target} is not a locked/banned IP or IP range.`);
+
+ Punishments.ips.delete(target);
+ Punishments.savePunishments();
+
+ for (const curUser of Users.findUsers([], [target])) {
+ if (curUser.locked && !curUser.locked.startsWith('#') && !Punishments.getPunishType(curUser.userid)) {
+ curUser.locked = false;
+ curUser.namelocked = false;
+ curUser.updateIdentity();
+ }
+ }
+ this.globalModlog(`UNLOCK${range ? 'RANGE' : 'IP'}`, target, ` by ${user.name}`);
+ this.addModAction(`${user.name} unlocked the ${range ? "IP range" : "IP"}: ${target}`);
+ },
+ unlockhelp: [
+ `/unlock [username] - Unlocks the user. Requires: % @ * & ~`,
+ `/unlockname [username] - Unlocks a punished alt while leaving the original punishment intact. Requires: % @ * & ~`,
+ `/unlockip [ip] - Unlocks a punished ip while leaving the original punishment intact. Requires: @ * & ~`,
+ ],
 
  forceglobalban: 'globalban',
  gban: 'globalban',
@@ -1982,8 +2031,7 @@ const commands = {
  this.privateModAction(displayMessage);
  }
 
- this.add(`|unlink|hide|${userid}`);
- if (userid !== toId(this.inputUsername)) this.add(`|unlink|hide|${toId(this.inputUsername)}`);
+ room.hideText([userid, toId(this.inputUsername)]);
 
  const globalReason = (target ? `: ${userReason} ${proof}` : '');
  this.globalModlog("BAN", targetUser, ` by ${user.userid}${globalReason}`);
@@ -2126,19 +2174,6 @@ const commands = {
 
  unrangelock: 'unlockip',
  rangeunlock: 'unlockip',
- unlockip: function (target, room, user) {
- target = target.trim();
- if (!target) {
- return this.parse('/help unbanip');
- }
- if (!this.can('rangeban')) return false;
- if (!Punishments.ips.has(target)) {
- return this.errorReply(`${target} is not a locked/banned IP or IP range.`);
- }
- Punishments.ips.delete(target);
- this.addModAction(`${user.name} unlocked the ${(target.charAt(target.length - 1) === '*' ? "IP range" : "IP")}: ${target}`);
- this.modlog('UNRANGELOCK', null, target);
- },
 
  /*********************************************************
  * Moderating: Other
@@ -2224,6 +2259,7 @@ const commands = {
  if (!this.can('promote')) return;
 
  target = this.splitTarget(target, true);
+ if (target) return this.errorReply(`This command does not support specifying a reason.`);
  let targetUser = this.targetUser;
  let userid = toId(this.targetUsername);
  let name = targetUser ? targetUser.name : this.targetUsername;
@@ -2358,6 +2394,32 @@ const commands = {
  },
  announcehelp: [`/announce OR /wall [message] - Makes an announcement. Requires: % @ * # & ~`],
 
+ notifyoffrank: 'notifyrank',
+ notifyrank: function (target, room, user, connection, cmd) {
+ if (!target) return this.parse(`/help notifyrank`);
+ if (!this.can('addhtml', null, room)) return false;
+ if (!this.canTalk()) return;
+ let [rank, notification] = this.splitOne(target);
+ if (!(rank in Config.groups)) return this.errorReply(`Group '${rank}' does not exist.`);
+ const id = `${room.id}-rank-${Config.groups[rank].id}`;
+ if (cmd === 'notifyoffrank') {
+ room.sendRankedUsers(`|tempnotifyoff|${id}`, rank);
+ } else {
+ let [title, message] = this.splitOne(notification);
+ if (!title) title = `${room.title} ${Config.groups[rank].name}+ message!`;
+ if (!user.can('addhtml')) {
+ title += ` (notification from ${user.name})`;
+ }
+ if (message.length > 300) return this.errorReply(`Notifications should not exceed 300 characters.`);
+ room.sendRankedUsers(`|tempnotify|${id}|${title}|${message}`, rank);
+ this.modlog(`NOTIFYRANK`, null, target);
+ }
+ },
+ notifyrankhelp: [
+ `/notifyrank [rank], [title], [message] - Sends a notification to everyone with the specified rank or higher. Requires: # * & ~`,
+ `/notifyoffrank [rank] - Closes the notification previously sent with /notifyrank [rank]. Requires: # * & ~`,
+ ],
+
  fr: 'forcerename',
  forcerename: function (target, room, user) {
  if (!target) return this.parse('/help forcerename');
@@ -2379,6 +2441,7 @@ const commands = {
  Ladders.cancelSearches(targetUser);
  targetUser.resetName(true);
  targetUser.send(`|nametaken||${user.name} considers your name inappropriate${(reason ? `: ${reason}` : ".")}`);
+ targetUser.trackRename = targetUser.name;
  return true;
  },
  forcerenamehelp: [`/forcerename OR /fr [username], [reason] - Forcibly change a user's name and shows them the [reason]. Requires: % @ * & ~`],
@@ -2454,20 +2517,18 @@ const commands = {
  if (!(user.can('lock') || localPunished)) return this.errorReply(`User ${name} is neither locked nor muted/banned from this room.`);
 
  if (targetUser && (cmd === 'hidealtstext' || cmd === 'hidetextalts' || cmd === 'hidealttext')) {
- this.addModAction(`${name}'s alts' messages were cleared from ${room.title} by ${user.name}.`);
+ room.sendByUser(user, `${name}'s alts messages were cleared from ${room.title} by ${user.name}.`);
+
  this.modlog('HIDEALTSTEXT', targetUser, null, {noip: 1});
- this.add(`|unlink|hide|${userid}`);
- const alts = targetUser.getAltUsers(true);
- for (const alt of alts) {
- this.add(`|unlink|hide|${alt.getLastId()}`);
- }
- for (const prevName in targetUser.prevNames) {
- this.add(`|unlink|hide|${targetUser.prevNames[prevName]}`);
- }
+ room.hideText([
+ userid,
+ ...Object.keys(targetUser.prevNames),
+ ...targetUser.getAltUsers(true).map(user => user.getLastId()),
+ ]);
  } else {
- this.addModAction(`${name}'s messages were cleared from ${room.title} by ${user.name}.`);
+ room.sendByUser(user, `${name}'s messages were cleared from ${room.title} by ${user.name}.`);
  this.modlog('HIDETEXT', targetUser || userid, null, {noip: 1, noalts: 1});
- this.add(`|unlink|hide|${userid}`);
+ room.hideText([userid]);
  }
  },
  hidetexthelp: [
@@ -2540,7 +2601,12 @@ const commands = {
  }
  return true;
  },
- blacklisthelp: [`/blacklist [username], [reason] - Blacklists the user from the room you are in for a year. Requires: # & ~`],
+ blacklisthelp: [
+ `/blacklist [username], [reason] - Blacklists the user from the room you are in for a year. Requires: # & ~`,
+ `/unblacklist [username] - Unblacklists the user from the room you are in. Requires: # & ~`,
+ `/showblacklist OR /showbl - show a list of blacklisted users in the room. Requires: % @ # & ~`,
+ `/expiringblacklists OR /expiringbls - show a list of blacklisted users from the room whose blacklists are expiring in 3 months or less. Requires: % @ # & ~`,
+ ],
 
  battleban: function (target, room, user, connection) {
  if (!target) return this.parse(`/help battleban`);
@@ -3290,7 +3356,7 @@ const commands = {
  // errors can occur while rebasing or popping the stash; make sure to recover
  try {
  this.sendReply(`Rebasing...`);
- [code, stdout, stderr] = await exec(`git rebase FETCH_HEAD`);
+ [code] = await exec(`git rebase FETCH_HEAD`);
  if (code) {
  // conflict while rebasing
  await exec(`git rebase --abort`);
@@ -3299,7 +3365,7 @@ const commands = {
 
  if (stashedChanges) {
  this.sendReply(`Restoring saved changes...`);
- [code, stdout, stderr] = await exec(`git stash pop`);
+ [code] = await exec(`git stash pop`);
  if (code) {
  // conflict while popping stash
  await exec(`git reset HEAD .`);
@@ -3802,12 +3868,8 @@ const commands = {
  let targetUser = Users.getExact(target);
  if (!targetUser) return this.errorReply(`User '${target}' not found.`);
 
- target = targetUser ? targetUser.userid : '';
-
- if (target) {
- room.battle.win(targetUser);
- this.modlog('FORCEWIN', target);
- }
+ room.battle.win(targetUser);
+ this.modlog('FORCEWIN', targetUser.userid);
  },
  forcewinhelp: [
  `/forcetie - Forces the current match to end in a tie. Requires: & ~`,
@@ -3901,6 +3963,7 @@ const commands = {
  '!accept': true,
  accept: function (target, room, user, connection) {
  target = this.splitTarget(target);
+ if (target) return this.popupReply(`This command does not support specifying multiple users`);
  const targetUser = this.targetUser || this.pmTarget;
  if (!targetUser) return this.popupReply(`User "${this.targetUsername}" not found.`);
  Ladders.acceptChallenge(connection, targetUser);

chat-formatter.js

@@ -64,7 +64,7 @@ class TextFormatter {
 
  // filter links first
  str = str.replace(linkRegex, uri => {
- let fulluri = uri;
+ let fulluri;
  if (/^[a-z0-9.]+@/ig.test(uri)) {
  fulluri = 'mailto:' + uri;
  } else {