- Add .4chan, .regional, .aesthetics, .textwall. Update some commands

- Add `.4chan`, `.regional`, `.aesthetics`, `.textwall`

- Update `.remind`
-> Use given time text instead of generating one when responding initially

- Remove `.urban random`, `.urban search`
-> `.urban` now does both

- Update Paginator to give files

Author: cakedan

package.json

@@ -10,20 +10,17 @@
   "dependencies": {
     "@sentry/node": "^6.4.1",
     "chrono-node": "^2.3.8",
-    "detritus-client": "^0.17.0-beta.1",
+    "detritus-client": "^0.17.0-beta.4",
     "emoji-aware": "^3.0.5",
     "juration": "^0.1.1",
     "moment": "^2.29.1",
     "moment-duration-format": "^2.3.2",
     "moment-timezone": "^0.5.32",
-    "node-libcurl": "^2.3.3",
-    "redis": "^3.1.2",
-    "typescript": "^4.1.2"
+    "redis": "^3.1.2"
   },
   "devDependencies": {
     "@types/moment-duration-format": "^2.2.2",
-    "@types/node": "^15.6.1",
-    "@types/node-fetch": "^2.5.10",
+    "@types/node": "^17.0.27",
     "@types/redis": "^2.8.28"
   },
   "scripts": {

src/api/endpoints.ts

@@ -183,6 +183,10 @@ export const Api = Object.freeze({
   REMINDER:
     '/reminders/:reminderId',
 
+  SEARCH_4CHAN:
+    '/search/4chan',
+  SEARCH_4CHAN_RANDOM:
+    '/search/4chan/random',
   SEARCH_DUCKDUCKGO:
     '/search/duckduckgo',
   SEARCH_DUCKDUCKGO_IMAGES:

src/api/index.ts

@@ -861,6 +861,22 @@ export async function putUser(
 }
 
 
+export async function search4Chan(
+  context: RequestContext,
+  options: RestOptions.Search4Chan,
+) {
+  return raw.search4Chan(context, options);
+}
+
+
+export async function search4ChanRandom(
+  context: RequestContext,
+  options: RestOptions.Search4ChanRandom,
+) {
+  return raw.search4ChanRandom(context, options);
+}
+
+
 export async function searchDuckDuckGo(
   context: RequestContext,
   options: RestOptions.SearchDuckDuckGo,

src/api/raw.ts

@@ -1791,6 +1791,40 @@ export async function putUser(
 }
 
 
+export async function search4Chan(
+  context: RequestContext,
+  options: RestOptions.Search4Chan,
+): Promise<RestResponsesRaw.Search4Chan> {
+  const query = {
+    board: options.board,
+  };
+  return request(context, {
+    query,
+    route: {
+      method: HTTPMethods.GET,
+      path: Api.SEARCH_4CHAN,
+    },
+  });
+}
+
+
+export async function search4ChanRandom(
+  context: RequestContext,
+  options: RestOptions.Search4ChanRandom,
+): Promise<RestResponsesRaw.Search4Chan> {
+  const query = {
+    nsfw: options.nsfw,
+  };
+  return request(context, {
+    query,
+    route: {
+      method: HTTPMethods.GET,
+      path: Api.SEARCH_4CHAN_RANDOM,
+    },
+  });
+}
+
+
 export async function searchDuckDuckGo(
   context: RequestContext,
   options: RestOptions.SearchDuckDuckGo,

src/api/structures/googlesearchimageresult.ts

@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { Collections, Structures } from 'detritus-client';
 

src/api/structures/guildsettings.ts

@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { Collections, ShardClient, Structures } from 'detritus-client';
 import { DiscordAbortCodes } from 'detritus-client/lib/constants';

src/api/types.ts

@@ -319,6 +319,14 @@ export namespace RestOptions {
   }
 
 
+  export interface Search4Chan {
+    board: string,
+  }
+
+  export interface Search4ChanRandom {
+    nsfw: boolean,
+  }
+
   export interface SearchDuckDuckGo {
     query: string,
   }
@@ -790,6 +798,76 @@ export namespace RestResponsesRaw {
   }
 
 
+  export interface Search4ChanMedia {
+    deleted: boolean,
+    extension: string,
+    height: number,
+    md5: string,
+    mobile_optimized: boolean,
+    name: string,
+    size: number,
+    spoiler: boolean,
+    spoiler_id: null | number,
+    tag: null | string,
+    url: string,
+    width: number,
+  }
+
+  export interface Search4ChanThread {
+    closed: boolean,
+    comment: string,
+    created_at: number,
+    created_at_text: string,
+    edited_at: null | number,
+    id: number,
+    images: number,
+    limited: {
+      bump: boolean,
+      images: boolean,
+    },
+    media: Search4ChanMedia | null,
+    omitted: {
+      images: number,
+      posts: number,
+    },
+    posts: Array<{
+      comment: string,
+      created_at: number,
+      created_at_text: string,
+      id: number,
+      media: Search4ChanMedia,
+      reply_id: null | number,
+      url: string,
+      user: Search4ChanUser,
+    }>,
+    replies: number,
+    sticky: boolean,
+    sticky_cap: number | null,
+    tail_size: number | null,
+    title: string,
+    unique_ips: number | null,
+    url: string,
+    url_semantic: string | null,
+    user: Search4ChanUser,
+  }
+
+  export interface Search4ChanUser {
+    badge: null | string,
+    country: null | {code: string, name: string},
+    id: null | string,
+    name: string,
+    since4pass: null | number,
+    trip: null | string,
+  }
+
+  export interface Search4Chan {
+    board: string,
+    nsfw: boolean,
+    threads: Array<Search4ChanThread>,
+    url: string,
+  }
+
+
   export interface SearchGoogle {
     cards: Array<SearchGoogleCard>,
     results: Array<SearchGoogleResult>,

src/bootstrap/moment-duration-format.ts

@@ -1,2 +1,2 @@
-import * as moment from 'moment';
+import moment from 'moment';
 import 'moment-duration-format';

src/bootstrap/moment-timezone.ts

@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment from 'moment';
 import 'moment-timezone';
 
 moment.tz.setDefault('America/New_York');

src/commands/interactions/slash/reminder/create.ts

@@ -39,6 +39,7 @@ export class ReminderCreateCommand extends BaseInteractionCommandOption {
     return Formatter.Commands.ReminderCreate.createMessage(context, {
       result: {
         content: args.content || args.when.content,
+        contentTimestamp: args.when.contentTimestamp,
         end: args.when.end,
         start: args.when.start,
       },