libram 0.4.1 → 0.4.2

package/dist/Clan.js

@@ -1,531 +1,314 @@
-"use strict";
-
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.regexp.to-string.js");
-
-require("core-js/modules/es.reflect.construct.js");
-
-require("core-js/modules/es.array.iterator.js");
-
-require("core-js/modules/es.regexp.constructor.js");
-
-require("core-js/modules/es.string.replace.js");
-
-require("core-js/modules/es.symbol.js");
-
-require("core-js/modules/es.symbol.description.js");
-
-require("core-js/modules/es.array.slice.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Clan = exports.ClanError = void 0;
-
-require("core-js/modules/es.array.includes.js");
-
-require("core-js/modules/es.string.includes.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
-require("core-js/modules/es.string.match.js");
-
-require("core-js/modules/es.array.filter.js");
-
-require("core-js/modules/es.array.map.js");
-
-require("core-js/modules/es.number.parse-int.js");
-
-require("core-js/modules/es.array.find.js");
-
-require("core-js/modules/es.array.sort.js");
-
-require("core-js/modules/es.array.concat.js");
-
-var _kolmafia = require("kolmafia");
-
-var _lib = require("./lib");
-
-var _logger = _interopRequireDefault(require("./logger"));
-
-var _utils = require("./utils");
-
-var _class;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
-
-function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, undefined, groups); }; var _super = RegExp.prototype; var _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); _groups.set(_this, groups || _groups.get(re)); return _setPrototypeOf(_this, BabelRegExp.prototype); } _inherits(BabelRegExp, RegExp); BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); if (result) result.groups = buildGroups(result, this); return result; }; BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if (typeof substitution === "string") { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } else if (typeof substitution === "function") { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; if (typeof args[args.length - 1] !== "object") { args = [].slice.call(args); args.push(buildGroups(args, _this)); } return substitution.apply(this, args); }); } else { return _super[Symbol.replace].call(this, str, substitution); } }; function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { groups[name] = result[g[name]]; return groups; }, Object.create(null)); } return _wrapRegExp.apply(this, arguments); }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
-
-function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-var ClanError = /*#__PURE__*/function (_Error) {
-  _inherits(ClanError, _Error);
-
-  var _super = _createSuper(ClanError);
-
-  function ClanError(message, reason) {
-    var _this;
-
-    _classCallCheck(this, ClanError);
-
-    _this = _super.call(this, message);
-
-    _defineProperty(_assertThisInitialized(_this), "reason", void 0);
-
-    _this.reason = reason;
-    Object.setPrototypeOf(_assertThisInitialized(_this), ClanError.prototype);
-    return _this;
-  }
-
-  return ClanError;
-}( /*#__PURE__*/_wrapNativeSuper(Error)); // It would be fantastic to have this function properly typed
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { availableAmount, cliExecute, getClanId, getClanName, getPlayerId, putStash, refreshStash, retrieveItem, stashAmount, takeStash, visitUrl, xpath, } from "kolmafia";
+import { getFoldGroup } from "./lib";
+import logger from "./logger";
+import { arrayToCountedMap, countedMapToArray, countedMapToString, notNull, parseNumber, } from "./utils";
+export class ClanError extends Error {
+    constructor(message, reason) {
+        super(message);
+        this.reason = reason;
+        Object.setPrototypeOf(this, ClanError.prototype);
+    }
+}
+// It would be fantastic to have this function properly typed
 // But until someone can work out how to do it, it gets the
 // comment blocks of shame
-
 /* eslint-disable */
-
-
-exports.ClanError = ClanError;
-
 function validate(target, propertyName, descriptor) {
-  if (!(descriptor !== null && descriptor !== void 0 && descriptor.value)) return;
-  var method = descriptor.value; // @ts-ignore
-
-  descriptor.value = function () {
+    if (!descriptor?.value)
+        return;
+    const method = descriptor.value;
     // @ts-ignore
-    if (this.id !== (0, _kolmafia.getClanId)()) {
-      throw new Error("You are no longer a member of this clan");
-    }
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    return method.apply(this, args);
-  };
+    descriptor.value = function (...args) {
+        // @ts-ignore
+        if (this.id !== getClanId()) {
+            throw new Error("You are no longer a member of this clan");
+        }
+        return method.apply(this, args);
+    };
 }
 /* eslint-enable */
-
-
-var clanIdCache = {};
-
-var toPlayerId = player => typeof player === "string" ? (0, _kolmafia.getPlayerId)(player) : player;
-
-var LOG_FAX_PATTERN = /*#__PURE__*/_wrapRegExp(/([0-9]{2}\/[0-9]{2}\/[0-9]{2}, [0-9]{2}:[0-9]{2}(?:AM|PM): )<a (?:(?!>)[\s\S])+>((?:(?!<)[\s\S])+)<\/a>(?: faxed in a (.*?))<br>/, {
-  monster: 3
-});
-
-var WHITELIST_DEGREE_PATTERN = /*#__PURE__*/_wrapRegExp(/(.*?) \(\xB0([0-9]+)\)/, {
-  name: 1,
-  degree: 2
-});
-
-var Clan = (_class = /*#__PURE__*/function () {
-  function Clan(id, name) {
-    _classCallCheck(this, Clan);
-
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "name", void 0);
-
-    this.id = id;
-    this.name = name;
-  }
-  /**
-   * Join clan
-   */
-
-
-  _createClass(Clan, [{
-    key: "join",
-    value: function join() {
-      return Clan._join(this.id);
+const clanIdCache = {};
+const toPlayerId = (player) => typeof player === "string" ? getPlayerId(player) : player;
+const LOG_FAX_PATTERN = /(\d{2}\/\d{2}\/\d{2}, \d{2}:\d{2}(?:AM|PM): )<a [^>]+>([^<]+)<\/a>(?: faxed in a (?<monster>.*?))<br>/;
+const WHITELIST_DEGREE_PATTERN = /(?<name>.*?) \(°(?<degree>\d+)\)/;
+export class Clan {
+    constructor(id, name) {
+        this.id = id;
+        this.name = name;
     }
-  }, {
-    key: "check",
-    value: function check() {
-      return (0, _kolmafia.visitUrl)("clan_hall.php").includes("<b>".concat(this.name, "</b>"));
+    static _join(id) {
+        const result = visitUrl(`showclan.php?recruiter=1&whichclan=${id}&pwd&whichclan=${id}&action=joinclan&apply=Apply+to+this+Clan&confirm=on`);
+        if (!result.includes("clanhalltop.gif")) {
+            throw new Error("Could not join clan");
+        }
+        return Clan.get();
     }
-    /**
-     * Return the monster that is currently in the current clan's fax machine if any
-     */
-
-  }, {
-    key: "getCurrentFax",
-    value: function getCurrentFax() {
-      var logs = (0, _kolmafia.visitUrl)("clan_log.php");
-      var lastFax = logs.match(LOG_FAX_PATTERN);
-      if (!lastFax) return null;
-
-      var _lastFax = _slicedToArray(lastFax, 4),
-          monsterName = _lastFax[3];
-
-      if (!monsterName) return null;
-      return Monster.get(monsterName);
+    static _withStash(borrowFn, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    returnFn, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    callback) {
+        const borrowed = borrowFn();
+        const map = arrayToCountedMap(borrowed);
+        try {
+            return callback(borrowed);
+        }
+        finally {
+            if (map.size > 0) {
+                const returned = arrayToCountedMap(returnFn(borrowed));
+                map.forEach((quantity, item) => {
+                    const remaining = quantity - (returned.get(item) || 0);
+                    if (remaining > 0) {
+                        map.set(item, remaining);
+                    }
+                    else {
+                        map.delete(item);
+                    }
+                });
+                if (map.size > 0) {
+                    logger.error(`Failed to return <b>${countedMapToString(map)}</b> to <b>${this.name}</b> stash`);
+                }
+            }
+        }
     }
     /**
-     * List available ranks (name, degree and id) from the current clan
+     * Join a clan and return its instance
+     * @param clanIdOrName Clan id or name
      */
-
-  }, {
-    key: "getRanks",
-    value: function getRanks() {
-      var page = (0, _kolmafia.visitUrl)("clan_whitelist.php");
-      return (0, _kolmafia.xpath)(page, '//select[@name="level"]//option').map(option => {
-        var validHtml = "<select>".concat(option, "</select>");
-        var match = (0, _kolmafia.xpath)(validHtml, "//text()")[0].match(WHITELIST_DEGREE_PATTERN);
-        var id = (0, _kolmafia.xpath)(validHtml, "//@value")[0];
-        if (!match || !id) return null;
-
-        var _match = _slicedToArray(match, 3),
-            name = _match[1],
-            degree = _match[2];
-
-        return {
-          name: name,
-          degree: Number.parseInt(degree),
-          id: Number.parseInt(id)
-        };
-      }).filter(_utils.notNull);
+    static join(clanIdOrName) {
+        let clanId;
+        if (typeof clanIdOrName === "string") {
+            const clanName = clanIdOrName.toLowerCase();
+            if (clanName === getClanName().toLowerCase()) {
+                return Clan.get();
+            }
+            if (!(clanName in clanIdCache)) {
+                const clan = Clan.getWhitelisted().find((c) => c.name.toLowerCase() === clanName);
+                if (!clan) {
+                    throw new Error("Player is not whitelisted to clan");
+                }
+                clanIdCache[clanName] = clan.id;
+            }
+            clanId = clanIdCache[clanName];
+        }
+        else {
+            clanId = clanIdOrName;
+            if (clanId === getClanId()) {
+                return Clan.get();
+            }
+        }
+        return Clan._join(clanId);
     }
     /**
-     * Add a player to the current clan's whitelist.
-     * If the player is already in the whitelist this will change their rank or title.
-     * @param player Player id or name
-     * @param rankName Rank to give the player. If not provided they will be given the lowest rank
-     * @param title Title to give the player. If not provided, will be blank
+     * Execute callback as a member of a clan
+     * and then restore prior membership
+     * @param clanIdOrName Clan id or name
      */
-
-  }, {
-    key: "addPlayerToWhitelist",
-    value: function addPlayerToWhitelist(player, rankName) {
-      var title = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
-      var playerId = toPlayerId(player);
-      var ranks = this.getRanks();
-      var rank = rankName ? ranks.find(r => r.name === rankName) : ranks.sort((a, b) => a.degree - b.degree)[0];
-      if (!rank) return false;
-      var result = (0, _kolmafia.visitUrl)("clan_whitelist.php?action=add&pwd&addwho=".concat(playerId, "&level=").concat(rank.id, "&title=").concat(title));
-      return result.includes("added to whitelist.") || result.includes("That player is already on the whitelist");
+    static with(clanIdOrName, callback) {
+        const startingClan = Clan.get();
+        const clan = Clan.join(clanIdOrName);
+        try {
+            return callback(clan);
+        }
+        finally {
+            startingClan.join();
+        }
     }
-    /**
-     * Remove a player from the current clan's whitelist
-     * @param player Player id or name
-     */
-
-  }, {
-    key: "removePlayerFromWhitelist",
-    value: function removePlayerFromWhitelist(player) {
-      var playerId = toPlayerId(player);
-      var result = (0, _kolmafia.visitUrl)("clan_whitelist.php?action=updatewl&pwd&who=".concat(playerId, "&remove=Remove"));
-      return result.includes("Whitelist updated.");
+    static withStash(clanIdOrName, items, // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+    callback // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
+    ) {
+        return Clan._withStash(() => Clan.with(clanIdOrName, (clan) => clan.take(items)), (borrowed) => Clan.with(clanIdOrName, (clan) => clan.put(borrowed)), callback);
     }
     /**
-     * Return the amount of meat in the current clan's coffer.
+     * Return player's current Clan
      */
-
-  }, {
-    key: "getMeatInCoffer",
-    value: function getMeatInCoffer() {
-      var page = (0, _kolmafia.visitUrl)("clan_stash.php");
-
-      var _ref = page.match(/Your <b>Clan Coffer<\/b> contains ([\d,]+) Meat./) || ["0", "0"],
-          _ref2 = _slicedToArray(_ref, 2),
-          meat = _ref2[1];
-
-      return (0, _utils.parseNumber)(meat);
+    static get() {
+        return new Clan(getClanId(), getClanName());
     }
     /**
-     * Add the given amount of meat to the current clan's coffer.
-     * @param amount Amount of meat to put in coffer
+     * Get list of clans to which the player is whitelisted
      */
-
-  }, {
-    key: "putMeatInCoffer",
-    value: function putMeatInCoffer(amount) {
-      var result = (0, _kolmafia.visitUrl)("clan_stash.php?pwd&action=contribute&howmuch=".concat(amount));
-      return result.includes("You contributed");
+    static getWhitelisted() {
+        const page = visitUrl("clan_signup.php");
+        return xpath(page, '//select[@name="whichclan"]//option').map((option) => {
+            const validHtml = `<select>${option}</select>`;
+            const id = Number.parseInt(xpath(validHtml, "//@value")[0]);
+            const name = xpath(validHtml, "//text()")[0];
+            return new Clan(id, name);
+        });
     }
     /**
-     * Take items from the stash
-     *
-     * This function will also take equivalent foldables if the original item cannot be found
-     *
-     * @param items Items to take
-     * @returns Items successfully taken
+     * Join clan
      */
-
-  }, {
-    key: "take",
-    value: function take(items) {
-      var map = (0, _utils.arrayToCountedMap)(items);
-      map.forEach((quantity, item) => {
-        var needed = Math.max(0, quantity - (0, _kolmafia.availableAmount)(item));
-
-        if (needed === 0) {
-          return map.set(item, 0);
-        }
-
-        var foldGroup = (0, _lib.getFoldGroup)(item);
-
-        var _iterator = _createForOfIteratorHelper(foldGroup),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var foldable = _step.value;
-            var quantityToFold = Math.min(needed, (0, _kolmafia.availableAmount)(foldable));
-
-            for (var _i3 = 0; _i3 < quantityToFold; _i3++) {
-              (0, _kolmafia.cliExecute)("fold ".concat(item.name));
-              needed--;
-            }
-
-            return map.set(item, needed);
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-
-        (0, _kolmafia.refreshStash)();
-
-        for (var _i2 = 0, _arr2 = [item].concat(_toConsumableArray(foldGroup)); _i2 < _arr2.length; _i2++) {
-          var matchingItem = _arr2[_i2];
-          var quantityToTake = Math.min(needed, (0, _kolmafia.stashAmount)(matchingItem));
-          if (quantityToTake === 0) continue; // If we can't take from the stash, there's no sense in iterating through the whole fold group
-
-          if (!(0, _kolmafia.takeStash)(quantityToTake, matchingItem)) return;
-
-          if (matchingItem === item) {
-            needed -= quantityToTake;
-          } else {
-            for (var i = 0; i < quantityToTake; i++) {
-              (0, _kolmafia.cliExecute)("fold ".concat(matchingItem.name));
-              needed--;
-            }
-          }
-        }
-      });
-      return Array.isArray(items) ? (0, _utils.countedMapToArray)(map) : map;
+    join() {
+        return Clan._join(this.id);
     }
-    /**
-     * Put items in the stash
-     * @param items Items to put in the stash
-     * @returns Items successfully put in the stash
-     */
-
-  }, {
-    key: "put",
-    value: function put(items) {
-      var map = (0, _utils.arrayToCountedMap)(items);
-      if (!this.check()) throw new Error("Wanted to return ".concat((0, _utils.countedMapToString)(map), " to ").concat(this.name, " but KoLmafia's clan data is out of sync"));
-      map.forEach((quantity, item) => {
-        (0, _kolmafia.retrieveItem)(quantity, item);
-        var returned = Math.min(quantity, (0, _kolmafia.availableAmount)(item));
-        (0, _kolmafia.putStash)(returned, item);
-        map.set(item, quantity - returned);
-      });
-      return Array.isArray(items) ? (0, _utils.countedMapToArray)(map) : map;
+    check() {
+        return visitUrl("clan_hall.php").includes(`<b>${this.name}</b>`);
     }
     /**
      * Return the monster that is currently in the current clan's fax machine if any
      */
-
-  }, {
-    key: "withStash",
-    value: function withStash(items, callback) {
-      var map = (0, _utils.arrayToCountedMap)(items);
-      return Clan._withStash(() => this.take(map), borrowed => this.put(borrowed), callback);
-    }
-  }], [{
-    key: "_join",
-    value: function _join(id) {
-      var result = (0, _kolmafia.visitUrl)("showclan.php?recruiter=1&whichclan=".concat(id, "&pwd&whichclan=").concat(id, "&action=joinclan&apply=Apply+to+this+Clan&confirm=on"));
-
-      if (!result.includes("clanhalltop.gif")) {
-        throw new Error("Could not join clan");
-      }
-
-      return Clan.get();
-    }
-  }, {
-    key: "_withStash",
-    value: function _withStash(borrowFn, // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    returnFn, // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    callback) {
-      var borrowed = borrowFn();
-      var map = (0, _utils.arrayToCountedMap)(borrowed);
-
-      try {
-        return callback(borrowed);
-      } finally {
-        if (map.size > 0) {
-          var returned = (0, _utils.arrayToCountedMap)(returnFn(borrowed));
-          map.forEach((quantity, item) => {
-            var remaining = quantity - (returned.get(item) || 0);
-
-            if (remaining > 0) {
-              map.set(item, remaining);
-            } else {
-              map.delete(item);
-            }
-          });
-
-          if (map.size > 0) {
-            _logger.default.error("Failed to return <b>".concat((0, _utils.countedMapToString)(map), "</b> to <b>").concat(this.name, "</b> stash"));
-          }
-        }
-      }
+    getCurrentFax() {
+        const logs = visitUrl("clan_log.php");
+        const lastFax = logs.match(LOG_FAX_PATTERN);
+        if (!lastFax)
+            return null;
+        const [, , , monsterName] = lastFax;
+        if (!monsterName)
+            return null;
+        return Monster.get(monsterName);
     }
     /**
-     * Join a clan and return its instance
-     * @param clanIdOrName Clan id or name
+     * List available ranks (name, degree and id) from the current clan
      */
-
-  }, {
-    key: "join",
-    value: function join(clanIdOrName) {
-      var clanId;
-
-      if (typeof clanIdOrName === "string") {
-        var _clanName = clanIdOrName.toLowerCase();
-
-        if (_clanName === (0, _kolmafia.getClanName)().toLowerCase()) {
-          return Clan.get();
-        }
-
-        if (!(_clanName in clanIdCache)) {
-          var clan = Clan.getWhitelisted().find(c => c.name.toLowerCase() === _clanName);
-
-          if (!clan) {
-            throw new Error("Player is not whitelisted to clan");
-          }
-
-          clanIdCache[_clanName] = clan.id;
-        }
-
-        clanId = clanIdCache[_clanName];
-      } else {
-        clanId = clanIdOrName;
-
-        if (clanId === (0, _kolmafia.getClanId)()) {
-          return Clan.get();
-        }
-      }
-
-      return Clan._join(clanId);
+    getRanks() {
+        const page = visitUrl("clan_whitelist.php");
+        return xpath(page, '//select[@name="level"]//option')
+            .map((option) => {
+            const validHtml = `<select>${option}</select>`;
+            const match = xpath(validHtml, "//text()")[0].match(WHITELIST_DEGREE_PATTERN);
+            const id = xpath(validHtml, "//@value")[0];
+            if (!match || !id)
+                return null;
+            const [, name, degree] = match;
+            return {
+                name,
+                degree: Number.parseInt(degree),
+                id: Number.parseInt(id),
+            };
+        })
+            .filter(notNull);
     }
     /**
-     * Execute callback as a member of a clan
-     * and then restore prior membership
-     * @param clanIdOrName Clan id or name
+     * Add a player to the current clan's whitelist.
+     * If the player is already in the whitelist this will change their rank or title.
+     * @param player Player id or name
+     * @param rankName Rank to give the player. If not provided they will be given the lowest rank
+     * @param title Title to give the player. If not provided, will be blank
      */
-
-  }, {
-    key: "with",
-    value: function _with(clanIdOrName, callback) {
-      var startingClan = Clan.get();
-      var clan = Clan.join(clanIdOrName);
-
-      try {
-        return callback(clan);
-      } finally {
-        startingClan.join();
-      }
+    addPlayerToWhitelist(player, rankName, title = "") {
+        const playerId = toPlayerId(player);
+        const ranks = this.getRanks();
+        const rank = rankName
+            ? ranks.find((r) => r.name === rankName)
+            : ranks.sort((a, b) => a.degree - b.degree)[0];
+        if (!rank)
+            return false;
+        const result = visitUrl(`clan_whitelist.php?action=add&pwd&addwho=${playerId}&level=${rank.id}&title=${title}`);
+        return (result.includes("added to whitelist.") ||
+            result.includes("That player is already on the whitelist"));
     }
     /**
-     * Execute callback with items from a clan stash
-     * and then restore those items to the stash
-     *
-     * During the execution of the callback, player will not be in the stash clan
-     *
-     * @param clanIdOrName Clan id or name
+     * Remove a player from the current clan's whitelist
+     * @param player Player id or name
      */
-
-  }, {
-    key: "withStash",
-    value: function withStash(clanIdOrName, items, // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
-    callback) {
-      return Clan._withStash(() => Clan.with(clanIdOrName, clan => clan.take(items)), borrowed => Clan.with(clanIdOrName, clan => clan.put(borrowed)), callback);
+    removePlayerFromWhitelist(player) {
+        const playerId = toPlayerId(player);
+        const result = visitUrl(`clan_whitelist.php?action=updatewl&pwd&who=${playerId}&remove=Remove`);
+        return result.includes("Whitelist updated.");
     }
     /**
-     * Return player's current Clan
+     * Return the amount of meat in the current clan's coffer.
      */
-
-  }, {
-    key: "get",
-    value: function get() {
-      return new Clan((0, _kolmafia.getClanId)(), (0, _kolmafia.getClanName)());
+    getMeatInCoffer() {
+        const page = visitUrl("clan_stash.php");
+        const [, meat] = page.match(/Your <b>Clan Coffer<\/b> contains ([\d,]+) Meat./) || ["0", "0"];
+        return parseNumber(meat);
     }
     /**
-     * Get list of clans to which the player is whitelisted
+     * Add the given amount of meat to the current clan's coffer.
+     * @param amount Amount of meat to put in coffer
      */
-
-  }, {
-    key: "getWhitelisted",
-    value: function getWhitelisted() {
-      var page = (0, _kolmafia.visitUrl)("clan_signup.php");
-      return (0, _kolmafia.xpath)(page, '//select[@name="whichclan"]//option').map(option => {
-        var validHtml = "<select>".concat(option, "</select>");
-        var id = Number.parseInt((0, _kolmafia.xpath)(validHtml, "//@value")[0]);
-        var name = (0, _kolmafia.xpath)(validHtml, "//text()")[0];
-        return new Clan(id, name);
-      });
+    putMeatInCoffer(amount) {
+        const result = visitUrl(`clan_stash.php?pwd&action=contribute&howmuch=${amount}`);
+        return result.includes("You contributed");
+    }
+    take(items) {
+        const map = arrayToCountedMap(items);
+        map.forEach((quantity, item) => {
+            let needed = Math.max(0, quantity - availableAmount(item));
+            if (needed === 0) {
+                return map.set(item, 0);
+            }
+            const foldGroup = getFoldGroup(item);
+            for (const foldable of foldGroup) {
+                const quantityToFold = Math.min(needed, availableAmount(foldable));
+                for (let i = 0; i < quantityToFold; i++) {
+                    cliExecute(`fold ${item.name}`);
+                    needed--;
+                }
+                return map.set(item, needed);
+            }
+            refreshStash();
+            for (const matchingItem of [item, ...foldGroup]) {
+                const quantityToTake = Math.min(needed, stashAmount(matchingItem));
+                if (quantityToTake === 0)
+                    continue;
+                // If we can't take from the stash, there's no sense in iterating through the whole fold group
+                if (!takeStash(quantityToTake, matchingItem))
+                    return;
+                if (matchingItem === item) {
+                    needed -= quantityToTake;
+                }
+                else {
+                    for (let i = 0; i < quantityToTake; i++) {
+                        cliExecute(`fold ${matchingItem.name}`);
+                        needed--;
+                    }
+                }
+            }
+        });
+        return Array.isArray(items) ? countedMapToArray(map) : map;
+    }
+    put(items) {
+        const map = arrayToCountedMap(items);
+        if (!this.check())
+            throw new Error(`Wanted to return ${countedMapToString(map)} to ${this.name} but KoLmafia's clan data is out of sync`);
+        map.forEach((quantity, item) => {
+            retrieveItem(quantity, item);
+            const returned = Math.min(quantity, availableAmount(item));
+            putStash(returned, item);
+            map.set(item, quantity - returned);
+        });
+        return Array.isArray(items) ? countedMapToArray(map) : map;
     }
-  }]);
-
-  return Clan;
-}(), (_applyDecoratedDescriptor(_class.prototype, "getCurrentFax", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "getCurrentFax"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "getRanks", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "getRanks"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "addPlayerToWhitelist", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "addPlayerToWhitelist"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "removePlayerFromWhitelist", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "removePlayerFromWhitelist"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "getMeatInCoffer", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "getMeatInCoffer"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "putMeatInCoffer", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "putMeatInCoffer"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "take", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "take"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "put", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "put"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "withStash", [validate], Object.getOwnPropertyDescriptor(_class.prototype, "withStash"), _class.prototype)), _class);
-exports.Clan = Clan;
+    withStash(items, callback // eslint-disable-line @typescript-eslint/no-explicit-any
+    ) {
+        const map = arrayToCountedMap(items);
+        return Clan._withStash(() => this.take(map), (borrowed) => this.put(borrowed), callback);
+    }
+}
+__decorate([
+    validate
+], Clan.prototype, "getCurrentFax", null);
+__decorate([
+    validate
+], Clan.prototype, "getRanks", null);
+__decorate([
+    validate
+], Clan.prototype, "addPlayerToWhitelist", null);
+__decorate([
+    validate
+], Clan.prototype, "removePlayerFromWhitelist", null);
+__decorate([
+    validate
+], Clan.prototype, "getMeatInCoffer", null);
+__decorate([
+    validate
+], Clan.prototype, "putMeatInCoffer", null);
+__decorate([
+    validate
+], Clan.prototype, "take", null);
+__decorate([
+    validate
+], Clan.prototype, "put", null);
+__decorate([
+    validate
+], Clan.prototype, "withStash", null);