lunibee 0.2.3 → 0.2.4

package/dist/managers/index.js

@@ -1,66 +1,36 @@
 // @bun
 // packages/collection/src/index.ts
-class RecencyList {
-  #nodes = new Map;
-  #oldest;
-  #newest;
-  get size() {
-    return this.#nodes.size;
-  }
-  oldest() {
-    return this.#oldest?.key;
-  }
-  touch(key) {
-    const node = this.#nodes.get(key);
-    if (node)
-      return this.#moveNewest(node);
-    const created = { key, older: this.#newest };
-    if (this.#newest)
-      this.#newest.newer = created;
-    else
-      this.#oldest = created;
-    this.#newest = created;
-    this.#nodes.set(key, created);
-  }
-  promote(key) {
-    const node = this.#nodes.get(key);
-    if (node)
-      this.#moveNewest(node);
-  }
-  delete(key) {
-    const node = this.#nodes.get(key);
-    if (!node)
-      return false;
-    this.#unlink(node);
-    this.#nodes.delete(key);
-    return true;
-  }
-  clear() {
-    this.#nodes.clear();
-    this.#oldest = this.#newest = undefined;
-  }
-  #unlink(node) {
-    if (node.older)
-      node.older.newer = node.newer;
-    else
-      this.#oldest = node.newer;
-    if (node.newer)
-      node.newer.older = node.older;
-    else
-      this.#newest = node.older;
-    node.older = node.newer = undefined;
-  }
-  #moveNewest(node) {
-    if (node === this.#newest)
-      return;
-    this.#unlink(node);
-    node.older = this.#newest;
-    if (this.#newest)
-      this.#newest.newer = node;
-    else
-      this.#oldest = node;
-    this.#newest = node;
-  }
+function newPolicy(options = {}) {
+  return {
+    ttl: options.ttl,
+    maxSize: options.maxSize,
+    slide: options.slide ?? true,
+    onEvict: options.onEvict,
+    expired: 0,
+    evicted: 0,
+    entries: new Map,
+    oldest: undefined,
+    newest: undefined,
+    lruSize: 0,
+    heap: [],
+    armedFor: Infinity
+  };
+}
+function peekOf(collection, key) {
+  return collection instanceof Map ? Map.prototype.get.call(collection, key) : collection.get(key);
+}
+var mapGet = Map.prototype.get;
+var mapHas = Map.prototype.has;
+function sample(items, amount) {
+  if (!Number.isInteger(amount) || amount < 0)
+    throw new RangeError("amount must be a non-negative integer.");
+  const count = Math.min(amount, items.length);
+  for (let i = 0;i < count; i++) {
+    const j = i + Math.floor(Math.random() * (items.length - i));
+    [items[i], items[j]] = [items[j], items[i]];
+  }
+  items.length = count;
+  return items;
 }
 function assertTTL(ttl) {
   if (ttl !== undefined && (!Number.isFinite(ttl) || ttl <= 0))
@@ -68,81 +38,90 @@ function assertTTL(ttl) {
 }
 
 class Collection extends Map {
-  #ttl;
-  #maxSize;
-  #onEvict;
-  #expiry = new Map;
-  #lru = new RecencyList;
-  #stats = {
-    hits: 0,
-    misses: 0,
-    expired: 0,
-    evicted: 0
-  };
-  #heap = [];
-  #timer;
-  #armedFor = Infinity;
+  #policy;
+  #hits = 0;
+  #misses = 0;
   constructor(entries, options = {}) {
     super();
     assertTTL(options.ttl);
     if (options.maxSize !== undefined && (!Number.isInteger(options.maxSize) || options.maxSize <= 0))
       throw new RangeError("maxSize must be a positive integer.");
-    this.#ttl = options.ttl;
-    this.#maxSize = options.maxSize;
-    this.#onEvict = options.onEvict;
+    if (options.ttl !== undefined || options.maxSize !== undefined || options.slide !== undefined || options.onEvict !== undefined)
+      this.#policy = newPolicy(options);
     if (entries)
       for (const [key, value] of entries)
         this.set(key, value);
   }
   set(key, value, ttl) {
+    if (ttl === undefined && this.#policy === undefined)
+      return super.set(key, value);
     assertTTL(ttl);
-    const window = ttl ?? this.#ttl;
-    if (this.#maxSize !== undefined) {
-      this.#lru.touch(key);
-    }
-    super.set(key, value);
+    const window = ttl ?? this.#policy?.ttl;
     if (window !== undefined)
-      this.#schedule(key, window);
-    else if (this.#expiry.size > 0)
-      this.#expiry.delete(key);
+      this.#policy ??= newPolicy();
+    if (!this.#policy)
+      return super.set(key, value);
+    const before = super.size;
+    super.set(key, value);
+    this.#track(key, value, window, super.size !== before);
     this.#enforceCap();
     return this;
   }
   setWithoutTTL(key, value) {
-    if (this.#expiry.size > 0)
-      this.#expiry.delete(key);
-    if (this.#lru.size > 0)
-      this.#lru.delete(key);
+    if (this.#policy)
+      this.#forget(key);
     super.set(key, value);
     return this;
   }
   get(key) {
-    if (this.#expireIfDue(key)) {
-      this.#stats.misses++;
+    const policy = this.#policy;
+    const entry = policy?.entries.get(key);
+    if (entry === undefined) {
+      const value = mapGet.call(this, key);
+      if (value !== undefined || mapHas.call(this, key)) {
+        this.#hits++;
+        return value;
+      }
+      this.#misses++;
       return;
     }
-    const value = super.get(key);
-    if (value === undefined && !super.has(key)) {
-      this.#stats.misses++;
+    const timed = entry.window !== 0;
+    const now = timed ? Date.now() : 0;
+    if (timed && entry.deadline <= now) {
+      this.#expire(entry);
+      this.#misses++;
       return;
     }
-    this.#stats.hits++;
-    const expiry = this.#expiry.get(key);
-    if (expiry)
-      expiry.deadline = Date.now() + expiry.window;
-    this.#lru.promote(key);
-    return value;
+    this.#hits++;
+    if (timed && policy.slide)
+      entry.deadline = now + entry.window;
+    if (entry.inLru)
+      this.#promote(policy, entry);
+    return entry.value;
+  }
+  ensure(key, factory, ttl) {
+    const existing = this.get(key);
+    if (existing !== undefined || super.has(key))
+      return existing;
+    const created = factory(key, this);
+    this.set(key, created, ttl);
+    return created;
   }
   peek(key) {
     if (!this.#expireIfDue(key) && super.has(key)) {
-      this.#stats.hits++;
+      this.#hits++;
       return super.get(key);
     }
-    this.#stats.misses++;
+    this.#misses++;
     return;
   }
   get stats() {
-    return { ...this.#stats };
+    return {
+      hits: this.#hits,
+      misses: this.#misses,
+      expired: this.#policy?.expired ?? 0,
+      evicted: this.#policy?.evicted ?? 0
+    };
   }
   has(key) {
     return !this.#expireIfDue(key) && super.has(key);
@@ -150,19 +129,23 @@ class Collection extends Map {
   delete(key) {
     if (this.#expireIfDue(key))
       return false;
-    this.#expiry.delete(key);
-    this.#lru.delete(key);
+    if (this.#policy)
+      this.#forget(key);
     return super.delete(key);
   }
   clear() {
     super.clear();
-    this.#expiry.clear();
-    this.#lru.clear();
-    this.#heap.length = 0;
-    if (this.#timer)
-      clearTimeout(this.#timer);
-    this.#timer = undefined;
-    this.#armedFor = Infinity;
+    const policy = this.#policy;
+    if (!policy)
+      return;
+    policy.entries.clear();
+    policy.oldest = policy.newest = undefined;
+    policy.lruSize = 0;
+    policy.heap.length = 0;
+    if (policy.timer)
+      clearTimeout(policy.timer);
+    policy.timer = undefined;
+    policy.armedFor = Infinity;
   }
   get size() {
     this.purge();
@@ -190,11 +173,11 @@ class Collection extends Map {
   ttlRemaining(key) {
     if (this.#expireIfDue(key))
       return;
-    const expiry = this.#expiry.get(key);
-    return expiry && Math.max(0, expiry.deadline - Date.now());
+    const entry = this.#policy?.entries.get(key);
+    return entry && entry.window !== 0 ? Math.max(0, entry.deadline - Date.now()) : undefined;
   }
   purge() {
-    if (this.#expiry.size === 0)
+    if (!this.#policy || this.#policy.heap.length === 0)
       return 0;
     const now = Date.now();
     let removed = 0;
@@ -205,133 +188,255 @@ class Collection extends Map {
       this.#remove(due.key);
       removed++;
     }
-    this.#stats.expired += removed;
+    this.#policy.expired += removed;
     this.#rearm();
     for (const [key, value] of dropped)
       this.#notify(key, value, "expired");
     return removed;
   }
   #expireIfDue(key) {
-    const expiry = this.#expiry.get(key);
-    if (!expiry || expiry.deadline > Date.now())
+    const entry = this.#policy?.entries.get(key);
+    if (!entry || entry.window === 0 || entry.deadline > Date.now())
       return false;
-    const value = super.get(key);
-    this.#remove(key);
-    this.#stats.expired++;
-    this.#notify(key, value, "expired");
+    this.#expire(entry);
     return true;
   }
+  #expire(entry) {
+    const value = super.get(entry.key);
+    this.#remove(entry.key);
+    this.#policy.expired++;
+    this.#notify(entry.key, value, "expired");
+  }
   #remove(key) {
-    this.#expiry.delete(key);
-    this.#lru.delete(key);
+    this.#forget(key);
     super.delete(key);
   }
+  #forget(key) {
+    const policy = this.#policy;
+    const entry = policy.entries.get(key);
+    if (!entry)
+      return;
+    if (entry.inLru)
+      this.#unlink(policy, entry);
+    policy.entries.delete(key);
+  }
+  #track(key, value, window, isNew) {
+    const policy = this.#policy;
+    const lru = policy.maxSize !== undefined;
+    let entry = isNew ? undefined : policy.entries.get(key);
+    if (entry)
+      entry.value = value;
+    if (window === undefined) {
+      if (entry && entry.window !== 0) {
+        if (lru)
+          entry = this.#replace(policy, entry, 0, 0);
+        else {
+          this.#forget(key);
+          return;
+        }
+      }
+      if (!entry && lru) {
+        entry = this.#create(key, value, 0, 0);
+        policy.entries.set(key, entry);
+      }
+      if (entry)
+        this.#promote(policy, entry);
+      return;
+    }
+    const deadline = Date.now() + window;
+    if (entry && entry.window !== 0) {
+      entry.deadline = deadline;
+      entry.window = window;
+      if (deadline < entry.filed)
+        entry = this.#replace(policy, entry, window, deadline);
+      else {
+        if (entry.inLru)
+          this.#promote(policy, entry);
+        return;
+      }
+    } else if (entry) {
+      entry.window = window;
+      entry.deadline = entry.filed = deadline;
+    } else {
+      entry = this.#create(key, value, window, deadline);
+      policy.entries.set(key, entry);
+    }
+    if (lru)
+      this.#promote(policy, entry);
+    this.#heapPush(entry);
+    if (policy.heap.length > 2 * policy.entries.size + 8)
+      this.#compact();
+    if (policy.timer === undefined || deadline < policy.armedFor)
+      this.#rearm();
+  }
+  #create(key, value, window, deadline) {
+    return {
+      key,
+      value,
+      older: undefined,
+      newer: undefined,
+      inLru: false,
+      window,
+      deadline,
+      filed: deadline
+    };
+  }
+  #replace(policy, old, window, deadline) {
+    const entry = {
+      ...old,
+      window,
+      deadline,
+      filed: deadline
+    };
+    if (old.inLru) {
+      if (old.older)
+        old.older.newer = entry;
+      else
+        policy.oldest = entry;
+      if (old.newer)
+        old.newer.older = entry;
+      else
+        policy.newest = entry;
+    }
+    policy.entries.set(old.key, entry);
+    return entry;
+  }
+  #promote(policy, entry) {
+    if (entry === policy.newest)
+      return;
+    if (entry.inLru)
+      this.#unlink(policy, entry, true);
+    else {
+      entry.inLru = true;
+      policy.lruSize++;
+    }
+    entry.older = policy.newest;
+    entry.newer = undefined;
+    if (policy.newest)
+      policy.newest.newer = entry;
+    else
+      policy.oldest = entry;
+    policy.newest = entry;
+  }
+  #unlink(policy, entry, keepCount = false) {
+    if (entry.older)
+      entry.older.newer = entry.newer;
+    else
+      policy.oldest = entry.newer;
+    if (entry.newer)
+      entry.newer.older = entry.older;
+    else
+      policy.newest = entry.older;
+    entry.older = entry.newer = undefined;
+    if (!keepCount) {
+      entry.inLru = false;
+      policy.lruSize--;
+    }
+  }
+  #derived() {
+    const Species = this.constructor[Symbol.species] ?? Collection;
+    return new Species;
+  }
   #notify(key, value, reason) {
-    if (!this.#onEvict)
+    const onEvict = this.#policy?.onEvict;
+    if (!onEvict)
       return;
     try {
-      this.#onEvict(key, value, reason);
+      onEvict(key, value, reason);
     } catch {}
   }
   #enforceCap() {
-    if (this.#maxSize === undefined)
+    const policy = this.#policy;
+    const max = policy.maxSize;
+    if (max === undefined)
       return;
-    while (this.#lru.size > this.#maxSize) {
-      const oldest = this.#lru.oldest();
-      const value = super.get(oldest);
-      this.#remove(oldest);
-      this.#stats.evicted++;
-      this.#notify(oldest, value, "evicted");
+    if (policy.lruSize > max && policy.heap.length > 0 && policy.heap[0].filed <= Date.now())
+      this.purge();
+    while (policy.lruSize > max) {
+      const oldest = policy.oldest;
+      const value = policy.onEvict ? super.get(oldest.key) : undefined;
+      this.#unlink(policy, oldest);
+      policy.entries.delete(oldest.key);
+      super.delete(oldest.key);
+      policy.evicted++;
+      this.#notify(oldest.key, value, "evicted");
     }
   }
-  #schedule(key, window) {
-    const deadline = Date.now() + window;
-    const expiry = this.#expiry.get(key);
-    if (expiry) {
-      expiry.deadline = deadline;
-      expiry.window = window;
-      if (deadline >= expiry.filed)
-        return;
-      expiry.filed = deadline;
-    } else
-      this.#expiry.set(key, { deadline, window, filed: deadline });
-    this.#heapPush({ key, deadline });
-    if (this.#heap.length > 2 * this.#expiry.size + 8)
-      this.#compact();
-    this.#rearm();
-  }
   #nextDeadline() {
+    const policy = this.#policy;
     for (;; ) {
-      const top = this.#heap[0];
+      const top = policy.heap[0];
       if (top === undefined)
         return Infinity;
-      const expiry = this.#expiry.get(top.key);
-      if (!expiry || expiry.filed !== top.deadline) {
+      if (policy.entries.get(top.key) !== top) {
         this.#heapPop();
         continue;
       }
-      if (expiry.deadline === top.deadline)
-        return top.deadline;
+      if (top.deadline === top.filed)
+        return top.filed;
       this.#heapPop();
-      expiry.filed = expiry.deadline;
-      this.#heapPush({ key: top.key, deadline: expiry.deadline });
+      top.filed = top.deadline;
+      this.#heapPush(top);
     }
   }
   #compact() {
-    const live = this.#heap.filter((record) => this.#expiry.get(record.key)?.filed === record.deadline);
-    this.#heap.length = 0;
-    for (const record of live)
-      this.#heapPush(record);
+    const policy = this.#policy;
+    const live = policy.heap.filter((entry) => policy.entries.get(entry.key) === entry);
+    policy.heap.length = 0;
+    for (const entry of live)
+      this.#heapPush(entry);
   }
   #rearm() {
+    const p = this.#policy;
     const deadline = this.#nextDeadline();
-    if (this.#timer !== undefined && deadline >= this.#armedFor)
+    if (p.timer !== undefined && deadline >= p.armedFor)
       return;
-    if (this.#timer)
-      clearTimeout(this.#timer);
-    this.#timer = undefined;
-    this.#armedFor = deadline;
+    if (p.timer)
+      clearTimeout(p.timer);
+    p.timer = undefined;
+    p.armedFor = deadline;
     if (deadline === Infinity)
       return;
-    this.#timer = setTimeout(() => {
-      this.#timer = undefined;
-      this.#armedFor = Infinity;
+    p.timer = setTimeout(() => {
+      p.timer = undefined;
+      p.armedFor = Infinity;
       this.purge();
     }, Math.max(0, deadline - Date.now()));
-    this.#timer.unref?.();
+    p.timer.unref?.();
   }
-  #heapPush(record) {
-    const heap = this.#heap;
-    heap.push(record);
-    let i = heap.length - 1;
+  #heapPush(entry) {
+    const heap = this.#policy.heap;
+    let i = heap.length;
+    heap.push(entry);
     while (i > 0) {
       const parent = i - 1 >> 1;
-      if (heap[parent].deadline <= heap[i].deadline)
+      const above = heap[parent];
+      if (above.filed <= entry.filed)
         break;
-      [heap[parent], heap[i]] = [heap[i], heap[parent]];
+      heap[i] = above;
       i = parent;
     }
+    heap[i] = entry;
   }
   #heapPop() {
-    const heap = this.#heap;
+    const heap = this.#policy.heap;
     const top = heap[0];
     const last = heap.pop();
     if (top === undefined || heap.length === 0)
       return top;
-    heap[0] = last;
-    for (let i = 0;; ) {
-      const left = 2 * i + 1;
-      const right = left + 1;
-      let smallest = i;
-      if (left < heap.length && heap[left].deadline < heap[smallest].deadline)
-        smallest = left;
-      if (right < heap.length && heap[right].deadline < heap[smallest].deadline)
-        smallest = right;
-      if (smallest === i)
+    let i = 0;
+    for (;; ) {
+      let child = 2 * i + 1;
+      if (child >= heap.length)
+        break;
+      if (child + 1 < heap.length && heap[child + 1].filed < heap[child].filed)
+        child++;
+      if (heap[child].filed >= last.filed)
         break;
-      [heap[smallest], heap[i]] = [heap[i], heap[smallest]];
-      i = smallest;
+      heap[i] = heap[child];
+      i = child;
     }
+    heap[i] = last;
     return top;
   }
   first() {
@@ -363,8 +468,26 @@ class Collection extends Map {
     }
     return;
   }
+  findLast(predicate) {
+    const entries = [...this];
+    for (let i = entries.length - 1;i >= 0; i--) {
+      const [key, value] = entries[i];
+      if (predicate(value, key, this))
+        return value;
+    }
+    return;
+  }
+  findLastKey(predicate) {
+    const entries = [...this];
+    for (let i = entries.length - 1;i >= 0; i--) {
+      const [key, value] = entries[i];
+      if (predicate(value, key, this))
+        return key;
+    }
+    return;
+  }
   filter(predicate) {
-    const result = new Collection;
+    const result = this.#derived();
     for (const [key, value] of this) {
       if (predicate(value, key, this))
         result.set(key, value);
@@ -408,7 +531,7 @@ class Collection extends Map {
     return [...this.entries()];
   }
   clone() {
-    const copy = new Collection;
+    const copy = this.#derived();
     for (const [key, value] of this)
       copy.set(key, value);
     return copy;
@@ -463,7 +586,7 @@ class Collection extends Map {
     return result;
   }
   intersection(other) {
-    const result = new Collection;
+    const result = this.#derived();
     for (const [key, value] of this) {
       if (other.has(key))
         result.set(key, value);
@@ -471,7 +594,7 @@ class Collection extends Map {
     return result;
   }
   difference(other) {
-    const result = new Collection;
+    const result = this.#derived();
     for (const [key, value] of this) {
       if (!other.has(key))
         result.set(key, value);
@@ -479,8 +602,8 @@ class Collection extends Map {
     return result;
   }
   partition(predicate) {
-    const pass = new Collection;
-    const fail = new Collection;
+    const pass = this.#derived();
+    const fail = this.#derived();
     for (const [key, value] of this) {
       if (predicate(value, key, this))
         pass.set(key, value);
@@ -489,6 +612,81 @@ class Collection extends Map {
     }
     return [pass, fail];
   }
+  symmetricDifference(other) {
+    const result = this.#derived();
+    for (const [key, value] of this)
+      if (!other.has(key))
+        result.set(key, value);
+    for (const [key, value] of other)
+      if (!this.has(key))
+        result.set(key, value);
+    return result;
+  }
+  concat(...collections) {
+    const result = this.clone();
+    for (const collection of collections)
+      for (const [key, value] of collection)
+        result.set(key, value);
+    return result;
+  }
+  merge(other, whenInSelf, whenInOther, whenInBoth) {
+    const result = this.#derived();
+    const decide = (key, kept) => {
+      if (kept.keep)
+        result.set(key, kept.value);
+    };
+    for (const [key, value] of this) {
+      decide(key, other.has(key) ? whenInBoth(value, peekOf(other, key), key) : whenInSelf(value, key));
+    }
+    for (const [key, value] of other)
+      if (!this.has(key))
+        decide(key, whenInOther(value, key));
+    return result;
+  }
+  equals(other) {
+    if (!other)
+      return false;
+    if (other === this)
+      return true;
+    if (this.size !== other.size)
+      return false;
+    for (const [key, value] of this) {
+      if (!other.has(key))
+        return false;
+      if (value !== peekOf(other, key))
+        return false;
+    }
+    return true;
+  }
+  mapValues(transform) {
+    const result = this.#derived();
+    for (const [key, value] of this)
+      result.set(key, transform(value, key, this));
+    return result;
+  }
+  toReversed() {
+    const result = this.#derived();
+    const entries = [...this];
+    for (let i = entries.length - 1;i >= 0; i--)
+      result.set(entries[i][0], entries[i][1]);
+    return result;
+  }
+  toSorted(comparator) {
+    return this.sorted(comparator);
+  }
+  static groupBy(items, keySelector) {
+    const groups = new Collection;
+    let index = 0;
+    for (const item of items)
+      groups.ensure(keySelector(item, index++), () => []).push(item);
+    return groups;
+  }
+  static combineEntries(entries, combine) {
+    const result = new Collection;
+    for (const [key, value] of entries)
+      result.set(key, result.has(key) ? combine(result.get(key), value, key) : value);
+    return result;
+  }
   tap(fn) {
     fn(this);
     return this;
@@ -507,6 +705,13 @@ class Collection extends Map {
       acc = fn(acc, value, key, this);
     return acc;
   }
+  reduceRight(fn, initialValue) {
+    const entries = [...this];
+    let acc = initialValue;
+    for (let i = entries.length - 1;i >= 0; i--)
+      acc = fn(acc, entries[i][1], entries[i][0], this);
+    return acc;
+  }
   sorted(comparator) {
     const decorated = [...this.entries()].map((entry, index) => ({
       entry,
@@ -517,22 +722,34 @@ class Collection extends Map {
         const comparison = comparator(x.entry[1], y.entry[1], x.entry[0], y.entry[0]);
         return comparison !== 0 ? comparison : x.index - y.index;
       });
-    const result = new Collection;
+    const result = this.#derived();
     for (const { entry } of decorated)
       result.set(entry[0], entry[1]);
     return result;
   }
-  random() {
-    const arr = [...this.values()];
-    if (!arr.length)
+  random(amount) {
+    if (amount !== undefined)
+      return sample([...this.values()], amount);
+    const size = this.size;
+    if (size === 0)
       return;
-    return arr[Math.floor(Math.random() * arr.length)];
+    let index = Math.floor(Math.random() * size);
+    for (const value of this.values())
+      if (index-- === 0)
+        return value;
+    return;
   }
-  randomKey() {
-    const arr = [...this.keys()];
-    if (!arr.length)
+  randomKey(amount) {
+    if (amount !== undefined)
+      return sample([...this.keys()], amount);
+    const size = this.size;
+    if (size === 0)
       return;
-    return arr[Math.floor(Math.random() * arr.length)];
+    let index = Math.floor(Math.random() * size);
+    for (const key of this.keys())
+      if (index-- === 0)
+        return key;
+    return;
   }
   at(index) {
     const arr = [...this.values()];
@@ -656,7 +873,7 @@ class ResourceManager extends Manager {
 // packages/rest/package.json
 var package_default = {
   name: "@lunibee/rest",
-  version: "0.2.3",
+  version: "0.2.4",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -673,6 +890,9 @@ var Routes = {
   user: () => "/users/@me",
   userById: (userId) => `/users/${snowflake(userId, "User ID")}`,
   guild: (guildId) => `/guilds/${snowflake(guildId, "Guild ID")}`,
+  currentUserGuild: (guildId) => `/users/@me/guilds/${snowflake(guildId, "Guild ID")}`,
+  sticker: (stickerId) => `/stickers/${snowflake(stickerId, "Sticker ID")}`,
+  messageReactionUser: (channelId, messageId, emoji, userId) => `${Routes.messageReactions(channelId, messageId, emoji)}/${snowflake(userId, "User ID")}`,
   guildPreview: (guildId) => `/guilds/${snowflake(guildId, "Guild ID")}/preview`,
   guildActiveThreads: (guildId) => `/guilds/${snowflake(guildId, "Guild ID")}/threads/active`,
   guildWebhooks: (guildId) => `/guilds/${snowflake(guildId, "Guild ID")}/webhooks`,
@@ -785,7 +1005,7 @@ function cdnURL(path, hash, options = {}) {
   const isAnimated = hash.startsWith("a_") && !options.forceStatic;
   const ext = options.extension ?? (isAnimated ? "gif" : "png");
   const size = options.size ? `?size=${options.size}` : "";
-  return `${CDN_BASE}${path}/${hash}.${ext}${size}`;
+  return `${CDN_BASE}${path}/${encodeURIComponent(hash)}.${ext}${size}`;
 }
 
 class User extends BaseStructure {
@@ -1141,60 +1361,7 @@ var Permissions = {
   PinMessages: 1n << 51n,
   BypassSlowmode: 1n << 52n
 };
-var PermissionFlagsBits = {
-  CreateInstantInvite: 1n << 0n,
-  KickMembers: 1n << 1n,
-  BanMembers: 1n << 2n,
-  Administrator: 1n << 3n,
-  ManageChannels: 1n << 4n,
-  ManageGuild: 1n << 5n,
-  AddReactions: 1n << 6n,
-  ViewAuditLog: 1n << 7n,
-  PrioritySpeaker: 1n << 8n,
-  Stream: 1n << 9n,
-  ViewChannel: 1n << 10n,
-  SendMessages: 1n << 11n,
-  SendTTSMessages: 1n << 12n,
-  ManageMessages: 1n << 13n,
-  EmbedLinks: 1n << 14n,
-  AttachFiles: 1n << 15n,
-  ReadMessageHistory: 1n << 16n,
-  MentionEveryone: 1n << 17n,
-  UseExternalEmojis: 1n << 18n,
-  ViewGuildInsights: 1n << 19n,
-  Connect: 1n << 20n,
-  Speak: 1n << 21n,
-  MuteMembers: 1n << 22n,
-  DeafenMembers: 1n << 23n,
-  MoveMembers: 1n << 24n,
-  UseVAD: 1n << 25n,
-  ChangeNickname: 1n << 26n,
-  ManageNicknames: 1n << 27n,
-  ManageRoles: 1n << 28n,
-  ManageWebhooks: 1n << 29n,
-  ManageGuildExpressions: 1n << 30n,
-  UseApplicationCommands: 1n << 31n,
-  RequestToSpeak: 1n << 32n,
-  ManageEvents: 1n << 33n,
-  ManageThreads: 1n << 34n,
-  CreatePublicThreads: 1n << 35n,
-  CreatePrivateThreads: 1n << 36n,
-  UseExternalStickers: 1n << 37n,
-  SendMessagesInThreads: 1n << 38n,
-  UseEmbeddedActivities: 1n << 39n,
-  ModerateMembers: 1n << 40n,
-  ViewCreatorMonetizationAnalytics: 1n << 41n,
-  UseSoundboard: 1n << 42n,
-  CreateGuildExpressions: 1n << 43n,
-  CreateEvents: 1n << 44n,
-  UseExternalSounds: 1n << 45n,
-  SendVoiceMessages: 1n << 46n,
-  SetVoiceChannelStatus: 1n << 48n,
-  SendPolls: 1n << 49n,
-  UseExternalApps: 1n << 50n,
-  PinMessages: 1n << 51n,
-  BypassSlowmode: 1n << 52n
-};
+var PermissionFlagsBits = Permissions;
 
 class PermissionSet {
   bitfield;
@@ -1595,10 +1762,10 @@ class GuildMember {
   get permissions() {
     if (this.#suppliedPermissions)
       return this.#suppliedPermissions;
-    return new PermissionsBitField(this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds) ?? 0n);
+    return new PermissionsBitField(this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds, undefined, this.timedOutUntil) ?? 0n);
   }
   permissionsIn(channelId) {
-    const computed = this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds, channelId);
+    const computed = this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds, channelId, this.timedOutUntil);
     return computed ? new PermissionsBitField(computed) : null;
   }
   #action(name) {
@@ -2169,7 +2336,7 @@ class UserManager extends ResourceManager {
     return this.upsert(new User(data));
   }
   async leaveGuild(guildId) {
-    await this.#rest.delete(`/users/@me/guilds/${guildId}`);
+    await this.#rest.delete(Routes.currentUserGuild(guildId));
   }
   async createDM(userId) {
     return this.#rest.post("/users/@me/channels", {
@@ -2458,20 +2625,15 @@ class RoleManager extends ResourceManager {
   }
   async create(options) {
     const { reason, ...payload } = options;
-    const data = await this.#rest.post(Routes.guildRoles(this.guildId), {
-      ...payload,
-      permissions: payload.permissions !== undefined ? String(payload.permissions) : undefined
-    }, { reason });
-    const role = new Role(data);
-    this.set(role.id, role);
-    return role;
+    const data = await this.#rest.post(Routes.guildRoles(this.guildId), rolePayload(payload), { reason });
+    return this.#store(data);
   }
   async edit(roleId, options) {
     const { reason, ...payload } = options;
-    const data = await this.#rest.patch(Routes.guildRole(this.guildId, roleId), {
-      ...payload,
-      permissions: payload.permissions !== undefined ? String(payload.permissions) : undefined
-    }, { reason });
+    const data = await this.#rest.patch(Routes.guildRole(this.guildId, roleId), rolePayload(payload), { reason });
+    return this.#store(data);
+  }
+  #store(data) {
     const role = new Role(data);
     this.set(role.id, role);
     return role;
@@ -2494,6 +2656,13 @@ class RoleManager extends ResourceManager {
     return this.remove(roleId);
   }
 }
+function rolePayload(options) {
+  const { permissions, ...rest } = options;
+  return {
+    ...rest,
+    permissions: permissions !== undefined ? String(permissions) : undefined
+  };
+}
 
 // packages/managers/src/guild-resources.ts
 function withQuery2(path, params) {
@@ -3130,7 +3299,7 @@ class ChannelManager extends Manager {
     await this.#rest.delete(`${Routes.messageReactions(channelId, messageId, emoji)}/@me`);
   }
   async removeReaction(channelId, messageId, emoji, userId) {
-    await this.#rest.delete(`${Routes.messageReactions(channelId, messageId, emoji)}/${userId}`);
+    await this.#rest.delete(Routes.messageReactionUser(channelId, messageId, emoji, userId));
   }
   async removeAllReactions(channelId, messageId) {
     await this.#rest.delete(Routes.messageReactionsAll(channelId, messageId));
@@ -3202,4 +3371,4 @@ export {
   toRequest
 };
 
-//# debugId=1B8C9372B2A05B6E64756E2164756E21
+//# debugId=B358201AAE38843564756E2164756E21